From a5a6521b8a0ab71fa864d4fd84c46e065454d2b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Apr 2017 13:21:53 +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_menu.tpl | 18 +++++++++++++----- .../admin/user/admin_form_user_data.tpl | 4 +--- .../templates/contact/form_contact_data.tpl | 6 +++--- 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 | 8 +++++++- .../templates/guest/guest_privacy_terms.tpl | 6 ++---- web/WEB-INF/templates/login/user/user_base.tpl | 1 - .../templates/login/user/user_footer.tpl | 2 +- web/WEB-INF/templates/login/user/user_menu.tpl | 2 +- web/WEB-INF/templates/user/userid_error.tpl | 2 +- 11 files changed, 33 insertions(+), 24 deletions(-) diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index b865ba02..9c8be065 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}
    @@ -16,7 +16,7 @@
- + #{msg.ADMIN_MENU_USER_TITLE}
    @@ -25,7 +25,15 @@
- + #{msg.ADMIN_MENU_RECRUITER_TITLE} +
+ +
    +
    • +
+ +
+ #{msg.ADMIN_MENU_CONTACT_TITLE}
    @@ -52,7 +60,7 @@
- + #{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}
    @@ -60,7 +68,7 @@
- + #{msg.ADMIN_MENU_LOGOUT_TITLE}
    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 5660bc07..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 @@ -73,9 +73,7 @@
      -
    • - -
      • +
    • #{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}
    • diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 1e02c8c9..6940fd8b 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -304,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 13cd78a3..a2ab5b59 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -15,9 +15,15 @@
    • +
+
+ +
+ +
  • - +
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/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_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl index 138ee1f6..f5299b62 100644 --- a/web/WEB-INF/templates/login/user/user_footer.tpl +++ b/web/WEB-INF/templates/login/user/user_footer.tpl @@ -29,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 de026340..ef9d1ae4 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}
      diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl index 0d45fc32..f5431636 100644 --- a/web/WEB-INF/templates/user/userid_error.tpl +++ b/web/WEB-INF/templates/user/userid_error.tpl @@ -7,7 +7,7 @@
      - + #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
      -- 2.39.5