From 920d19e25bcf1c2f7788f7584616e92f7d97de59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 24 May 2016 17:09:04 +0200 Subject: [PATCH] removed double-redundant XML parsing instructions, (X)HTML doesn't want it anyway MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/templates.dist/admin_page.xhtml | 1 - .../templates.dist/guest_login_page.xhtml | 1 - web/WEB-INF/templates.dist/guest_page.xhtml | 1 - web/WEB-INF/templates.dist/login_page.xhtml | 1 - .../templates/guest/guest_privacy_terms.tpl | 4 + .../admin_contact_cellphone_delete.xhtml | 1 - .../admin_contact_cellphone_edit.xhtml | 1 - .../admin_contact_cellphone_list.xhtml | 1 - .../admin_contact_cellphone_show.xhtml | 1 - .../admin_contact_cellphone_unlink.xhtml | 1 - web/admin/contact/admin_contact_delete.xhtml | 1 - web/admin/contact/admin_contact_edit.xhtml | 1 - web/admin/contact/admin_contact_export.xhtml | 1 - web/admin/contact/admin_contact_list.xhtml | 1 - web/admin/contact/admin_contact_show.xhtml | 83 ++-- web/admin/country/admin_country_delete.xhtml | 1 - web/admin/country/admin_country_edit.xhtml | 1 - web/admin/country/admin_country_list.xhtml | 1 - web/admin/index.xhtml | 1 - .../admin_mobile_provider_delete.xhtml | 1 - .../admin_mobile_provider_edit.xhtml | 1 - .../admin_mobile_provider_list.xhtml | 1 - .../admin_mobile_provider_show.xhtml | 1 - web/admin/user/admin_user_delete.xhtml | 57 ++- web/admin/user/admin_user_list.xhtml | 1 - web/admin/user/admin_user_show.xhtml | 377 +++++++++--------- web/admin/user/admin_user_unlock.xhtml | 57 ++- web/exception.xhtml | 1 - web/guest/user/confirm_account.xhtml | 1 - web/guest/user/login.xhtml | 1 - web/guest/user/login_error.xhtml | 1 - web/guest/user/lost_passwd.xhtml | 1 - web/guest/user/register.xhtml | 1 - web/guest/user/register_done.xhtml | 1 - web/guest/user/register_page2.xhtml | 1 - web/guest/user/resend_link.xhtml | 1 - web/guest/user/user_list.xhtml | 1 - web/guest/user/user_profile.xhtml | 1 - web/imprint.xhtml | 1 - web/index.xhtml | 1 - web/logout.xhtml | 1 - web/privacy.xhtml | 1 - web/terms.xhtml | 1 - web/user/login_change_email_address.xhtml | 1 - web/user/login_change_password.xhtml | 1 - web/user/login_change_personal_data.xhtml | 1 - web/user/login_contact_data_saved.xhtml | 1 - web/user/login_data_saved.xhtml | 1 - web/user/login_edit_user_data.xhtml | 1 - web/user/login_index.xhtml | 1 - web/user/login_user_data_saved.xhtml | 1 - 51 files changed, 289 insertions(+), 335 deletions(-) diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml index 7a3536e1..06972855 100644 --- a/web/WEB-INF/templates.dist/admin_page.xhtml +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -1,4 +1,3 @@ - + + @@ -38,7 +40,9 @@
+ +
diff --git a/web/admin/cellphone/admin_contact_cellphone_delete.xhtml b/web/admin/cellphone/admin_contact_cellphone_delete.xhtml index 0030f585..605ec9fe 100644 --- a/web/admin/cellphone/admin_contact_cellphone_delete.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_delete.xhtml @@ -1,4 +1,3 @@ - - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT} - - - #{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT} - - - - - - - -
- - - -
- -
- - - - -
- - - + + + + + + + + + + #{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 d63f31c7..c5bee9d3 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -1,4 +1,3 @@ - - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_DELETE_USER} - - - #{msg.CONTENT_TITLE_ADMIN_DELETE_USER} - - - - - - Here goes your content. - - - + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_USER} + + + #{msg.CONTENT_TITLE_ADMIN_DELETE_USER} + + + + + + Here goes your content. + + + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 42e78ad7..745b1fda 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -1,4 +1,3 @@ - - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_SHOW_USER} - - - #{msg.CONTENT_TITLE_ADMIN_SHOW_USER} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- -
- - - - -
- - - + + + + + + + + + + #{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 f5df7f75..7124aca2 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -1,29 +1,28 @@ - - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_UNLOCK_USER} - - - #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER} - - - - - - Here goes your content. - - - + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLOCK_USER} + + + #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER} + + + + + + Here goes your content. + + + diff --git a/web/exception.xhtml b/web/exception.xhtml index a32706b3..2996a8c0 100644 --- a/web/exception.xhtml +++ b/web/exception.xhtml @@ -1,4 +1,3 @@ -