Please cherry-pick:

- converted div (no JSF component, not controlled by JSF engine) to h:panelGroup
- got rid of some ui:fragment in favour of h:panelGroup and div tag
- added some missing container (h:panelGroup again) around some ui:include

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

diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index b0e99e81fb718275f84baeba91776e2f7d9bbbcb..2aedc46a4128d9889d38648b60a50163ac800a64 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -9,7 +9,7 @@ TODO: Add something here that should be displayed on all admin pages
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
        <ui:define name="title">
-               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA}" /> -
+               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA} - " />
                <ui:insert name="admin_title">
                        <h:outputText value="Default admin title" />
                </ui:insert>

diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 68167363f5d2076ead55d2ebe573e459341daf8a..92bf06fb3a1238aa9e7998a4d5d4e19216c7a43f 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="menu_outer">
-               <div class="menu">
+               <h:panelGroup styleClass="menu" layout="block">
                        <div class="menu_header">
                                <h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
                        </div>
@@ -78,6 +78,6 @@
                                <li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li>
                                <li><h:link title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" /></li>
                        </ul>
-               </div>
+               </h:panelGroup>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
index e6ba90df742fd26440c397c5e61e1e7317cdeb77..e77192256139e75f33f95bc409c5658c5d7d6fff 100644 (file)
--- a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
+++ b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset" id="business_basic_data">
                        <legend title="#{msg.ADMIN_BUSINESS_BASIC_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_LEGEND}" />
@@ -194,5 +194,5 @@
                                <div class="clear"></div>
                        </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index dd1aea7f97a5e57250a767940847e325292a8dcb..da4a550eb2fe0938ada903ddd71da4b403b424cf 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block">
                <h:outputText value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
                <h:outputText value="allowEmptyRequiredData is empty" rendered="#{empty allowEmptyRequiredData}" />
 
@@ -268,13 +268,13 @@
                                <div class="clear"></div>
                        </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 
-       <div class="para notice">
+       <h:panelGroup styleClass="para notice" layout="block">
                <ul>
                        <li>
                                <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
                        </li>
                </ul>
-       </div>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index b87d9c18a77141780c3c6c8511840a86a0de3fb9..cbed24ae28f8379368e030227f356d846db55eaa 100644 (file)
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -5,11 +5,11 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para notice">
+       <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
-       </div>
+       </h:panelGroup>
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset" id="country_data">
                        <legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
@@ -128,5 +128,5 @@
                                <h:message for="countryPhoneCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 51e7413142d06109c5465f773b369a53cf2482e9..ab6654f46047470899cbfd784ef8ff64a38bb7cb 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -8,47 +8,45 @@
 
        <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
 
-       <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
-               <div class="para">
-                       <fieldset class="fieldset" id="fax_data">
-                               <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
-                                       <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
-                               </legend>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
-                                                       <ui:param name="targetController" value="#{adminPhoneController}" />
-                                               </ui:include>
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
-                       </fieldset>
-               </div>
-       </ui:fragment>
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.faxNumber}">
+               <fieldset class="fieldset" id="fax_data">
+                       <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
+                                               <ui:param name="targetController" value="#{adminPhoneController}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index ead5d55be0a1041deacaa18b74b01f800feb68eb..c6047b4e26ab740ffec6b82dfca6c57f6ddc5744 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -8,47 +8,45 @@
 
        <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
 
-       <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
-               <div class="para">
-                       <fieldset class="fieldset" id="landline_data">
-                               <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
-                                       <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
-                               </legend>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-                                                       <ui:param name="targetController" value="#{adminPhoneController}" />
-                                               </ui:include>
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
-                       </fieldset>
-               </div>
-       </ui:fragment>
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.landLineNumber}">
+               <fieldset class="fieldset" id="landline_data">
+                       <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
+                                               <ui:param name="targetController" value="#{adminPhoneController}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index cb4656074622a8e735a00a908aba6036a4e1f47c..625f4ff7c7b6a5859519139b225b0d360a946028 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -8,63 +8,61 @@
 
        <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-               <div class="para">
-                       <fieldset class="fieldset" id="mobile_data">
-                               <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
-                                       <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
-                               </legend>
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.mobileNumber}">
+               <fieldset class="fieldset" id="mobile_data">
+                       <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
+                       </legend>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               </div>
 
-                                       <div class="table_right_medium">
-                                               <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
-                                       </div>
+                               <div class="table_right_medium">
+                                       <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
+                               </div>
 
-                                       <div class="clear"></div>
-                               </h:panelGroup>
+                               <div class="clear"></div>
+                       </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+                               </div>
 
-                                       <div class="table_right_medium">
-                                               <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
-                                                       <f:converter converterId="MobileProviderConverter" />
-                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-                                               </h:selectOneMenu>
-                                       </div>
+                               <div class="table_right_medium">
+                                       <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
+                                               <f:converter converterId="MobileProviderConverter" />
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+                                       </h:selectOneMenu>
+                               </div>
 
-                                       <div class="clear"></div>
+                               <div class="clear"></div>
 
-                                       <h:panelGroup styleClass="error_container" layout="block">
-                                               <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                       </h:panelGroup>
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
+                       </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+                               </div>
 
-                                       <div class="table_right_medium">
-                                               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
-                                                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-                                               </h:inputText>
-                                       </div>
+                               <div class="table_right_medium">
+                                       <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+                               </div>
 
-                                       <div class="clear"></div>
+                               <div class="clear"></div>
 
-                                       <h:panelGroup styleClass="error_container" layout="block">
-                                               <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                       </h:panelGroup>
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </fieldset>
-               </div>
-       </ui:fragment>
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index d0a226f5553c09067a369cb53e963ca81ecaaab8..46a68868f5423d71925d693ec7cd071dc5f5be1c 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -5,11 +5,11 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para notice">
-               #{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}
-       </div>
+       <h:panelGroup styleClass="para notice" layout="block">
+               <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}" />
+       </h:panelGroup>
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset" id="mobile_provider">
                        <legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
@@ -74,5 +74,5 @@
                                <div class="clear"></div>
                        </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index 73cc0a4a6c70e7c3214ff44055c8e65accd8c459..4d533c4c219fa40da700793d72e9b4467707b53a 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -8,76 +8,72 @@
 
        <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" styleClass="errors" rendered="#{empty mode}" />
 
-       <ui:fragment rendered="#{not empty mode}">
-               <div class="para">
-                       <fieldset class="fieldset" id="login_data">
-                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
-                                       <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
-                               </legend>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <div class="para"></div>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
-                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
-                                       </div>
-
-                                       <div class="table_right_medium">
-                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </h:panelGroup>
-
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left_medium">
-                                                       <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
-                                               </div>
-
-                                               <div class="table_right_medium">
-                                                       <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
-                                               </div>
-
-                                               <div class="clear"></div>
-                                       </h:panelGroup>
-                               </ui:fragment>
-
-                               <div class="para notice">
-                                       <ul>
-                                               <li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
-
-                                               <li>
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
-                                               </li>
-                                       </ul>
+       <h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
+               <fieldset class="fieldset" id="login_data">
+                       <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                </div>
-                       </fieldset>
-               </div>
-       </ui:fragment>
+
+                               <div class="table_right_medium">
+                                       <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <div class="para"></div>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="table_row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </h:panelGroup>
+
+                       <div class="para notice">
+                               <ul>
+                                       <li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
+
+                                       <li>
+                                               <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+                                               <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
+                                       </li>
+                               </ul>
+                       </div>
+               </fieldset>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 31a17db3fb7a67ed276d0a5a76d8ab4e67fee8ce..78580ad687c534cca5eb2f71c054828e1763fa16 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -7,11 +7,11 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <div class="para notice">
+       <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
-       </div>
+       </h:panelGroup>
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset" id="personal_data">
                        <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
@@ -247,27 +247,25 @@
 
                        <widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
                </fieldset>
-       </div>
-
-       <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-               <div class="para">
-                       <fieldset class="fieldset" id="profile_mode">
-                               <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
-                                       <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
-                               </legend>
-
-                               <widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
-
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="para notice">
-                                               <ul>
-                                                       <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
-                                                       <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}" /></li>
-                                                       <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
-                                               </ul>
-                                       </div>
-                               </h:panelGroup>
-                       </fieldset>
-               </div>
-       </ui:fragment>
+       </h:panelGroup>
+
+       <h:panelGroup styleClass="para" layout="block" rendered="#{userController.isPublicUserProfileEnabled()}">
+               <fieldset class="fieldset" id="profile_mode">
+                       <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
+                       </legend>
+
+                       <widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
+
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="para notice">
+                                       <ul>
+                                               <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
+                                               <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}" /></li>
+                                               <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
+                                       </ul>
+                               </div>
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 737a6dce3770121b090a0af2301194e8272a41b1..77b56d5c51d5495370968360c3aa3af972f661d5 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -4,6 +4,7 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
        <div class="footer">
                <ul class="footer_nav">
                        <li class="footer_link">

diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index 7567f4b5ac2111ff19c9823de12ae569b8b5b0b7..0e81ece225dd4a0516e9e8ebba3727366a4162d9 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para">
+       <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset" id="terms_privacy">
                        <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">
                                <h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
@@ -55,5 +55,5 @@
                                </h:panelGroup>
                        </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index db2d06759bc508d3e80264ba8f78dc9a7da7cfcb..8b576f324cc1d976e05dc57981b43633a0856cad 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -7,8 +7,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
        <ui:define name="title">
-               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" />
-               <h:outputText value=" - " />
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" -  />
                <ui:insert name="login_title">
                        <h:outputText value="Default login title" />
                </ui:insert>

diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index e89bd4ec2323114eeda4836cd04efa6eed5b3516..97a4e7c992f38a16f04ea9e8d3283cd7ee1a932a 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -5,29 +5,29 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-               <div class="para">
-                       <fieldset class="fieldset" id="current_password">
-                               <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
-                                       <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
-                               </legend>
+       <h:panelGroup styleClass="para" layout="block">
+               <fieldset class="fieldset" id="current_password">
+                       <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
+                       </legend>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left">
-                                               <h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_row" layout="block">
+                               <div class="table_left">
+                                       <h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
+                               </div>
 
-                                       <div class="table_right">
-                                               <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-                                                       <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
-                                               </h:inputSecret>
-                                       </div>
+                               <div class="table_right">
+                                       <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+                                               <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
+                                       </h:inputSecret>
+                               </div>
 
-                                       <div class="clear"></div>
+                               <div class="clear"></div>
 
-                                       <h:panelGroup styleClass="error_container" layout="block">
-                                               <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                       </h:panelGroup>
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </fieldset>
-               </div>
+                       </h:panelGroup>
+               </fieldset>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index 2466876b362829d25c0db8cffa799e2501294acf..59e33252ee3a8ee31a914ccd9df5a26f932ca8c7 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="menu_outer">
-               <div class="menu">
+               <h:panelGroup styleClass="menu" layout="block">
                        <div class="menu_header">
                                <h:outputText value="#{msg.MENU_HOME_TITLE}" />
                        </div>
@@ -76,6 +76,6 @@
                                        <h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
                                </li>
                        </ul>
-               </div>
+               </h:panelGroup>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
index f54316367bb8b634fab7d8e026b2a59a3befea2b..0d45fc32c7b720963fad2d6f203833974a40ff92 100644 (file)
--- a/web/WEB-INF/templates/user/userid_error.tpl
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -7,7 +7,7 @@
 
        <h:panelGroup styleClass="table" layout="block">
                <div class="table_header">
-                       #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}
+                       <h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
                </div>
 
                <div class="para">

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 7df3ccac110a3e5cab93f96a40bd71809811b422..70fa64a706531def4914a6fa49c454ddc4530947 100644 (file)
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -20,9 +20,9 @@
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
                                </div>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
-                               </div>
+                               </h:panelGroup>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 1456d176ccb42dec37bb8ae887205c8d119457c4..1b7add6bff81290123e7c8368cad265b14440a6f 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -25,23 +25,25 @@
                <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
-                       <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
+                       <h:panelGroup styleClass="para" layout="block">
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
+                       </h:panelGroup>
 
-                       <div class="para">
+                       <h:panelGroup styleClass="para" layout="block">
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="para">
+                       <h:panelGroup styleClass="para" layout="block">
                                <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="para">
+                       <h:panelGroup styleClass="para" layout="block">
                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="para">
+                       <h:panelGroup styleClass="para" layout="block">
                                <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-                       </div>
+                       </h:panelGroup>
                </ui:fragment>
        </ui:define>
 </ui:composition>

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index f26e2f21c0d5ec032cd0038ea9ef1293c71e807d..c5d2293c77326ae3761ee90e3a968b77e66e4602 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -1,17 +1,17 @@
 <?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 onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
-       </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="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+               </f:metadata>
+       </ui:define>
+
        <ui:define name="admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
        </ui:define>

diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 8c5c3dd776b62849097e3f028a9fa0f6985dee9a..0a7ac74978c1cd8894ca4d35d5dfd78ae9af31c7 100644 (file)
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -74,12 +74,12 @@
                                </div>
                        </h:panelGroup>
 
-                       <div class="para notice">
+                       <h:panelGroup styleClass="para notice" layout="block">
                                <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}" />
                                <ul>
                                        <li><h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}" /></li>
                                </ul>
-                       </div>
+                       </h:panelGroup>
                </h:form>
        </ui:define>
 </ui:composition>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 51acd1574d848d4f9bc13c4b7a132b76a22d58df..ae93f79fe008eede9e2b08f4b3e0c89b9d03113e 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -96,7 +96,7 @@
                                </div>
 
                                <!-- Whether select contact data .. //-->
-                               <div id="admin_user_personal_data_option_1" class="para">
+                               <h:panelGroup id="admin_user_personal_data_option_1" styleClass="para" layout="block">
                                        <fieldset class="fieldset" id="user_contact">
                                                <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
                                                        <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
@@ -117,16 +117,16 @@
                                                        <div class="clear"></div>
                                                </h:panelGroup>
                                        </fieldset>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
-                               </div>
+                               </h:panelGroup>
 
                                <!-- ... or enter it directly together it creating user account //-->
-                               <div id="admin_user_personal_data_option_2">
+                               <h:panelGroup id="admin_user_personal_data_option_2" layout="block">
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
-                               </div>
+                               </h:panelGroup>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index f49798322065ee745dbfa93c51023f04ca7e6c0b..5a7ef3dbc3c44ac2407b2599c042477a2cb0e5b9 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -33,45 +33,45 @@
                                        </h:outputFormat>
                                </div>
 
-                               <div class="para">
-                                       <div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
                                                <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table_right_medium">
                                                <h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
-                                       <div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
                                                <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table_right_medium">
                                                <h:outputFormat id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
-                                       <div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
                                                <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table_right_medium">
                                                <h:outputFormat id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
-                                       <div>
+                               <h:panelGroup styleClass="table_row" layout="block">
+                                       <div class="table_left_medium">
                                                <h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
                                        </div>
 
-                                       <div>
+                                       <div class="table_right_medium">
                                                <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:panelGroup>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 9fdc706dde6a6aa0907aa3513786662e6180f440..4e15d4927ae9bc566b513e7b59cc003fcdd03247 100644 (file)
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -33,13 +33,13 @@
                                        </h:outputFormat>
                                </div>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
-                               </div>
+                               </h:panelGroup>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index a85b6328147c8b0f948cc22d89651cbb5e9777ba..c535aa8993c57cf16279990aa92296c50d3cd86d 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -26,20 +26,20 @@
 
                <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
-               <div class="para">
+               <h:panelGroup styleClass="para" layout="block">
                        <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />
-               </div>
+               </h:panelGroup>
 
-               <div class="para">
+               <h:panelGroup styleClass="para" layout="block">
                        <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-               </div>
+               </h:panelGroup>
 
-               <div class="para">
+               <h:panelGroup styleClass="para" layout="block">
                        <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-               </div>
+               </h:panelGroup>
 
-               <div class="para">
+               <h:panelGroup styleClass="para" layout="block">
                        <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-               </div>
+               </h:panelGroup>
        </ui:define>
 </ui:composition>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index cd4978df6805a5691c085177bde333409cc9d8af..11dc6c3481cf4528cf8a55e7ce5d7ade9611ebb8 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -33,7 +33,7 @@
                                        </h:outputFormat>
                                </div>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <div class="table_data_label">
                                                <h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
                                        </div>
@@ -43,9 +43,9 @@
                                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                                </h:link>
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <div class="table_data_label">
                                                <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
@@ -53,9 +53,9 @@
                                        <div class="table_data_field">
                                                <h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <div class="table_data_label">
                                                <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                        </div>
@@ -63,9 +63,9 @@
                                        <div class="table_data_field">
                                                <h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <div class="table_data_label">
                                                <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                        </div>
@@ -73,9 +73,9 @@
                                        <div class="table_data_field">
                                                <h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <div class="table_data_label">
                                                <h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
                                        </div>
@@ -85,9 +85,9 @@
                                                        <f:convertDateTime for="userLastLocked" type="both" />
                                                </h:outputText>
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <div class="table_data_label">
                                                <h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
                                        </div>
@@ -95,7 +95,7 @@
                                        <div class="table_data_field">
                                                <h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />

diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index fbf31ff9e107254ae4213611d01424ec87f61ec3..5a3130ee4fc64b4386e953ccd49aa1dbf1e970cd 100644 (file)
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -24,9 +24,9 @@
                                <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">
+                       <h:panelGroup styleClass="para" layout="block">
                                <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
-                       </div>
+                       </h:panelGroup>
 
                        <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}" />

diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index 7161fce72b4ea45d64b5359372c4216380ab31f7..73f3b2c0321b1f0062c310147b5893a7edeeda70 100644 (file)
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -14,9 +14,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <div class="para">
+               <h:panelGroup styleClass="para" layout="block">
                        <h:outputText value="#{msg.GUEST_USER_REGISTRATION_COMPLETED}" />
-               </div>
+               </h:panelGroup>
 
                <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')}" />

diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index 234d39276b0b1d3b6c4f32ca5c7f092553af57cf..c65dbad0d75d654c1aa3638ce73020ab4c79513c 100644 (file)
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -19,11 +19,11 @@
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <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>
+                               </h:panelGroup>
                        </ui:fragment>
 
                        <h:panelGroup layout="block" styleClass="registration_form">

diff --git a/web/index.xhtml b/web/index.xhtml
index 5c7a59e64d40609a885b5b854d4c76ed83840605..130236ee5ce8c4fd5fe1f7119b2e5fce18d03d44 100644 (file)
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -21,9 +21,9 @@
                                </ui:fragment>
                        </h:panelGroup>
 
-                       <div class="para">
+                       <h:panelGroup styleClass="para" layout="block">
                                <h:outputText value="#{msg.CONTENT_PAGE_INDEX_PARA3}" />
-                       </div>
+                       </h:panelGroup>
                </ui:fragment>
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">

diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 67fbf8a638622574c749ac6ada42977583dabd32..481cca5aef06ed5945930faea2098f69c30349fa 100644 (file)
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -14,39 +14,35 @@
        </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>
+               <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <div class="table_header">
+                               <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
                        </div>
-               </ui:fragment>
+
+                       <h:panelGroup styleClass="para notice" layout="block">
+                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+                               <ul>
+                                       <ui:fragment rendered="#{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="#{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>
+
+                                       <li>
+                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+                                       </li>
+                               </ul>
+                       </h:panelGroup>
+               </h:panelGroup>
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />

diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index 3c68ee74c4e9a280f79227e3d6a53eb574697fc1..f8620d57b5b73c718ac7125a18c4c729e50ad981 100644 (file)
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -20,9 +20,9 @@
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
                                </div>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
-                               </div>
+                               </h:panelGroup>
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 35f7cdaf8e7734576aa61a24a3ce003ed97ac0c5..98003d1f1f68fdb017328a393ce4d7f03e149d7f 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -18,12 +18,11 @@
                <widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
                <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">
+                       <h:form id="form_user_change_password">
+                               <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>
 
                                        <fieldset class="fieldset" id="change_password">
                                                <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
@@ -71,8 +70,8 @@
                                                <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>
+                               </h:panelGroup>
+                       </h:form>
                </ui:fragment>
 
                <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />