]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Thu, 20 Apr 2017 00:42:52 +0000 (02:42 +0200)
committerRoland Häder <roland@mxchange.org>
Thu, 20 Apr 2017 00:43:49 +0000 (02:43 +0200)
- much more cleanups

Signed-off-by: Roland Häder <roland@mxchange.org>
25 files changed:
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_export.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/country/admin_country_delete.xhtml
web/admin/country/admin_country_edit.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/index.xhtml
web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_show.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_unlock.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_link.xhtml
web/user/login_data_saved.xhtml
web/user/login_index.xhtml
web/user/login_user_data_saved.xhtml

index 9707352b0c19dc47617277158793d3af15eff698..d9debf2fe23af581ef7b9f3f87adb5400d963f1e 100644 (file)
@@ -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" />
index 000a0b7d90164344876e5393ff3024c01408114f..0f9c851b1ab71d8feee780d8dd93b39ad7aac825 100644 (file)
@@ -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">
index e42651ff259a89e0c88425792a3a36a639a537b0..7754d3d8962756ac994f6fb4fe936938479884ab 100644 (file)
@@ -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">
index 5f2cae8cd81b25af20a9cc242e6afa8dd0e59f70..e508400748b7f73bf190e2fc578870ed1d69a7af 100644 (file)
@@ -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}"
index 256dc93219446081c7331820ad43b81e10dadb3f..c37d12ae893f07168ea4415499d26d830596e515 100644 (file)
@@ -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}"
index f52766e4067fc58bf3bc1acc9c7be50845b350c8..35bba855cca8dbeb6bacab2769010eb08714a1e9 100644 (file)
@@ -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}"
index d821574a899fe5f546d25876ca44e2f6138833db..0f056e3628a42bacae347b9d6ff1a8f9b06e271f 100644 (file)
@@ -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}"
index 4f9e2292df3052fc872321c36e26be703b9fd490..a9c08f4339a2d918f6ed3081c27e776ece5d1ba8 100644 (file)
@@ -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}"
index 1553f7509b2644308e08197ad8bb4a2829a15a36..192ef47a54344768e49a721fa8ce45e457b7fae4 100644 (file)
@@ -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}"
index b4a05224fc8c219d782837bd1214c38034488591..cc4c0c78d21decba47cc4fd60c1bacf586180c2e 100644 (file)
@@ -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}"
index 6593d0d77f595096b032518c1c96965a0e2ac3c2..b6c3f73400313ac14606b0dedc0dd7998abfe7a5 100644 (file)
@@ -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}"
index fb95c150013f7114a8e2bfab86712956ae0a2620..72c8d4c1352b5da3dce117121c7d9443a1853f94 100644 (file)
@@ -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}"
index f62ff88cff5579d002cf8a92ddbb68e737b1d1d9..5d36aee840a550113575c9756405d34e1324ccc8 100644 (file)
@@ -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}"
index 9d8c126360c137df5d1815d8714ea87625e33e1f..8a706644d539c65b32601fab2c911e5583aba86a 100644 (file)
@@ -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}"
index 8d6a487179540c8f89a887b05491d3db7433208a..882484011bb9200f7caf2cda7dee3f47aafe0096 100644 (file)
@@ -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}">
index ec1edd8810ed3c785c963191e68f7358fcdc622c..d0cde138fc105d3d58d05ff711c296566f61826c 100644 (file)
@@ -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}"
index fe615ac7ba78f89496d86b08baaf023e357f92cd..df7506ea9cabbf2cfb63d8a4e17ccb556c1e9984 100644 (file)
@@ -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">
index 2d6a6a06272a634d166a0e43ba7049fa5fabdbc1..ac2552d9f2d191ff544ad3faafaeb9ba330a9fb3 100644 (file)
@@ -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}"
index 55f8af2a73dcc4984b0f0ea77335f67ae13d98dc..db10a2fc99a0b36719925a2a5f632ceb72817bfd 100644 (file)
@@ -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}"
index 65b3bda1c7fd6200d5d023968f079fa0df3d9553..a16bdc2896626f9363b787de9f0c1daa1e19b1cc 100644 (file)
@@ -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}"
index 35557e623af211f846a559ad7e13cd2342aa8a5f..f06e953c8e82007f35ccd6a153d53f3be74b9e64 100644 (file)
@@ -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}"
index c4da123a94cbe8984abff1d8618452236f733313..73be773aed481d978176fcab6bf7bc55778bc567 100644 (file)
@@ -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}"
index 2e95fcc8c613cc895effdf00cbb09880df53121f..bda92d33ac3cc101944beb2068cf16eb7ef71bab 100644 (file)
@@ -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">
index c8f9c836ba57c4c0135e072e4e0b1b9ef6fd68c9..f6b6502d1903857965ebe8de3a19baf0d24bbf87 100644 (file)
@@ -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}"
index ddb9e96b818f568d48df47d30b1feaf211873a71..bbe9c2e3d6be9a28310f4fa326b1596bba805ab5 100644 (file)
@@ -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">