From 2cafb49e29867bf5bda64a0e15fa6ccb917dbb0e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Apr 2017 13:59:23 +0200 Subject: [PATCH] Please cherry-pick: - WARNING: You have to update project name, maybe one day this will be moved out to properties file? - updated templates as they are long out-dated - added missing templates, a lot new has been added 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 | 8 +- web/WEB-INF/templates/admin/admin_footer.tpl | 1 + web/WEB-INF/templates/admin/admin_menu.tpl | 28 ++- .../cellphone/admin_cellphone_add_show.tpl | 17 -- .../admin/cellphone/admin_cellphone_data.tpl | 46 ----- .../contact/admin_contact_data_columns.tpl | 118 ++++++++++++ .../admin_contact_data_columns_mini.tpl | 41 +++++ .../admin/contact/admin_contact_data_mini.tpl | 33 ++++ .../admin/contact/admin_contact_links.tpl | 47 ++--- .../admin/contact/admin_form_contact_data.tpl | 105 +++++++---- .../admin/contact/admin_show_contact_data.tpl | 17 ++ .../admin/country/admin_form_country_data.tpl | 38 +++- .../admin/fax/admin_fax_add_show.tpl | 22 +++ .../templates/admin/fax/admin_fax_data.tpl | 62 +++++++ .../admin_fax_links.tpl} | 25 +-- .../admin/fax/admin_form_add_contact_fax.tpl | 76 ++++++++ .../admin/fax/admin_form_fax_data.tpl | 56 ++++++ .../admin_form_add_contact_landline.tpl | 76 ++++++++ .../landline/admin_form_landline_data.tpl | 56 ++++++ .../landline/admin_landline_add_show.tpl | 22 +++ .../admin/landline/admin_landline_data.tpl | 62 +++++++ .../admin/landline/admin_landline_links.tpl | 51 ++++++ .../mobile/admin_form_add_contact_mobile.tpl | 64 +++++++ .../admin_form_contact_mobile.tpl} | 2 +- .../admin/mobile/admin_form_mobile_data.tpl | 15 +- .../admin/mobile/admin_mobile_add_show.tpl | 22 +++ .../admin/mobile/admin_mobile_data.tpl | 71 ++++++++ .../admin/mobile/admin_mobile_links.tpl | 51 ++++++ .../admin_form_mobile_provider.tpl | 10 +- .../admin/user/admin_form_user_data.tpl | 17 +- .../user/admin_form_user_personal_data.tpl | 4 - .../admin/user/admin_show_user_data.tpl | 74 ++++++++ .../admin/user/admin_show_user_data_mini.tpl | 50 ++++++ .../templates/admin/user/admin_user_links.tpl | 103 ++++++----- web/WEB-INF/templates/base.tpl | 24 +-- .../templates/contact/form_contact_data.tpl | 168 ++++++++++-------- web/WEB-INF/templates/generic/message_box.tpl | 6 +- web/WEB-INF/templates/guest/guest_footer.tpl | 2 +- web/WEB-INF/templates/guest/guest_menu.tpl | 6 + .../templates/guest/guest_privacy_terms.tpl | 6 +- .../input_fields/fax_input_fields.tpl | 30 ++++ .../input_fields/landline_input_fields.tpl | 30 ++++ .../input_fields/mobile_input_fields.tpl | 26 +++ .../templates/login/user/user_base.tpl | 1 - ...ser_change_email_address_repeat_fields.tpl | 14 +- .../user/user_enter_current_password.tpl | 38 ++-- .../templates/login/user/user_footer.tpl | 3 +- .../templates/login/user/user_menu.tpl | 38 +++- .../templates/user/user_not_logged_in.tpl | 6 +- .../templates/user/user_profile_link.tpl | 7 +- web/WEB-INF/templates/user/userid_error.tpl | 6 +- 51 files changed, 1558 insertions(+), 343 deletions(-) delete mode 100644 web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl delete mode 100644 web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl create mode 100644 web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl create mode 100644 web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl create mode 100644 web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl create mode 100644 web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl create mode 100644 web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl create mode 100644 web/WEB-INF/templates/admin/fax/admin_fax_data.tpl rename web/WEB-INF/templates/admin/{cellphone/admin_cellphone_links.tpl => fax/admin_fax_links.tpl} (59%) create mode 100644 web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl create mode 100644 web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl create mode 100644 web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl create mode 100644 web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl create mode 100644 web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl create mode 100644 web/WEB-INF/templates/admin/landline/admin_landline_data.tpl create mode 100644 web/WEB-INF/templates/admin/landline/admin_landline_links.tpl create mode 100644 web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl rename web/WEB-INF/templates/admin/{cellphone/admin_form_contact_cellphone.tpl => mobile/admin_form_contact_mobile.tpl} (90%) create mode 100644 web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl create mode 100644 web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl create mode 100644 web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl create mode 100644 web/WEB-INF/templates/admin/user/admin_show_user_data.tpl create mode 100644 web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl create mode 100644 web/WEB-INF/templates/input_fields/fax_input_fields.tpl create mode 100644 web/WEB-INF/templates/input_fields/landline_input_fields.tpl create mode 100644 web/WEB-INF/templates/input_fields/mobile_input_fields.tpl diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index 029bfc66..92dc3d0a 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -1,3 +1,7 @@ + + Administration - Default admin title - - diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl index 6aa4abef..e8c6756d 100644 --- a/web/WEB-INF/templates/admin/admin_footer.tpl +++ b/web/WEB-INF/templates/admin/admin_footer.tpl @@ -3,6 +3,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/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 2a7e3501..5f01a741 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -8,7 +8,7 @@
    - + #{msg.ADMIN_MENU_MAIN_TITLE}
      @@ -26,7 +26,7 @@
    - + #{msg.ADMIN_MENU_USER_TITLE}
      @@ -35,7 +35,15 @@
    - + #{msg.ADMIN_MENU_RECRUITER_TITLE} +
    + +
      +
      • +
    + +
    + #{msg.ADMIN_MENU_CONTACT_TITLE}
      @@ -43,6 +51,16 @@
    +
    + +
    + +
      +
      • +
      • +
      • +
    +
    @@ -52,7 +70,7 @@
- + #{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
    @@ -60,7 +78,7 @@
- + #{msg.ADMIN_MENU_LOGOUT_TITLE}
    diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl deleted file mode 100644 index 4f127340..00000000 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl deleted file mode 100644 index 09b5ac25..00000000 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - -
    -     -     -     diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl new file mode 100644 index 00000000..76203216 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl new file mode 100644 index 00000000..1d996043 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..2ac7b2c5 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 175474e2..a5d91955 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl @@ -5,30 +5,33 @@ xmlns:h="http://java.sun.com/jsf/html" 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 9ba3ade5..fd6e7137 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">
    -
    +
    @@ -25,9 +25,9 @@
    -
    + -
    +
    @@ -41,9 +41,9 @@
    -
    + -
    +
    @@ -57,9 +57,9 @@
    -
    + -
    +
    @@ -73,9 +73,9 @@
    -
    + -
    +
    @@ -89,9 +89,9 @@
    -
    + -
    +
    @@ -107,9 +107,9 @@
    -
    + -
    +
    @@ -123,9 +123,9 @@
    -
    + -
    +
    @@ -141,9 +141,9 @@
    -
    + -
    +
    @@ -157,9 +157,9 @@
    -
    + -
    +
    @@ -167,8 +167,7 @@
    - - + @@ -177,9 +176,9 @@
    -
    + -
    +
    @@ -187,18 +186,18 @@
    - + - - + + - - + +
    @@ -211,13 +210,13 @@
    - + - + @@ -235,9 +234,15 @@
    - - - + + + + + + + + +
    @@ -254,6 +259,40 @@
    + + + + + +
    +
    + +
    + +
    + + + +
    + +
    +
    + + + + + +
    +
    + +
    + +
    + +
    + +
    +
    diff --git a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl new file mode 100644 index 00000000..774bcff8 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl @@ -0,0 +1,17 @@ + + + + + + + + + + + + + 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 2a478cf2..521946fe 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 @@ -6,11 +6,11 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
    - #{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE} +
    -
    +
    @@ -22,20 +22,24 @@
    - +
    + + + +
    - + @@ -45,13 +49,17 @@
    + + + +
    - +
    @@ -59,6 +67,10 @@
    + + + +
    @@ -74,6 +86,10 @@
    + + + +
    @@ -81,13 +97,17 @@
    - +
    + + + +
    @@ -95,7 +115,7 @@
    - + @@ -103,6 +123,10 @@
    + + + +
    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 new file mode 100644 index 00000000..21f97818 --- /dev/null +++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl new file mode 100644 index 00000000..72230476 --- /dev/null +++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    +     +     +     diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl similarity index 59% rename from web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl rename to web/WEB-INF/templates/admin/fax/admin_fax_links.tpl index 22cf2ff8..61e466e1 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl @@ -5,40 +5,45 @@ xmlns:h="http://java.sun.com/jsf/html" 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 new file mode 100644 index 00000000..2cfa486a --- /dev/null +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -0,0 +1,76 @@ + + + + + + + + + + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    + + + + + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + + + +
    + +
    +
    + + + + + + + + + +
    + + + + + +
    +     +     +     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 new file mode 100644 index 00000000..adb9bac9 --- /dev/null +++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl @@ -0,0 +1,56 @@ + + + + + + + + + + +
    +
    + + + + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    + +
    + + + +
    + +
    +
    + + + + + + + + +
    +
    +     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 new file mode 100644 index 00000000..1aec8d21 --- /dev/null +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -0,0 +1,76 @@ + + + + + + + + + + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    + + + + + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + + + +
    + +
    +
    + + + + + + + + + +
    + + + + + +
    +     +     +     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 new file mode 100644 index 00000000..98f95d66 --- /dev/null +++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl @@ -0,0 +1,56 @@ + + + + + + + + + + +
    +
    + + + + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    +
    + +
    + +
    + + + +
    + +
    +
    + + + + + + + + +
    +
    +     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 new file mode 100644 index 00000000..4ed5e600 --- /dev/null +++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl new file mode 100644 index 00000000..45d494ec --- /dev/null +++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    +     +     +     diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl new file mode 100644 index 00000000..6ffb7660 --- /dev/null +++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl @@ -0,0 +1,51 @@ + + + + + + + + + + + +
      + +
    • + + + + +
      • +       + +
    • + + + + +
      • + + +
    • + + + + + +
      • +       + +
    • + + + + +
      • +
    +     +     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 new file mode 100644 index 00000000..b6c73ff0 --- /dev/null +++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl @@ -0,0 +1,64 @@ + + + + + + + + + + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    + + + + + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + + + +
    +
    + +
    + + + + + +
    +     +     +     diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl similarity index 90% rename from web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl rename to web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl index 06e96e21..0a978f2d 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl @@ -7,6 +7,6 @@ - + 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 742cc4a2..b612405a 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 @@ -5,7 +5,12 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + + + + + +
    @@ -40,9 +45,9 @@
    -
    + -
    +
    @@ -58,9 +63,9 @@
    -
    + -
    +
    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 new file mode 100644 index 00000000..de0dd7e7 --- /dev/null +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl new file mode 100644 index 00000000..95cfde3f --- /dev/null +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    +     +     +     diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl new file mode 100644 index 00000000..33d5ed3a --- /dev/null +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl @@ -0,0 +1,51 @@ + + + + + + + + + + + +
      + +
    • + + + + +
      • +       + +
    • + + + + +
      • + + +
    • + + + + + +
      • +       + +
    • + + + + +
      • +
    +     +     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 0b2fd8f8..4faff759 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 @@
    -
    +
    @@ -21,16 +21,16 @@
    - +
    -
    -
    - + + +
    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..f7acb1ce 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 @@ -5,11 +5,16 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + + + + + +
    -
    +
    @@ -59,7 +64,7 @@
    - +
    @@ -68,12 +73,10 @@
      -
    • - -
      • +
    • #{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}
    • - +
      • diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl index e26833ea..8b47c6f8 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl @@ -10,8 +10,4 @@
    - - - - diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl new file mode 100644 index 00000000..52f1cc58 --- /dev/null +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl new file mode 100644 index 00000000..42e57557 --- /dev/null +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 34cb19a5..3e14d0c8 100644 --- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl +++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl @@ -5,48 +5,65 @@ xmlns:h="http://java.sun.com/jsf/html" 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 e158b5d4..69dac706 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -1,10 +1,12 @@ - + xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> + + + @@ -18,10 +20,10 @@ Pizza-Service - <ui:insert name="title">Default title</ui:insert> - +
    -
    -
    -
    +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    -
    -
    - + + +
    -
    +
    -
    +
    @@ -190,29 +190,29 @@
    -
    -
    - + + +
    -
    - +
    +
    -
    - +
    + - + - +
    @@ -220,19 +220,27 @@
    + + + + + + + +
    -
    +
    -
    - +
    + - + @@ -244,15 +252,29 @@
    + + + + + + + +
    -
    - +
    +
    -
    - - - +
    + + + + + + + + +
    @@ -262,17 +284,17 @@
    -
    +
    -
    +
    -
    +
    @@ -282,9 +304,9 @@
      -
      • -
      • -
      • +
    • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}
      • +
    • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}
      • +
    • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}
    diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl index 07c5b1e4..f513f187 100644 --- a/web/WEB-INF/templates/generic/message_box.tpl +++ b/web/WEB-INF/templates/generic/message_box.tpl @@ -8,7 +8,7 @@
    - + #{msg.MESSAGE_BOX_TITLE}
    @@ -25,9 +25,9 @@ - +
    - + #{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}
    diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index 5fffa6f7..e06950f2 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -34,7 +34,7 @@ -
  • Copyright (c) 2016 by Roland Häder
    • +
  • Copyright (c) 2016 Galdora e.K.
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 9df06a7a..3aaaebb5 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -15,7 +15,13 @@
    • + +
    + +
    + +
      • diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index fe656323..a3807770 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -23,8 +23,7 @@ - - + #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}
      @@ -46,8 +45,7 @@ - - + #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}
      diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl new file mode 100644 index 00000000..12552ce7 --- /dev/null +++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl new file mode 100644 index 00000000..536bfecc --- /dev/null +++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl new file mode 100644 index 00000000..4ed66357 --- /dev/null +++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl index 12ea9db4..f31190a0 100644 --- a/web/WEB-INF/templates/login/user/user_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -13,7 +13,6 @@ - diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl index 72a423da..f138ece7 100644 --- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl @@ -18,6 +18,10 @@
      + + + +
      @@ -30,13 +34,9 @@
      - - -
      - -
      -
      - + + +
      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 06ce59b3..f8de86cc 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 @@ -5,29 +5,29 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
      -
      - - - +
      +
      + + + -
      -
      - -
      +
      +
      + +
      -
      - +
      + - -
      +       +
      -
      +
      -
      - + + +
      -
      -
      -
      +
      +
      diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl index 73d6d5e7..f5299b62 100644 --- a/web/WEB-INF/templates/login/user/user_footer.tpl +++ b/web/WEB-INF/templates/login/user/user_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"> +
      • @@ -28,7 +29,7 @@
        • -
      • Copyright (c) 2016 by Roland Häder
        • +
      • Copyright (c) 2016 Galdora e.K.
      diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl index d6e8c5e0..b7697535 100644 --- a/web/WEB-INF/templates/login/user/user_menu.tpl +++ b/web/WEB-INF/templates/login/user/user_menu.tpl @@ -8,7 +8,7 @@
      - + #{msg.MENU_HOME_TITLE}
        @@ -27,20 +27,44 @@
      - +
      - +
        -
      • - -
        • + +
      • + +
        • +         + + +
      • + +
        • +         + + +
      • + +
        • +
      - + #{msg.MENU_APPLICATIONS_TITLE} +
      + +
        +
      • + +
        • +
      + +
      + #{msg.MENU_LOGOUT_TITLE}
        diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl index 2bce29de..b8a98d6b 100644 --- a/web/WEB-INF/templates/user/user_not_logged_in.tpl +++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl @@ -5,13 +5,13 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
        -
        + +
        -
        + diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl index 6188f9c1..e85accf1 100644 --- a/web/WEB-INF/templates/user/user_profile_link.tpl +++ b/web/WEB-INF/templates/user/user_profile_link.tpl @@ -5,7 +5,12 @@ 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 4b3fec3c..f5431636 100644 --- a/web/WEB-INF/templates/user/userid_error.tpl +++ b/web/WEB-INF/templates/user/userid_error.tpl @@ -5,13 +5,13 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
        +
        - + #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
        -
        + -- 2.39.5