From b9afa08ce1806a18dddb26788a12d61f1b881edc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 20 Aug 2017 20:29:37 +0200 Subject: [PATCH] MOJARRA - Please cherry-pick: - introduced own (still project-local) taglib for message template replacement - now this is much shorter, down to only one JSF tag instead of 2-3 minimum MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/generic.jsf.taglib.xml | 57 +++++++++++ .../tags/generic}/messages/message_box.tpl | 3 +- .../generic}/messages/message_box_mini.tpl | 3 +- .../admin_form_business_basic_data.tpl | 2 +- .../admin/contact/admin_contact_links.tpl | 8 +- .../admin/contact/admin_form_contact_data.tpl | 5 + .../admin/fax/admin_fax_add_show.tpl | 8 +- .../templates/admin/fax/admin_fax_data.tpl | 8 +- .../templates/admin/fax/admin_fax_links.tpl | 8 +- .../admin/fax/admin_form_add_contact_fax.tpl | 8 +- .../admin/fax/admin_form_fax_data.tpl | 92 +++++++++-------- .../admin_form_add_contact_landline.tpl | 8 +- .../landline/admin_form_landline_data.tpl | 92 +++++++++-------- .../landline/admin_landline_add_show.tpl | 8 +- .../admin/landline/admin_landline_data.tpl | 8 +- .../admin/landline/admin_landline_links.tpl | 8 +- .../mobile/admin_form_add_contact_mobile.tpl | 8 +- .../admin/mobile/admin_form_mobile_data.tpl | 98 +++++++++---------- .../admin/mobile/admin_mobile_add_show.tpl | 8 +- .../admin/mobile/admin_mobile_data.tpl | 8 +- .../admin/mobile/admin_mobile_links.tpl | 8 +- .../admin/user/admin_form_user_data.tpl | 8 +- .../templates/admin/user/admin_user_links.tpl | 8 +- .../input_fields/fax_input_fields.tpl | 8 +- .../input_fields/landline_input_fields.tpl | 8 +- .../input_fields/mobile_input_fields.tpl | 10 +- .../templates/login/user/user_base.tpl | 9 +- .../personal_title_selection_box.tpl | 8 +- .../templates/user/user_profile_link.tpl | 8 +- web/WEB-INF/web.xml | 7 +- .../admin_business_contacts_list.xhtml | 12 +-- web/admin/contact/admin_contact_delete.xhtml | 10 +- web/admin/contact/admin_contact_edit.xhtml | 8 +- web/admin/contact/admin_contact_export.xhtml | 8 +- web/admin/contact/admin_contact_list.xhtml | 12 +-- web/admin/contact/admin_contact_show.xhtml | 8 +- .../unlink/admin_contact_fax_unlink.xhtml | 15 +-- .../admin_contact_landline_unlink.xhtml | 15 +-- .../unlink/admin_contact_mobile_unlink.xhtml | 15 +-- web/admin/fax/admin_fax_delete.xhtml | 8 +- web/admin/fax/admin_fax_edit.xhtml | 8 +- web/admin/fax/admin_fax_list.xhtml | 8 +- web/admin/fax/admin_fax_show.xhtml | 2 +- .../landline/admin_landline_delete.xhtml | 8 +- web/admin/landline/admin_landline_edit.xhtml | 8 +- web/admin/landline/admin_landline_list.xhtml | 8 +- web/admin/landline/admin_landline_show.xhtml | 2 +- web/admin/mobile/admin_mobile_delete.xhtml | 8 +- web/admin/mobile/admin_mobile_edit.xhtml | 8 +- web/admin/mobile/admin_mobile_list.xhtml | 8 +- web/admin/mobile/admin_mobile_show.xhtml | 2 +- web/admin/user/admin_user_activity_log.xhtml | 8 +- web/admin/user/admin_user_delete.xhtml | 8 +- web/admin/user/admin_user_edit.xhtml | 8 +- web/admin/user/admin_user_export.xhtml | 8 +- web/admin/user/admin_user_list.xhtml | 8 +- web/admin/user/admin_user_lock.xhtml | 8 +- .../admin_user_resend_confirmation_link.xhtml | 10 +- web/admin/user/admin_user_show.xhtml | 8 +- web/admin/user/admin_user_unlock.xhtml | 8 +- web/guest/user/user_confirm_account.xhtml | 15 +-- web/guest/user/user_list.xhtml | 8 +- web/guest/user/user_login.xhtml | 8 +- web/guest/user/user_lost_password.xhtml | 11 +-- web/guest/user/user_profile.xhtml | 18 +--- web/guest/user/user_register.xhtml | 15 +-- web/guest/user/user_register_page2.xhtml | 10 +- web/guest/user/user_resend_done.xhtml | 5 +- web/guest/user/user_resend_link.xhtml | 8 +- web/user/login_contact_data_saved.xhtml | 11 +-- web/user/login_data_saved.xhtml | 7 +- .../login_user_change_email_address.xhtml | 10 +- web/user/login_user_change_password.xhtml | 14 +-- .../login_user_change_personal_data.xhtml | 8 +- web/user/login_user_contact_data_saved.xhtml | 16 +-- web/user/login_user_data_saved.xhtml | 7 +- 76 files changed, 365 insertions(+), 591 deletions(-) create mode 100644 web/WEB-INF/generic.jsf.taglib.xml rename web/WEB-INF/{templates => resources/tags/generic}/messages/message_box.tpl (95%) rename web/WEB-INF/{templates => resources/tags/generic}/messages/message_box_mini.tpl (95%) diff --git a/web/WEB-INF/generic.jsf.taglib.xml b/web/WEB-INF/generic.jsf.taglib.xml new file mode 100644 index 00000000..68ac2a69 --- /dev/null +++ b/web/WEB-INF/generic.jsf.taglib.xml @@ -0,0 +1,57 @@ + + + + http://mxchange.org/jsf/core + + outputMessageBox + This tag renders a style-able and customizable message for any kind of messages that the user should see. + resources/tags/generic/generic/messages/message_box.tpl + + message + The message that should be place into the message box. You may also use EL code here that resolves to a message string. + true + java.lang.String + + + styleClass + The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message. + false + java.lang.String + + + + outputMessageBoxMini + This tag renders a style-able and customizable mini message for any kind of messages that the user should see. It is similar to outputMessageBox tag but it renders a smaller box instead. + resources/tags/generic/generic/messages/message_box_mini.tpl + + message + The message that should be place into the message box. You may also use EL code here that resolves to a message string. + true + java.lang.String + + + styleClass + The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message. + false + java.lang.String + + + diff --git a/web/WEB-INF/templates/messages/message_box.tpl b/web/WEB-INF/resources/tags/generic/messages/message_box.tpl similarity index 95% rename from web/WEB-INF/templates/messages/message_box.tpl rename to web/WEB-INF/resources/tags/generic/messages/message_box.tpl index 07c5b1e4..c32fdf7b 100644 --- a/web/WEB-INF/templates/messages/message_box.tpl +++ b/web/WEB-INF/resources/tags/generic/messages/message_box.tpl @@ -3,8 +3,7 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html" - xmlns:f="http://xmlns.jcp.org/jsf/core" - > + xmlns:f="http://xmlns.jcp.org/jsf/core">
diff --git a/web/WEB-INF/templates/messages/message_box_mini.tpl b/web/WEB-INF/resources/tags/generic/messages/message_box_mini.tpl similarity index 95% rename from web/WEB-INF/templates/messages/message_box_mini.tpl rename to web/WEB-INF/resources/tags/generic/messages/message_box_mini.tpl index e8e1c560..35cd54ad 100644 --- a/web/WEB-INF/templates/messages/message_box_mini.tpl +++ b/web/WEB-INF/resources/tags/generic/messages/message_box_mini.tpl @@ -3,8 +3,7 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html" - xmlns:f="http://xmlns.jcp.org/jsf/core" - > + xmlns:f="http://xmlns.jcp.org/jsf/core">
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 1e5f856d..39a99437 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 @@ -35,7 +35,7 @@
- +
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 1fc03955..b172a81f 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl @@ -1,16 +1,12 @@ - - - - - - +
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 8ee9b405..ddc82a43 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,6 +6,9 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ + +
@@ -19,6 +22,7 @@
+
@@ -251,6 +255,7 @@
+
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 e3cc014a..b1e06064 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 @@ -1,16 +1,12 @@ - - - - - - + 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 532ef872..1a0deff8 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl @@ -1,16 +1,12 @@ - - - - - - + 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 42e0f26d..037cac38 100644 --- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl @@ -1,16 +1,12 @@ - - - - - - +
    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 180ad4c0..c0198241 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 @@ -1,16 +1,12 @@ - - - - - - + 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 c3aa9fff..e1b74edd 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 @@ -1,56 +1,54 @@ - - - - - + + + +
    +
    + + + + + +
    + +
    + +
    + +
    + +
    +
    + + +
    + +
    + +
    + + + +
    + +
    +
    + + + + + + + + +
    +
    - -
    -
    - - - - - -
    - -
    - -
    - -
    - -
    -
    - - -
    - -
    - -
    - - - -
    - -
    -
    - - - - - - - - -
    -
    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 d81e62cc..272ab53c 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 @@ -1,16 +1,12 @@ - - - - - - + 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 52cc1c22..f10df164 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 @@ -1,56 +1,54 @@ - - - - - + + + +
    +
    + + + + + +
    + +
    + +
    + +
    + +
    +
    + + +
    + +
    + +
    + + + +
    + +
    +
    + + + + + + + + +
    +
    - -
    -
    - - - - - -
    - -
    - -
    - -
    - -
    -
    - - -
    - -
    - -
    - - - -
    - -
    -
    - - - - - - - - -
    -
    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 82b3ecf4..ca57e430 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 @@ -1,16 +1,12 @@ - - - - - - + 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 4e8b11b6..8a905c2c 100644 --- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl @@ -1,16 +1,12 @@ - - - - - - + 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 25b36dd3..aa6a44e6 100644 --- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl @@ -1,16 +1,12 @@ - - - - - - +
      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 b4892289..036ba693 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 @@ -1,16 +1,12 @@ - - - - - - + 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 9f56cfa1..54898df3 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 @@ -1,72 +1,70 @@ - - - - - - + -
      -
      - - - + +
      +
      + + + - -
      - -
      + +
      + +
      -
      - -
      +
      + +
      -
      -
      +
      +
      - -
      - -
      + +
      + +
      -
      - - - - - -
      +
      + + + + + +
      -
      +
      - - + + + -
      - -
      - -
      + +
      + +
      -
      - - - -
      +
      + + + +
      -
      +
      - - + + + -
      -
      -
      +
      +
      +
      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 9580d1da..2519b588 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 @@ -1,16 +1,12 @@ - - - - - - + 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 fbcc22db..8a022bd4 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl @@ -1,16 +1,12 @@ - - - - - - + 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 0458bd9b..69d4688e 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl @@ -1,16 +1,12 @@ - - - - - - +
        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 74042e47..5f8e7edc 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 @@ -1,16 +1,12 @@ - - - - - - +
        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 d7c209c6..6cb6f61f 100644 --- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl +++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl @@ -1,16 +1,12 @@ - - - - - - +
        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 7849f34e..015ad4ca 100644 --- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl +++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl @@ -1,16 +1,12 @@ - - - - - - + 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 da4cb793..e80ddeff 100644 --- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl +++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl @@ -1,16 +1,12 @@ - - - - - - + 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 1bfa5771..6a60fc2c 100644 --- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl +++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl @@ -1,20 +1,16 @@ - - - - - - + - + diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl index 00c63b1c..0b1d2110 100644 --- a/web/WEB-INF/templates/login/user/user_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -2,6 +2,7 @@ @@ -14,12 +15,8 @@ - - - - - - + + diff --git a/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl index c09e757a..7e748eaa 100644 --- a/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl +++ b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl @@ -1,16 +1,12 @@ - - - - - - + diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl index 47abe987..aa275dce 100644 --- a/web/WEB-INF/templates/user/user_profile_link.tpl +++ b/web/WEB-INF/templates/user/user_profile_link.tpl @@ -1,16 +1,12 @@ - - - - - - + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index c6c43310..24bc9644 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -3,7 +3,12 @@ An application to handle all your receipts and do some calculation with it. JFinancials Application v1.0 - Project stage. + Generic custom JSF tags library + javax.faces.FACELETS_LIBRARIES + /WEB-INF/generic.jsf.taglib.xml + + + Project stage javax.faces.PROJECT_STAGE Development diff --git a/web/admin/business_contacts/admin_business_contacts_list.xhtml b/web/admin/business_contacts/admin_business_contacts_list.xhtml index ab2de3f3..1544f835 100644 --- a/web/admin/business_contacts/admin_business_contacts_list.xhtml +++ b/web/admin/business_contacts/admin_business_contacts_list.xhtml @@ -1,6 +1,7 @@ @@ -14,12 +15,7 @@ - - - - - - + @@ -55,9 +51,9 @@ - + - + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index e334721f..7cb4a543 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -1,6 +1,7 @@ @@ -8,7 +9,7 @@ - + @@ -21,12 +22,7 @@ - - - - - - + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 41ed4f56..c6e61f72 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -1,6 +1,7 @@ @@ -21,12 +22,7 @@ - - - - - - + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 942d4470..93075510 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -1,6 +1,7 @@ - - - - - - + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index a7a50196..22f33510 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -1,6 +1,7 @@ @@ -14,12 +15,7 @@ - - - - - - + @@ -85,7 +81,9 @@
        - + + +
- - - - - - + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index 34296e01..8d92dbb5 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -1,6 +1,7 @@ @@ -8,7 +9,7 @@ - + @@ -30,12 +31,7 @@ - - - - - - +
@@ -43,16 +39,12 @@ +
- - - - - - +
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml index 792cf678..e3492f8e 100644 --- a/web/guest/user/user_register.xhtml +++ b/web/guest/user/user_register.xhtml @@ -1,6 +1,7 @@ @@ -34,18 +35,8 @@ - - - - - - + - - - - - - + diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml index 2c982608..4f946eef 100644 --- a/web/guest/user/user_register_page2.xhtml +++ b/web/guest/user/user_register_page2.xhtml @@ -1,6 +1,7 @@ @@ -14,6 +15,8 @@ + +
@@ -27,12 +30,5 @@ - - - - - - - diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml index f291735a..917d14c2 100644 --- a/web/guest/user/user_resend_done.xhtml +++ b/web/guest/user/user_resend_done.xhtml @@ -1,6 +1,7 @@ @@ -14,8 +15,6 @@ - - - + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index 92742a69..6686887a 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -1,6 +1,7 @@ @@ -53,11 +54,6 @@ - - - - - - + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index 170e5fcb..02a00061 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -1,6 +1,7 @@ @@ -14,18 +15,14 @@ - - - - - + + + - - diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 6ddb2373..22fa37c0 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -1,6 +1,7 @@ @@ -14,11 +15,7 @@ - - - - - + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 36821750..51fbabae 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -1,6 +1,7 @@ @@ -14,6 +15,8 @@ + +
@@ -51,13 +54,6 @@ - - - - - - - diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 7eddb313..f5cf8969 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -1,6 +1,7 @@ @@ -14,11 +15,7 @@ - - - - - + @@ -78,12 +75,7 @@ - - - - - - + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index 18b8be0d..5794b68a 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -1,6 +1,7 @@ @@ -33,12 +34,7 @@ - - - - - - + diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml index 047c2649..8384359b 100644 --- a/web/user/login_user_contact_data_saved.xhtml +++ b/web/user/login_user_contact_data_saved.xhtml @@ -1,6 +1,7 @@ @@ -14,23 +15,14 @@ - - - - - + + + - - - - - - - diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index aa7c6062..7324ebb0 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -1,6 +1,7 @@ @@ -14,11 +15,7 @@ - - - - - + -- 2.39.5