Please cherry-pick:

- re-added (huh? was somehow lost?) user data form with user name and password
- moved notice from user (old place) to contact ("new" place) as it was
  previously double and in user obsolete, let all contacts have at least one
  email address
- renamed i18n string accordingly (naming-convention)

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 6ae0658db227a6712fb30c7899aff22794b347d6..829ffd56bfe3c47ed18d9e3bb29b840aab31e274 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -260,7 +260,7 @@ ADMIN_PERSONAL_DATA_ENTER_USER_NAME=Benutzername (*1):
 ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS=Email-Adresse (*2):
 ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System pr\u00fcft dies f\u00fcr Sie.
 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.
+ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein.
 BUTTON_ADMIN_ADD_USER=Neues Benutzeraccount hinzuf\u00fcgen
 ADMIN_MENU_COUNTRY_TITLE=L\u00e4nderdaten
 LINK_ADMIN_LIST_COUNTRIES=L\u00e4nder auflisten

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 0e52e9aaa16c2f1b0a348b9f26284f70e075ffdf..f9b4ac84a77d7e315571e08760c80cd7665b8345 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -243,7 +243,7 @@ ADMIN_PERSONAL_DATA_ENTER_USER_NAME=User name (*1):
 ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS=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_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.
+ADMIN_CONTACT_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
 LINK_ADMIN_LIST_COUNTRIES=List countries

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 ce141485e119304968fcdb8c095b23da6f12cb50..8ee9b405bfbd94182d86cba1901b30a580cd7c05 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
@@ -292,4 +292,12 @@
                        </h:panelGroup>
                </fieldset>
        </div>
+
+       <div class="para notice">
+               <ul>
+                       <li>
+                               <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
+                       </li>
+               </ul>
+       </div>
 </ui:composition>

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 e91047b4f5750b39e53e07c9f3c4a9e217ed85b9..74042e47a17a8b8d77938f8f60ad893e5a764500 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
@@ -68,7 +68,7 @@
                                                </div>
 
                                                <div class="clear"></div>
-                                       </div>
+                                       </h:panelGroup>
                                </ui:fragment>
 
                                <div class="para notice">
@@ -79,10 +79,6 @@
                                                        <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>
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}" />
-                                               </li>
                                        </ul>
                                </div>
                        </fieldset>

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 8b47c6f865d53d39d789e1e2ba50493e59c85e26..9628451e8f1422fc3c7f963e8ff6493ee9e32073 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
@@ -5,6 +5,10 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
+               <ui:param name="mode" value="add" />
+       </ui:include>
+
        <div class="para notice">
                <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
        </div>