From 88256b303ab6c51fc1a90bb0290b3df7d91a85d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 19 Aug 2017 16:11:42 +0200 Subject: [PATCH] Please cherry-pick: - renamed JSF views with "contact_business" to "business_data" - moved selection boxes to own template folder "selection_boxes" - renamed + moved locale_selection_box.tpl to widgets/locale_change_widget.tpl - renamed "generic" templates folder to "messages" - TODO: moving out "country selection box" to a template can be done: + for each type, land-line and fax number have a separate template + the target controllers must all then have same naming, e.g. landLineCountry 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 ++++---- web/WEB-INF/templates/admin/admin_menu.tpl | 4 ++-- .../admin/contact/admin_contact_links.tpl | 2 +- .../admin/contact/admin_form_contact_data.tpl | 14 ++++---------- .../templates/admin/fax/admin_fax_add_show.tpl | 2 +- .../templates/admin/fax/admin_fax_data.tpl | 2 +- .../templates/admin/fax/admin_fax_links.tpl | 2 +- .../admin/fax/admin_form_add_contact_fax.tpl | 2 +- .../templates/admin/fax/admin_form_fax_data.tpl | 2 +- .../landline/admin_form_add_contact_landline.tpl | 2 +- .../admin/landline/admin_form_landline_data.tpl | 2 +- .../admin/landline/admin_landline_add_show.tpl | 2 +- .../admin/landline/admin_landline_data.tpl | 2 +- .../admin/landline/admin_landline_links.tpl | 2 +- .../mobile/admin_form_add_contact_mobile.tpl | 2 +- .../admin/mobile/admin_form_mobile_data.tpl | 2 +- .../admin/mobile/admin_mobile_add_show.tpl | 2 +- .../templates/admin/mobile/admin_mobile_data.tpl | 2 +- .../admin/mobile/admin_mobile_links.tpl | 2 +- .../admin/user/admin_form_user_data.tpl | 2 +- .../templates/admin/user/admin_user_links.tpl | 2 +- web/WEB-INF/templates/base.tpl | 3 ++- .../templates/contact/form_contact_data.tpl | 16 +++++----------- .../templates/input_fields/fax_input_fields.tpl | 2 +- .../input_fields/landline_input_fields.tpl | 2 +- .../input_fields/mobile_input_fields.tpl | 14 ++++---------- web/WEB-INF/templates/login/user/user_base.tpl | 2 +- .../{generic => messages}/message_box.tpl | 0 .../{generic => messages}/message_box_mini.tpl | 0 .../mobile_selection_box.tpl | 0 .../personal_title_selection_box.tpl | 2 +- .../profile_mode_selection_box.tpl | 0 web/WEB-INF/templates/user/user_profile_link.tpl | 2 +- .../locale_change_widget.tpl} | 0 .../admin_business_data_list.xhtml} | 12 ++++++------ web/admin/contact/admin_contact_delete.xhtml | 2 +- web/admin/contact/admin_contact_edit.xhtml | 2 +- web/admin/contact/admin_contact_export.xhtml | 2 +- web/admin/contact/admin_contact_list.xhtml | 2 +- web/admin/contact/admin_contact_show.xhtml | 2 +- .../unlink/admin_contact_fax_unlink.xhtml | 4 ++-- .../unlink/admin_contact_landline_unlink.xhtml | 4 ++-- .../unlink/admin_contact_mobile_unlink.xhtml | 4 ++-- web/admin/fax/admin_fax_delete.xhtml | 2 +- web/admin/fax/admin_fax_edit.xhtml | 2 +- web/admin/fax/admin_fax_list.xhtml | 2 +- web/admin/landline/admin_landline_delete.xhtml | 2 +- web/admin/landline/admin_landline_edit.xhtml | 2 +- web/admin/landline/admin_landline_list.xhtml | 2 +- web/admin/mobile/admin_mobile_delete.xhtml | 2 +- web/admin/mobile/admin_mobile_edit.xhtml | 2 +- web/admin/mobile/admin_mobile_list.xhtml | 2 +- web/admin/user/admin_user_activity_log.xhtml | 2 +- web/admin/user/admin_user_delete.xhtml | 2 +- web/admin/user/admin_user_edit.xhtml | 2 +- web/admin/user/admin_user_export.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 2 +- web/admin/user/admin_user_lock.xhtml | 2 +- .../admin_user_resend_confirmation_link.xhtml | 2 +- web/admin/user/admin_user_show.xhtml | 2 +- web/admin/user/admin_user_unlock.xhtml | 2 +- web/guest/user/user_confirm_account.xhtml | 4 ++-- web/guest/user/user_list.xhtml | 2 +- web/guest/user/user_login.xhtml | 2 +- web/guest/user/user_lost_password.xhtml | 2 +- web/guest/user/user_profile.xhtml | 4 ++-- web/guest/user/user_register.xhtml | 4 ++-- web/guest/user/user_register_page2.xhtml | 2 +- web/guest/user/user_resend_done.xhtml | 2 +- web/guest/user/user_resend_link.xhtml | 2 +- web/user/login_contact_data_saved.xhtml | 2 +- web/user/login_data_saved.xhtml | 2 +- web/user/login_user_change_email_address.xhtml | 2 +- web/user/login_user_change_password.xhtml | 4 ++-- web/user/login_user_change_personal_data.xhtml | 2 +- web/user/login_user_contact_data_saved.xhtml | 4 ++-- web/user/login_user_data_saved.xhtml | 2 +- 77 files changed, 100 insertions(+), 117 deletions(-) rename web/WEB-INF/templates/{generic => messages}/message_box.tpl (100%) rename web/WEB-INF/templates/{generic => messages}/message_box_mini.tpl (100%) rename web/WEB-INF/templates/{generic => selection_boxes}/mobile_selection_box.tpl (100%) rename web/WEB-INF/templates/{generic => selection_boxes}/personal_title_selection_box.tpl (94%) rename web/WEB-INF/templates/{generic => selection_boxes}/profile_mode_selection_box.tpl (100%) rename web/WEB-INF/templates/{generic/locale_selection_box.tpl => widgets/locale_change_widget.tpl} (100%) rename web/admin/{contact_business/admin_contact_business_list.xhtml => business_data/admin_business_data_list.xhtml} (79%) diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index a7fc0766..b8264608 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -109,12 +109,12 @@ /admin/contact/admin_contact_export.xhtml - admin_list_contact_business - /admin/contact_business/admin_contact_business_list.xhtml + admin_list_business_data + /admin/business_data/admin_business_data_list.xhtml - admin_export_contact_business - /admin/contact_business/admin_contact_business_export.xhtml + admin_export_business_data + /admin/business_data/admin_business_data_export.xhtml admin_list_user diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 12d3bb23..05270cc2 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -39,8 +39,8 @@
    -
    • -
    • +
    • +
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl index dc8195a6..1fc03955 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 7ab91ab7..a862af19 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 @@ -17,7 +17,7 @@
- +
@@ -235,15 +235,9 @@
- - - - - - - - - + + +
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl index 21f97818..e3cc014a 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl index 72230476..532ef872 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl index 33c33bcf..42e0f26d 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 df6fefcd..180ad4c0 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 2665a383..c3aa9fff 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 22134c7d..d81e62cc 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 0e721a16..52cc1c22 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl index 4ed5e600..82b3ecf4 100644 --- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl index 45d494ec..4e8b11b6 100644 --- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl index 4292e6dd..25b36dd3 100644 --- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl index 0371fcd6..b4892289 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 6066cbec..9f56cfa1 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl index de0dd7e7..9580d1da 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl index f579fab2..fbcc22db 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl index 48d218af..0458bd9b 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + 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 cc7ce2da..e91047b4 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 @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl index f5855475..d7c209c6 100644 --- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl +++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index 3c24222d..3ea18220 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -46,7 +46,8 @@ - + + diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 7f80980d..6b75bebe 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -23,7 +23,7 @@
- +
@@ -267,15 +267,9 @@
- - - - - - - - - + + +
@@ -296,7 +290,7 @@
- +
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl index ecddbde6..7849f34e 100644 --- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl +++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl index 6bec8872..da4cb793 100644 --- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl +++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl index a9ccc2e1..1bfa5771 100644 --- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl +++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl @@ -6,21 +6,15 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - - - - - - - - - + + + diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl index f398c0f2..00c63b1c 100644 --- a/web/WEB-INF/templates/login/user/user_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -15,7 +15,7 @@ - + diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/messages/message_box.tpl similarity index 100% rename from web/WEB-INF/templates/generic/message_box.tpl rename to web/WEB-INF/templates/messages/message_box.tpl diff --git a/web/WEB-INF/templates/generic/message_box_mini.tpl b/web/WEB-INF/templates/messages/message_box_mini.tpl similarity index 100% rename from web/WEB-INF/templates/generic/message_box_mini.tpl rename to web/WEB-INF/templates/messages/message_box_mini.tpl diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl similarity index 100% rename from web/WEB-INF/templates/generic/mobile_selection_box.tpl rename to web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl diff --git a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl similarity index 94% rename from web/WEB-INF/templates/generic/personal_title_selection_box.tpl rename to web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl index 7cd411bd..c09e757a 100644 --- a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl +++ b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl similarity index 100% rename from web/WEB-INF/templates/generic/profile_mode_selection_box.tpl rename to web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl index 1ddb6de7..47abe987 100644 --- a/web/WEB-INF/templates/user/user_profile_link.tpl +++ b/web/WEB-INF/templates/user/user_profile_link.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl similarity index 100% rename from web/WEB-INF/templates/generic/locale_selection_box.tpl rename to web/WEB-INF/templates/widgets/locale_change_widget.tpl diff --git a/web/admin/contact_business/admin_contact_business_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml similarity index 79% rename from web/admin/contact_business/admin_contact_business_list.xhtml rename to web/admin/business_data/admin_business_data_list.xhtml index bf0024b8..a2e1553a 100644 --- a/web/admin/contact_business/admin_contact_business_list.xhtml +++ b/web/admin/business_data/admin_business_data_list.xhtml @@ -15,7 +15,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -71,7 +71,7 @@ - +
@@ -81,7 +81,7 @@
- +
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index d02fb758..e334721f 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 8ae087e9..41ed4f56 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 4bd0584e..942d4470 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -16,7 +16,7 @@ - + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 03d8c0e1..a7a50196 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -15,7 +15,7 @@ - + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 5820d498..60b6c5f3 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index e9d23a02..56743a07 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -53,14 +53,14 @@ - + - + diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index 5c6788d5..906f4b9b 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -51,14 +51,14 @@ - + - + diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index 4735bdaf..72ee0953 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -51,14 +51,14 @@ - + - + diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml index 8477adb9..6da5063c 100644 --- a/web/admin/fax/admin_fax_delete.xhtml +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -45,7 +45,7 @@ - + diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index 14acb2f1..5cfe15ff 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -39,7 +39,7 @@ - + diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml index fb577651..1df83790 100644 --- a/web/admin/fax/admin_fax_list.xhtml +++ b/web/admin/fax/admin_fax_list.xhtml @@ -55,7 +55,7 @@ - + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index 9c9894c0..486ff2d7 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -45,7 +45,7 @@ - + diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index d4f0a1e7..969a36fa 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -39,7 +39,7 @@ - + diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml index 8767fe93..426230c8 100644 --- a/web/admin/landline/admin_landline_list.xhtml +++ b/web/admin/landline/admin_landline_list.xhtml @@ -55,7 +55,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index eae1af98..a7b54554 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -45,7 +45,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index e067086f..c5c6c1fa 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -39,7 +39,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index 8f0ea330..e6bedf9a 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -65,7 +65,7 @@ - + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index 686c0e7d..6991e52c 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index f988b3ec..b95f567a 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index fef405b5..e6602eeb 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 79731fec..db18fe83 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -16,7 +16,7 @@ - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 14a7b0a9..74267d91 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -15,7 +15,7 @@ - + diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index c88cb2be..0f1e7b0e 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml index dba93f62..aab5e8e6 100644 --- a/web/admin/user/admin_user_resend_confirmation_link.xhtml +++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index 993374a9..02c2dddc 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index d98c0368..074c56d1 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -22,7 +22,7 @@ - + diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index c9c380d8..da804aa4 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index 663d97a9..ba45e295 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -41,7 +41,7 @@ > - + diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml index bf08a860..55e02a4c 100644 --- a/web/guest/user/user_login.xhtml +++ b/web/guest/user/user_login.xhtml @@ -33,7 +33,7 @@ - + diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index cab17c33..a68301a6 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -67,7 +67,7 @@ - + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index 200bf166..34296e01 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -31,7 +31,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml index 128e806c..792cf678 100644 --- a/web/guest/user/user_register.xhtml +++ b/web/guest/user/user_register.xhtml @@ -35,14 +35,14 @@ - + - + diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml index d18f23ec..2c982608 100644 --- a/web/guest/user/user_register_page2.xhtml +++ b/web/guest/user/user_register_page2.xhtml @@ -29,7 +29,7 @@ - + diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml index 8f6d50d7..f291735a 100644 --- a/web/guest/user/user_resend_done.xhtml +++ b/web/guest/user/user_resend_done.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index cb9aa3a2..92742a69 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -54,7 +54,7 @@ - + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index afd73815..170e5fcb 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -15,7 +15,7 @@ - + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index c21ff285..6ddb2373 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -15,7 +15,7 @@ - + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 2127d8a0..36821750 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -52,7 +52,7 @@ - + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 16e42405..7eddb313 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -15,7 +15,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index 89e5b773..18b8be0d 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -34,7 +34,7 @@ - + diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml index 3fe4121f..047c2649 100644 --- a/web/user/login_user_contact_data_saved.xhtml +++ b/web/user/login_user_contact_data_saved.xhtml @@ -15,7 +15,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index 6f9eadcc..aa7c6062 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -15,7 +15,7 @@ - + -- 2.39.5