Please cherry-pick:

- internationalized "Administration" so it can be translated in many
  other languages
- put ui:insert for "metadata" into f:view, still broken!
- no need for "id-ing" h:body/head as they should occur once anyway
- moved f:metadata back into ui:component, still broken and expection

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index ba8070c6731170e816a75d0cbb53f61b64ee3292..ebc60506c34fd231b2032083dac94f72c739dc14 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -807,3 +807,4 @@ GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=Sie muessen selbst ein Passw
 GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Bitte geben Sie ein Passwort ein. Dies muss den Sicherheitsregeln entsprechen.
 #@TODO Please fix German umlauts!
 GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Bitte wiederholen Sie das eingegebene Passwort. Dies wird zur Bestaetigung benoetigt.
+PAGE_TITLE_ADMIN_AREA=Administration

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 79cc129c656ab58d2848181f2ddc55e0de6e5c46..4fa078fd852ae88996170c82c1e2fed220d2ac0b 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -802,3 +802,4 @@ GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED=If you left both password fields
 GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=You have to enter an own password. Please enter it twice for confirmation.
 GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Please enter a password. This must match with security rules.
 GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Please repeat the entered password. This done to confirm the password.
+PAGE_TITLE_ADMIN_AREA=Administration

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index 92dc3d0aaf50f8a37e5a4686be4bdf46c60caa3d..ed355aec21366e6ee8798f1a26b923240186c2dd 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -5,9 +5,13 @@ TODO: Add something here that should be displayed on all admin pages
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">Administration - <ui:insert name="admin_title">Default admin title</ui:insert></ui:define>
+       <ui:define name="title">
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA}" /> -
+               <ui:insert name="admin_title">Default admin title</ui:insert>
+       </ui:define>
 
        <ui:define name="menu">
                <ui:include src="/WEB-INF/templates/admin/admin_menu.tpl" />

diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 05de07c6235aeff1c931b60152f86bf57c2bdfb8..a0f92b5cbe4d68d8331ada48527e83f33f8d9cca 100644 (file)
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -5,11 +5,10 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:insert name="metadata">
-       </ui:insert>
-
        <f:view locale="#{localizationController.locale}" contentType="text/html">
-               <h:head id="head">
+               <ui:insert name="metadata" />
+
+               <h:head>
                        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
                        <f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
@@ -20,7 +19,7 @@
                        <title>JJobs - <ui:insert name="title">Default title</ui:insert></title>
                </h:head>
 
-               <h:body id="body">
+               <h:body>
                        <div id="top">
                                <div id="page_header">
                                        <div id="page_title">

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 81e28bf0a3d86a2f9fb5838071791fc5de9f6f11..535cac3f304f06f5de3109669015fbe2173cdb66 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index e0ea8d77243d0a48430ba20a1c9ca9ad589e7298..e931438466794532fc32e43593ae2dd095f1b75f 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-               <f:viewAction action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index a01e615dad559e454cd690114859e0e4e6c07e0a..fefe5d66542d90ca8e2be065cdeffe3ab490c7ac 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-       </f:metadata>
-
        <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_PHONE_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>

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 53dc21cbea06bd75f706ce21d2712ee19cdc8485..b2bb1eb9ddc68d15fdbf6ee68482eba0a4f3db83 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
                </ui:define>

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index cc02f580574c3b38674c8d47aa3fec7f371e15e8..28d1ed27723ed683ffeb2c3dd62a8ca08d2a79ee 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 90ab08c202a330c8c47aebca78331897e88e1265..eb4c5c5c05254d17c0222a137a314520a1c38967 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index af1520428061f8be4e99253a66470e5bd22199f0..e02e874e10733833ac7b1b7dc9225d361b7304b9 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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>

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index c7067b07cd47e217b43e6533cd57686af5bddcb9..ac08ee46fcc2e14297d5178393225c1e17485112 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
                </ui:define>

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 7d3579bc0217da1a79af0eb65de4bf2646fe88e3..f091d4023fdbb67f034fdfe8b490302ea566b217 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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>

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 2d899f74e13ae5474cdbe537d5fa261343f16599..2fe57c42d0481104a3e58fa7fbe936bda3c3b6b1 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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>

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index e524a72f3a105c198e36398833e3a3199843534c..f24cf7d9534d764cb0ed68288a1164179e77b886 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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_EDIT_LAND_LINE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 12f321fff9e4ba51ad312ca3f84cd87e0672b8bf..7259c5875ef3433cc9fc99ba07ded3b90a400c62 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -7,10 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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 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">
                <ui:define name="admin_title">

diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index dfa45124a103e817493b9859c7328f6f8f90702c..f78c5262df3bab7e7a88aa5838b29d261e27db4f 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" 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: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="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 61b201919a6b5ff47833abf7af1a09455211af64..c7ad382359a0ff587bb97a74bfa02e4d455600d5 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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>

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 67982d911b8fe7d1c931c99b35c74bbfaded14ad..fc9381cff8944f569e16e867cb3dc2bd41c16dfa 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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: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_EDIT_MOBILE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 465a77cce363bb0eb88985649618ad7e69c38cac..887adbeca2aa2ebb509b61964020281bcf2aec55 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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 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}" />

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 88ff48a375facf443eee05a6f09f37469ec482e9..9e714dc029b4e373017493041d6787f737c66c92 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 7a2802b8d9a6df024c4878798b6ae8d9de927990..c3740b3c92797aa51d755a86949e1fc701d68a3b 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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_DELETE_USER}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 174b1a9802a4d81eb9e3fce6965efab9f33cf6f3..86dd72c116090e15103bcb7b9b5293386949142d 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 3923130f8abb9a7dc114dbe6b5acdd467a675fa6..f967ea648e2f1eb3cee1243b0b45c343401645bc 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 7544cb04e3016de0e8de39e29b273a095dcdfb88..a79e8dda0122ece597317fe71b2fe069d508be88 100644 (file)
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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_RESEND_USER_CONFIRMATION_LINK}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 9a5f1b206a933ffd2926ec7d605545657a840e31..fd81fc0a66b7872ce8b2a8a80524f5589e3fd140 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 8988b3bbb416d27d4a5675439eee2e61d5bbd248..897798190c220200c9dbe7ba38dc1eaa1e4bb8b9 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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>

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 81dea8eb948460cfb9b91ead936b6e9b6424c50a..a49b6eaadb22c38d940d0f944c3924669f907727 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -7,12 +7,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-               <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
-       </f:metadata>
-
        <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="guest_title">
                        <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
                </ui:define>

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index dd7a61e965419a7ce335ac49bbbdf5c43c91b318..fd6ac461c9053f51b08a8659b635d42a8410dace 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -7,12 +7,14 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <f:metadata>
-               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-               <f:viewAction action="#{beanHelper.copyUserToController()}" />
-       </f:metadata>
-
        <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>