This bean cannot be singleton as more than one admin may be logged in. It should...

[addressbook-war.git] / web / WEB-INF / templates / admin / admin_form_personal_data.tpl

diff --git a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
index 9bbce6803833bb5cdbb47d05cc59cdf981c23e10..87d709e30c88d3de49ba6317b527a993df0739c7 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
@@ -19,7 +19,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{adminUserController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
@@ -59,9 +61,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminUserController.street}" required="true">
-                                               <f:validator for="street" validatorId="NameValidator" />
-                                       </h:inputText>
+                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminUserController.street}" />
                                </div>
 
                                <div class="clear"></div>
@@ -73,7 +73,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminUserController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminUserController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
@@ -87,7 +87,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminUserController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminUserController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
                                        </h:inputText>
                                </div>
@@ -101,9 +101,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminUserController.city}" required="true">
-                                               <f:validator for="city" validatorId="NameValidator" />
-                                       </h:inputText>
+                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminUserController.city}" />
                                </div>
 
                                <div class="clear"></div>
@@ -130,7 +128,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="phoneCountryCode" value="#{adminUserController.phoneCountry}" converter="country">
+                                       <h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminUserController.phoneCountry}" converter="country">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
                                        </h:selectOneMenu>
@@ -176,14 +174,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="cellphoneCarrier" value="#{adminUserController.cellphoneCarrier}" converter="CellphoneCarrierConverter">
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{cellphone.allSmsProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryLocalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
-                                       </h:selectOneMenu>
-
-                                       <h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{adminUserController.cellphoneNumber}">
-                                               <f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
+                                       <ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{adminUserController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
@@ -221,6 +214,30 @@
 
                        <div class="para"></div>
 
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="password1" value="#{msg.ADMIN_ADD_USER_ENTER_PASSWORD1}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" required="true" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="password2" value="#{msg.ADMIN_ADD_USER_ENTER_PASSWORD2}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" required="true" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
                        <div class="para notice">
                                <ul>
                                        <li>#{msg.ADMIN_ADD_USER_USER_NAME_NOTICE}</li>