Continued:

- template 'admin_form_user_data' requires parameter 'mode'.
- added missing i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index ad480b69cde38de1b9b0432e98ff12816eb3b9d3..c9e25c474356fc9a334acef71db83b181ff22789 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -330,7 +330,7 @@ ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Vergeben Sie hier den Benutzernamen und geben
 ADMIN_USER_DATA_ENTER_USER_NAME=Benutzername (*1):
 ADMIN_USER_DATA_ENTER_EMAIL=Email-Adresse (*2):
 ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System prueft dies fuer Sie.
-ADMIN_USER_DATA_PASSWORD_NOTICE=Lassen Sie beide Passwortfelder leer und es wird ein Passwort per Zufall generiert. Das Passwort wird dem Benutzer nach Erstellung des Zugangs an die Email-Adresse gesendet.
+ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Lassen Sie beide Passwortfelder leer und es wird ein Passwort per Zufall generiert. Das Passwort wird dem Benutzer nach Erstellung des Zugangs an die Email-Adresse gesendet.
 ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein.
 BUTTON_ADMIN_ADD_USER=Neuen Benutzer hinzuf\u00fcgen
 ADMIN_MENU_COUNTRY_TITLE=L\u00e4nderdaten
@@ -483,3 +483,5 @@ ADMIN_LINK_EDIT_CONTACT=Kontaktdaten editieren
 ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren.
 BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern
 ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren
+ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00fcssen Sie es zweimal eingeben, anderfalls beide leer lassen.
+ERROR_PARAMETER_MODE_NOT_SET=Fehler: Parameter 'modus' nicht gesetzt.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 1960c2c74d4f6795bd20e01528ce660803c6b8eb..d961dd0052b31b39b8597ea25edefe74d7301d1f 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -304,7 +304,7 @@ ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Enter here a user name and email address.
 ADMIN_USER_DATA_ENTER_USER_NAME=User name (*1):
 ADMIN_USER_DATA_ENTER_EMAIL=Email address (*2):
 ADMIN_USER_DATA_USER_NAME_NOTICE=*1: The user name must be unique which is checked by the system for you.
-ADMIN_USER_DATA_PASSWORD_NOTICE=Keep both password fields empty to create a random password. The password is being sent to the user's email address after creation of the account.
+ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Keep both password fields empty to create a random password. The password is being sent to the user's email address after creation of the account.
 ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE=*2: The email address must be unique.
 BUTTON_ADMIN_ADD_USER=Add new user account
 ADMIN_MENU_COUNTRY_TITLE=Country data
@@ -457,3 +457,5 @@ ADMIN_LINK_EDIT_CONTACT=Edit contact data
 ADMIN_LINK_EDIT_CONTACT_TITLE=Here you can edit contact data.
 BUTTON_ADMIN_EDIT_USER=Change user data
 ADMIN_EDIT_USER_TITLE=Edit user data
+ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter it twice, otherwise leave both empty.
+ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'modus' is not set.

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 589fa1e1d7459e984ce99b9abe535e710ae7a940..d96ee2efdd9daa4a961e8914bd645a8c479e1fcf 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
@@ -5,67 +5,76 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para">
-               <fieldset id="login_data">
-                       <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>
+       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
 
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="userName" value="#{msg.ADMIN_USER_DATA_ENTER_USER_NAME}" />
-                               </div>
+       <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_right">
-                                       <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-                               </div>
+                               <div class="table_row">
+                                       <div class="table_left">
+                                               <h:outputLabel for="userName" value="#{msg.ADMIN_USER_DATA_ENTER_USER_NAME}" />
+                                       </div>
 
-                               <div class="clear"></div>
-                       </div>
+                                       <div class="table_right">
+                                               <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+                                       </div>
 
-                       <div class="table_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_USER_DATA_ENTER_EMAIL}" />
+                                       <div class="clear"></div>
                                </div>
 
-                               <div class="table_right">
-                                       <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
+                               <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="clear"></div>
-                       </div>
+                               <div class="para"></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_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="password1" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD1}" />
-                               </div>
+                                       <div class="table_right">
+                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                                       </div>
 
-                               <div class="table_right">
-                                       <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                                       <div class="clear"></div>
                                </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_row">
-                               <div class="table_left">
-                                       <h:outputLabel for="password2" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD2}" />
-                               </div>
+                                       <div class="table_right">
+                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                                       </div>
 
-                               <div class="table_right">
-                                       <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                                       <div class="clear"></div>
                                </div>
 
-                               <div class="clear"></div>
-                       </div>
-
-                       <div class="para notice">
-                               <ul>
-                                       <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
-                                       <li>#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}</li>
-                                       <li>#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}</li>
-                               </ul>
-                       </div>
-               </fieldset>
-       </div>
+                               <div class="para notice">
+                                       <ul>
+                                               <li>#{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_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
+                                               </li>
+
+                                               <li>#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}</li>
+                                       </ul>
+                               </div>
+                       </fieldset>
+               </div>
+       </ui:fragment>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
index 2ad070f845967b5b748a7fd0d491f087ed6519c6..b6a1bd1d68dff5659390be385afe85f4f606f682 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
@@ -11,5 +11,7 @@
 
        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
-       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl" />
+       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
+               <ui:param name="mode" value="add" />
+       </ui:include>
 </ui:composition>