From db702ab881adbec7403da3edc42b5c56cc4f394e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 11 Aug 2016 17:41:54 +0200 Subject: [PATCH] Improved many things: (please cherry-pick) - added missing navigation rule from admin_user_(un)lock to admin_show_mobile_provider - removed reset-form button from logout forms - much nicer CSS style applied for form elements and content_header - CSS hover effects added for above buttons, select boxes and text areas - used table_medium, table_left(25)_medium, table_right(75)_medium for registration page - added missing context parameter is_debug_register_enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/faces-config.xml | 8 ++ .../admin/cellphone/admin_cellphone_data.tpl | 16 ++-- .../cellphone/admin_form_cellphone_data.tpl | 2 +- .../admin/contact/admin_contact_data.tpl | 60 ++++++------ .../admin/contact/admin_contact_data_mini.tpl | 24 ++--- .../admin/contact/admin_form_contact_data.tpl | 12 ++- .../admin/country/admin_form_country_data.tpl | 2 +- .../admin_form_mobile_provider.tpl | 2 +- .../admin/user/admin_form_user_data.tpl | 2 +- .../templates/contact/form_contact_data.tpl | 87 ++++++++--------- .../generic/locale_selection_box.tpl | 2 +- .../generic/mobile_selection_box.tpl | 3 +- .../templates/guest/guest_privacy_terms.tpl | 10 +- .../templates/guest/user/guest_login_form.tpl | 6 +- .../register/guest_form_register_page1.tpl | 18 ++-- .../register/guest_form_register_page2.tpl | 4 +- .../register/guest_form_register_single.tpl | 6 +- .../user/user_enter_current_password.tpl | 2 +- web/WEB-INF/web.xml | 5 + web/admin/admin_logout.xhtml | 1 - .../cellphone/admin_cellphone_edit.xhtml | 2 +- .../cellphone/admin_cellphone_show.xhtml | 28 +++--- web/admin/contact/admin_contact_delete.xhtml | 2 +- web/admin/contact/admin_contact_edit.xhtml | 4 +- web/admin/contact/admin_contact_list.xhtml | 2 +- web/admin/country/admin_country_list.xhtml | 2 +- .../admin_mobile_provider_list.xhtml | 2 +- web/admin/user/admin_user_edit.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 4 +- web/admin/user/admin_user_lock.xhtml | 2 +- web/admin/user/admin_user_show.xhtml | 86 ++++++++--------- web/admin/user/admin_user_unlock.xhtml | 12 +-- web/guest/user/lost_passwd.xhtml | 4 +- web/guest/user/resend_link.xhtml | 4 +- web/resources/css/cssLayout.css | 94 ++++++++++++++----- web/user/login_change_email_address.xhtml | 4 +- web/user/login_change_password.xhtml | 4 +- web/user/login_change_personal_data.xhtml | 4 +- web/user/login_logout.xhtml | 1 - 39 files changed, 295 insertions(+), 240 deletions(-) diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index adfa5e41..b21a73dd 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -409,6 +409,10 @@ admin_show_user /admin/user/admin_user_show.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + /admin/user/admin_user_unlock.xhtml @@ -416,6 +420,10 @@ admin_show_user /admin/user/admin_user_show.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + /admin/cellphone/admin_contact_cellphone_unlink.xhtml diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl index bea54384..aa73fdb3 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl @@ -13,30 +13,30 @@ - + - + - + - + - + - + - + -
+
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl index 1acba675..04402905 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl @@ -8,7 +8,7 @@
-
+
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl index 0cf4cfd1..d0d36d87 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl @@ -13,99 +13,99 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl index 7206e070..b4773515 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl @@ -13,39 +13,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + 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 23f196aa..3cdb6a09 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:ui="http://xmlns.jcp.org/jsf/facelets">
-
+
@@ -166,12 +166,13 @@
- + + - + @@ -189,12 +190,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 994c1022..2bc243cc 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 @@ -10,7 +10,7 @@
-
+
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 f4b11504..8917611c 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 @@ -10,7 +10,7 @@
-
+
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 ae979a96..c6e37a9e 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 @@ -9,7 +9,7 @@
-
+
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index dc990a7b..969fe4e6 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -11,17 +11,17 @@
-
+
-
+
-
+
@@ -33,11 +33,11 @@
-
+
-
+
@@ -49,11 +49,11 @@
-
+
-
+
@@ -65,11 +65,11 @@
-
+
-
+
@@ -81,11 +81,11 @@
-
+
-
+
@@ -99,11 +99,11 @@
-
+
-
+
@@ -115,25 +115,11 @@
-
- -
- -
- -
- -
-
- - - -
-
+
-
+
@@ -145,11 +131,11 @@
-
+
-
+
@@ -161,11 +147,11 @@
-
+
-
+
@@ -177,12 +163,13 @@
-
+
-
- +
+ + @@ -194,17 +181,18 @@
-
+
-
- +
+ + - + @@ -217,17 +205,18 @@
-
+
-
- +
+ + - + @@ -240,11 +229,11 @@
-
+
-
+
@@ -257,17 +246,17 @@
-
+
-
+
-
+
diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl index 1da2f1ab..49f485c0 100644 --- a/web/WEB-INF/templates/generic/locale_selection_box.tpl +++ b/web/WEB-INF/templates/generic/locale_selection_box.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl index 2fa3c34a..16967867 100644 --- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl +++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl @@ -6,7 +6,8 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + + diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index 1681ba29..741662df 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -6,19 +6,19 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
+
-
+
-
+
@@ -32,13 +32,13 @@
-
+
-
+
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 ee814a92..aeb0ae81 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -11,7 +11,7 @@ #{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
-
+
@@ -42,8 +42,8 @@
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl index 870c4ffa..284aea50 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl @@ -7,24 +7,24 @@ -
+
#{msg.GUEST_REGISTRATION_PAGE1_TITLE}
-
+
-
+
-
+
@@ -38,11 +38,11 @@
-
+
-
+
@@ -50,11 +50,11 @@
-
+
-
+
@@ -71,7 +71,7 @@
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl index 74f3291e..dd4a3628 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
+
#{msg.GUEST_REGISTRATION_PAGE2_TITLE}
@@ -14,7 +14,7 @@
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 dc3cd180..04c19d55 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
+
@@ -14,7 +14,7 @@
-
+
@@ -72,7 +72,7 @@
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 e3eda8c0..5fe12055 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
+
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 5741b53e..2e01a3c9 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -112,6 +112,11 @@ max_user_password_history 5 + + Whether debugging of registration form is enabled. + is_debug_register_enabled + false + Faces Servlet javax.faces.webapp.FacesServlet diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index 34ec868b..17ac3d5e 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -26,7 +26,6 @@
diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml index 2fbc9826..2474727c 100644 --- a/web/admin/cellphone/admin_cellphone_edit.xhtml +++ b/web/admin/cellphone/admin_cellphone_edit.xhtml @@ -29,7 +29,7 @@
diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml index 8a107ada..b88d2a4b 100644 --- a/web/admin/cellphone/admin_cellphone_show.xhtml +++ b/web/admin/cellphone/admin_cellphone_show.xhtml @@ -31,50 +31,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 29f93641..f65c99cc 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -92,7 +92,7 @@
-
+
@@ -121,7 +121,7 @@ diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 17e97836..94ebf9b6 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -73,7 +73,7 @@
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index ca7e8dda..294ff5e5 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -31,149 +31,149 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index 98e7bea6..95830395 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -36,7 +36,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -78,13 +78,13 @@
-
+
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml index 2ff7f1ec..4bfc01c4 100644 --- a/web/guest/user/lost_passwd.xhtml +++ b/web/guest/user/lost_passwd.xhtml @@ -23,7 +23,7 @@
-
+
@@ -59,7 +59,7 @@
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml index 51061ce1..ff57a37e 100644 --- a/web/guest/user/resend_link.xhtml +++ b/web/guest/user/resend_link.xhtml @@ -21,7 +21,7 @@
-
+
@@ -48,7 +48,7 @@
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 84d84f6c..69e17cd9 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -66,6 +66,10 @@ table, .table, .table_medium { width: 500px; } +.table_footer { + margin: 2px; +} + .table_medium { width: 650px; } @@ -77,6 +81,7 @@ table, .table, .table_medium { .table_row { width: 100%; min-height: 20px; + margin: 2px; } .table_left { @@ -115,6 +120,18 @@ table, .table, .table_medium { float: right; } +.table_left25_medium { + width: 30px; + min-height: 20px; + float: left; +} + +.table_right75_medium { + width: 570px; + min-height: 20px; + float: right; +} + .para { padding: 5px 5px 5px 5px; } @@ -160,16 +177,23 @@ ul.footer_nav li.footer_copyright { font-weight: bold; } +.table_data_label, .table_data_field { + display: block; + border: 1px solid #aaaaaa; + border-top-right-radius: 8px; + border-bottom-left-radius: 8px; +} + .table_data_label { font-weight: bold; background-image: linear-gradient(#eeeeee, #bbbbbb); - border: 1px solid #aaaaaa; height: 16px; padding-left: 2px; } -.table_data_value { - border: 1px solid #aaaaaa; +.table_data_field { + background-color: #f5f5f5; + vertical-align: top; padding-top: 1px; padding-bottom: 1px; padding-left: 2px; @@ -179,10 +203,12 @@ ul.footer_nav li.footer_copyright { } #content_header { - background-color: #dddddd; + border-color: #888888; + background-image: linear-gradient(#eeeeee, #aaaaaa); font-weight: bold; font-size: 18px; margin-bottom: 20px; + padding-left: 5px; } .table_header_column { @@ -242,21 +268,6 @@ ul.footer_nav li.footer_copyright { color: #aa0000; } -.data_label, .data_field { - display: block; - width: 100%; - height: 14px; - padding: 1px; - margin: 1px; - border: 1px solid #aaaaaa; - vertical-align: top; -} - -.data_label { - font-weight: bold; - background-color: #dddddd; -} - .unlink_link { color: #aaaa00; } @@ -265,14 +276,55 @@ ul.footer_nav li.footer_copyright { color: #aa0000; } +.right_space { + margin-right: 2px; +} + +#content_header, .input, .select, .submit, .reset, .delete_button, .unlink_button, .fieldset { + border-style: groove; + border-width: 1px; + border-top-right-radius: 8px; + border-bottom-left-radius: 8px; + border-color: #888888; +} + +input, textarea, select, option { + background-color: #fbfbfb; +} + +.submit, .reset, .delete_button, .unlink_button { + cursor: pointer; +} + +input:hover, textarea:hover, select:hover, option:hover { + border-color: #666666; + background-color: #eeeeee; +} + +.delete_button:hover { + border-color: #dd0000; + background-color: #aa0000; + color: #eeeeee; +} + +.unlink_button:hover { + border-color: #dddd00; + background-color: #cccc00; + color: #eeeeee; +} + .delete_button { - border: #ee0000 1px groove; + border-color: #ee0000; background-color: #880000; color: #ffffff; } .unlink_button { - border: #eeee00 1px groove; + border-color: #eeee00; background-color: #aaaa00; color: #ffffff; } + +.fieldset { + padding: 5px; +} diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index f329ea45..edb392c1 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -23,7 +23,7 @@
-
+
@@ -47,7 +47,7 @@ diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index eb3f15dd..7d957e14 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -24,7 +24,7 @@
-
+
@@ -76,7 +76,7 @@
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index 560a90b5..a968286e 100644 --- a/web/user/login_change_personal_data.xhtml +++ b/web/user/login_change_personal_data.xhtml @@ -16,7 +16,7 @@ -
+
@@ -29,7 +29,7 @@ diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index 3820f96c..957b4f20 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -26,7 +26,6 @@
-- 2.39.5