From 80e04923b45275ffe03f934564a8deda43054a16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 24 Aug 2017 21:40:00 +0200 Subject: [PATCH] Please cherry-pick: - converted div (no JSF component, not controlled by JSF engine) to h:panelGroup - got rid of some ui:fragment in favour of h:panelGroup and div tag - added some missing container (h:panelGroup again) around some ui:include MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/templates/admin/admin_base.tpl | 2 +- web/WEB-INF/templates/admin/admin_menu.tpl | 4 +- .../admin_form_business_basic_data.tpl | 4 +- .../admin/contact/admin_form_contact_data.tpl | 8 +- .../admin/country/admin_form_country_data.tpl | 8 +- .../admin/fax/admin_form_fax_data.tpl | 84 ++++++----- .../landline/admin_form_landline_data.tpl | 84 ++++++----- .../admin/mobile/admin_form_mobile_data.tpl | 90 ++++++------ .../admin_form_mobile_provider.tpl | 10 +- .../admin/user/admin_form_user_data.tpl | 138 +++++++++--------- .../templates/contact/form_contact_data.tpl | 50 +++---- web/WEB-INF/templates/guest/guest_footer.tpl | 1 + .../templates/guest/guest_privacy_terms.tpl | 4 +- .../templates/login/user/user_base.tpl | 3 +- .../user/user_enter_current_password.tpl | 40 ++--- .../templates/login/user/user_menu.tpl | 4 +- web/WEB-INF/templates/user/userid_error.tpl | 2 +- web/admin/admin_logout.xhtml | 4 +- web/admin/contact/admin_contact_show.xhtml | 20 +-- web/admin/landline/admin_landline_show.xhtml | 14 +- .../admin_mobile_provider_list.xhtml | 4 +- web/admin/user/admin_user_list.xhtml | 12 +- web/admin/user/admin_user_lock.xhtml | 32 ++-- .../admin_user_resend_confirmation_link.xhtml | 8 +- web/admin/user/admin_user_show.xhtml | 16 +- web/admin/user/admin_user_unlock.xhtml | 24 +-- web/guest/user/user_login.xhtml | 4 +- web/guest/user/user_register_done.xhtml | 4 +- web/guest/user/user_register_page2.xhtml | 4 +- web/index.xhtml | 4 +- web/user/login_edit_user_data.xhtml | 60 ++++---- web/user/login_logout.xhtml | 4 +- web/user/login_user_change_password.xhtml | 15 +- 33 files changed, 375 insertions(+), 390 deletions(-) diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index b0e99e81..2aedc46a 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -9,7 +9,7 @@ TODO: Add something here that should be displayed on all admin pages xmlns:h="http://xmlns.jcp.org/jsf/html"> - - + diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 68167363..92bf06fb 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> diff --git a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl index fb4cf8ad..178c70cb 100644 --- a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl +++ b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
+
@@ -194,5 +194,5 @@
-
+ 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 dd1aea7f..da4a550e 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 @@ -6,7 +6,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
+ @@ -268,13 +268,13 @@
-
+ -
+
-
+ diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl index b87d9c18..cbed24ae 100644 --- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl +++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl @@ -5,11 +5,11 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
+ -
+ -
+
@@ -128,5 +128,5 @@
-
+ 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 51e74131..ab6654f4 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 @@ -8,47 +8,45 @@ - -
-
- - - - - -
- -
- -
- -
- -
-
- - -
- -
- -
- - - -
- -
-
- - - - - - - - -
-
-
+ +
+ + + + + +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ + + +
+ +
+
+ + + + + + + + +
+
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 ead5d55b..c6047b4e 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 @@ -8,47 +8,45 @@ - -
-
- - - - - -
- -
- -
- -
- -
-
- - -
- -
- -
- - - -
- -
-
- - - - - - - - -
-
-
+ +
+ + + + + +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ + + +
+ +
+
+ + + + + + + + +
+
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 cb465607..625f4ff7 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 @@ -8,63 +8,61 @@ - -
-
- - - + +
+ + + - -
- -
+ +
+ +
-
- -
+
+ +
-
-
+
+
- -
- -
+ +
+ +
-
- - - - - -
+
+ + + + + +
-
+
- - - + + +
- -
- -
+ +
+ +
-
- - - -
+
+ + + +
-
+
- - - + + -
-
-
+ + + 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 d0a226f5..46a68868 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 @@ -5,11 +5,11 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
- #{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE} -
+ + + -
+
@@ -74,5 +74,5 @@
-
+ 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 73cc0a4a..4d533c4c 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl @@ -8,76 +8,72 @@ - -
-
- - - - - -
- -
- -
- -
- -
-
- -
- - -
- -
- -
- -
- -
-
- - -
- -
- -
- -
- -
-
- - - -
- -
- -
- -
- -
-
-
- -
-
    -
  • - -
  • - - -
  • -
+ +
+ + + + + +
+
-
-
- + +
+ +
+ +
+ + +
+ + +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+
+ +
+
    +
  • + +
  • + + +
  • +
+
+
+ diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index d946bd98..c7d13d30 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -7,11 +7,11 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui"> -
+ -
+ -
+
@@ -247,27 +247,25 @@
-
- - -
-
- - - - - - - -
-
    -
  • -
  • -
  • -
-
-
-
-
-
+ + + +
+ + + + + + + +
+
    +
  • +
  • +
  • +
+
+
+
+
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index 737a6dce..77b56d5c 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -4,6 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> + +
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl index f5431636..0d45fc32 100644 --- a/web/WEB-INF/templates/user/userid_error.tpl +++ b/web/WEB-INF/templates/user/userid_error.tpl @@ -7,7 +7,7 @@
- #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID} +
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index 7df3ccac..70fa64a7 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -20,9 +20,9 @@
-
+ -
+
-
+
-
+
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 51acd157..ae93f79f 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -96,7 +96,7 @@ -
+
@@ -117,16 +117,16 @@
-
+ -
+ -
+ -
+ -
+ -
-
+ +
-
+
-
+
-
-
+ +
-
+
-
+
-
-
+ +
-
+
-
+
-
-
+ +
-
+
-
+
-
+ -
+ -
+ -
+ -
+
@@ -43,9 +43,9 @@
-
+ -
+
@@ -53,9 +53,9 @@
-
+ -
+
@@ -63,9 +63,9 @@
-
+ -
+
@@ -73,9 +73,9 @@
-
+ -
+
@@ -85,9 +85,9 @@
-
+ -
+
@@ -95,7 +95,7 @@
-
+