Continued a bit:

- in admin area it should be medium-sized to hacve more room
- email address is already in contact data template

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 04aeab1438c9abc04e08c67e10bacabbb55af71b..0eae8720f1f5b3b72ff35d57a02077fe6d435ca0 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -10,11 +10,11 @@
                        <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}</legend>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="gender" value="#{msg.ADMIN_PERSONAL_DATA_GENDER}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
                                                <ui:param name="targetController" value="#{adminContactController}" />
                                        </ui:include>
@@ -24,11 +24,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
                                </div>
 
@@ -36,11 +36,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
                                </div>
 
@@ -48,11 +48,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
                                </div>
 
@@ -60,11 +60,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
@@ -74,11 +74,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
                                        </h:inputText>
@@ -88,11 +88,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
                                </div>
 
@@ -100,11 +100,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
@@ -115,11 +115,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
@@ -138,11 +138,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
@@ -161,11 +161,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
                                                <ui:param name="targetController" value="#{adminContactController}" />
                                        </ui:include>
@@ -175,11 +175,11 @@
                        </div>
 
                        <div class="table_row">
-                               <div class="table_left">
+                               <div class="table_left_medium">
                                        <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" />
                                </div>
 

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index 32a07ff8657ccaf1b44431262ed7c471cb004aa4..d84b063f0631805d87aa07a6d941e39efe50d7af 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -1,88 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<ui:composition\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
-\r
-       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />\r
-\r
-       <ui:fragment rendered="#{not empty mode}">\r
-               <div class="para">\r
-                       <fieldset id="login_data">\r
-                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>\r
-\r
-                               <div class="table_row">\r
-                                       <div class="table_left_medium">\r
-                                               <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />\r
-                                       </div>\r
-\r
-                                       <div class="table_right">\r
-                                               <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />\r
-                                       </div>\r
-\r
-                                       <div class="clear"></div>\r
-                               </div>\r
-\r
-                               <div class="para"></div>\r
-\r
-                               <ui:fragment rendered="#{mode == 'add'}">\r
-                                       <div class="table_row">\r
-                                               <div class="table_left_medium">\r
-                                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS}" />\r
-                                               </div>\r
-\r
-                                               <div class="table_right">\r
-                                                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />\r
-                                               </div>\r
-\r
-                                               <div class="clear"></div>\r
-                                       </div>\r
-\r
-                                       <div class="para"></div>\r
-                               </ui:fragment>\r
-\r
-                               <div class="table_row">\r
-                                       <div class="table_left">\r
-                                               <h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />\r
-                                       </div>\r
-\r
-                                       <div class="table_right">\r
-                                               <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />\r
-                                       </div>\r
-\r
-                                       <div class="clear"></div>\r
-                               </div>\r
-\r
-                               <div class="table_row">\r
-                                       <div class="table_left">\r
-                                               <h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />\r
-                                       </div>\r
-\r
-                                       <div class="table_right">\r
-                                               <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />\r
-                                       </div>\r
-\r
-                                       <div class="clear"></div>\r
-                               </div>\r
-\r
-                               <div class="para notice">\r
-                                       <ul>\r
-                                               <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>\r
-\r
-                                               <li>\r
-                                                       <h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />\r
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />\r
-                                               </li>\r
-\r
-                                               <ui:fragment rendered="#{mode == 'add'}">\r
-                                                       <li>\r
-                                                               <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />\r
-                                                       </li>\r
-                                               </ui:fragment>\r
-                                       </ul>\r
-                               </div>\r
-                       </fieldset>\r
-               </div>\r
-       </ui:fragment>\r
-</ui:composition>\r
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
+
+       <ui:fragment rendered="#{not empty mode}">
+               <div class="para">
+                       <fieldset id="login_data">
+                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>
+
+                               <div class="table_row">
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+                                       </div>
+
+                                       <div class="table_right">
+                                               <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </div>
+
+                               <div class="para"></div>
+
+                               <div class="table_row">
+                                       <div class="table_left">
+                                               <h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
+                                       </div>
+
+                                       <div class="table_right">
+                                               <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </div>
+
+                               <div class="table_row">
+                                       <div class="table_left">
+                                               <h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
+                                       </div>
+
+                                       <div class="table_right">
+                                               <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </div>
+
+                               <div class="para notice">
+                                       <ul>
+                                               <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+
+                                               <li>
+                                                       <h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
+                                               </li>
+
+                                               <li>
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
+                                               </li>
+                                       </ul>
+                               </div>
+                       </fieldset>
+               </div>
+       </ui:fragment>
+</ui:composition>