]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 28 Jul 2017 23:21:02 +0000 (01:21 +0200)
committerRoland Häder <roland@mxchange.org>
Fri, 28 Jul 2017 23:55:29 +0000 (01:55 +0200)
- all outside ui:composition is being *IGNORED* (maybe only the XML header by
  NetBeans IDE is used)
- so you have to move your DOCTYPE and html tag to

Signed-off-by: Roland Häder <roland@mxchange.org>
74 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/base.tpl
web/admin/admin_logout.xhtml
web/admin/category/admin_category_delete.xhtml
web/admin/category/admin_category_edit.xhtml
web/admin/category/admin_category_list.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/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/contact_business/admin_contact_business_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/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/index.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_contact_mobile_list.xhtml
web/admin/mobile/admin_contact_mobile_unlink.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_edit.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.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_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/exception.xhtml
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.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.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_done.xhtml
web/guest/user/user_resend_link.xhtml
web/imprint.xhtml
web/index.xhtml
web/privacy.xhtml
web/terms.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_logout.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml
web/user/login_user_data_saved.xhtml

index 15ef3689bbe7f9df1681a7a98e916c02a777905d..e42352cd4ee925c26d5ef04b0b78ea684d837135 100644 (file)
@@ -1,23 +1,19 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_FOO}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_FOO}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index cb8aa91b25e8955924cb22e8f1da8fd95cd69daa..6bbae12b0c89c17e0327ab9967fb8b4fe332e018 100644 (file)
@@ -1,23 +1,19 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 089488593c51a65806d87c973a6fd17ee7a1b675..5844811cb56498860d7be27135ac02e891c98730 100644 (file)
@@ -1,23 +1,19 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 45c3bd59a1c11a96522b0e5ac97d7d7b4187a3a2..c21917a5c9c661f7ea4b0e1c0b6cc6ed409dc9fc 100644 (file)
@@ -1,22 +1,19 @@
-<!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}"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_FOO}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_FOO}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index a21dd8cc06c7efed19d6178a8fc13622147738b3..1bcbb35af1401f1d373bbf8d1c6136a7439e2180 100644 (file)
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+<!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}">
+
+       <f:view locale="#{localizationController.locale}" contentType="text/html"
+                       xmlns="http://www.w3.org/1999/xhtml"
+                       xmlns:f="http://java.sun.com/jsf/core"
+                       xmlns:h="http://java.sun.com/jsf/html"
+                       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <f:view locale="#{localizationController.locale}" contentType="text/html">
                <ui:insert name="metadata" />
 
                <h:head>
@@ -63,4 +64,4 @@
                        </div>
                </h:body>
        </f:view>
-</ui:composition>
+</html>
index 7e5a13f39afc826caabbfddbf0adc1c64d8884c1..7df3ccac110a3e5cab93f96a40bd71809811b422 100644 (file)
@@ -1,37 +1,33 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOGOUT}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOGOUT}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_admin_logout">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_admin_logout">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
+                               </div>
 
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
-                                       </div>
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index 81d080241411b3f6074d6ead4eb78739ec4fa664..c71f277cb556f50b3af075076e8d4f4e1bc83b79 100644 (file)
@@ -1,24 +1,19 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CATEGORY}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CATEGORY}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index cc9a1e027ac0f90a0bf8338de6187af4032e15a9..ae74d8e7d1779a6ea809105dbe01ed0c736e4db5 100644 (file)
@@ -1,24 +1,19 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CATEGORY}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CATEGORY}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CATEGORY}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CATEGORY}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 5e678e706e50ab3192b5c4b3108d8094665b4925..17fc705e96ba8ea9aff04402f2a5eb1d798bf0c6 100644 (file)
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_CATEGORIES}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_CATEGORIES}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para">
-                               <h:dataTable id="categories" var="cat" value="#{categoryController.allCategories}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_CATEGORY}">
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CATEGORY_ID}" />
-                                               </f:facet>
-
-                                               <h:link outcome="admin_edit_category" title="#{msg.ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE}" value="#{cat.categoryId}">
-                                                       <f:param name="categoryId" value="#{cat.categoryId}" />
-                                               </h:link>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{cat.categoryTitle}" />
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_PARENT_CATEGORY}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{cat.parentCategory.categoryId}" />
-                                       </h:column>
-                               </h:dataTable>
-                       </div>
-
-                       <div class="para">
-                               <h:form id="form_add_category">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       <h:outputText value="#{msg.ADMIN_ADD_CATEGORY_TITLE}" />
-                                               </div>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_CATEGORIES}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_CATEGORIES}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <div class="para">
+                       <h:dataTable id="categories" var="cat" value="#{categoryController.allCategories}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_CATEGORY}">
+                               <h:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CATEGORY_ID}" />
+                                       </f:facet>
+
+                                       <h:link outcome="admin_edit_category" title="#{msg.ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE}" value="#{cat.categoryId}">
+                                               <f:param name="categoryId" value="#{cat.categoryId}" />
+                                       </h:link>
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{cat.categoryTitle}" />
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_PARENT_CATEGORY}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{cat.parentCategory.categoryId}" />
+                               </h:column>
+                       </h:dataTable>
+               </div>
+
+               <div class="para">
+                       <h:form id="form_add_category">
+                               <div class="table">
+                                       <div class="table_header">
+                                               <h:outputText value="#{msg.ADMIN_ADD_CATEGORY_TITLE}" />
+                                       </div>
 
-                                               <fieldset id="product_data">
-                                                       <legend>
-                                                               <h:outputText value="#{msg.PLEASE_FILL_ALL_FIELDS}" />
-                                                       </legend>
+                                       <fieldset id="product_data">
+                                               <legend>
+                                                       <h:outputText value="#{msg.PLEASE_FILL_ALL_FIELDS}" />
+                                               </legend>
 
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE}" />
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE}" />
 
-                                                                       <div class="tiny">
-                                                                               <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}" />
-                                                                       </div>
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:inputText class="input" id="guest_title" value="#{adminCategoryController.categoryTitle}" size="10" maxlength="255" required="true" />
+                                                               <div class="tiny">
+                                                                       <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}" />
                                                                </div>
+                                                       </div>
 
-                                                               <div class="clear"></div>
+                                                       <div class="table_right">
+                                                               <h:inputText class="input" id="guest_title" value="#{adminCategoryController.categoryTitle}" size="10" maxlength="255" required="true" />
                                                        </div>
 
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputText value="#{msg.ADMIN_PARENT_CATEGORY}" />
-                                                               </div>
+                                                       <div class="clear"></div>
+                                               </div>
 
-                                                               <div class="table_right">
-                                                                       <ui:include src="/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl" />
-                                                               </div>
+                                               <div class="table_row">
+                                                       <div class="table_left">
+                                                               <h:outputText value="#{msg.ADMIN_PARENT_CATEGORY}" />
+                                                       </div>
 
-                                                               <div class="clear"></div>
+                                                       <div class="table_right">
+                                                               <ui:include src="/WEB-INF/templates/admin/category/admin_parent_category_selection_box.tpl" />
                                                        </div>
-                                               </fieldset>
 
-                                               <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" action="#{adminCategoryController.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
+                                                       <div class="clear"></div>
                                                </div>
+                                       </fieldset>
+
+                                       <div class="table_footer">
+                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton class="submit" type="submit" action="#{adminCategoryController.addCategory()}" value="#{msg.ADMIN_BUTTON_ADD_CATEGORY}" />
                                        </div>
-                               </h:form>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
+                               </div>
+                       </h:form>
+               </div>
+       </ui:define>
+</ui:composition>
index 535cac3f304f06f5de3109669015fbe2173cdb66..d02fb758b205c50dc29eca4ee7117fdfb783f56e 100644 (file)
@@ -1,57 +1,52 @@
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
-                                                       <f:param value="#{beanHelper.contact.contactId}" />
-                                               </h:outputFormat>
-                                       </div>
-
-                                       <div class="para notice">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_CONTACT_NOTICE}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
+                                               <f:param value="#{beanHelper.contact.contactId}" />
+                                       </h:outputFormat>
+                               </div>
+
+                               <div class="para notice">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_CONTACT_NOTICE}" />
+                               </div>
+
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index e931438466794532fc32e43593ae2dd095f1b75f..c6a1712245f96b26aebb647edff482c91c6109b7 100644 (file)
@@ -1,59 +1,54 @@
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyContactToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
+                                               <f:param value="#{beanHelper.contact.contactId}" />
+                                       </h:outputFormat>
+                               </div>
+
+                               <div class="para 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">
+                                       <ui:param name="mode" value="edit" />
                                </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
-                                                       <f:param value="#{beanHelper.contact.contactId}" />
-                                               </h:outputFormat>
-                                       </div>
-
-                                       <div class="para 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">
-                                               <ui:param name="mode" value="edit" />
-                                       </ui:include>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index db0b88321acd42042f3b4e538b6b985b496e33c7..4bd0584e76419db25bb0ea61c450d5e2c1efaa02 100644 (file)
 <?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}"
-       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:p="http://primefaces.org/ui">
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
-                               <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
-                                       <p:column exportable="false">
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
-                                               </f:facet>
-
-                                               <h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
-                                                       <f:param name="contactId" value="#{contact.contactId}" />
-                                               </h:link>
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactTitle}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactFirstName}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactFamilyName}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactStreet}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactHouseNumber}#{contact.contactHouseNumberExtension}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactCountry.countryCode}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactZipCode}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactCity}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{contact.contactEmailAddress}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
-                                               </f:facet>
-
-                                               <h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
-                                                       <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
-                                               </h:outputText>
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{adminContactController.generateMobileNumber(contact.contactMobileNumber)}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactLandLineNumber)}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactFaxNumber)}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
-                                               </f:facet>
-
-                                               <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
-                                               </h:outputText>
-                                       </p:column>
-                               </p:dataTable>
-
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
-                                                       <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
-                                               </h:commandButton>
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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:p="http://primefaces.org/ui">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
+                       <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
+                               <p:column exportable="false">
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
+                                       </f:facet>
+
+                                       <h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                       </h:link>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactTitle}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactFirstName}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactFamilyName}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactStreet}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactHouseNumber}#{contact.contactHouseNumberExtension}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactCountry.countryCode}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactZipCode}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactCity}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactEmailAddress}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
+                                       </f:facet>
+
+                                       <h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
+                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{adminContactController.generateMobileNumber(contact.contactMobileNumber)}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactLandLineNumber)}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactFaxNumber)}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
+                                       </f:facet>
+
+                                       <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
+                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       </h:outputText>
+                               </p:column>
+                       </p:dataTable>
+
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
+                                               <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+                                       </h:commandButton>
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index 25bf85d9a996278429057946fb7bcfee28e82fee..03d8c0e1fa6b9553cd4830418c89c64510ed8e69 100644 (file)
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{contact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{contact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
-                                       </f:facet>
-
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
-
-                       <h:form id="form_admin_add_contact">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+                                       <f:param name="contactId" value="#{contact.contactId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{contact.contactFirstName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{contact.contactFamilyName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+                               </f:facet>
+
+                               <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
+                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
+
+               <h:form id="form_admin_add_contact">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
+                               </div>
+
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index 8a21a69408ebe73813042c01926287206da266a4..72b85615b4887d9f357b967830a2cf8893e1743a 100644 (file)
@@ -1,55 +1,51 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
-                               </div>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-                               </div>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-                               </div>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-                               </div>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
+                       </div>
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </div>
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+                       </div>
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+                       </div>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 8d1ee9b99e2dab505bfaf456f8bfee443cf11a22..a196acfd95d92be24d3dde45df62aaf5b6d03c5a 100644 (file)
@@ -1,76 +1,72 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
+                               </div>
 
-                                       <div class="para">
-                                               <h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
-                                                       <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                               </h:link>
-                                       </div>
+                               <div class="para">
+                                       <h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </h:link>
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
+                                               <ui:param name="isShowPage" value="#{false}" />
+                                               <ui:param name="showAdminLinks" value="#{false}" />
+                                       </ui:include>
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
-                               <f:param value="#{beanHelper.faxNumber.phoneId}" />
-                               <f:param value="#{beanHelper.contact.contactId}" />
-                       </h:outputFormat>
-               </ui:define>
-       </ui:composition>
-</html>
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
+                       <f:param value="#{beanHelper.faxNumber.phoneId}" />
+                       <f:param value="#{beanHelper.contact.contactId}" />
+               </h:outputFormat>
+       </ui:define>
+</ui:composition>
index aa4a24a4414dc955df1c1b9bb0687c0bc7b1a557..5c6788d50e8ceda676a70d138a212a33deab13e4 100644 (file)
@@ -1,76 +1,72 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
+                               </div>
 
-                                       <div class="para">
-                                               <h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
-                                                       <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                               </h:link>
-                                       </div>
+                               <div class="para">
+                                       <h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </h:link>
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+                                               <ui:param name="isShowPage" value="#{false}" />
+                                               <ui:param name="showAdminLinks" value="#{false}" />
+                                       </ui:include>
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
-                               <f:param value="#{beanHelper.landLineNumber.phoneId}" />
-                               <f:param value="#{beanHelper.contact.contactId}" />
-                       </h:outputFormat>
-               </ui:define>
-       </ui:composition>
-</html>
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
+                       <f:param value="#{beanHelper.landLineNumber.phoneId}" />
+                       <f:param value="#{beanHelper.contact.contactId}" />
+               </h:outputFormat>
+       </ui:define>
+</ui:composition>
index 7b020fffb2f4e548e8f70c9a276a050f45732afe..4735bdafc17eb2c42a03ad0ee0c78ceaccfeb17a 100644 (file)
@@ -1,76 +1,72 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
+                               </div>
 
-                                       <div class="para">
-                                               <h:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
-                                                       <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                               </h:link>
-                                       </div>
+                               <div class="para">
+                                       <h:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </h:link>
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
+                                               <ui:param name="isShowPage" value="#{false}" />
+                                               <ui:param name="showAdminLinks" value="#{false}" />
+                                       </ui:include>
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{empty beanHelper.contact}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{empty beanHelper.contact}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
-                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
-                               <f:param value="#{beanHelper.contact.contactId}" />
-                       </h:outputFormat>
-               </ui:define>
-       </ui:composition>
-</html>
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
+                       <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+                       <f:param value="#{beanHelper.contact.contactId}" />
+               </h:outputFormat>
+       </ui:define>
+</ui:composition>
index 7619af6018ffbf90810ee80097051a34bd656712..0aea3c40c9a9adeac7ebf9e9a051c82b1fab9938 100644 (file)
@@ -1,97 +1,93 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{adminBusinessDataController.allBusinessContacts().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_CONTACT_BUSINESS_LIST_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:dataTable id="table_list_business_contacts" var="businessContact" value="#{adminBusinessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT_BUSINESS}" rendered="#{not adminBusinessDataController.allBusinessContacts().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_ID}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_show_contact_business" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
-                                               <f:param name="businessDataId" value="#{businessContact.businessDataId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_OWNER_ID}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
-
-                                       <h:link outcome="admin_assign_contact_business_owner" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{businessContact.companyName}&nbsp;#{businessContact.companyLegalStatus}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CONTACT_PERSON}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
-
-                                       <h:link outcome="admin_assign_contact_business_contact" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CREATED}" />
-                                       </f:facet>
-
-                                       <h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
-
-                       <h:form id="form_admin_add_contact_business">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{adminBusinessDataController.allBusinessContacts().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_BUSINESS_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:dataTable id="table_list_business_contacts" var="businessContact" value="#{adminBusinessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT_BUSINESS}" rendered="#{not adminBusinessDataController.allBusinessContacts().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_contact_business" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
+                                       <f:param name="businessDataId" value="#{businessContact.businessDataId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_OWNER_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
+
+                               <h:link outcome="admin_assign_contact_business_owner" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{businessContact.companyName}&nbsp;#{businessContact.companyLegalStatus}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CONTACT_PERSON}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
+
+                               <h:link outcome="admin_assign_contact_business_contact" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CREATED}" />
+                               </f:facet>
+
+                               <h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
+                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
+
+               <h:form id="form_admin_add_contact_business">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA}" />
+                               </div>
+
+                               <ui:include src="/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index a12d698a72f495fed533283941bce283adb06d13..d4acc07a1e323c244ce373e5517c32fc16e1a078 100644 (file)
@@ -1,23 +1,19 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 9d2303d41e3dfa49b7e6a16e048a84560dbf0f62..e1977eca00abb16f018ab4132fa7d3c636f9ad1e 100644 (file)
@@ -1,24 +1,19 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 0f056e3628a42bacae347b9d6ff1a8f9b06e271f..3498fbd09833744d124bb5f20a7f95b5e05ae540 100644 (file)
@@ -1,80 +1,75 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
-                                       </f:facet>
+       <ui:define name="content">
+               <h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
+                               </f:facet>
 
-                                       <h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
-                                               <f:param name="countryId" value="#{country.countryId}" />
-                                       </h:link>
-                               </h:column>
+                               <h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
+                                       <f:param name="countryId" value="#{country.countryId}" />
+                               </h:link>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{country.countryCode}" />
-                               </h:column>
+                               <h:outputText value="#{country.countryCode}" />
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{country.countryExternalDialPrefix}" />
-                               </h:column>
+                               <h:outputText value="#{country.countryExternalDialPrefix}" />
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{msg[country.countryI18nKey]}" />
-                               </h:column>
-                       </h:dataTable>
+                               <h:outputText value="#{msg[country.countryI18nKey]}" />
+                       </h:column>
+               </h:dataTable>
 
-                       <h:form id="form_add_country">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
+               <h:form id="form_add_country">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
-                                       </div>
-                               </h:panelGroup>
+                               <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
-                               <div class="para notice">
-                                       <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_NOTICES}" />
-                                       <ul>
-                                               <li><h:outputText value="#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}" /></li>
-                                       </ul>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
                                </div>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+                       </h:panelGroup>
+
+                       <div class="para notice">
+                               <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_NOTICES}" />
+                               <ul>
+                                       <li><h:outputText value="#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}" /></li>
+                               </ul>
+                       </div>
+               </h:form>
+       </ui:define>
+</ui:composition>
index e02e874e10733833ac7b1b7dc9225d361b7304b9..1c29b5379aefa2d5b91055b11b9f49705b8d4aa3 100644 (file)
@@ -1,58 +1,54 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_FAX}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData(beanHelper.faxNumber)}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-
-                       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_FAX}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
+                                               <ui:param name="isShowPage" value="#{false}" />
+                                               <ui:param name="showAdminLinks" value="#{false}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData(beanHelper.faxNumber)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+
+               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index ac08ee46fcc2e14297d5178393225c1e17485112..88707af6a553d1534b794cfdbd3fc6cda7de0b59 100644 (file)
@@ -1,52 +1,48 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
-                                                       <f:param value="#{beanHelper.faxNumber.phoneId}" />
-                                               </h:outputFormat>
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
+                                               <f:param value="#{beanHelper.faxNumber.phoneId}" />
+                                       </h:outputFormat>
+                               </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl" />
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl" />
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.editFaxData(beanHelper.faxNumber)}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.editFaxData(beanHelper.faxNumber)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{empty beanHelper.faxNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{empty beanHelper.faxNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index e9573610de0b5087a31f989535fd5de006f8fdc8..fb5776519279b8acba4d4baa9724291d6ef49238 100644 (file)
@@ -1,68 +1,64 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                                       </f:facet>
+       <ui:define name="content">
+               <h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               </f:facet>
 
-                                       <h:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                                       </h:link>
-                               </h:column>
+                               <h:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                               </h:link>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+                               </f:facet>
 
-                                       <h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
-                               </h:column>
+                               <h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{faxNumber.phoneEntryCreated.time}">
-                                               <f:convertDateTime type="both" />
-                                       </h:outputText>
-                               </h:column>
+                               <h:outputText value="#{faxNumber.phoneEntryCreated.time}">
+                                       <f:convertDateTime type="both" />
+                               </h:outputText>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
-                                               <f:convertDateTime type="both" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
+                               <h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
+                                       <f:convertDateTime type="both" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
 
-                       <ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 0d2852123cb4060b87a73efa96492410d97b6286..9b28b3fa4722a7cd1110bda2ca15739784027cfd 100644 (file)
@@ -1,96 +1,92 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                               <ui:param name="isShowPage" value="#{true}" />
-                       </ui:include>
-
-                       <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
-                               <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
-                                               <f:param value="#{beanHelper.faxNumber.phoneId}" />
-                                       </h:outputFormat>
-                               </f:facet>
-
-                               <h:column>
-                                       <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-                                       <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-
-                                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
-
-                                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
-                                               <h:outputText value="#{contact.contactEmailAddress}" />
-                                       </h:outputLink>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
-
-                                       <div class="table_data_field">
-                                               <ul class="mini_nav">
-                                                       <li class="mini_link">
-                                                               <h:link outcome="admin_unlink_contact_fax">
-                                                                       <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-                                                                       <f:param name="contactId" value="#{contact.contactId}" />
-                                                               </h:link>
-                                                       </li>
-                                               </ul>
-                                       </div>
-                               </h:column>
-                       </h:dataTable>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
+                       <ui:param name="isShowPage" value="#{true}" />
+               </ui:include>
+
+               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <f:facet name="header">
+                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
+                                       <f:param value="#{beanHelper.faxNumber.phoneId}" />
+                               </h:outputFormat>
+                       </f:facet>
+
+                       <h:column>
+                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+                               <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+                                       <f:param name="contactId" value="#{contact.contactId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+
+                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+
+                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                                       <h:outputText value="#{contact.contactEmailAddress}" />
+                               </h:outputLink>
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+
+                               <div class="table_data_field">
+                                       <ul class="mini_nav">
+                                               <li class="mini_link">
+                                                       <h:link outcome="admin_unlink_contact_fax">
+                                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                                       </h:link>
+                                               </li>
+                                       </ul>
+                               </div>
+                       </h:column>
+               </h:dataTable>
+       </ui:define>
+</ui:composition>
index a9c08f4339a2d918f6ed3081c27e776ece5d1ba8..55ae806681345a3220d2e29dbb5a6600f1c367a1 100644 (file)
@@ -1,27 +1,22 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_WELCOME}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_WELCOME}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!--
-                       TODO: Replace this dummy
-                       //-->
-                       Einiges kann hier eingestellt werden.
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!--
+               TODO: Replace this dummy
+               //-->
+               Einiges kann hier eingestellt werden.
+       </ui:define>
+</ui:composition>
index 2fe57c42d0481104a3e58fa7fbe936bda3c3b6b1..f04185a98563e6271f693c201cc5bda2a7dafb0e 100644 (file)
@@ -1,58 +1,54 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData(beanHelper.landLineNumber)}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-
-                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+                                               <ui:param name="isShowPage" value="#{false}" />
+                                               <ui:param name="showAdminLinks" value="#{false}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData(beanHelper.landLineNumber)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+
+               <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index f24cf7d9534d764cb0ed68288a1164179e77b886..28acb79acf2ca1e296874dbc66884873645fcdeb 100644 (file)
@@ -1,52 +1,48 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
-                                                       <f:param value="#{beanHelper.landLineNumber.phoneId}" />
-                                               </h:outputFormat>
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
+                                               <f:param value="#{beanHelper.landLineNumber.phoneId}" />
+                                       </h:outputFormat>
+                               </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl" />
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl" />
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.editLandLineData(beanHelper.landLineNumber)}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.editLandLineData(beanHelper.landLineNumber)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index b1584ff5d38dcc9df37e4efecec015c39b4620b3..8767fe9312e8f3ca2c5b64e78e8449867dc48a95 100644 (file)
@@ -1,68 +1,64 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                                       </f:facet>
+       <ui:define name="content">
+               <h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               </f:facet>
 
-                                       <h:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-                                       </h:link>
-                               </h:column>
+                               <h:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                               </h:link>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
-                               </h:column>
+                               <h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
-                                               <f:convertDateTime type="both" />
-                                       </h:outputText>
-                               </h:column>
+                               <h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
+                                       <f:convertDateTime type="both" />
+                               </h:outputText>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
-                                               <f:convertDateTime type="both" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
+                               <h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
+                                       <f:convertDateTime type="both" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
 
-                       <ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index e900d982ee0a258ece194034d85b1cc3ba20ec28..dd860e2285195f78ee12de4493b406cac22ff4ce 100644 (file)
@@ -1,97 +1,93 @@
-<!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"
-       >
-
-       <ui:define name="metadata">
-               <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-                       <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
-               </f:metadata>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:define name="metadata">
+       <f:metadata>
+               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+       </f:metadata>
+</ui:define>
+
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
        </ui:define>
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                               <ui:param name="isShowPage" value="#{true}" />
-                       </ui:include>
-
-                       <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
-                               <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
-                                               <f:param value="#{beanHelper.landLineNumber.phoneId}" />
-                                       </h:outputFormat>
-                               </f:facet>
-
-                               <h:column>
-                                       <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-                                       <h:link id="contactId" outcome="admin_show_contact">
-                                               <h:outputText styleClass="table_data_field" value="#{contact.contactId}" />
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-
-                                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
-
-                                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
-                                               <h:outputText value="#{contact.contactEmailAddress}" />
-                                       </h:outputLink>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
-
-                                       <div class="table_data_field">
-                                               <ul class="mini_nav">
-                                                       <li class="mini_link">
-                                                               <h:link outcome="admin_unlink_contact_landline">
-                                                                       <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-                                                                       <f:param name="contactId" value="#{contact.contactId}" />
-                                                               </h:link>
-                                                       </li>
-                                               </ul>
-                                       </div>
-                               </h:column>
-                       </h:dataTable>
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+                       <ui:param name="isShowPage" value="#{true}" />
+               </ui:include>
+
+               <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <f:facet name="header">
+                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
+                                       <f:param value="#{beanHelper.landLineNumber.phoneId}" />
+                               </h:outputFormat>
+                       </f:facet>
+
+                       <h:column>
+                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+                               <h:link id="contactId" outcome="admin_show_contact">
+                                       <h:outputText styleClass="table_data_field" value="#{contact.contactId}" />
+                                       <f:param name="contactId" value="#{contact.contactId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+
+                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+
+                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                                       <h:outputText value="#{contact.contactEmailAddress}" />
+                               </h:outputLink>
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+
+                               <div class="table_data_field">
+                                       <ul class="mini_nav">
+                                               <li class="mini_link">
+                                                       <h:link outcome="admin_unlink_contact_landline">
+                                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                                       </h:link>
+                                               </li>
+                                       </ul>
+                               </div>
+                       </h:column>
+               </h:dataTable>
+       </ui:define>
+</ui:composition>
index d4e1d24c42b7ff7173066b348f52b06c893198b2..9534375aa12dcce84ffb977dd2de007d87e7610a 100644 (file)
@@ -1,29 +1,25 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allCellphones()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CELLPHONES}" rendered="#{not phoneController.allCellphones().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
-                                       </f:facet>
-                               </h:column>
-                       </h:dataTable>
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+                               </f:facet>
+                       </h:column>
+               </h:dataTable>
+       </ui:define>
+</ui:composition>
index 3e522ca83cf3762d140dd68a8f75c04f50cc7621..f9a73c6305b131a49970237728daec1fb9a77120 100644 (file)
@@ -1,30 +1,26 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{adminPhoneController.mobileNumber}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{adminPhoneController.mobileNumber}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index c7ad382359a0ff587bb97a74bfa02e4d455600d5..ab7219d3d6e6d61e05c48acf9bf15ce9e06aaa02 100644 (file)
@@ -1,58 +1,54 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData(beanHelper.mobileNumber)}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-
-                       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
+                                               <ui:param name="isShowPage" value="#{false}" />
+                                               <ui:param name="showAdminLinks" value="#{false}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData(beanHelper.mobileNumber)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+
+               <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index fc9381cff8944f569e16e867cb3dc2bd41c16dfa..ab6b2bdd4956e2441de613f511fe26a5553af619 100644 (file)
@@ -1,52 +1,48 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
-                                                       <f:param value="#{beanHelper.mobileNumber.phoneId}" />
-                                               </h:outputFormat>
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
+                                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+                                       </h:outputFormat>
+                               </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
+                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.editMobileData(beanHelper.mobileNumber)}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.editMobileData(beanHelper.mobileNumber)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 5230f8b70449ffd1ebfa1a6a54cd72d497b47bba..8f0ea33036ec976b289a4498c5b0fd15935b31c7 100644 (file)
@@ -1,78 +1,74 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                                       </f:facet>
+       <ui:define name="content">
+               <h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               </f:facet>
 
-                                       <h:link outcome="admin_show_mobile" value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-                                               <f:param name="phoneId" value="#{mobile.phoneId}" />
-                                       </h:link>
-                               </h:column>
+                               <h:link outcome="admin_show_mobile" value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+                                       <f:param name="phoneId" value="#{mobile.phoneId}" />
+                               </h:link>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+                               </f:facet>
 
-                                       <h:link outcome="admin_show_mobile_provider" value="#{mobile.mobileProvider.providerName}">
-                                               <f:param name="providerId" value="#{mobile.mobileProvider.providerId}" />
-                                       </h:link>
-                               </h:column>
+                               <h:link outcome="admin_show_mobile_provider" value="#{mobile.mobileProvider.providerName}">
+                                       <f:param name="providerId" value="#{mobile.mobileProvider.providerId}" />
+                               </h:link>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{mobile.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobile.mobileProvider.providerDialPrefix}-#{mobile.phoneNumber}" />
-                               </h:column>
+                               <h:outputText value="#{mobile.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobile.mobileProvider.providerDialPrefix}-#{mobile.phoneNumber}" />
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{mobile.phoneEntryCreated.time}">
-                                               <f:convertDateTime type="both" />
-                                       </h:outputText>
-                               </h:column>
+                               <h:outputText value="#{mobile.phoneEntryCreated.time}">
+                                       <f:convertDateTime type="both" />
+                               </h:outputText>
+                       </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-                                       </f:facet>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                               </f:facet>
 
-                                       <h:outputText value="#{mobile.phoneEntryUpdated.time}">
-                                               <f:convertDateTime type="both" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
+                               <h:outputText value="#{mobile.phoneEntryUpdated.time}">
+                                       <f:convertDateTime type="both" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
 
-                       <ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index df52fa8647ac9d901457b974feb9bd9d8809877a..fa622389efc829f9c2b706416b0711fb21f3657c 100644 (file)
@@ -1,96 +1,92 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                               <ui:param name="isShowPage" value="#{true}" />
-                       </ui:include>
-
-                       <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
-                               <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
-                                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
-                                       </h:outputFormat>
-                               </f:facet>
-
-                               <h:column>
-                                       <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-                                       <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-
-                                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
-
-                                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
-                                               <h:outputText value="#{contact.contactEmailAddress}" />
-                                       </h:outputLink>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
-
-                                       <div class="table_data_field">
-                                               <ul class="mini_nav">
-                                                       <li class="mini_link">
-                                                               <h:link outcome="admin_unlink_contact_mobile">
-                                                                       <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-                                                                       <f:param name="contactId" value="#{contact.contactId}" />
-                                                               </h:link>
-                                                       </li>
-                                               </ul>
-                                       </div>
-                               </h:column>
-                       </h:dataTable>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
+                       <ui:param name="isShowPage" value="#{true}" />
+               </ui:include>
+
+               <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <f:facet name="header">
+                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
+                                       <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+                               </h:outputFormat>
+                       </f:facet>
+
+                       <h:column>
+                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+                               <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+                                       <f:param name="contactId" value="#{contact.contactId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+
+                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+
+                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                                       <h:outputText value="#{contact.contactEmailAddress}" />
+                               </h:outputLink>
+                       </h:column>
+
+                       <h:column>
+                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+
+                               <div class="table_data_field">
+                                       <ul class="mini_nav">
+                                               <li class="mini_link">
+                                                       <h:link outcome="admin_unlink_contact_mobile">
+                                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+                                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                                       </h:link>
+                                               </li>
+                                       </ul>
+                               </div>
+                       </h:column>
+               </h:dataTable>
+       </ui:define>
+</ui:composition>
index a74b0be6c43019ec5f58f0a0d24e9cc9c356b976..9758398ba064e81d5b52458d6930898ca2325ef6 100644 (file)
@@ -1,24 +1,19 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index fe3a89ab918d5bee2b8fe1a93894f2412a2a983a..0ccf412418bfec0890847ce89ac7769ef30596e1 100644 (file)
@@ -1,24 +1,19 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index b6c3f73400313ac14606b0dedc0dd7998abfe7a5..8c5c3dd776b62849097e3f028a9fa0f6985dee9a 100644 (file)
@@ -1,90 +1,85 @@
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
-                                               <f:param name="providerId" value="#{mobile.providerId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{mobile.providerName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{mobile.providerDialPrefix}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[mobile.providerCountry.countryI18nKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}" />
-                                       </f:facet>
-
-                                       <h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
-                                               <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
-
-                       <h:form id="form_add_mobile_provider">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
-                                       </div>
-                               </h:panelGroup>
-
-                               <div class="para notice">
-                                       <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}" />
-                                       <ul>
-                                               <li><h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}" /></li>
-                                       </ul>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
+                                       <f:param name="providerId" value="#{mobile.providerId}" />
+                               </h:link>
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{mobile.providerName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
+                               </f:facet>
+
+                               <h:outputText value="#{mobile.providerDialPrefix}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[mobile.providerCountry.countryI18nKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}" />
+                               </f:facet>
+
+                               <h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
+                                       <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
+
+               <h:form id="form_add_mobile_provider">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
                                </div>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                               <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+                               </div>
+                       </h:panelGroup>
+
+                       <div class="para notice">
+                               <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}" />
+                               <ul>
+                                       <li><h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}" /></li>
+                               </ul>
+                       </div>
+               </h:form>
+       </ui:define>
+</ui:composition>
index e44982e876c6ebed6a224170c3a96b8e269bca16..c4733e30c429368f142762261a87b8358a28b984 100644 (file)
@@ -1,24 +1,19 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <!-- @TODO Here goes your content. //-->
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 9d7ca70db7c3eb86469472f564f90e427371d831..d46cc09351cc21c65350452af1efc9aaaa3bf69d 100644 (file)
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
-                                               <f:param name="userId" value="#{userActivity.activityUser.userId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{userActivity.activityUserName}" />
-                                       </h:column>
-                               </ui:fragment>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{userActivity.activityPrincipalName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_PERSONAL_TITLE}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[userActivity.activityContactGender.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{userActivity.activityContactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{userActivity.activityContactFamilyName}" />
-                               </h:column>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+                                       <f:param name="userId" value="#{userActivity.activityUser.userId}" />
+                               </h:link>
+                       </h:column>
+
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
+                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{userActivity.activityMessage}" />
+                                       <h:outputText value="#{userActivity.activityUserName}" />
                                </h:column>
+                       </ui:fragment>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_TYPE}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
-                                       </f:facet>
-
-                                       <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
-                                               <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
-               </ui:define>
-       </ui:composition>
-</html>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{userActivity.activityPrincipalName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_PERSONAL_TITLE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[userActivity.activityContactGender.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{userActivity.activityContactFirstName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{userActivity.activityContactFamilyName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{userActivity.activityMessage}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_TYPE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
+                               </f:facet>
+
+                               <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
+                                       <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
+       </ui:define>
+</ui:composition>
index c3740b3c92797aa51d755a86949e1fc701d68a3b..25c8161f69fce8a9702f05dc73a22710927f6ada 100644 (file)
@@ -1,70 +1,65 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
-                                                       <f:param value="#{beanHelper.user.userName}" />
-                                                       <f:param value="#{beanHelper.user.userId}" />
-                                               </h:outputFormat>
-                                       </div>
-
-                                       <div class="para notice">
-                                               <h:outputFormat value="#{msg.ADMIN_DELETE_USER_NOTICE}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
+               <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
+                                               <f:param value="#{beanHelper.user.userName}" />
+                                               <f:param value="#{beanHelper.user.userId}" />
+                                       </h:outputFormat>
+                               </div>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left25_medium">
-                                                       <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
-                                               </div>
+                               <div class="para notice">
+                                       <h:outputFormat value="#{msg.ADMIN_DELETE_USER_NOTICE}" />
+                               </div>
 
-                                               <div class="table_right75_medium">
-                                                       <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
-                                               </div>
+                               <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
-                                               <div class="clear"></div>
-                                       </h:panelGroup>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left25_medium">
+                                               <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
+                                       </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData(beanHelper.user)}" />
+                                       <div class="table_right75_medium">
+                                               <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                        </div>
+
+                                       <div class="clear"></div>
                                </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData(beanHelper.user)}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index 86dd72c116090e15103bcb7b9b5293386949142d..0c4ca70120c262bbec7362ad9f681421381a9497 100644 (file)
@@ -1,56 +1,52 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
+                               </div>
+
+                               <div class="para notice">
+                                       <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+                               </div>
+
+                               <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
+                                       <ui:param name="mode" value="edit" />
                                </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
-                                       </div>
-
-                                       <div class="para notice">
-                                               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
-                                       </div>
-
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-                                               <ui:param name="mode" value="edit" />
-                                       </ui:include>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index b44a9eee4e77ce670fab58d3eabbabb80092498d..15bf8cbb2967c1b290ac49159d9ba9cbcaeb5ff5 100644 (file)
-<!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"
-       xmlns:p="http://primefaces.org/ui">
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-                               <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
-                                       <p:column exportable="false">
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
-                                               </f:facet>
-
-                                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </p:column>
-
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                               <p:column>
-                                                       <f:facet name="header">
-                                                               <h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />
-                                                       </f:facet>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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:p="http://primefaces.org/ui">
 
-                                                       <h:outputText value="#{user.userName}" />
-                                               </p:column>
-                                       </ui:fragment>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
+       </ui:define>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_ACCOUNT_STATUS}" />
-                                               </f:facet>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}" />
+       </ui:define>
 
-                                               <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-                                       </p:column>
+       <ui:define name="content">
+               <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
-                                               </f:facet>
+               <h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
+                       <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+                               <p:column exportable="false">
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
+                                       </f:facet>
 
-                                               <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
-                                       </p:column>
+                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                               <f:param name="userId" value="#{user.userId}" />
+                                       </h:link>
+                               </p:column>
 
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />
                                                </f:facet>
 
-                                               <h:outputText value="#{user.userContact.contactTitle}" />
+                                               <h:outputText value="#{user.userName}" />
                                        </p:column>
+                               </ui:fragment>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{user.userContact.contactFirstName}" />
-                                       </p:column>
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_USER_ACCOUNT_STATUS}" />
+                                       </f:facet>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
-                                               </f:facet>
+                                       <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+                               </p:column>
 
-                                               <h:outputText value="#{user.userContact.contactFamilyName}" />
-                                       </p:column>
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
+                                       </f:facet>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
-                                               </f:facet>
+                                       <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
+                               </p:column>
 
-                                               <h:outputText value="#{user.userContact.contactStreet}" />
-                                       </p:column>
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
+                                       </f:facet>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
-                                               </f:facet>
+                                       <h:outputText value="#{user.userContact.contactTitle}" />
+                               </p:column>
 
-                                               <h:outputText value="#{user.userContact.contactHouseNumber}#{user.userContact.contactHouseNumberExtension}" />
-                                       </p:column>
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
+                                       </f:facet>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
-                                               </f:facet>
+                                       <h:outputText value="#{user.userContact.contactFirstName}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactFamilyName}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactStreet}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactHouseNumber}#{user.userContact.contactHouseNumberExtension}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactCountry.countryCode}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactZipCode}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
+                                       </f:facet>
 
-                                               <h:outputText value="#{user.userContact.contactCountry.countryCode}" />
-                                       </p:column>
+                                       <h:outputText value="#{user.userContact.contactCity}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
+                                       </f:facet>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
-                                               </f:facet>
+                                       <h:outputText value="#{user.userContact.contactEmailAddress}" />
+                               </p:column>
 
-                                               <h:outputText value="#{user.userContact.contactZipCode}" />
-                                       </p:column>
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
+                                       </f:facet>
 
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{user.userContact.contactCity}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{user.userContact.contactEmailAddress}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
-                                               </f:facet>
-
-                                               <h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
-                                                       <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
-                                               </h:outputText>
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{adminContactController.generateMobileNumber(user.userContact.contactMobileNumber)}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactFaxNumber)}" />
-                                       </p:column>
-
-                                       <p:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
-                                               </f:facet>
-
-                                               <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
-                                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
-                                               </h:outputText>
-                                       </p:column>
-                               </p:dataTable>
-
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                                       <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-                                               </h:commandButton>
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-               </ui:define>
-       </ui:composition>
-</html>
+                                       <h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
+                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{adminContactController.generateMobileNumber(user.userContact.contactMobileNumber)}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactFaxNumber)}" />
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
+                                       </f:facet>
+
+                                       <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
+                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       </h:outputText>
+                               </p:column>
+                       </p:dataTable>
+
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
+                                               <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
+                                       </h:commandButton>
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+       </ui:define>
+</ui:composition>
index 23890a9ae54138dd4a7d3bb6fc7379ac50d3b983..43f73d7637ef23551b43dbb894802ad2ee407dd2 100644 (file)
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <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_USER_ID}" />
-                                       </f:facet>
-
-                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
-                                               <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
-                               </h:column>
-
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                               </f:facet>
-
-                                               <h:outputText value="#{user.userName}" />
-                                       </h:column>
-                               </ui:fragment>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{user.userContact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{user.userContact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-                                       </f:facet>
-
-                                       <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-                               </h:column>
-
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <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_USER_ID}" />
+                               </f:facet>
+
+                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                       <f:param name="userId" value="#{user.userId}" />
+                               </h:link>
+                       </h:column>
+
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
+                                       <h:outputText value="#{user.userName}" />
                                </h:column>
+                       </ui:fragment>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
-                                       </f:facet>
-
-                                       <h:outputText id="userCreated" value="#{user.userCreated.time}">
-                                               <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:dataTable>
-
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <h:form id="form_admin_add_user">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
-                                       </div>
-
-                                       <!-- Whether select contact data .. //-->
-                                       <div id="admin_user_personal_data_option_1" class="para">
-                                               <fieldset class="fieldset" id="user_contact">
-                                                       <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
-                                                               <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
-                                                       </legend>
-
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left_medium">
-                                                                       <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
-                                                               </div>
-
-                                                               <div class="table_right_medium">
-                                                                       <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
-                                                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                                                               <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
-                                                                       </h:selectOneMenu>
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </h:panelGroup>
-                                               </fieldset>
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
-                                       </div>
-
-                                       <!-- ... or enter it directly together it creating user account //-->
-                                       <div id="admin_user_personal_data_option_2">
-                                               <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
-                                       </div>
-                               </h:form>
-                       </h:panelGroup>
-               </ui:define>
-       </ui:composition>
-</html>
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{user.userContact.contactFirstName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                               </f:facet>
+
+                               <h:outputText value="#{user.userContact.contactFamilyName}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+                               </f:facet>
+
+                               <h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+                               </f:facet>
+
+                               <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
+                       </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
+                               </f:facet>
+
+                               <h:outputText id="userCreated" value="#{user.userCreated.time}">
+                                       <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+                               </h:outputText>
+                       </h:column>
+               </h:dataTable>
+
+               <h:panelGroup styleClass="table_medium" layout="block">
+                       <h:form id="form_admin_add_user">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
+                               </div>
+
+                               <!-- Whether select contact data .. //-->
+                               <div id="admin_user_personal_data_option_1" class="para">
+                                       <fieldset class="fieldset" id="user_contact">
+                                               <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
+                                                       <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
+                                               </legend>
+
+                                               <h:panelGroup styleClass="table_row" layout="block">
+                                                       <div class="table_left_medium">
+                                                               <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
+                                                       </div>
+
+                                                       <div class="table_right_medium">
+                                                               <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
+                                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                                                       <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+                                                               </h:selectOneMenu>
+                                                       </div>
+
+                                                       <div class="clear"></div>
+                                               </h:panelGroup>
+                                       </fieldset>
+                               </div>
+
+                               <div class="para">
+                                       <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
+                               </div>
+
+                               <!-- ... or enter it directly together it creating user account //-->
+                               <div id="admin_user_personal_data_option_2">
+                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+                               </div>
+                       </h:form>
+               </h:panelGroup>
+       </ui:define>
+</ui:composition>
index f967ea648e2f1eb3cee1243b0b45c343401645bc..b48474cf6bff35394c37ce38a7013ab6cc18f789 100644 (file)
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOCK_USER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
-                                                       <f:param value="#{beanHelper.user.userName}" />
-                                                       <f:param value="#{beanHelper.user.userId}" />
-                                               </h:outputFormat>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOCK_USER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
+                                               <f:param value="#{beanHelper.user.userName}" />
+                                               <f:param value="#{beanHelper.user.userId}" />
+                                       </h:outputFormat>
+                               </div>
+
+                               <div class="para">
+                                       <div>
+                                               <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
 
-                                       <div class="para">
-                                               <div>
-                                                       <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
-                                               </div>
-
-                                               <div>
-                                                       <h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
-                                               </div>
+                                       <div>
+                                               <h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
+                               </div>
 
-                                       <div class="para">
-                                               <div>
-                                                       <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
-                                               </div>
-
-                                               <div>
-                                                       <h:outputFormat id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
-                                               </div>
+                               <div class="para">
+                                       <div>
+                                               <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                        </div>
 
-                                       <div class="para">
-                                               <div>
-                                                       <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
-                                               </div>
-
-                                               <div>
-                                                       <h:outputFormat id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
-                                               </div>
+                                       <div>
+                                               <h:outputFormat id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
+                               </div>
 
-                                       <div class="para">
-                                               <div>
-                                                       <h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
-                                               </div>
+                               <div class="para">
+                                       <div>
+                                               <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+                                       </div>
 
-                                               <div>
-                                                       <h:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
-                                               </div>
+                                       <div>
+                                               <h:outputFormat id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="para">
+                                       <div>
+                                               <h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
+                                       </div>
 
-                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
+                                       <div>
+                                               <h:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                        </div>
-                               </h:panelGroup>
-                       </h:form>
-
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
-
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
-               </ui:define>
-       </ui:composition>
-</html>
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+
+                                       <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+                       <f:param value="#{beanHelper.user.userName}" />
+                       <f:param value="#{beanHelper.user.userId}" />
+               </h:outputFormat>
+
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+                       <f:param value="#{beanHelper.user.userName}" />
+                       <f:param value="#{beanHelper.user.userId}" />
+               </h:outputFormat>
+       </ui:define>
+</ui:composition>
index a79e8dda0122ece597317fe71b2fe069d508be88..3c79bdeb805c1866c061fe92b8ba0b8e9106527e 100644 (file)
@@ -1,70 +1,66 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
-               </ui:define>
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
-                                                       <f:param value="#{beanHelper.user.userName}" />
-                                                       <f:param value="#{beanHelper.user.userId}" />
-                                               </h:outputFormat>
-                                       </div>
+               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
+                                               <f:param value="#{beanHelper.user.userName}" />
+                                               <f:param value="#{beanHelper.user.userId}" />
+                                       </h:outputFormat>
+                               </div>
 
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
-                                       </div>
+                               <div class="para">
+                                       <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
+                               </div>
 
-                                       <div class="para">
-                                               <h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
-                                       </div>
+                               <div class="para">
+                                       <h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                                       <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                       <f:param value="#{beanHelper.user.userName}" />
+                       <f:param value="#{beanHelper.user.userId}" />
+               </h:outputFormat>
 
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
-               </ui:define>
-       </ui:composition>
-</html>
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+                       <f:param value="#{beanHelper.user.userName}" />
+                       <f:param value="#{beanHelper.user.userId}" />
+               </h:outputFormat>
+       </ui:define>
+</ui:composition>
index fd81fc0a66b7872ce8b2a8a80524f5589e3fd140..03145215f6d12afdf10091609734b66b1444dce8 100644 (file)
@@ -1,53 +1,49 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
-
-                       <div class="para">
-                               <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
-                       </div>
-
-                       <div class="para">
-                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-                       </div>
-
-                       <div class="para">
-                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-                       </div>
-
-                       <div class="para">
-                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
+
+               <div class="para">
+                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
+               </div>
+
+               <div class="para">
+                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+               </div>
+
+               <div class="para">
+                       <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+               </div>
+
+               <div class="para">
+                       <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+               </div>
+       </ui:define>
+</ui:composition>
index 897798190c220200c9dbe7ba38dc1eaa1e4bb8b9..08acbb8a8b0a29c52284433e31221332a9cd4e58 100644 (file)
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="admin_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{empty beanHelper.user}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-                               <h:panelGroup styleClass="table_medium" layout="block">
-                                       <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
-                                                       <f:param value="#{beanHelper.user.userName}" />
-                                                       <f:param value="#{beanHelper.user.userId}" />
-                                               </h:outputFormat>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="admin_title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{empty beanHelper.user}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
+                       <h:panelGroup styleClass="table_medium" layout="block">
+                               <div class="table_header">
+                                       <h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
+                                               <f:param value="#{beanHelper.user.userName}" />
+                                               <f:param value="#{beanHelper.user.userId}" />
+                                       </h:outputFormat>
+                               </div>
+
+                               <div class="para">
+                                       <div class="table_data_label">
+                                               <h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
                                        </div>
 
-                                       <div class="para">
-                                               <div class="table_data_label">
-                                                       <h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
-                                               </div>
-
-                                               <div class="table_data_field">
-                                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
-                                                               <f:param name="userId" value="#{beanHelper.user.userId}" />
-                                                       </h:link>
-                                               </div>
+                                       <div class="table_data_field">
+                                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                                                       <f:param name="userId" value="#{beanHelper.user.userId}" />
+                                               </h:link>
                                        </div>
+                               </div>
 
-                                       <div class="para">
-                                               <div class="table_data_label">
-                                                       <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
-                                               </div>
-
-                                               <div class="table_data_field">
-                                                       <h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
-                                               </div>
+                               <div class="para">
+                                       <div class="table_data_label">
+                                               <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
 
-                                       <div class="para">
-                                               <div class="table_data_label">
-                                                       <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
-                                               </div>
-
-                                               <div class="table_data_field">
-                                                       <h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
-                                               </div>
+                                       <div class="table_data_field">
+                                               <h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
+                               </div>
 
-                                       <div class="para">
-                                               <div class="table_data_label">
-                                                       <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
-                                               </div>
+                               <div class="para">
+                                       <div class="table_data_label">
+                                               <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+                                       </div>
 
-                                               <div class="table_data_field">
-                                                       <h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
-                                               </div>
+                                       <div class="table_data_field">
+                                               <h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
+                               </div>
 
-                                       <div class="para">
-                                               <div class="table_data_label">
-                                                       <h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
-                                               </div>
+                               <div class="para">
+                                       <div class="table_data_label">
+                                               <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+                                       </div>
 
-                                               <div class="table_data_field">
-                                                       <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
-                                                               <f:convertDateTime for="userLastLocked" type="both" />
-                                                       </h:outputText>
-                                               </div>
+                                       <div class="table_data_field">
+                                               <h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
+                               </div>
 
-                                       <div class="para">
-                                               <div class="table_data_label">
-                                                       <h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
-                                               </div>
+                               <div class="para">
+                                       <div class="table_data_label">
+                                               <h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+                                       </div>
 
-                                               <div class="table_data_field">
-                                                       <h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
-                                               </div>
+                                       <div class="table_data_field">
+                                               <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
+                                                       <f:convertDateTime for="userLastLocked" type="both" />
+                                               </h:outputText>
                                        </div>
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="para">
+                                       <div class="table_data_label">
+                                               <h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+                                       </div>
 
-                                               <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
+                                       <div class="table_data_field">
+                                               <h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
                                        </div>
-                               </h:panelGroup>
-                       </h:form>
-
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
-
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                               <f:param value="#{beanHelper.user.userName}" />
-                               <f:param value="#{beanHelper.user.userId}" />
-                       </h:outputFormat>
-               </ui:define>
-       </ui:composition>
-</html>
+                               </div>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+
+                                       <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+                       <f:param value="#{beanHelper.user.userName}" />
+                       <f:param value="#{beanHelper.user.userId}" />
+               </h:outputFormat>
+
+               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+                       <f:param value="#{beanHelper.user.userName}" />
+                       <f:param value="#{beanHelper.user.userId}" />
+               </h:outputFormat>
+       </ui:define>
+</ui:composition>
index 0e145b20937b430d3e979a73a679e5f74ce5fec1..312b89a08bc16bb65c7c766e35a009d939d023f2 100644 (file)
@@ -1,23 +1,19 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_EXCEPTION_THROWN}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_EXCEPTION_THROWN}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       Unfortunately an unexpected error has occurred.
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               Unfortunately an unexpected error has occurred.
+       </ui:define>
+</ui:composition>
index a49b6eaadb22c38d940d0f944c3924669f907727..c9c380d83ce77cae329729b94083a73154ff944c 100644 (file)
@@ -1,58 +1,54 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-                               <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
-                       </f:metadata>
-               </ui:define>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
+                       <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+               </f:metadata>
+       </ui:define>
 
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
-                               <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
-                                       </div>
+       <ui:define name="content">
+               <ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
+                       <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
+                               </div>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
-                                                       <f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
-                                                       <f:param value="#{beanHelper.user.userContact.contactFirstName}" />
-                                                       <f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
-                                               </h:outputFormat>
-                                       </h:panelGroup>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
+                                               <f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
+                                               <f:param value="#{beanHelper.user.userContact.contactFirstName}" />
+                                               <f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
+                                       </h:outputFormat>
                                </h:panelGroup>
+                       </h:panelGroup>
 
-                               <ui:fragment rendered="#{empty beanHelper.user}">
-                                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                               <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
-                                               <ui:param name="styleClass" value="errors" />
-                                       </ui:include>
-                               </ui:fragment>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
+                       <ui:fragment rendered="#{empty beanHelper.user}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+                                       <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
                                        <ui:param name="styleClass" value="errors" />
                                </ui:include>
                        </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index e5140ebadec98850cdc554de66afce6a069d1f1d..663d97a9d21a885f40e9222cbd7c9727d0e0f265 100644 (file)
@@ -1,53 +1,50 @@
-<!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">
-
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LIST}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
-                               </div>
-
-                               <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.USER_NAME}" />
-                                               </f:facet>
-
-                                               <ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
-                                                       <ui:param name="user" value="#{user}" />
-                                               </ui:include>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.USER_CREATED}" />
-                                               </f:facet>
-
-                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-                                       </h:column>
-                               </h:dataTable>
-                       </h:panelGroup>>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
+
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_LIST}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+                       <div class="table_header">
+                               <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
+                       </div>
+
+                       <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
+                               <h:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.USER_NAME}" />
+                                       </f:facet>
+
+                                       <ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
+                                               <ui:param name="user" value="#{user}" />
+                                       </ui:include>
+                               </h:column>
+
+                               <h:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.USER_CREATED}" />
+                                       </f:facet>
+
+                                       <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+                               </h:column>
+                       </h:dataTable>
+               </h:panelGroup>>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 8cae955a5236c31adfff11a462e067dd3842dd0b..bf08a860246e188005454bb945f97a19ad5212de 100644 (file)
@@ -1,46 +1,42 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                               <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-                                       <h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
-
-                                       <h:outputText value="&#160;" />
-
-                                       <h:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
-                               </h:panelGroup>
-
-                               <div class="para">
-                                       <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
-                               </div>
-
-                               <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-                                       <h:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
-                               </h:panelGroup>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
+
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                       <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
+                               <h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
+
+                               <h:outputText value="&#160;" />
+
+                               <h:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
+                       </h:panelGroup>
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
+                       </div>
+
+                       <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
+                               <h:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+                       </h:panelGroup>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 2de3ed1683aadd641c2b6588be2f87a466c6eff4..cab17c333c5c2b8f6031333d1d6c1ffac7c2fa7a 100644 (file)
@@ -1,81 +1,76 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-                               <div class="para" id="user_lost_password_content">
-                                       <h:form id="form_lost_password">
-                                               <h:panelGroup styleClass="table" layout="block">
-                                                       <div class="table_header">
-                                                               <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
-                                                       </div>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
+                       <div class="para" id="user_lost_password_content">
+                               <h:form id="form_lost_password">
+                                       <h:panelGroup styleClass="table" layout="block">
+                                               <div class="table_header">
+                                                       <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
+                                               </div>
 
-                                                       <fieldset class="fieldset" id="login_data">
-                                                               <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
-                                                                       <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
-                                                               </legend>
+                                               <fieldset class="fieldset" id="login_data">
+                                                       <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
+                                                               <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
+                                                       </legend>
 
-                                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
-                                                                       </div>
+                                                       <h:panelGroup styleClass="table_row" layout="block">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+                                                               </div>
 
-                                                                       <div class="table_right">
-                                                                               <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
-                                                                       </div>
+                                                               <div class="table_right">
+                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                               </div>
 
-                                                                       <div class="clear"></div>
-                                                               </h:panelGroup>
+                                                               <div class="clear"></div>
+                                                       </h:panelGroup>
 
-                                                               <div class="table_header">
-                                                                       <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
-                                                               </div>
+                                                       <div class="table_header">
+                                                               <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
+                                                       </div>
 
-                                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
-                                                                       </div>
+                                                       <h:panelGroup styleClass="table_row" layout="block">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+                                                               </div>
 
-                                                                       <div class="table_right">
-                                                                               <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
-                                                                       </div>
+                                                               <div class="table_right">
+                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                               </div>
 
-                                                                       <div class="clear"></div>
-                                                               </h:panelGroup>
+                                                               <div class="clear"></div>
+                                                       </h:panelGroup>
 
-                                                       </fieldset>
+                                               </fieldset>
 
-                                                       <div class="table_footer">
-                                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                               <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
-                                                       </div>
-                                               </h:panelGroup>
-                                       </h:form>
-                               </div>
-                       </ui:fragment>
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+                                               </div>
+                                       </h:panelGroup>
+                               </h:form>
+                       </div>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index fd6ac461c9053f51b08a8659b635d42a8410dace..61032ce3dc55d84be3b0ed79d17642e9bc49e4d1 100644 (file)
@@ -1,62 +1,58 @@
 <?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}"
-       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">
-
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                               <f:viewAction action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
-
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
-               </ui:define>
-
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-                               <ui:fragment rendered="#{userController.isUserIdEmpty()}">
-                                       <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
-                               </ui:fragment>
-
-                               <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-                                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                               <ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
-                                               <ui:param name="styleClass" value="errors" />
-                                       </ui:include>
-                               </ui:fragment>
-
-                               <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-                                       <div align="center">
-                                               <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
-                                                       <f:facet name="header">
-                                                               <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
-                                                       </f:facet>
-                                               </h:panelGrid>
-                                       </div>
-                               </ui:fragment>
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+                               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">
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyUserToController()}" />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
+       </ui:define>
+
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
+                       <ui:fragment rendered="#{userController.isUserIdEmpty()}">
+                               <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
+                       <ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                                       <ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
                                        <ui:param name="styleClass" value="errors" />
                                </ui:include>
                        </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                       <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
+                               <div align="center">
+                                       <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
+                                               </f:facet>
+                                       </h:panelGrid>
+                               </div>
+                       </ui:fragment>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 61f08ed53f2a180b68f622f1b5d23523f4279d53..599384f54714be3fee2657867f164fb61318205a 100644 (file)
@@ -1,64 +1,60 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                       <h:panelGroup styleClass="para" layout="block">
-                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-                                               <h:outputText value="&nbsp;" />
-                                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                                               <h:outputText value="&nbsp;" />
-                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
-                                       </h:panelGroup>
-                               </ui:fragment>
-
-                               <h:panelGroup layout="block" styleClass="registration_form">
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
-                                               <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
-                                       </ui:fragment>
-
-                                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-                                               <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
-                                       </ui:fragment>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
+
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                               <h:panelGroup styleClass="para" layout="block">
+                                       <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
+                                       <h:outputText value="&nbsp;" />
+                                       <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <h:outputText value="&nbsp;" />
+                                       <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                </h:panelGroup>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
+                       <h:panelGroup layout="block" styleClass="registration_form">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+                                       <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
+                               </ui:fragment>
 
-               <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-               </ui:define>
-       </ui:composition>
-</html>
+                               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
+                                       <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl" />
+                               </ui:fragment>
+                       </h:panelGroup>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+
+       <ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:define>
+</ui:composition>
index 46c2e6a9147c97126f68d780d5e4d6f7fbaed7d2..7161fce72b4ea45d64b5359372c4216380ab31f7 100644 (file)
@@ -1,30 +1,25 @@
 <?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}"
-       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"
-         >
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <div class="para">
-                               <h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
-                       </div>
+       <ui:define name="content">
+               <div class="para">
+                       <h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
+               </div>
 
-                       <h:panelGroup layout="block" styleClass="registration_form">
-                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
-                       </h:panelGroup>
-               </ui:define>
-       </ui:composition>
-</html>
+               <h:panelGroup layout="block" styleClass="registration_form">
+                       <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+               </h:panelGroup>
+       </ui:define>
+</ui:composition>
index 7e180037b408896f108300254f64ea267d442e7c..d18f23ec6c41757ec762f042d8128f9652ce7eb1 100644 (file)
@@ -1,43 +1,38 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                       <div class="para">
-                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-                                               <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-                                               <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
-                                       </div>
-                               </ui:fragment>
-
-                               <h:panelGroup layout="block" styleClass="registration_form">
-                                       <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl" />
-                               </h:panelGroup>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                               <div class="para">
+                                       <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
+                                       <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
+                               </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+                       <h:panelGroup layout="block" styleClass="registration_form">
+                               <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl" />
+                       </h:panelGroup>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index c062782f05859367d8c605cd8de75d0e7ca95d69..8f6d50d7c1f6166bf9f3c26264f1a7075b49608a 100644 (file)
@@ -1,25 +1,21 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_RESEND_DONE}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_RESEND_DONE}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
-                       </ui:include>
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+               </ui:include>
+       </ui:define>
+</ui:composition>
index af96c6a9bfbe3d67da690441fb605fe64ef0869c..cb9aa3a21aecaa851aa5b4015f8092f4490a49da 100644 (file)
@@ -1,68 +1,63 @@
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
-                                       </div>
-
-                                       <fieldset class="fieldset" id="email_address_notice">
-                                               <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
-                                                       <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
-                                               </legend>
-
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
-                                                               <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
-                                                       </div>
-
-                                                       <div class="table_right">
-                                                               <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
-                                                                       <f:validator validatorId="EmailAddressValidator" />
-                                                               </h:inputText>
-                                                       </div>
-                                               </h:panelGroup>
-                                       </fieldset>
-
-                                       <h:panelGroup styleClass="error_container" layout="block">
-                                               <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-                                       </h:panelGroup>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
+
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
+                               </div>
+
+                               <fieldset class="fieldset" id="email_address_notice">
+                                       <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
+                                       </legend>
 
                                        <h:panelGroup styleClass="table_row" layout="block">
-                                               <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
+                                               <div class="table_left">
+                                                       <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
+                                               </div>
+
+                                               <div class="table_right">
+                                                       <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                                                               <f:validator validatorId="EmailAddressValidator" />
+                                                       </h:inputText>
+                                               </div>
                                        </h:panelGroup>
+                               </fieldset>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               </h:panelGroup>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
-                                       </div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
-                       </h:form>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 3a54f92c939d39c67b85e396da593562dfff4cee..b5c44fbdf529d801b71fbf3a2bd751b51e5c535f 100644 (file)
@@ -1,25 +1,21 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_IMPRINT}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_IMPRINT}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
-                               TODO: Hier kommt das Impressum hin!
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
+                       TODO: Hier kommt das Impressum hin!
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 75ba7c25377c976ad313e1884fd5793a4c025ec2..6c75749a2f4ec1c12f811f0890a4eddccb2abfdb 100644 (file)
@@ -1,42 +1,38 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
+                               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">
 
        <!--
        TODO: Not used:
        xmlns:basket="http://mxchange.org/jshop/tags/basket"
        //-->
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <h:panelGroup layout="block" styleClass="registration_form">
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
-                                               <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
-                                       </ui:fragment>
-                               </h:panelGroup>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
+                       <h:panelGroup layout="block" styleClass="registration_form">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
+                                       <ui:include src="/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl" />
+                               </ui:fragment>
+                       </h:panelGroup>
 
-                               <div class="para">
-                                       <h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />
-                               </div>
-                       </ui:fragment>
+                       <div class="para">
+                               <h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />
+                       </div>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
-                               <ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
+                       <ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 01a29d1826f6089e82cc169e14fdcccdcdcad4c0..bfa7c54c7bc04428a8c40175572efb6d1d3d22ce 100644 (file)
@@ -1,25 +1,21 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
-                               Hier kommen die Datenschutzbestimmungen hin.
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
+                       Hier kommen die Datenschutzbestimmungen hin.
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index c6be672ebb3f5cfeea9427516ef3dd14c64ea2f9..7d8528d56d9576fb54dd60bca67721c9f3dd9349 100644 (file)
@@ -1,25 +1,21 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="guest_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
-               </ui:define>
+       <ui:define name="guest_title">
+               <h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_TERMS}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_INDEX_TERMS}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
-                               Hier kommen die allgemeinen Geschäftsbedingungen hin.
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+       <ui:define name="content">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
+                       Hier kommen die allgemeinen Geschäftsbedingungen hin.
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 725ca347b86de455ae8592548c10788be6cc9164..afd7381591dcf6aad772cab452e9c5a720cddc4e 100644 (file)
@@ -1,37 +1,33 @@
-<!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"
-         >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
+               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+               </ui:fragment>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+               <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index bda92d33ac3cc101944beb2068cf16eb7ef71bab..c21ff285a228c3bc33142089090deff5b44469b7 100644 (file)
@@ -1,32 +1,27 @@
 <?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}"
-       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"
-         >
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 73e9e26214ce563ca95fc442ca2c9d385cb94079..67fbf8a638622574c749ac6ada42977583dabd32 100644 (file)
@@ -1,59 +1,55 @@
-<!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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <div class="table">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
-                                       </div>
-
-                                       <div class="para notice">
-                                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <ul>
-                                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                                                               <li>
-                                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
-                                                               </li>
-                                                       </ui:fragment>
-
-                                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                                                               <li>
-                                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
-                                                               </li>
-                                                       </ui:fragment>
-
-                                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
-                                                               <li>
-                                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
-                                                               </li>
-                                                       </ui:fragment>
-                                               </ul>
-                                       </div>
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
+
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <div class="table">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
                                </div>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+
+                               <div class="para notice">
+                                       <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+                               </div>
+
+                               <div class="para">
+                                       <ul>
+                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                                                       <li>
+                                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+                                                       </li>
+                                               </ui:fragment>
+
+                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                                                       <li>
+                                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+                                                       </li>
+                                               </ui:fragment>
+
+                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+                                                       <li>
+                                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+                                                       </li>
+                                               </ui:fragment>
+                                       </ul>
+                               </div>
+                       </div>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 902550a7309f622d5f1b7873bc71f7d40456f48c..207e6965cd46628bf085299a32444d618a1b1b39 100644 (file)
@@ -1,34 +1,29 @@
 <?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}"
-       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"
-         >
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <!-- @TODO Here goes your content. //-->
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <!-- @TODO Here goes your content. //-->
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
+               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 10efa9019996363d6e0a05843291eb9ec4b11115..3c68ee74c4e9a280f79227e3d6a53eb574697fc1 100644 (file)
@@ -1,41 +1,37 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
-                                       </div>
+       <ui:define name="content">
+               <h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
+                       <h:panelGroup styleClass="table" layout="block">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
+                               </div>
 
-                                       <div class="para">
-                                               <h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
-                                       </div>
+                               <div class="para">
+                                       <h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
+                               </div>
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
+                               </div>
+                       </h:panelGroup>
+               </h:form>
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 4b6a1b0af288b0569d6243eacab175e07df12a02..2127d8a01b85160b698371044a414b9be590e97d 100644 (file)
@@ -1,70 +1,65 @@
 <?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}"
-       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"
-       >
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
-                               </div>
+       <ui:define name="content">
+               <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
+                       <div class="table_header">
+                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
+                       </div>
 
-                               <h:form id="form_user_change_email_address">
-                                       <fieldset class="fieldset" id="change_email">
-                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
-                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
-                                               </legend>
+                       <h:form id="form_user_change_email_address">
+                               <fieldset class="fieldset" id="change_email">
+                                       <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+                                       </legend>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
-                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
-                                                       </div>
+                                       <h:panelGroup styleClass="table_row" layout="block">
+                                               <div class="table_left">
+                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
+                                               </div>
 
-                                                       <div class="table_right">
-                                                               <h:outputText value="#{contactController.emailAddress}" />
-                                                       </div>
+                                               <div class="table_right">
+                                                       <h:outputText value="#{contactController.emailAddress}" />
+                                               </div>
 
-                                                       <div class="clear"></div>
-                                               </h:panelGroup>
+                                               <div class="clear"></div>
+                                       </h:panelGroup>
 
-                                               <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
-                                       </fieldset>
+                                       <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
+                               </fieldset>
 
-                                       <div class="para"></div>
+                               <div class="para"></div>
 
-                                       <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-                                       <div class="table_footer">
-                                               <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
-                                       </div>
-                               </h:form>
-                       </h:panelGroup>
+                               <div class="table_footer">
+                                       <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
+                               </div>
+                       </h:form>
+               </h:panelGroup>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 780d0119b97fb32693d57e009c70799217cfac5a..16e42405d81a620cde5f04e4bf0a00043f55e322 100644 (file)
@@ -1,97 +1,92 @@
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
+
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
+                       </ui:include>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
+                               </div>
+
+                               <h:form id="form_user_change_password">
+
+                                       <fieldset class="fieldset" id="change_password">
+                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
+                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
+                                               </legend>
+
+                                               <h:panelGroup styleClass="table_row" layout="block">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
+                                                       </div>
+
+                                                       <div class="table_right">
+                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+                                                       </div>
+
+                                                       <div class="clear"></div>
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="table_row" layout="block">
+                                                       <div class="table_left">
+                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
+                                                       </div>
+
+                                                       <div class="table_right">
+                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+                                                       </div>
+
+                                                       <div class="clear"></div>
+                                               </h:panelGroup>
+
+                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               </h:panelGroup>
+                                       </fieldset>
+
+                                       <div class="para"></div>
+
+                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
                                        </div>
-
-                                       <h:form id="form_user_change_password">
-
-                                               <fieldset class="fieldset" id="change_password">
-                                                       <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
-                                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
-                                                       </legend>
-
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </h:panelGroup>
-
-                                                       <h:panelGroup styleClass="error_container" layout="block">
-                                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                       </h:panelGroup>
-
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </h:panelGroup>
-
-                                                       <h:panelGroup styleClass="error_container" layout="block">
-                                                               <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                       </h:panelGroup>
-                                               </fieldset>
-
-                                               <div class="para"></div>
-
-                                               <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
-
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-                                               </div>
-                                       </h:form>
-                               </h:panelGroup>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+                               </h:form>
+                       </h:panelGroup>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 32286f303ff4d4c6fa614a5bf29b2d8e2e01d08e..89e5b773ee1811c2b4ae003e0ddb3dcab7ece324 100644 (file)
@@ -1,56 +1,51 @@
 <?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}"
-       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"
-       >
-
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
-               </ui:define>
-
-               <ui:define name="content">
-                       <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
-                               </div>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
+
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <div class="table_header">
+                               <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
+                       </div>
 
-                               <h:form id="form_login_change_personal">
-                                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
-
-                                       <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
-
-                                       <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-                                       </div>
-                               </h:form>
-                       </h:panelGroup>
-
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+                       <h:form id="form_login_change_personal">
+                               <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+
+                               <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+
+                               <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+                               </div>
+                       </h:form>
+               </h:panelGroup>
+
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+               </ui:fragment>
+
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index 4de72ddfd717c01c87a95c5f374404105bd511e2..3fe4121f68f9ddcf944f57c534afc311a0567899 100644 (file)
@@ -1,42 +1,38 @@
-<!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"
-       >
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
+               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                                       <ui:param name="styleClass" value="errors" />
-                               </ui:include>
-                       </ui:fragment>
+               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+                               <ui:param name="styleClass" value="errors" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>
index bbe9c2e3d6be9a28310f4fa326b1596bba805ab5..6f9eadccd4a57212efde6f3676dfb5748fd78466 100644 (file)
@@ -1,36 +1,31 @@
 <?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}"
-       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"
-         >
+<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
+                               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">
 
-       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">
-                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="login_title">
+               <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
-               </ui:define>
+       <ui:define name="content_header">
+               <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
+       </ui:define>
 
-               <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                               </ui:include>
-                       </ui:fragment>
+       <ui:define name="content">
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                       </ui:include>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-                       </ui:fragment>
+               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-                       </ui:fragment>
-               </ui:define>
-       </ui:composition>
-</html>
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+               </ui:fragment>
+       </ui:define>
+</ui:composition>