From: Roland Häder Date: Wed, 19 Apr 2017 14:07:36 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e70c8363e8422b91ccac4c8abdf74d6a18dd6309;p=addressbook-war.git Please cherry-pick: - used h:outputText to wrap text ... this is a WUI (like a GUI) and text elements should be wrapped into JSF tags Signed-off-by: Roland Häder --- diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index 34ec868b..faec4153 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_LOGOUT} - #{msg.CONTENT_TITLE_ADMIN_LOGOUT} + diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml index 72a387f4..072aae18 100644 --- a/web/admin/cellphone/admin_cellphone_delete.xhtml +++ b/web/admin/cellphone/admin_cellphone_delete.xhtml @@ -15,7 +15,7 @@ #{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE} - #{msg.CONTENT_TITLE_ADMIN_DELETE_CELLPHONE} + diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml index 31a3d1cd..e48c4042 100644 --- a/web/admin/cellphone/admin_cellphone_edit.xhtml +++ b/web/admin/cellphone/admin_cellphone_edit.xhtml @@ -15,7 +15,7 @@ #{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE} - #{msg.CONTENT_TITLE_ADMIN_EDIT_CELLPHONE} + diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml index 4e040639..bd140ab7 100644 --- a/web/admin/cellphone/admin_cellphone_show.xhtml +++ b/web/admin/cellphone/admin_cellphone_show.xhtml @@ -15,7 +15,7 @@ #{msg.PAGE_TITLE_ADMIN_SHOW_CELLPHONE} - #{msg.CONTENT_TITLE_ADMIN_SHOW_CELLPHONE} + diff --git a/web/admin/cellphone/admin_contact_cellphone_list.xhtml b/web/admin/cellphone/admin_contact_cellphone_list.xhtml index b319d1e6..2881b151 100644 --- a/web/admin/cellphone/admin_contact_cellphone_list.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_list.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE} - #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE} + diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml index 715d7bc9..fadc8b53 100644 --- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} - #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 0e949e8a..c332e485 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT} - #{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT} + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 642dbc8f..2026b38f 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT} - #{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT} + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 502d57a3..6ba68ed4 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -12,7 +12,7 @@ #{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT} - #{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT} + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 5b081f69..5a101fd7 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT} - #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT} + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 4b3ecb30..facf5b99 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT} - #{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT} + diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml index c5bee9d3..cfe3270c 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY} - #{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY} + diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml index efede20c..6183baa3 100644 --- a/web/admin/country/admin_country_edit.xhtml +++ b/web/admin/country/admin_country_edit.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY} - #{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY} + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index 2462fdd7..21463e08 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY} - #{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY} + diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml index eb077993..c764ee06 100644 --- a/web/admin/index.xhtml +++ b/web/admin/index.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_WELCOME} - #{msg.CONTENT_TITLE_ADMIN_WELCOME} + diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml index 99566d6b..04eba36c 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE} - #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE} + diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml index da2bbb45..16242a6d 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT} - #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT} + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index ba052003..557e4726 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST} - #{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST} + diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml index 153b763b..85ed97ce 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER} - #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER} + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index 4397e930..d6d207cb 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_DELETE_USER} - #{msg.CONTENT_TITLE_ADMIN_DELETE_USER} + diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index f7a826ff..b9fc96cb 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -17,7 +17,7 @@ #{msg.PAGE_TITLE_ADMIN_EDIT_USER} - #{msg.CONTENT_TITLE_ADMIN_EDIT_USER} + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 151ea73d..0d87a41a 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -12,7 +12,7 @@ #{msg.PAGE_TITLE_ADMIN_EXPORT_USER} - #{msg.CONTENT_TITLE_ADMIN_EXPORT_USER} + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index f82cb0c4..f6a238f6 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_ADMIN_LIST_USER} - #{msg.CONTENT_TITLE_ADMIN_LIST_USER} + diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index e074bcb7..1468eaca 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -17,7 +17,7 @@ #{msg.PAGE_TITLE_ADMIN_LOCK_USER} - #{msg.CONTENT_TITLE_ADMIN_LOCK_USER} + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index ca7e8dda..e92cee10 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_SHOW_USER} - #{msg.CONTENT_TITLE_ADMIN_SHOW_USER} + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index fe8dc182..d5b45feb 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_ADMIN_UNLOCK_USER} - #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER} + diff --git a/web/exception.xhtml b/web/exception.xhtml index 2996a8c0..296d7284 100644 --- a/web/exception.xhtml +++ b/web/exception.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_EXCEPTION_THROWN} - #{msg.CONTENT_TITLE_EXCEPTION_THROWN} + diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml index a7d6a9c1..c38d0f63 100644 --- a/web/guest/user/confirm_account.xhtml +++ b/web/guest/user/confirm_account.xhtml @@ -16,7 +16,7 @@ #{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT} - #{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT} + diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml index 3fd70d0e..5ee98148 100644 --- a/web/guest/user/login.xhtml +++ b/web/guest/user/login.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_USER_LOGIN} - #{msg.CONTENT_TITLE_USER_LOGIN} + diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml index 3bce0b7a..ed3a6deb 100644 --- a/web/guest/user/login_error.xhtml +++ b/web/guest/user/login_error.xhtml @@ -12,7 +12,7 @@ #{msg.PAGE_TITLE_USER_LOGIN_ERROR} - #{msg.CONTENT_TITLE_USER_LOGIN_ERROR} + diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml index 2ff7f1ec..2227657d 100644 --- a/web/guest/user/lost_passwd.xhtml +++ b/web/guest/user/lost_passwd.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_USER_LOST_PASSWORD} - #{msg.CONTENT_TITLE_USER_LOST_PASSWORD} + diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml index 2ee42d82..32b24579 100644 --- a/web/guest/user/register.xhtml +++ b/web/guest/user/register.xhtml @@ -11,16 +11,16 @@ #{msg.PAGE_TITLE_USER_REGISTER} - #{msg.CONTENT_TITLE_USER_REGISTER} +
- #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} + - #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2} +
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml index 5a4d6080..c0e4757c 100644 --- a/web/guest/user/register_done.xhtml +++ b/web/guest/user/register_done.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_USER_REGISTER_DONE} - #{msg.CONTENT_TITLE_USER_REGISTER_DONE} + diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml index e00f5542..d6176438 100644 --- a/web/guest/user/register_page2.xhtml +++ b/web/guest/user/register_page2.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_USER_REGISTER_PAGE2} - #{msg.CONTENT_TITLE_USER_REGISTER_PAGE2} + diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml index 2cf5efea..3c2ae96a 100644 --- a/web/guest/user/resend_done.xhtml +++ b/web/guest/user/resend_done.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_USER_RESEND_DONE} - #{msg.CONTENT_TITLE_USER_RESEND_DONE} + diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml index e520db4f..b4d2f8be 100644 --- a/web/guest/user/resend_link.xhtml +++ b/web/guest/user/resend_link.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_INDEX_RESEND_LINK} - #{msg.CONTENT_TITLE_INDEX_RESEND_LINK} + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index afcb44da..897b9ef9 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -10,7 +10,7 @@ #{msg.PAGE_TITLE_USER_LIST} - #{msg.CONTENT_TITLE_USER_LIST} + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index 280d0c9c..ec67dbcc 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -18,7 +18,7 @@ #{msg.PAGE_TITLE_INDEX_USER_PROFILE} - #{msg.CONTENT_TITLE_INDEX_USER_PROFILE} + diff --git a/web/imprint.xhtml b/web/imprint.xhtml index 5578d959..91448b82 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_INDEX_IMPRINT} - #{msg.CONTENT_TITLE_INDEX_IMPRINT} + diff --git a/web/index.xhtml b/web/index.xhtml index be97930e..b34c72cd 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -11,10 +11,11 @@ #{msg.PAGE_TITLE_INDEX_WELCOME} - #{msg.CONTENT_TITLE_INDEX_WELCOME} + + Default content diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 6cb3893e..0a113dee 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_INDEX_PRIVACY} - #{msg.CONTENT_TITLE_INDEX_PRIVACY} + diff --git a/web/terms.xhtml b/web/terms.xhtml index 1e7acae5..6b4a3b65 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_INDEX_TERMS} - #{msg.CONTENT_TITLE_INDEX_TERMS} + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index f33cf16a..2e61450d 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED} - #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED} + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 550d192f..2a063464 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_DATA_SAVED} - #{msg.CONTENT_TITLE_LOGIN_DATA_SAVED} + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 3dde1ed8..96a0f0f1 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} - #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA} + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index b85c6661..7a892786 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_HOME} - #{msg.CONTENT_TITLE_LOGIN_HOME} + diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index 3820f96c..7b55cc85 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_USER_LOGOUT} - #{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT} + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 1df0b8c3..95827a75 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS} - #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS} + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 46ce7b4f..339571e0 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PASSWORD} - #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD} + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index 9bd33af1..0e330310 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA} - #{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA} + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index f0831d0b..dd0a2451 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED} - #{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED} +