From 5f3631283717fd5a1ab524e9a4cb9b8032fc38f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Apr 2017 02:42:52 +0200 Subject: [PATCH] Please cherry-pick: - much more cleanups MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/admin/contact/admin_contact_delete.xhtml | 3 ++- web/admin/contact/admin_contact_edit.xhtml | 3 ++- web/admin/contact/admin_contact_export.xhtml | 2 +- web/admin/contact/admin_contact_list.xhtml | 1 + web/admin/country/admin_country_delete.xhtml | 1 - web/admin/country/admin_country_edit.xhtml | 1 + web/admin/country/admin_country_list.xhtml | 1 + web/admin/index.xhtml | 1 + .../admin_mobile_provider_delete.xhtml | 1 + .../admin_mobile_provider_edit.xhtml | 1 + .../admin_mobile_provider_list.xhtml | 1 + .../admin_mobile_provider_show.xhtml | 1 + web/admin/user/admin_user_delete.xhtml | 1 + web/admin/user/admin_user_edit.xhtml | 1 - web/admin/user/admin_user_list.xhtml | 15 ++++++++------- web/admin/user/admin_user_unlock.xhtml | 1 + web/guest/user/user_list.xhtml | 6 +++--- web/guest/user/user_login.xhtml | 8 ++++---- web/guest/user/user_lost_password.xhtml | 1 + web/guest/user/user_profile.xhtml | 1 + web/guest/user/user_register_done.xhtml | 1 + web/guest/user/user_register_page2.xhtml | 1 + web/guest/user/user_resend_link.xhtml | 1 + web/user/login_data_saved.xhtml | 3 ++- web/user/login_index.xhtml | 1 + web/user/login_user_data_saved.xhtml | 3 ++- 26 files changed, 40 insertions(+), 21 deletions(-) diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 9707352b..d9debf2f 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -1,3 +1,4 @@ +
- +
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 000a0b7d..0f9c851b 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -1,3 +1,4 @@ +
- +
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index e42651ff..7754d3d8 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -1,3 +1,4 @@ + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 5f2cae8c..e5084007 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -1,3 +1,4 @@ + - + @@ -47,7 +48,7 @@ - + @@ -55,7 +56,7 @@ - + @@ -63,7 +64,7 @@ - + @@ -71,7 +72,7 @@ - + @@ -79,7 +80,7 @@ - + @@ -87,7 +88,7 @@ - + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index ec1edd88..d0cde138 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -1,3 +1,4 @@ + + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core"> diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml index fe615ac7..df7506ea 100644 --- a/web/guest/user/user_login.xhtml +++ b/web/guest/user/user_login.xhtml @@ -2,10 +2,10 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index 2d6a6a06..ac2552d9 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -1,3 +1,4 @@ + - + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index c8f9c836..f6b6502d 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -1,3 +1,4 @@ + - + -- 2.39.5