]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
removed double-redundant XML parsing instructions, (X)HTML doesn't want it anyway
authorRoland Häder <roland@mxchange.org>
Tue, 24 May 2016 15:09:04 +0000 (17:09 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 25 May 2016 18:03:04 +0000 (20:03 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
51 files changed:
web/WEB-INF/templates.dist/admin_page.xhtml
web/WEB-INF/templates.dist/guest_login_page.xhtml
web/WEB-INF/templates.dist/guest_page.xhtml
web/WEB-INF/templates.dist/login_page.xhtml
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/admin/cellphone/admin_contact_cellphone_delete.xhtml
web/admin/cellphone/admin_contact_cellphone_edit.xhtml
web/admin/cellphone/admin_contact_cellphone_list.xhtml
web/admin/cellphone/admin_contact_cellphone_show.xhtml
web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
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/contact/admin_contact_show.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_list.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/customer/empty_basket.xhtml
web/exception.xhtml
web/guest/user/confirm_account.xhtml
web/guest/user/login.xhtml
web/guest/user/lost_passwd.xhtml
web/guest/user/register.xhtml
web/guest/user/register_done.xhtml
web/guest/user/register_page2.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_profile.xhtml
web/imprint.xhtml
web/index.xhtml
web/item_added.xhtml
web/logout.xhtml
web/privacy.xhtml
web/terms.xhtml
web/user/login_change_email_address.xhtml
web/user/login_change_password.xhtml
web/user/login_change_personal_data.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_index.xhtml
web/user/login_user_data_saved.xhtml

index 7720f40f404db6040e985383a092176ac03adf03..92ef3dbd32376da8e5729dcae795798d461e607c 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 e3d7e7d6f1a65d3689754ca81adb7ca27a25b143..4c614aa545389786b1b59137f80a9e031338b267 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 ed7ba1023b5aa830f624371b9534bd83b1c1c735..98b02eb15c05a25b9c605ca4ea93a52a3a24f2e5 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 7330578e9e6ee26a4e4033d8a05b3205bd0150fb..a965fee1eaf0779e70dd75ce681ff6687fb10dde 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 xmlns="http://www.w3.org/1999/xhtml"
          lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
index 0fa71d69d7d6c1981d3c289c75a648edbdc987aa..1681ba2942375c0df13237a8f66a3c27f4519b38 100644 (file)
@@ -20,7 +20,9 @@
 
                                <div class="table_right75">
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
+                                       <h:outputText value="&#160;" />
                                        <h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
+                                       <h:outputText value="&#160;" />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
 
@@ -38,7 +40,9 @@
 
                                <div class="table_right75">
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
+                                       <h:outputText value="&#160;" />
                                        <h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
+                                       <h:outputText value="&#160;" />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
 
index 0030f585fa1e30c6c3e39e65939b4362124fe656..605ec9fe1b54e34fe23ea72c69d545af3774b2e2 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 bc0b57fde937890ca9c7ad0a50e58e8d0ab22fa3..eb3d93cd37c25af7e2c1b8bcd5d1965ac0711369 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 9570f60f19bfc97365978b81202856f289129a32..5ba61eba5eb6208ad349964cd1ae063de9e03c8f 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 dda3e9387c32b65724b0d1a4699093e2a18c0e4a..7d0e1af44e5f42deacef0dc336300710e0d6d5d9 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 239d23cc562e2e5a836c25f45e8319eb0a70c599..b6f7e4ed28833e1688582d06d04a381662d62640 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 f1966a3fbfadfbb91495dbaf49e07804326b8698..e203fd2a882aa01adda7a5deb4ec36785a479916 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 29e47b402b4ca0a19827444618af213633164b97..bbc2b89d5898939d004d39b420f13bedafb2e9b9 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 8ee9e3bdb12890e1738b3ecd739a33eae27e2974..56382ebc09343b4965892cafa3cca98b608dd565 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 af2c2af18dc726302e00762901b37bd16ac0bca1..40f1ff996a7f862ce32651c00c26348b954a4b7a 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 28131f2002ca3320d458c4b62ffb72a944b0896b..b2fd1ffd14c8b5071289012797dd1231bb231929 100644 (file)
@@ -1,42 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <f:metadata>\r
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />\r
-               <f:viewAction action="#{beanHelper.copyContactToController()}" />\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />\r
-\r
-                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />\r
-\r
-                       <div>\r
-                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl">\r
-                                       <ui:param name="contact" value="#{beanHelper.contact}" />\r
-                               </ui:include>\r
-                       </div>\r
-\r
-                       <div>\r
-                               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">\r
-                                       <ui:param name="cellphoneNumber" value="#{beanHelper.contact.contactCellphoneNumber}" />\r
-                                       <ui:param name="contact" value="#{beanHelper.contact}" />\r
-                               </ui:include>\r
-                       </div>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<!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}"
+       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"
+       >
+
+       <f:metadata>
+               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyContactToController()}" />
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+
+                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
+
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl">
+                                       <ui:param name="contact" value="#{beanHelper.contact}" />
+                               </ui:include>
+                       </div>
+
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
+                                       <ui:param name="cellphoneNumber" value="#{beanHelper.contact.contactCellphoneNumber}" />
+                                       <ui:param name="contact" value="#{beanHelper.contact}" />
+                               </ui:include>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
index d63f31c754fa1e0d9c6a3d6b647eece9021b8e19..c5bee9d3c21867851bd3fc10869a8e9d165c72a2 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 d37796d3f1db16ae3c93869c9bd1e2243be4c954..efede20cf6f1cda0331ff1a1ff22cbd8a65c88f3 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 102d02fc954808436518c24a461645fbd1c862cd..26b383ae5e7ba08b058e1b07cdf3f5b0ecc88e0d 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 76285470d04daf59546796f5d89a4d466775a2cb..eb077993d58893e4f2fb4587157b9a32ddf6f117 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 c63947f30706eb351935bf6db2b1ffd25dc60328..99566d6b6e9e83e591ccad9bfe2b2695c887a604 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 4cb30890d1aa43f16e0dfb400393b3ecb4242b00..da2bbb4557bcffe50453e443ff4b792da72542ca 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 fdd1d473bed5e0fc4567d73cea93a4ed0148bbb4..8d30d8b19be303bc2db7e134e6d39b7c6d336971 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 982e39460546fb7672952a44ccf5a709beed2f3a..153b763b6feb937b0177b48d1c7d3e137661b4e6 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 bc0f33aaf6bbdf616f54fdcd76a294a43c73c45d..4397e93084c62777dda28019aa16921b2173a12c 100644 (file)
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <f:metadata>\r
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />\r
-               <f:viewAction action="#{beanHelper.copyUserToController()}" />\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_USER}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />\r
-\r
-                       Here goes your content.\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<!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}"
+       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"
+       >
+
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_DELETE_USER}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
index 42e78ad73142918a675c1562b9a46adf8edd94f1..745b1fda97fc028372b8622289cb5236bc0c4321 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 3eb471cb009a01cfb41fd0ab49bd596d68a21ae0..1476295a4d8dc2daecd47d114f0167aa419d7cf5 100644 (file)
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <f:metadata>\r
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />\r
-               <f:viewAction action="#{beanHelper.copyUserToController()}" />\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_USER}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />\r
-\r
-                       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">\r
-                               <f:facet name="header">\r
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">\r
-                                               <f:param value="#{beanHelper.user.userName}" />\r
-                                               <f:param value="#{beanHelper.user.userId}" />\r
-                                       </h:outputFormat>\r
-                               </f:facet>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />\r
-\r
-                                       <h:outputText id="userId" styleClass="data_field" value="#{beanHelper.user.userId}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />\r
-\r
-                                       <h:outputText id="userName" styleClass="data_field" value="#{beanHelper.user.userName}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />\r
-\r
-                                       <h:outputText id="userCreated" styleClass="data_field" value="#{beanHelper.user.userCreated.time}">\r
-                                               <f:convertDateTime for="userCreated" type="both" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />\r
-\r
-                                       <h:outputText id="userUpdated" styleClass="data_field" value="#{beanHelper.user.userUpdated.time}">\r
-                                               <f:convertDateTime for="userUpdated" type="both" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />\r
-\r
-                                       <h:outputText id="userAccountStatus" styleClass="data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />\r
-\r
-                                       <h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />\r
-\r
-                                       <h:outputText id="userLastLocked" styleClass="data_field" value="#{beanHelper.user.userLastLocked.time}">\r
-                                               <f:convertDateTime for="userLastLocked" type="both" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />\r
-\r
-                                       <h:outputText id="lastLockedReason" styleClass="data_field" value="#{beanHelper.user.userLastLockedReason}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />\r
-\r
-                                       <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.user.userContact.contactCreated.time}">\r
-                                               <f:convertDateTime for="contactCreated" type="both" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />\r
-\r
-                                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">\r
-                                               <f:convertDateTime for="contactUpdated" type="both" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />\r
-\r
-                                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />\r
-\r
-                                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />\r
-\r
-                                       <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.user.userContact.contactTitle}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />\r
-\r
-                                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFirstName}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />\r
-\r
-                                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />\r
-\r
-                                       <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.user.userContact.contactStreet}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />\r
-\r
-                                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />\r
-\r
-                                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.user.userContact.contactZipCode}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />\r
-\r
-                                       <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.user.userContact.contactCity}" />\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />\r
-\r
-                                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">\r
-                                               <h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />\r
-                                       </h:outputLink>\r
-                               </h:column>\r
-\r
-                               <h:column>\r
-                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />\r
-\r
-                                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">\r
-                                               <f:convertDateTime for="contactBirthday" type="date" />\r
-                                       </h:outputText>\r
-                               </h:column>\r
-                       </h:panelGrid>\r
-\r
-                       <div>\r
-                               <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">\r
-                                       <ui:param name="user" value="#{beanHelper.user}" />\r
-                               </ui:include>\r
-                       </div>\r
-\r
-                       <div>\r
-                               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">\r
-                                       <ui:param name="cellphoneNumber" value="#{beanHelper.user.userContact.contactCellphoneNumber}" />\r
-                                       <ui:param name="contact" value="#{beanHelper.user.userContact}" />\r
-                               </ui:include>\r
-                       </div>\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<!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}"
+       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"
+       >
+
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+
+                       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
+                               <f:facet name="header">
+                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                                               <f:param value="#{beanHelper.user.userName}" />
+                                               <f:param value="#{beanHelper.user.userId}" />
+                                       </h:outputFormat>
+                               </f:facet>
+
+                               <h:column>
+                                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />
+
+                                       <h:outputText id="userId" styleClass="data_field" value="#{beanHelper.user.userId}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
+
+                                       <h:outputText id="userName" styleClass="data_field" value="#{beanHelper.user.userName}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />
+
+                                       <h:outputText id="userCreated" styleClass="data_field" value="#{beanHelper.user.userCreated.time}">
+                                               <f:convertDateTime for="userCreated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+
+                                       <h:outputText id="userUpdated" styleClass="data_field" value="#{beanHelper.user.userUpdated.time}">
+                                               <f:convertDateTime for="userUpdated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+
+                                       <h:outputText id="userAccountStatus" styleClass="data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+
+                                       <h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+
+                                       <h:outputText id="userLastLocked" styleClass="data_field" value="#{beanHelper.user.userLastLocked.time}">
+                                               <f:convertDateTime for="userLastLocked" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+
+                                       <h:outputText id="lastLockedReason" styleClass="data_field" value="#{beanHelper.user.userLastLockedReason}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
+
+                                       <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.user.userContact.contactCreated.time}">
+                                               <f:convertDateTime for="contactCreated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
+
+                                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">
+                                               <f:convertDateTime for="contactUpdated" type="both" />
+                                       </h:outputText>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+
+                                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+
+                                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+
+                                       <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.user.userContact.contactTitle}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+                                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+                                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+
+                                       <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.user.userContact.contactStreet}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+
+                                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+
+                                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+
+                                       <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.user.userContact.contactCity}" />
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+                                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
+                                               <h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />
+                                       </h:outputLink>
+                               </h:column>
+
+                               <h:column>
+                                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+
+                                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">
+                                               <f:convertDateTime for="contactBirthday" type="date" />
+                                       </h:outputText>
+                               </h:column>
+                       </h:panelGrid>
+
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
+                                       <ui:param name="user" value="#{beanHelper.user}" />
+                               </ui:include>
+                       </div>
+
+                       <div>
+                               <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
+                                       <ui:param name="cellphoneNumber" value="#{beanHelper.user.userContact.contactCellphoneNumber}" />
+                                       <ui:param name="contact" value="#{beanHelper.user.userContact}" />
+                               </ui:include>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>
index f5df7f75567d9d59e0ec50093518138f78137ce0..7124aca2126c50b8e92036af6131cf0401dbf100 100644 (file)
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html\r
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"\r
-       xmlns:h="http://xmlns.jcp.org/jsf/html"\r
-       xmlns:f="http://xmlns.jcp.org/jsf/core"\r
-       >\r
-\r
-       <f:metadata>\r
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />\r
-               <f:viewAction action="#{beanHelper.copyUserToController()}" />\r
-       </f:metadata>\r
-\r
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">\r
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>\r
-\r
-               <ui:define name="content_header">\r
-                       #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}\r
-               </ui:define>\r
-\r
-               <ui:define name="content">\r
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />\r
-\r
-                       Here goes your content.\r
-               </ui:define>\r
-       </ui:composition>\r
-</html>\r
+<!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}"
+       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"
+       >
+
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
+
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
+               </ui:define>
+
+               <ui:define name="content">
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+
+                       Here goes your content.
+               </ui:define>
+       </ui:composition>
+</html>
index 382db6282a607f06a322353d3e1b6efae817145b..cabf62d382b247e207853b0e96dae116a7c286ce 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 a32706b3f947182af3314c0be47052a26e7c5acb..2996a8c0afabe4b940346acf05c67bcf858b4a7d 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 8b6a4571ffbb1d0cc001ffdbcf6b6b92ded64ada..a7d6a9c1f03f2f3a47dac3ae4e4bdd0899fce99b 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 5d90669c73030fd595c751af76403636df879656..b0b36816515975a02831cf16f0e0776a8055a4c8 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 01faefeff2ab9b312cc0bbfd86920bbbb6d20b84..24474074bed518feac469c5244fb8ac43fd060b5 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 e8546fec4bb687815a20b90c71e61b250770fba6..c71ad8812ed73d7c697611ac11b7d56cb8a8bdb5 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 ddffa7e7fdcabe282608e7ddc8e13e073049c9c5..e89511e94faa63187a8c3a6a80c55b3ac6f646da 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 04b7ccd20e351042fb2043a56360a1285ef651ad..1b00e64ae18612bed9fbc834cf2ea7efb01fa09e 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 e05b336f1216d2ff1a3460bc9c7835c70747d8ac..031f3b69f18c5770114ac0c2f5ed67682715102c 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 a90b20a56e06dbab83f23a7256cebadb916d0ae0..89a917f5d50f9d0e2690714aacf676c3d9d58f35 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 25c8180fde3491f2c4c3b185e3f4ba29f99d8178..8965e3f6d2e42d8ad2af74fa8bc728ea8c72db36 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 993dec3b1f4af9f1216d2aae51ef2fe7cd0d50c1..dad8b72c58bde58d045ae215276731c218d37384 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 1c52cd57190ecb06592d7c4d35ef0577dcae8683..0b652b075619d3b5e39474b7be0e002e8dc0e6ba 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 63b277cc20771c263ba5a48dc534d2b44381f547..0c4010dc147357f9c533c3d73eb90cefe4a83ef4 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 86df2feb92e7c9698d855dc217a9314448bb572f..b50e729cdfc09ec68917bca059484813f33a242b 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 f46e4cf89ad6c82323bcf858507a284e72adf96b..e8270e846e7be6f03786fca9909b88100dbc118c 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 ce3741e0e1a37c68e13c05f7279c823441fd04dc..c8d47e9d149a81329e969dcfc8ad8ab60c5f0988 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 b724c628ef3a5643114a94d929de0f5b4f42219f..1c8c6021d6a2bfe1c0b8eb29a10b19c276281e2c 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 1aa2863904b74640020eabe4daf94aed841fa59c..b184daae45afcaf429dce241ae9ec4cfe0aaafac 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 fd2a453378f2476fca14d5fed194c4341e0fa655..262f86eff66e52a0fae74ffc27bc04c756de69fd 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 dd82a522249689ea84c42b8620d87d967a74d10e..62b20ab0f47429c74a2767bf739f0a72dcd90dd9 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 f65e87c01082b282de98cee19d4eb917ee4ac9f2..dca0bc27fdeb55dfb0561e8034936c8f292779e9 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 db4032430977e0d23cb0e55afe13a523f23dfa79..8954954a39b849e93d063422627dc884cec9c6c1 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 860658497e0f81d885553409680abd54b96d9447..91fcd108ad7a1f1b7d8872c2490e228a0be94111 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}"