Please cherry-pick:

- converted another div (class=table_row) to h:panelGroup
- well, I wanted here a "h:tableRow" or something, maybe one day I rewrite this

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

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java
index 9b0e882923f3499bc1f4d239f9b45fface3efb65..f42d84844205d74d763908eeabbf7701aae2b77b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java
@@ -238,10 +238,10 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
                } else if ((this.adminPhoneController.getFaxNumber() == null) && (this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) {
                        // All fields are empty
-                       throw new NullPointerException("choosenFaxNumber, mobileProvider and phoneNumer are null"); //NOI18N
+                       throw new NullPointerException("faxNumber, mobileProvider and phoneNumer are null"); //NOI18N
                } else if ((this.adminPhoneController.getFaxNumber() instanceof DialableFaxNumber) && (this.adminPhoneController.getPhoneCountry() instanceof Country) && (this.adminPhoneController.getPhoneAreaCode() instanceof Integer) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
                        // All fields are set
-                       throw new IllegalStateException("choosenFaxNumber, mobileProvider and phoneNumer are all set"); //NOI18N
+                       throw new IllegalStateException("faxNumber, mobileProvider and phoneNumer are all set"); //NOI18N
                } else if ((this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() instanceof Integer) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) {
                        // No country selected
                        this.showFacesMessage("form_add_contact_fax:phoneCountry", "ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED"); //NOI18N
@@ -300,10 +300,10 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
                } else if ((this.adminPhoneController.getLandLineNumber() == null) && (this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) {
                        // All fields are empty
-                       throw new NullPointerException("choosenLandLineNumber, mobileProvider and phoneNumer are null"); //NOI18N
+                       throw new NullPointerException("landLineNumber, mobileProvider and phoneNumer are null"); //NOI18N
                } else if ((this.adminPhoneController.getLandLineNumber() instanceof DialableLandLineNumber) && (this.adminPhoneController.getPhoneCountry() instanceof Country) && (this.adminPhoneController.getPhoneAreaCode() instanceof Integer) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
                        // All fields are set
-                       throw new IllegalStateException("choosenLandLineNumber, mobileProvider and phoneNumer are all set"); //NOI18N
+                       throw new IllegalStateException("landLineNumber, mobileProvider and phoneNumer are all set"); //NOI18N
                } else if ((this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() instanceof Integer) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) {
                        // No country selected
                        this.showFacesMessage("form_add_contact_landLine:phoneCountry", "ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED"); //NOI18N
@@ -362,10 +362,10 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im
                        throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
                } else if ((this.adminPhoneController.getMobileNumber() == null) && (this.adminPhoneController.getMobileProvider() == null) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) {
                        // All fields are empty
-                       throw new NullPointerException("choosenMobileNumber, mobileProvider and phoneNumer are null"); //NOI18N
+                       throw new NullPointerException("mobileNumber, mobileProvider and phoneNumer are null"); //NOI18N
                } else if ((this.adminPhoneController.getMobileNumber() instanceof DialableMobileNumber) && (this.adminPhoneController.getMobileProvider() instanceof MobileProvider) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
                        // All fields are set
-                       throw new IllegalStateException("choosenMobileNumber, mobileProvider and phoneNumer are all set"); //NOI18N
+                       throw new IllegalStateException("mobileNumber, mobileProvider and phoneNumer are all set"); //NOI18N
                } else if ((this.adminPhoneController.getMobileProvider() == null) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) {
                        // No mobile provider selected
                        this.showFacesMessage("form_add_contact_mobile:phoneCountry", "ERROR_ADMIN_NO_PHONE_MOBILE_PROVIDER_SELECTED"); //NOI18N

diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java
index b4df84c7c9001086a3adecae6b1f94eba0333291..d73884a5d7bed581546dfc19f912ecbf2c60e18b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java
@@ -89,17 +89,17 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement
        /**
         * fax number
         */
-       private DialableFaxNumber choosenFaxNumber;
+       private DialableFaxNumber faxNumber;
 
        /**
         * land-line number
         */
-       private DialableLandLineNumber choosenLandLineNumber;
+       private DialableLandLineNumber landLineNumber;
 
        /**
         * mobile number
         */
-       private DialableMobileNumber choosenMobileNumber;
+       private DialableMobileNumber mobileNumber;
 
        /**
         * Event being fired when an administrator has deleted fax number
@@ -555,35 +555,35 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement
        @Override
        public DialableFaxNumber getFaxNumber () {
                // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
-               // System.out.println(MessageFormat.format("{0}: Returning this.choosenFaxNumber={1}, caller: {2}", this.getClass().getSimpleName(), this.choosenFaxNumber, caller));
-               return this.choosenFaxNumber;
+               // System.out.println(MessageFormat.format("{0}: Returning this.faxNumber={1}, caller: {2}", this.getClass().getSimpleName(), this.faxNumber, caller));
+               return this.faxNumber;
        }
 
        @Override
-       public void setFaxNumber (final DialableFaxNumber choosenFaxNumber) {
+       public void setFaxNumber (final DialableFaxNumber faxNumber) {
                // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
-               // System.out.println(MessageFormat.format("{0}: Settin choosenFaxNumber={1}, previous: this.choosenFaxNumber={2}, caller: {3}", this.getClass().getSimpleName(), choosenFaxNumber, this.choosenFaxNumber, caller));
-               this.choosenFaxNumber = choosenFaxNumber;
+               // System.out.println(MessageFormat.format("{0}: Settin faxNumber={1}, previous: this.faxNumber={2}, caller: {3}", this.getClass().getSimpleName(), faxNumber, this.faxNumber, caller));
+               this.faxNumber = faxNumber;
        }
 
        @Override
        public DialableLandLineNumber getLandLineNumber () {
-               return this.choosenLandLineNumber;
+               return this.landLineNumber;
        }
 
        @Override
-       public void setLandLineNumber (final DialableLandLineNumber choosenLandLineNumber) {
-               this.choosenLandLineNumber = choosenLandLineNumber;
+       public void setLandLineNumber (final DialableLandLineNumber landLineNumber) {
+               this.landLineNumber = landLineNumber;
        }
 
        @Override
        public DialableMobileNumber getMobileNumber () {
-               return this.choosenMobileNumber;
+               return this.mobileNumber;
        }
 
        @Override
-       public void setMobileNumber (final DialableMobileNumber choosenMobileNumber) {
-               this.choosenMobileNumber = choosenMobileNumber;
+       public void setMobileNumber (final DialableMobileNumber mobileNumber) {
+               this.mobileNumber = mobileNumber;
        }
 
        @Override

diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java
index f8df058d057b1abc0de1af67dc57849654f23034..bfc4b3d4f0360dbdd18155cb457bb12f121a99fa 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java
@@ -133,9 +133,9 @@ public interface PizzaAdminPhoneWebRequestController extends Serializable {
        /**
         * Setter for choosen fax number
         * <p>
-        * @param choosenFaxNumber fax number
+        * @param faxNumber fax number
         */
-       void setFaxNumber (final DialableFaxNumber choosenFaxNumber);
+       void setFaxNumber (final DialableFaxNumber faxNumber);
 
        /**
         * Getter for choosen land-line number
@@ -147,9 +147,9 @@ public interface PizzaAdminPhoneWebRequestController extends Serializable {
        /**
         * Setter for choosen land-line number
         * <p>
-        * @param choosenLandLineNumber land-line number
+        * @param landLineNumber land-line number
         */
-       void setLandLineNumber (final DialableLandLineNumber choosenLandLineNumber);
+       void setLandLineNumber (final DialableLandLineNumber landLineNumber);
 
        /**
         * Getter for choosen mobile number
@@ -161,9 +161,9 @@ public interface PizzaAdminPhoneWebRequestController extends Serializable {
        /**
         * Setter for choosen mobile number
         * <p>
-        * @param choosenMobileNumber mobile number
+        * @param mobileNumber mobile number
         */
-       void setMobileNumber (final DialableMobileNumber choosenMobileNumber);
+       void setMobileNumber (final DialableMobileNumber mobileNumber);
 
        /**
         * Getter for phone area code

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
index a5d91955023bef8c56b4a5855c17fd55bde82bed..dc8195a6680ef23f52e8b767c6708c7b69a1196d 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -17,7 +17,7 @@
                        <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
                </div>
 
-               <div class="table_row">
+               <h:panelGroup styleClass="table_row" layout="block">
                        <ul>
                                <li>
                                        <h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
@@ -32,6 +32,6 @@
                                        </h:link>
                                </li>
                        </ul>
-               </div>
+               </h:panelGroup>
        </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 b8d0765ac0867738745cd61562177dbdc68c4158..5b015a0d8eb59a4e9c0e1bd8e2ae159fc9cb367f 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
@@ -11,7 +11,7 @@
                                <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="personalTitle" value="#{msg.ADMIN_PERSONAL_DATA_PERSONAL_TITLE}" />
                                </div>
@@ -23,13 +23,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
                                </div>
@@ -39,13 +39,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
                                </div>
@@ -55,13 +55,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
@@ -71,13 +71,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
                                </div>
@@ -87,13 +87,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
@@ -105,13 +105,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
                                </div>
@@ -121,13 +121,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
                                </div>
@@ -139,13 +139,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
                                </div>
@@ -155,13 +155,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
                                </div>
@@ -174,13 +174,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
@@ -202,9 +202,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
@@ -226,9 +226,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
                                </div>
@@ -246,9 +246,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
                                </div>
@@ -258,13 +258,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="emailAddress" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
                                </div>
@@ -276,13 +276,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
                                </div>
@@ -292,7 +292,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </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 521946feb15e3d244e45aacc255e9a6ed9acc748..b87d9c18a77141780c3c6c8511840a86a0de3fb9 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
@@ -15,7 +15,7 @@
                                <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
                                </div>
@@ -27,13 +27,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
                                </div>
@@ -47,13 +47,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="countryCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
                                </div>
@@ -65,13 +65,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="countryI18nKey" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
                                </div>
@@ -84,13 +84,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="countryIsLocalPrefixRequired" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
                                </div>
@@ -102,13 +102,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
                                </div>
@@ -122,7 +122,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="countryPhoneCode" errorClass="errors" fatalClass="errors" warnClass="errors" />

diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index 2cfa486a4eb370961e8c24dd77ba2c6d2de52dc2..65ec7dbc1cc175f764d9de35bddb7cb26f0b41af 100644 (file)
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -22,13 +22,13 @@
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenFaxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
+                                       <h:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="choosenFaxNumber" value="#{adminPhoneController.choosenFaxNumber}">
+                                       <h:selectOneMenu styleClass="select right_space" id=" " value="#{adminPhoneController.faxNumber}">
                                                <f:converter converterId="FaxNumberConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
@@ -36,13 +36,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <div class="para">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
@@ -54,7 +54,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />

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 adb9bac949c15394e719002614b14635dfe1a348..2665a383047b3c4ce9bb95bf8f4f7c03f48a2267 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
@@ -18,7 +18,7 @@
                                <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
@@ -28,9 +28,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
                                </div>
@@ -42,7 +42,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 1aec8d21e19da42f50062034a0e78be1323b09f5..22134c7d93f7c87d5539890fbd90eb2d3de1ed9c 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -22,13 +22,13 @@
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenLandLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
+                                       <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
+                                       <h:selectOneMenu styleClass="select right_space" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
                                                <f:converter converterId="LandLineNumberConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
@@ -36,13 +36,13 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <div class="para">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
                                </div>
@@ -54,7 +54,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />

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 98f95d66a704ad9260abf86a98a79ca119567edf..0e721a163e4651de5bf46b1d9c9663aa462260df 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
@@ -18,7 +18,7 @@
                                <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
@@ -28,9 +28,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
                                </div>
@@ -42,7 +42,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />

diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index b6c73ff0f0f23b581c30b7de24de3492308b229c..0371fcd6a45b287a6856e2d9b34cf0001833eca6 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -22,25 +22,25 @@
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenMobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
+                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="choosenMobileNumber" value="#{adminPhoneController.choosenMobileNumber}">
+                                       <h:selectOneMenu styleClass="select right_space" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
                                                <f:converter converterId="MobileNumberConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
-                       </div>
+                       </h:panelGroup>
 
                        <div class="para">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
                        </div>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
                                </div>
@@ -50,7 +50,7 @@
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                                </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/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index b612405ab943990d8af94667b7119ae2870843f2..6066cbec06d7f6f0a1718e484d258e454aae0ee0 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
@@ -18,7 +18,7 @@
                                <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
@@ -28,9 +28,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
                                </div>
@@ -48,9 +48,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
                                </div>
@@ -66,7 +66,7 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </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 4faff7598f6ed374d428e17176bb57a066f1a50f..d0a226f5553c09067a369cb53e963ca81ecaaab8 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
@@ -15,7 +15,7 @@
                                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
                                </div>
@@ -31,9 +31,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="providerMailPattern" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
                                </div>
@@ -45,9 +45,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
                                </div>
@@ -57,9 +57,9 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
                                </div>
@@ -72,7 +72,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </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 f7acb1ce2792b7000ce5a8234315b4ecc142dd92..cc7ce2daac4f20a76ad33650a43c249e2549a8d6 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
@@ -19,7 +19,7 @@
                                        <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
                                </legend>
 
-                               <div class="table_row">
+                               <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>
@@ -29,11 +29,11 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
                                <div class="para"></div>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left_medium">
                                                <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
                                        </div>
@@ -43,9 +43,9 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="table_row">
+                               <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>
@@ -55,10 +55,10 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left_medium">
                                                        <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
                                                </div>
@@ -73,7 +73,7 @@
 
                                <div class="para notice">
                                        <ul>
-                                               <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+                                               <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'}" />

diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index 3e14d0c82ebd8b0612f8ec32182e76a88a2c04f0..f5855475670d6cf31d3a796ac4daa36e30678205 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -17,7 +17,7 @@
                        <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
                </div>
 
-               <div class="table_row">
+               <h:panelGroup styleClass="table_row" layout="block">
                        <ul>
                                <li>
                                        <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
@@ -64,6 +64,6 @@
                                        </h:link>
                                </li>
                        </ul>
-               </div>
+               </h:panelGroup>
        </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 e49330f5b83d9ca95a2022a7354ce009480c0782..2191eb14da69de73f751cc2a70e3133564141e85 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -7,7 +7,7 @@
        xmlns:p="http://primefaces.org/ui">
 
        <div class="para notice">
-               #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
+               <h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
        </div>
 
        <div class="para">
@@ -16,7 +16,7 @@
                                <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="personalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                </div>
@@ -32,9 +32,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                </div>
@@ -50,9 +50,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
@@ -68,9 +68,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
                                </div>
@@ -86,9 +86,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
@@ -104,9 +104,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
                                </div>
@@ -120,9 +120,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
                                </div>
@@ -138,9 +138,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
                                </div>
@@ -156,9 +156,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
                                </div>
@@ -174,9 +174,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
                                </div>
@@ -194,9 +194,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
@@ -218,7 +218,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
@@ -228,7 +228,7 @@
                                <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
@@ -250,7 +250,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
@@ -260,7 +260,7 @@
                                <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
                                </div>
@@ -278,7 +278,7 @@
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 
@@ -289,7 +289,7 @@
                                        <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
                                </legend>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left_medium">
                                                <h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
                                        </div>
@@ -299,17 +299,17 @@
                                        </div>
 
                                        <div class="clear"></div>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="para notice">
                                                <ul>
-                                                       <li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}</li>
-                                                       <li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}</li>
-                                                       <li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}</li>
+                                                       <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>
-                               </div>
+                               </h:panelGroup>
                        </fieldset>
                </div>
        </ui:fragment>

diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index fab6239f30446cfbf13de8ae8101a8ed82db7a1c..0a47f71b8d101210ab462f9b7263f4a14267e3af 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -6,7 +6,7 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <div class="table_row">
+       <h:panelGroup styleClass="table_row" layout="block">
                <div class="table_left_medium">
                        <h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
                </div>
@@ -22,9 +22,9 @@
                <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                </h:panelGroup>
-       </div>
+       </h:panelGroup>
 
-       <div class="table_row">
+       <h:panelGroup styleClass="table_row" layout="block">
                <div class="table_left_medium">
                        <h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
                </div>
@@ -38,5 +38,5 @@
                <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                </h:panelGroup>
-       </div>
+       </h:panelGroup>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index a38077708b25d2ff347b3102d3567ee211ab4afc..7567f4b5ac2111ff19c9823de12ae569b8b5b0b7 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -11,7 +11,7 @@
                                <h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
                        </legend>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left25">
                                        <h:selectBooleanCheckbox styleClass="checkbox" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
@@ -23,7 +23,7 @@
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
                                        <h:outputText value="&#160;" />
                                        <h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
-                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
 
                                <div class="clear"></div>
@@ -31,9 +31,9 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
 
-                       <div class="table_row">
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left25">
                                        <h:selectBooleanCheckbox styleClass="checkbox" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
@@ -45,7 +45,7 @@
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
                                        <h:outputText value="&#160;" />
                                        <h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
-                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
 
                                <div class="clear"></div>
@@ -53,7 +53,7 @@
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                                </h:panelGroup>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index ea92ab2e2516aa8c4295a6cfe10a1ff71bcf9e26..cc8edcf362cfce6df68ade8afcf3ee9469306079 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -16,7 +16,7 @@
                                                <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
                                        </legend>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left">
                                                        <h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
                                                </div>
@@ -30,9 +30,9 @@
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                </h:panelGroup>
-                                       </div>
+                                       </h:panelGroup>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left">
                                                        <h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
                                                </div>
@@ -46,7 +46,7 @@
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                </h:panelGroup>
-                                       </div>
+                                       </h:panelGroup>
                                </fieldset>
 
                                <div class="table_footer">

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index ca8cd7c9f437e1ed661fd83b8be19d4394f42b6f..df920e5064711a407c24bf17825927c82b0acaaf 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -18,7 +18,7 @@
                                        </legend>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left_medium">
                                                                <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
                                                        </div>
@@ -28,7 +28,7 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
+                                               </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
@@ -40,7 +40,7 @@
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                                <div class="para"></div>
 
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left_medium">
                                                                <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                        </div>
@@ -50,13 +50,13 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
+                                               </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                </h:panelGroup>
 
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left_medium">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                        </div>
@@ -66,7 +66,7 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
+                                               </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 6745979efa946315b139d38b20896473a15d50ca..7fb7d9c8e3a0f8b076d3fda56699957a6458202f 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -20,7 +20,7 @@
                                        </legend>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left">
                                                                <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
                                                        </div>
@@ -34,7 +34,7 @@
                                                        <h:panelGroup styleClass="error_container" layout="block">
                                                                <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                        </h:panelGroup>
-                                               </div>
+                                               </h:panelGroup>
                                        </ui:fragment>
 
                                        <ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
@@ -42,7 +42,7 @@
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                                <div class="para"></div>
 
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left">
                                                                <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                        </div>
@@ -52,13 +52,13 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
+                                               </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                </h:panelGroup>
 
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                        </div>
@@ -68,7 +68,7 @@
                                                        </div>
 
                                                        <div class="clear"></div>
-                                               </div>
+                                               </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                        <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />

diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index 3787315c3885e31d89169416ea6d0da546d535f5..a54a8306953c2c9c8385f29b0a8bd1347ce72bca 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -6,7 +6,7 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <div class="table_row">
+       <h:panelGroup styleClass="table_row" layout="block">
                <div class="table_left">
                        <h:outputLabel for="emailAddress" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL}" />
                </div>
@@ -22,9 +22,9 @@
                <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                </h:panelGroup>
-       </div>
+       </h:panelGroup>
 
-       <div class="table_row">
+       <h:panelGroup styleClass="table_row" layout="block">
                <div class="table_left">
                        <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
                </div>
@@ -38,5 +38,5 @@
                <h:panelGroup styleClass="error_container" layout="block">
                        <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                </h:panelGroup>
-       </div>
+       </h:panelGroup>
 </ui:composition>

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 881e30c151e0755e125bc3677895e7e3d4f0ebd2..ded265ba5002ccfbcd4c4f91004af175aa2e864e 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
@@ -11,7 +11,7 @@
                                        <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
                                </legend>
 
-                               <div class="table_row">
+                               <h:panelGroup styleClass="table_row" layout="block">
                                        <div class="table_left">
                                                <h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
                                        </div>
@@ -27,7 +27,7 @@
                                        <h:panelGroup styleClass="error_container" layout="block">
                                                <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                        </h:panelGroup>
-                               </div>
+                               </h:panelGroup>
                        </fieldset>
                </div>
 </ui:composition>

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 5d36aee840a550113575c9756405d34e1324ccc8..2e927990aada86e240d34a34f2ec71fbf8281d9c 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -47,7 +47,7 @@
 
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_left25_medium">
                                                        <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
                                                </div>
@@ -57,7 +57,7 @@
                                                </div>
 
                                                <div class="clear"></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_list.xhtml b/web/admin/user/admin_user_list.xhtml
index f22a1a5619b42d3106f44205ac5c60e271ab5e1b..546c88281f77ea72bcc12b45fb3d6432911774f4 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -110,7 +110,7 @@
                                                                <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
                                                        </legend>
 
-                                                       <div class="table_row">
+                                                       <h:panelGroup styleClass="table_row" layout="block">
                                                                <div class="table_left_medium">
                                                                        <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
                                                                </div>
@@ -123,7 +123,7 @@
                                                                </div>
 
                                                                <div class="clear"></div>
-                                                       </div>
+                                                       </h:panelGroup>
                                                </fieldset>
                                        </div>
 

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 40adbfdf71bb1432be9f5d57d75e764989ffedac..aeb797b41f4688bfd7d613e7c009852cfbbeaba1 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -30,13 +30,13 @@
                                                <h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
                                        </div>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
                                                        <f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                                        <f:param value="#{beanHelper.user.userContact.contactFirstName}" />
                                                        <f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
                                                </h:outputFormat>
-                                       </div>
+                                       </h:panelGroup>
                                </h:panelGroup>
 
                                <ui:fragment rendered="#{empty beanHelper.user}">

diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index 2532da19f3193e2f4f8214c6da972b6e43c3ade0..a60a3f6360746b415c9134955b4ab6b896bb1aae 100644 (file)
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -31,7 +31,7 @@
                                                                        <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
                                                                </legend>
 
-                                                               <div class="table_row">
+                                                               <h:panelGroup styleClass="table_row" layout="block">
                                                                        <div class="table_left">
                                                                                <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
                                                                        </div>
@@ -41,13 +41,13 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-                                                               </div>
+                                                               </h:panelGroup>
 
                                                                <div class="table_header">
                                                                        <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
                                                                </div>
 
-                                                               <div class="table_row">
+                                                               <h:panelGroup styleClass="table_row" layout="block">
                                                                        <div class="table_left">
                                                                                <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
                                                                        </div>
@@ -57,7 +57,7 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-                                                               </div>
+                                                               </h:panelGroup>
 
                                                        </fieldset>
 

diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index dd71f5288956fabc66fe7583fdd3a715cc56d15b..af96c6a9bfbe3d67da690441fb605fe64ef0869c 100644 (file)
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -29,7 +29,7 @@
                                                        <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
                                                </legend>
 
-                                               <div class="table_row">
+                                               <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left">
                                                                <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
                                                        </div>
@@ -39,16 +39,16 @@
                                                                        <f:validator validatorId="EmailAddressValidator" />
                                                                </h:inputText>
                                                        </div>
-                                               </div>
+                                               </h:panelGroup>
                                        </fieldset>
 
                                        <h:panelGroup styleClass="error_container" layout="block">
                                                <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                                        </h:panelGroup>
 
-                                       <div class="table_row">
+                                       <h:panelGroup styleClass="table_row" layout="block">
                                                <h:outputText value="#{msg.GUEST_RESEND_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/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index df37532ff92bac808de42f7f9837c0dee8f3af97..4b6a1b0af288b0569d6243eacab175e07df12a02 100644 (file)
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -24,33 +24,33 @@
                                </div>
 
                                <h:form id="form_user_change_email_address">
-                                       <div class="para">
-                                               <fieldset class="fieldset" id="change_email">
-                                                       <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
-                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
-                                                       </legend>
+                                       <fieldset class="fieldset" id="change_email">
+                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+                                               </legend>
 
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:outputText value="#{contactController.emailAddress}" />
-                                                               </div>
+                                               <h:panelGroup styleClass="table_row" layout="block">
+                                                       <div class="table_left">
+                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
+                                                       </div>
 
-                                                               <div class="clear"></div>
+                                                       <div class="table_right">
+                                                               <h:outputText value="#{contactController.emailAddress}" />
                                                        </div>
 
-                                                       <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
-                                               </fieldset>
-                                       </div>
+                                                       <div class="clear"></div>
+                                               </h:panelGroup>
+
+                                               <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
+                                       </fieldset>
+
+                                       <div class="para"></div>
 
                                        <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doChangeEmailAddress()}" />
+                                               <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
                                        </div>
                                </h:form>
                        </h:panelGroup>

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index d55eb2be395803aef716b4968e9f8cb2768fcab5..780d0119b97fb32693d57e009c70799217cfac5a 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -31,45 +31,46 @@
                                        </div>
 
                                        <h:form id="form_user_change_password">
-                                               <div class="para">
-                                                       <fieldset class="fieldset" id="change_password">
-                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
-                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
-                                                               </legend>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
+
+                                               <fieldset class="fieldset" id="change_password">
+                                                       <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
+                                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
+                                                       </legend>
+
+                                                       <h:panelGroup styleClass="table_row" layout="block">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
                                                                </div>
 
-                                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </h:panelGroup>
+                                                               <div class="table_right">
+                                                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+                                                               </div>
 
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
-                                                                       </div>
+                                                               <div class="clear"></div>
+                                                       </h:panelGroup>
 
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
-                                                                       </div>
+                                                       <h:panelGroup styleClass="error_container" layout="block">
+                                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       </h:panelGroup>
 
-                                                                       <div class="clear"></div>
+                                                       <h:panelGroup styleClass="table_row" layout="block">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
                                                                </div>
 
-                                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </h:panelGroup>
-                                                       </fieldset>
-                                               </div>
+                                                               <div class="table_right">
+                                                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </h:panelGroup>
+
+                                                       <h:panelGroup styleClass="error_container" layout="block">
+                                                               <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       </h:panelGroup>
+                                               </fieldset>
+
+                                               <div class="para"></div>
 
                                                <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />