added title (e.g. Dr., Prof. etc)

[pizzaservice-war.git] / web / WEB-INF / templates / admin / user / admin_form_user_data.tpl

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 ad6c8db7a12af1b630e9221e9381fd7393812bf2..511af3b08f105b28e8483d537088641b38754c22 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
@@ -10,15 +10,17 @@
        <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>
+                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
+                               </legend>
 
                                <div class="table_row">
-                                       <div class="table_left">
-                                               <h:outputLabel for="userName" value="#{msg.ADMIN_USER_DATA_ENTER_USER_NAME}" />
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                        </div>
 
-                                       <div class="table_right">
-                                               <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+                                       <div class="table_right_medium">
+                                               <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
                                        </div>
 
                                        <div class="clear"></div>
@@ -26,41 +28,25 @@
 
                                <div class="para"></div>
 
-                               <ui:fragment rendered="#{mode == 'add'}">
-                                       <div class="table_row">
-                                               <div class="table_left">
-                                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_USER_DATA_ENTER_EMAIL}" />
-                                               </div>
-
-                                               <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
-                                               </div>
-
-                                               <div class="clear"></div>
-                                       </div>
-
-                                       <div class="para"></div>
-                               </ui:fragment>
-
                                <div class="table_row">
-                                       <div class="table_left">
-                                               <h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
+                                       <div class="table_left_medium">
+                                               <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
                                        </div>
 
-                                       <div class="table_right">
-                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                                       <div class="table_right_medium">
+                                               <h:inputSecret styleClass="input" id="userPassword" 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 class="table_left_medium">
+                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
                                        </div>
 
-                                       <div class="table_right">
-                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                                       <div class="table_right_medium">
+                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
                                        </div>
 
                                        <div class="clear"></div>
@@ -68,15 +54,17 @@
 
                                <div class="para notice">
                                        <ul>
-                                               <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+                                               <li>
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" />
+                                               </li>
 
                                                <li>
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+                                                       <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}" rendered="#{mode == 'add'}" />
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
                                                </li>
                                        </ul>
                                </div>