From 52d37a22478a13a66e28bd29f3c217dea6a3d06f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 26 Aug 2016 12:17:40 +0200 Subject: [PATCH] Please cherry-pick: - replace div class="error_container" to h:panelGroup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/bundle_de_DE.properties | 1 + .../localization/bundle_en_US.properties | 1 + .../admin/contact/admin_form_contact_data.tpl | 44 +++++++-------- .../admin/fax/admin_form_add_contact_fax.tpl | 8 +-- .../admin/fax/admin_form_fax_data.tpl | 8 +-- .../admin_form_add_contact_landline.tpl | 8 +-- .../landline/admin_form_landline_data.tpl | 8 +-- .../admin/mobile/admin_form_mobile_data.tpl | 8 +-- .../admin_form_mobile_provider.tpl | 4 +- web/WEB-INF/templates/base.tpl | 4 ++ .../templates/contact/form_contact_data.tpl | 56 +++++++++---------- .../guest_email_address_repeat_fields.tpl | 8 +-- .../templates/guest/guest_privacy_terms.tpl | 8 +-- .../templates/guest/user/guest_login_form.tpl | 14 +++-- .../register/guest_form_register_single.tpl | 4 +- ...ser_change_email_address_repeat_fields.tpl | 8 +-- .../user/user_enter_current_password.tpl | 4 +- web/guest/user/resend_link.xhtml | 4 +- web/user/login_change_password.xhtml | 12 ++-- 19 files changed, 111 insertions(+), 101 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 8df49098..63532d5e 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -767,3 +767,4 @@ ADMIN_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=Administrator hat neues Benutzeraccount USER_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=Ein Administrator hat Ihren Benutzeracciunt angelegt. ADMIN_ACTIVITY_USER_LOGGED_OUT=Benutzer hat sich ausgeloggt. USER_ACTIVITY_USER_LOGGED_OUT=Sie haben sich ausgeloggt. +ERROR_GUEST_USER_NAME_REQUIRED_DISABLED=Fehler: Die Anwendung verwendet keine Benutzernamen, dennoch wurde dieses Template geladen. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 93e0f3b3..01ae184e 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -768,3 +768,4 @@ ADMIN_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=An administrator has created a new user USER_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=An aministrator has created your new user account. ADMIN_ACTIVITY_USER_LOGGED_OUT=User has logged out. USER_ACTIVITY_USER_LOGGED_OUT=You have logged out. +ERROR_GUEST_USER_NAME_REQUIRED_DISABLED=Error: This application requires no user name, still this template has been loaded. 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 b3515394..8e8f5431 100644 --- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl @@ -24,9 +24,9 @@
-
+ -
+
@@ -40,9 +40,9 @@
-
+ -
+
@@ -56,9 +56,9 @@
-
+ -
+
@@ -72,9 +72,9 @@
-
+ -
+
@@ -88,9 +88,9 @@
-
+ -
+
@@ -106,9 +106,9 @@
-
+ -
+
@@ -122,9 +122,9 @@
-
+ -
+
@@ -140,9 +140,9 @@
-
+ -
+
@@ -156,9 +156,9 @@
-
+ -
+
@@ -175,9 +175,9 @@
-
+ -
+
@@ -273,9 +273,9 @@
-
+ -
+
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index ceaa9526..2cfa486a 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -56,13 +56,13 @@
-
+ -
+ -
+ -
+
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl index c2137c0f..adb9bac9 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl @@ -44,13 +44,13 @@
-
+ -
+ -
+ -
+ diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl index b110d8ae..1aec8d21 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -56,13 +56,13 @@
-
+ -
+ -
+ -
+
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl index a560cac7..98f95d66 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl @@ -44,13 +44,13 @@
-
+ -
+ -
+ -
+ diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl index ff56323e..b612405a 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl @@ -45,9 +45,9 @@
-
+ -
+
@@ -63,9 +63,9 @@
-
+ -
+
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl index 94786d7e..4faff759 100644 --- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl +++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl @@ -28,9 +28,9 @@
-
+ -
+
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index 59e93a4c..e6e227a7 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -43,6 +43,10 @@
Default content
+ + + +
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index f39c43f1..1e02c8c9 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -29,9 +29,9 @@
-
+ -
+
@@ -47,9 +47,9 @@
-
+ -
+
@@ -65,9 +65,9 @@
-
+ -
+
@@ -83,9 +83,9 @@
-
+ -
+
@@ -101,9 +101,9 @@
-
+ -
+
@@ -117,9 +117,9 @@
-
+ -
+
@@ -135,9 +135,9 @@
-
+ -
+
@@ -153,9 +153,9 @@
-
+ -
+
@@ -171,9 +171,9 @@
-
+ -
+
@@ -191,9 +191,9 @@
-
+ -
+
@@ -220,13 +220,13 @@
-
+ -
+ -
+ -
+
@@ -252,13 +252,13 @@
-
+ -
+ -
+ -
+
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl index b6b50319..286cd67a 100644 --- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl @@ -19,9 +19,9 @@
-
+ -
+
@@ -35,8 +35,8 @@
-
+ -
+
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index 9d1943d0..87f6c602 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -29,9 +29,9 @@
-
+ -
+
@@ -52,9 +52,9 @@
-
+ -
+
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl index 1bb24a80..ff8f295a 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- +
#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE} @@ -27,9 +27,9 @@
-
+ -
+
@@ -43,9 +43,9 @@
-
+ -
+
@@ -55,5 +55,9 @@
+ + + + diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl index 7ddcabfc..eb9db275 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl @@ -31,9 +31,9 @@
-
+ -
+ diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl index 6afb3eb6..d20a2d1e 100644 --- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl @@ -19,9 +19,9 @@
-
+ -
+
@@ -35,8 +35,8 @@
-
+ -
+
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl index 7c8a11c9..cbe9d2d4 100644 --- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl +++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl @@ -24,9 +24,9 @@
-
+ -
+ diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml index b1fc24bf..c4da123a 100644 --- a/web/guest/user/resend_link.xhtml +++ b/web/guest/user/resend_link.xhtml @@ -41,9 +41,9 @@ -
+ -
+
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index 254d07c8..fd798350 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -41,9 +41,9 @@
-
+ -
+
@@ -58,9 +58,9 @@
-
+ -
+
@@ -73,9 +73,9 @@
-
+ -
+
-- 2.39.5