From: Roland Häder Date: Tue, 24 May 2016 10:49:37 +0000 (+0200) Subject: Used much more h:outputText instead of directly the message in the template. This... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=36689693d5b8b1c9d3ecbc47194d32bf79795bd9;p=pizzaservice-war.git Used much more h:outputText instead of directly the message in the template. This should make it more compatible and lesser problematic in the future. --- 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 0eae8720..e5e3836b 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 @@ -7,7 +7,9 @@
- #{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND} + + +
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 2113b82d..994c1022 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 @@ -11,7 +11,9 @@
- #{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND} + + +
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 e6a87ddb..0b259e34 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 @@ -11,7 +11,9 @@
- #{msg.ADMIN_MOBILE_PROVIDER_LEGEND} + + +
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 fa1bb31d..511af3b0 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 @@ -10,7 +10,9 @@
- #{msg.ADMIN_USER_DATA_EMAIL_LEGEND} + + +
@@ -52,7 +54,9 @@
    -
  • #{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 a76da6d8..49e2ec50 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -12,7 +12,9 @@
    - #{msg.PERSONAL_DATA_LEGEND} + + +
    @@ -222,7 +224,9 @@
    - #{msg.USER_PROFILE_LEGEND} + + +
    @@ -239,9 +243,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/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index b060e38f..0fa71d69 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -7,7 +7,9 @@
    - #{msg.PRIVACY_TERMS_LEGEND} + + +
    @@ -17,9 +19,9 @@
    - #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1} + - #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2} +
    @@ -35,9 +37,9 @@
    - #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1} + - #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2} +
    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 e34ebe30..d007b217 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -13,7 +13,9 @@
    - #{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND} + + +
    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 b8106fdf..465fc01f 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 @@ -14,7 +14,9 @@
    - #{msg.GUEST_REGISTRATION_EMAIL_LEGEND} + + +
    @@ -60,7 +62,7 @@
    - #{msg.GUEST_REGISTRATION_USER_NAME_NOTICE} +
    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 df3087a7..d26fd581 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 @@ -8,14 +8,16 @@
    - #{msg.GUEST_REGISTRATION_TITLE} +
    - #{msg.GUEST_REGISTRATION_EMAIL_LEGEND} + + +
    @@ -61,7 +63,7 @@
    - #{msg.GUEST_REGISTRATION_USER_NAME_NOTICE} +
    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 9a732b38..14717dea 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 @@ -7,7 +7,10 @@
    - #{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND} + + + +
    diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml index 3beb00ec..382db628 100644 --- a/web/customer/empty_basket.xhtml +++ b/web/customer/empty_basket.xhtml @@ -24,7 +24,9 @@
    - #{msg.RESEND_CONFIRMATION_LINK_LEGEND} + + +
    diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml index 1890b69d..01faefef 100644 --- a/web/guest/user/lost_passwd.xhtml +++ b/web/guest/user/lost_passwd.xhtml @@ -21,11 +21,13 @@
    - #{msg.GUEST_LOST_PASSWORD_TITLE} +
    - #{msg.GUEST_LOST_PASSWORD_LEGEND} + + +
    @@ -40,7 +42,7 @@
    - #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL} +
    diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index f6bf9b97..ce3741e0 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -19,21 +19,23 @@
    - #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE} +
    - #{msg.LOGIN_CHANGE_EMAIL_LEGEND} + + +
    - #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS} +
    - #{contactController.emailAddress} +
    diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index aef02c12..b724c628 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -19,13 +19,15 @@
    - #{msg.LOGIN_CHANGE_PASSWORD_TITLE} +
    - #{msg.LOGIN_CHANGE_PASSWORD_LEGEND} + + +