From 6e41afa759614e6e402674725d06798ef032613f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 02:42:52 +0200
Subject: [PATCH] Please cherry-pick: - much more cleanups
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
web/admin/contact/admin_contact_delete.xhtml | 3 ++-
web/admin/contact/admin_contact_edit.xhtml | 3 ++-
web/admin/contact/admin_contact_export.xhtml | 2 +-
web/admin/contact/admin_contact_list.xhtml | 1 +
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 | 1 +
web/admin/user/admin_user_edit.xhtml | 1 -
web/admin/user/admin_user_list.xhtml | 15 ++++++++-------
web/admin/user/admin_user_unlock.xhtml | 1 +
web/guest/user/user_login.xhtml | 8 ++++----
web/guest/user/user_lost_password.xhtml | 1 +
web/guest/user/user_profile.xhtml | 1 +
web/guest/user/user_register_done.xhtml | 1 +
web/guest/user/user_register_page2.xhtml | 1 +
web/guest/user/user_resend_link.xhtml | 1 +
web/user/login_data_saved.xhtml | 3 ++-
web/user/login_index.xhtml | 1 +
web/user/login_user_data_saved.xhtml | 3 ++-
25 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 9707352b..d9debf2f 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -40,7 +41,7 @@
</div>
<div class="para notice">
- <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_NOTICE}" />
+ <h:outputText value="#{msg.ADMIN_DELETE_CONTACT_NOTICE}" />
</div>
<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 000a0b7d..0f9c851b 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -40,7 +41,7 @@
</div>
<div class="para notice">
- <h:outputFormat value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
+ <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
</div>
<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index e42651ff..7754d3d8 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -5,7 +6,6 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:f="http://xmlns.jcp.org/jsf/core"
-
xmlns:p="http://primefaces.org/ui">
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 5f2cae8c..e5084007 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
index 256dc932..c37d12ae 100644
--- a/web/admin/country/admin_country_delete.xhtml
+++ b/web/admin/country/admin_country_delete.xhtml
@@ -1,4 +1,3 @@
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
index f52766e4..35bba855 100644
--- a/web/admin/country/admin_country_edit.xhtml
+++ b/web/admin/country/admin_country_edit.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index d821574a..0f056e36 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
index 4f9e2292..a9c08f43 100644
--- a/web/admin/index.xhtml
+++ b/web/admin/index.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
index 1553f750..192ef47a 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
index b4a05224..cc4c0c78 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 6593d0d7..b6c3f734 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
index fb95c150..72c8d4c1 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index f62ff88c..5d36aee8 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 9d8c1263..8a706644 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 8d6a4871..88248401 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -27,7 +28,7 @@
<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+ <h:outputText value="#{msg.ADMIN_USER_ID}" />
</f:facet>
<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
@@ -47,7 +48,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
+ <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
</f:facet>
<h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
@@ -55,7 +56,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
+ <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
</f:facet>
<h:outputText value="#{user.userContact.contactFirstName}" />
@@ -63,7 +64,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
+ <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
</f:facet>
<h:outputText value="#{user.userContact.contactFamilyName}" />
@@ -71,7 +72,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}" />
+ <h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
</f:facet>
<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
@@ -79,7 +80,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_PROFILE_MODE}" />
+ <h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
</f:facet>
<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
@@ -87,7 +88,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_LIST_USER_CREATED}" />
+ <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
</f:facet>
<h:outputText id="userCreated" value="#{user.userCreated.time}">
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index ec1edd88..d0cde138 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index fe615ac7..df7506ea 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -2,10 +2,10 @@
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
- >
+ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:f="http://xmlns.jcp.org/jsf/core"
+ >
<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
<ui:define name="guest_title">
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index 2d6a6a06..ac2552d9 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 55f8af2a..db10a2fc 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index 65b3bda1..a16bdc28 100644
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index 35557e62..f06e953c 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index c4da123a..73be773a 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 2e95fcc8..bda92d33 100644
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -13,7 +14,7 @@
</ui:define>
<ui:define name="content_header">
- <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}" />
+ <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
</ui:define>
<ui:define name="content">
diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index c8f9c836..f6b6502d 100644
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index ddb9e96b..bbe9c2e3 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -9,7 +10,7 @@
<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
<ui:define name="login_title">
- <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_DATA_SAVED}" />
+ <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
</ui:define>
<ui:define name="content_header">
--
2.39.5