]> git.mxchange.org Git - jfinancials-war.git/commitdiff
class was wrong, needs to be styleClass
authorRoland Häder <roland@mxchange.org>
Wed, 4 May 2016 10:58:03 +0000 (12:58 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 7 May 2016 09:59:24 +0000 (11:59 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
35 files changed:
src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java
src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java
web/WEB-INF/templates.dist/login_page.xhtml
web/WEB-INF/templates/admin/admin_base.tpl
web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
web/WEB-INF/templates/contact/form_contact_data.tpl [new file with mode: 0644]
web/WEB-INF/templates/generic/form_personal_data.tpl
web/WEB-INF/templates/generic/gender_selection_box.tpl
web/WEB-INF/templates/generic/mobile_selection_box.tpl
web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
web/WEB-INF/templates/generic/user_profile_link.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/guest/guest_login_form.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/guest/guest_registration_form.tpl
web/WEB-INF/templates/login/login_base.tpl
web/WEB-INF/templates/login/login_enter_current_password.tpl
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_list.xhtml
web/guest/user/login.xhtml
web/guest/user/lost_passwd.xhtml
web/guest/user/register_done.xhtml
web/guest/user/show_addressbook.xhtml
web/user/login_add_addressbook.xhtml
web/user/login_change_email_address.xhtml
web/user/login_change_password.xhtml
web/user/login_change_personal_data.xhtml

index 9a379e7d9745f90f956cb73c9d68688d8194c2e6..0c8956d0ef5ccee2667cebb2c47e1bb7d9af746a 100644 (file)
@@ -26,13 +26,13 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress;
 import org.mxchange.jusercore.model.email_address.EmailAddressChange;
 import org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 
 /**
  * A web session bean for changing email addresses
@@ -51,12 +51,12 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
        /**
         * Email address 1 (changing)
         */
-       private String emailAddress1;
+       private String emailAddress;
 
        /**
         * Email address 2 (repeat in changing)
         */
-       private String emailAddress2;
+       private String emailAddressRepeat;
 
        /**
         * Local list of already queued email addresses
@@ -103,7 +103,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
                } else if (!this.isRequiredChangeEmailAddressSet()) {
                        // Not all required fields are set
                        throw new FaceletException("Not all required fields are set."); //NOI18N
-               } else if (!Objects.equals(this.getEmailAddress1(), this.getEmailAddress2())) {
+               } else if (!Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())) {
                        // Email address 1+2 mismatch
                        throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N
                } else if (!this.loginController.ifCurrentPasswordMatches()) {
@@ -123,7 +123,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
                assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
 
                // Get dummy email address
-               String dummyEmail = this.getEmailAddress1();
+               String dummyEmail = this.getEmailAddress();
 
                // Unset all so the user is forced to re-enter it
                this.clear();
@@ -145,29 +145,29 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
        }
 
        @Override
-       public String getEmailAddress1 () {
-               return this.emailAddress1;
+       public String getEmailAddress () {
+               return this.emailAddress;
        }
 
        @Override
-       public void setEmailAddress1 (final String emailAddress1) {
-               this.emailAddress1 = emailAddress1;
+       public void setEmailAddress (final String emailAddress) {
+               this.emailAddress = emailAddress;
        }
 
        @Override
-       public String getEmailAddress2 () {
-               return this.emailAddress2;
+       public String getEmailAddressRepeat () {
+               return this.emailAddressRepeat;
        }
 
        @Override
-       public void setEmailAddress2 (final String emailAddress2) {
-               this.emailAddress2 = emailAddress2;
+       public void setEmailAddressRepeat (final String emailAddressRepeat) {
+               this.emailAddressRepeat = emailAddressRepeat;
        }
 
        @Override
        public boolean isRequiredChangeEmailAddressSet () {
-               return ((this.getEmailAddress1() != null) &&
-                               (this.getEmailAddress2() != null));
+               return ((this.getEmailAddress() != null) &&
+                               (this.getEmailAddressRepeat() != null));
        }
 
        /**
@@ -175,8 +175,8 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
         */
        private void clear () {
                // Clear fields
-               this.setEmailAddress1(null);
-               this.setEmailAddress2(null);
+               this.setEmailAddress(null);
+               this.setEmailAddressRepeat(null);
        }
 
        /**
@@ -186,7 +186,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
         * <p>
         * @param emailAddress Email address to verify
         * <p>
-        * @return Whether the email address in field emailAddress1 is already queued
+        * @return Whether the email address in field emailAddress is already queued
         */
        private boolean isEmailAddressQueued (final String emailAddress) {
                // It should be there
index 1d939fd0064f59d8a14955cfe0b7ec73f51ad2f7..373235a74bf76a1741cf6bfdf9daefd5563432e4 100644 (file)
@@ -30,28 +30,28 @@ public interface AddressbookEmailChangeWebSessionController extends Serializable
         * <p>
         * @return Email address
         */
-       String getEmailAddress1 ();
+       String getEmailAddress ();
 
        /**
         * Setter for email address 1 (changing)
         * <p>
-        * @param emailAddress1 Email address 1
+        * @param emailAddress Email address 1
         */
-       void setEmailAddress1 (final String emailAddress1);
+       void setEmailAddress (final String emailAddress);
 
        /**
         * Getter for email address 2 (repeat changing)
         * <p>
         * @return Email address 2
         */
-       String getEmailAddress2 ();
+       String getEmailAddressRepeat ();
 
        /**
         * Setter for email address 2 (repeat changing)
         * <p>
-        * @param emailAddress2 Email address 2
+        * @param emailAddressRepeat Email address 2
         */
-       void setEmailAddress2 (final String emailAddress2);
+       void setEmailAddressRepeat (final String emailAddressRepeat);
 
        /**
         * Checks whether all required are set for changing email address
index a0b740762104ceb815af08ca206e75a2e515a4ba..ef04e61b4ae8e671582978ccdb5a696d99e73858 100644 (file)
@@ -11,7 +11,7 @@
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
                <ui:define name="menu">
-                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+                       <ui:include id="menu" src="/WEB-INF/templates/login/login_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
@@ -23,7 +23,7 @@
                </ui:define>
 
                <ui:define name="footer">
-                       <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+                       <ui:include id="footer" src="/WEB-INF/templates/login/login_footer.tpl" />
                </ui:define>
        </ui:composition>
 </html>
index bd06406a6824ec8bea77bc4100cc0b4e6d62468b..4ad01e3626ee8ed83dcd1b2a56274dcddd10f43c 100644 (file)
@@ -3,17 +3,17 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:define name="title">Administration - <ui:insert name="admin_title" class="admin_title" /></ui:define>
+       <ui:define name="title">Administration - <ui:insert name="admin_title">Default admin title</ui:insert></ui:define>
 
        <!--
        TODO: Add something here that should be displayed on all admin pages
        //-->
 
        <ui:define name="menu">
-               <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
+               <ui:include id="menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
        </ui:define>
 
        <ui:define name="footer">
-               <ui:include id="footer" class="admin_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
+               <ui:include id="footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
        </ui:define>
 </ui:composition>
index b1c484b1ee88e203fafccdde264b4f2f04a5a694..04aeab1438c9abc04e08c67e10bacabbb55af71b 100644 (file)
@@ -29,9 +29,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" required="true">
-                                               <f:validator for="firstName" validatorId="NameValidator" />
-                                       </h:inputText>
+                                       <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
                                </div>
 
                                <div class="clear"></div>
@@ -43,9 +41,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" required="true">
-                                               <f:validator for="familyName" validatorId="NameValidator" />
-                                       </h:inputText>
+                                       <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
                                </div>
 
                                <div class="clear"></div>
@@ -57,7 +53,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
+                                       <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
                                </div>
 
                                <div class="clear"></div>
@@ -69,7 +65,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                       <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
@@ -83,7 +79,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                       <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
                                        </h:inputText>
                                </div>
@@ -97,7 +93,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+                                       <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
                                </div>
 
                                <div class="clear"></div>
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
+                                       <h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
                                        </h:selectOneMenu>
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
+                                       <h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
                                                <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
-                                       <h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{adminContactController.phoneNumber}">
+                                       <h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{adminContactController.phoneNumber}">
                                                <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+                                       <h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
-                                       <h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
+                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
 
                                <div class="clear"></div>
                        </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
                </fieldset>
        </div>
 </ui:composition>
index c77f8b6e5861f60eae92c34a25c635ef188b22d5..4700255eaa6a520d504b0e0a2bdf4d2db8871d3a 100644 (file)
@@ -19,7 +19,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
                                                <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+                                       <h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
                                                <f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
                                        </h:inputText>
 
-                                       <h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
+                                       <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
                                </div>
 
                                <div class="clear"></div>
@@ -49,7 +49,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+                                       <h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </h:inputText>
                                </div>
@@ -63,7 +63,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1" class="select">
+                                       <h:selectOneListbox styleClass="select" required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
                                                <f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
                                                <f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
                                        </h:selectOneListbox>
@@ -78,7 +78,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
                                                <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
+                                       <h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
                                                <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
 
-                                       <h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
+                                       <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
                                </div>
 
                                <div class="clear"></div>
index bef9b00aeb1b74d917f64badf0e86088f8047bfd..9bbaf3d1f10c9bcaadaea76a768eff9f360c1259 100644 (file)
@@ -19,7 +19,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
                                                <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
                                        </h:inputText>
                                </div>
@@ -33,9 +33,9 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
+                                       <h:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
-                                       <h:outputText class="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
+                                       <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
                                </div>
 
                                <div class="clear"></div>
@@ -47,7 +47,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText class="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
+                                       <h:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
                                </div>
 
                                <div class="clear"></div>
@@ -59,7 +59,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu class="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
                                                <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
                                        </h:selectOneMenu>
                                </div>
index 08f223d9223e26f47c2f61504373da6ac25407b1..8ff1740d55eadbdf0e7ae934f75c9c1a38515806 100644 (file)
@@ -18,7 +18,7 @@
                                        </div>
 
                                        <div class="table_right">
-                                               <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+                                               <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
                                        </div>
 
                                        <div class="clear"></div>
@@ -33,7 +33,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
+                                                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -48,7 +48,7 @@
                                        </div>
 
                                        <div class="table_right">
-                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                                               <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
                                        </div>
 
                                        <div class="clear"></div>
@@ -60,7 +60,7 @@
                                        </div>
 
                                        <div class="table_right">
-                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                                               <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
                                        </div>
 
                                        <div class="clear"></div>
@@ -71,7 +71,7 @@
                                                <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
 
                                                <li>
-                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+                                                       <h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
                                                        <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
                                                </li>
 
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
new file mode 100644 (file)
index 0000000..30065fd
--- /dev/null
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <div class="para notice">
+               #{msg.PERSONAL_DATA_MINIMUM_NOTICE}
+       </div>
+
+       <div class="para">
+               <fieldset id="personal_data">
+                       <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">#{msg.PERSONAL_DATA_LEGEND}</legend>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+                                               <ui:param  name="targetController" value="#{contactController}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
+                                               <f:validator for="firstName" validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
+                                               <f:validator for="familyName" validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
+                                               <f:validator for="street" validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                               <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
+                                               <f:validator for="city" validatorId="NameValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+                                       </h:selectOneMenu>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+                                               <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+                                               <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
+                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                       </h:selectOneMenu>
+
+                                       <h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+
+                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+                                       </h:inputText>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{contactController}" />
+                                       </ui:include>
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+               </fieldset>
+       </div>
+
+       <div class="para">
+               <fieldset id="user_profile">
+                       <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">#{msg.USER_PROFILE_LEGEND}</legend>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="para notice">
+                                       <ul>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}</li>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}</li>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}</li>
+                                       </ul>
+                               </div>
+                       </div>
+               </fieldset>
+       </div>
+</ui:composition>
index a39b1a926ec577e659f2b750b99dcfc095794cc2..30065fd46b4afdafbf72290b2e3d126e5a5bf848 100644 (file)
@@ -33,7 +33,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
+                                       <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
                                                <f:validator for="firstName" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
@@ -47,7 +47,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
+                                       <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
                                                <f:validator for="familyName" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
@@ -61,7 +61,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
+                                       <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
                                                <f:validator for="street" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
@@ -75,7 +75,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                       <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
@@ -89,7 +89,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                       <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
+                                       <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
                                                <f:validator for="city" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="country" value="#{contactController.country}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
                                        </h:selectOneMenu>
                                </div>
 
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+                                       <h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
                                                <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
-                                       <h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+                                       <h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
                                                <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right">
-                                       <h:selectOneMenu class="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
+                                       <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+                                               <f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                       <h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
-                                       <h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
                        <div class="table_row">
                                <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>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}</li>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}</li>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}</li>
                                        </ul>
                                </div>
                        </div>
index b439e935a4497d5dc79fdadabcbc6b5eba914b84..4a5919f1eb21c2199f316b9be518f9ebf374aac7 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu class="select" id="gender" value="#{targetController.gender}">
+               <h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}">
                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                        <f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
                </h:selectOneMenu>
index 55ea9e3f2c67b338449402a70b0c6aeaa8f0bfdc..14515170c01c4c125cb877040722f4e98b383049 100644 (file)
@@ -6,12 +6,12 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu class="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
+               <h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                        <f:selectItems value="#{mobileController.allMobileProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
                </h:selectOneMenu>
 
-               <h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
+               <h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
                        <f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>
index 5b59fb43b54f93740d2dfcc76325a8fae976886d..307999163ea9eb845609dea9c4bac6b33c8e1fa2 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:selectOneMenu class="select" id="profileMode" value="#{userController.userProfileMode}">
-               <f:selectItems value="#{profileMode.allProfileModes}" var="m" itemValue="#{m}" itemLabel="#{msg[m.messageKey]}" />
+       <h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
+               <f:selectItems value="#{profileModeController.allProfileModes}" var="m" itemValue="#{m}" itemLabel="#{msg[m.messageKey]}" />
        </h:selectOneMenu>
 </ui:composition>
index 26fe351606ca3a71194251b71e528e27558a1643..6188f9c13999b6f7babb488bba3436e07f9fa037 100644 (file)
@@ -7,7 +7,7 @@
 
        <h:outputText styleClass="notice" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
 
-       <h:outputText class="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+       <h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
        <h:link id="userProfileLink" outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
                <h:outputText id="userName" value="#{user.userName}" />
index 5b18b854130c44b063bee43961278235987c54e2..4b2e0aa90b00ca1397b0484faa54e82da17d6fca 100644 (file)
@@ -5,14 +5,14 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <ui:define name="title">
-               <ui:insert name="guest_title" class="guest_title" />
+               <ui:insert name="guest_title">Default guest title</ui:insert>
        </ui:define>
 
        <ui:define name="menu">
-               <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               <ui:include id="menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
        </ui:define>
 
        <ui:define name="footer">
-               <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               <ui:include id="footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
        </ui:define>
 </ui:composition>
index f6384692912d185d67f819b3d9afc30647419745..03ca598f09ce5fc72c23947e5d08b6aee676c0a7 100644 (file)
@@ -4,6 +4,7 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
        <div id="user_login_content">
                <h:form id="login_form">
                        <div class="table">
@@ -20,7 +21,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+                                                       <h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
                                        </div>
 
@@ -32,7 +33,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputSecret class="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+                                                       <h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
                                        </div>
 
@@ -40,8 +41,8 @@
                                </fieldset>
 
                                <div class="table_footer">
-                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton class="submit" type="submit" action="#{loginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
+                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
                                </div>
                        </div>
                </h:form>
index d49b56432343ce371bb9dac6f5632d84374a0cf9..e4b3f3981a8233d151305ea4ac12d5396828c37b 100644 (file)
@@ -11,7 +11,7 @@
 
                        <div class="table_row">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
+                                       <h:selectBooleanCheckbox styleClass="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
@@ -27,7 +27,7 @@
 
                        <div class="table_row">
                                <div class="table_left25">
-                                       <h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
+                                       <h:selectBooleanCheckbox styleClass="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
index fe5758e68a6046a504ef1dc8cb5ab796f4a4f53b..73e5c5a0029be506d55d1e7e7fc896a90fac8f5a 100644 (file)
@@ -24,7 +24,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+                                                       <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -36,7 +36,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
+                                                       <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -48,7 +48,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddressRepeat}" required="true" />
+                                                       <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -62,7 +62,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+                                                       <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -74,7 +74,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+                                                       <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -89,8 +89,8 @@
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
                        <div class="table_footer">
-                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
+                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
                        </div>
                </div>
        </h:form>
index dafc778692108fb3ae5f4c43c7fe87dc1a97f7f4..7af8e03779e61a8ef17eb45a55f301ae14875ecb 100644 (file)
@@ -5,18 +5,18 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title" class="login_title" /></ui:define>
+       <ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
 
        <ui:define name="menu">
-               <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+                       <ui:include id="menu" src="/WEB-INF/templates/login/login_menu.tpl" />
                </ui:fragment>
-               <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                       <h:outputText class="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
+               <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                       <h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
                </ui:fragment>
        </ui:define>
 
        <ui:define name="footer">
-               <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+               <ui:include id="footer" src="/WEB-INF/templates/login/login_footer.tpl" />
        </ui:define>
 </ui:composition>
index 9f32eb9bbca6301e868aa06e4ab6e66914428382..9a732b38c2a1107ada64927e5259b2ad1ea6282c 100644 (file)
@@ -14,9 +14,9 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputSecret class="input" id="currentPassword" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
-                                               <h:message for="currentPassword" class="errors" />
-                                               <!-- <f:validator for="currentPassword" validatorId="AddressbookUserPasswordValidator" /> //-->
+                                       <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
+                                               <h:message for="currentPassword" styleClass="errors" />
+                                               <!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
                                        </h:inputSecret>
                                </div>
 
index 5ca8b083847a4f5db3a55dfbb5fdb28f725a4bd5..badc92e324eacf9d2a54fae2706acb3cc9768420 100644 (file)
@@ -38,8 +38,8 @@
                                        <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
                                        </div>
                                </div>
                        </h:form>
index 11928a3ea82f3b4282d7065009c113c52d49ede6..0ac502ada92c85d08c8dea858c15c28d2c339129 100644 (file)
@@ -40,8 +40,8 @@
                                        </ui:include>
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
                                        </div>
                                </div>
                        </h:form>
index dca2708a54f7f30d2ed86748891c277b3c660070..1c2b214f189d1e749b9c55a9af0c3d3a55afdd04 100644 (file)
@@ -71,8 +71,8 @@
                                        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
                                        </div>
                                </h:form>
                        </div>
index 61a6c9375e6e947f545713413aa8ac3617f35c61..63cda07cfbbb75022dff30ccba641a3dc61f14f5 100644 (file)
@@ -53,8 +53,8 @@
                                        <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
                                        </div>
                                </div>
 
index 5bb205a0bc5fda29b877ddb9da989cd50dca2524..9d03373c352a80d399e0f5b61f8fc80a424b40d9 100644 (file)
@@ -61,8 +61,8 @@
                                        <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
                                        </div>
                                </div>
 
index 9c0ca9a9d759ad8e7d27f3404cec85b6a4159be6..1578ec171cc51cc9741e50f97d179e0558f01c5c 100644 (file)
@@ -10,6 +10,7 @@
 
        <f:metadata>
                <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{adminHelper.copyUserToController()}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -29,7 +30,7 @@
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
@@ -37,8 +38,8 @@
                                        </ui:include>
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
                                        </div>
                                </div>
                        </h:form>
index bbed8b885d0452f43f804b1e1fcd1dd2fb0f72b6..3588c9c3dcdad9b6e28821e62bc07cb5f4688700 100644 (file)
@@ -86,7 +86,7 @@
                                                                </div>
 
                                                                <div class="table_right_medium">
-                                                                       <h:selectOneMenu class="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
+                                                                       <h:selectOneMenu styleClass="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
                                                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                                                <f:selectItems value="#{adminUserController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                        </h:selectOneMenu>
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
                                        </div>
                                </h:form>
                        </div>
index 0b0efb62dba434ff0bc507b3dc31587e0aaf0485..7c8739759a7d38b958a50a406f32514bd14d6084 100644 (file)
@@ -22,7 +22,7 @@
                        </div>
 
                        <div class="para">
-                               <ui:include id="login_form" class="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
+                               <ui:include id="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
                        </div>
 
                        <div class="para">
index c6c0848cc9ae5e64f87e25ad9dcc259f12df0642..103e070c322b8f85f855e70daf1af2472a37685e 100644 (file)
@@ -32,7 +32,7 @@
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <h:inputText class="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
                                                                </div>
 
                                                                <div class="clear"></div>
@@ -48,7 +48,7 @@
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <h:inputText class="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
                                                                </div>
 
                                                                <div class="clear"></div>
@@ -57,8 +57,8 @@
                                                </fieldset>
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
                                                </div>
                                        </div>
                                </h:form>
index bbec38e6fc1a990bbb86302cf0cb00ea2eb9f52a..ddffa7e7fdcabe282608e7ddc8e13e073049c9c5 100644 (file)
@@ -21,7 +21,7 @@
                        </div>
 
                        <div class="registration_form">
-                               <h:link id="resend_link" class="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
+                               <h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
                                        <f:param name="user_id" value="#{userController.userId}" />
                                </h:link>
                        </div>
index 1a1193fcb8785e099b36434c771213db35531603..6095ec33f5b7cee6f2dfc51f026efdc57f11731f 100644 (file)
@@ -14,7 +14,7 @@
                </f:viewParam>
        </f:metadata>
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
 
                        <h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
                                <f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
 
-                               <h:outputLabel for="addressbookName" class="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
+                               <h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
                                <h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
 
-                               <h:outputLabel for="userProfileLink" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
+                               <h:outputLabel for="userProfileLink" styleClass="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
                                <ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
                                        <ui:param name="user" value="#{addressbookController.addressbookUser}" />
                                </ui:include>
 
-                               <h:outputLabel for="addressbookCreated" class="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
+                               <h:outputLabel for="addressbookCreated" styleClass="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
                                <h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
                                        <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
                                </h:outputFormat>
 
-                               <h:outputLabel for="addressbookStatus" class="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
+                               <h:outputLabel for="addressbookStatus" styleClass="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
                                <h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
 
                                <f:facet name="footer">
-                                       <h:outputText id="ownProfileInvible" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not loginController.isUserLoggedIn()}" />
-                                       <h:outputText id="ownProfileInvible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{loginController.isUserLoggedIn() and loginController.isInvisible()}" />
-
-                                       <ui:fragment rendered="#{loginController.isUserLoggedIn() and not loginController.isInvisible()}">
-                                               <h:link id="startSharing" outcome="login_start_sharing_addressbook" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.isOwnAddressbook()}" />
+                                       <h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
+                                       <h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />
 
+                                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">
                                                <h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />
                                        </ui:fragment>
                                </f:facet>
index 7f1c85799f9d7c6c4ccb93a506e4222979ae8f07..a3d17464bc386a4c3e2334f5256197f6dcc6bdab 100644 (file)
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <h:form id="add_addressbook" acceptcharset="utf-8">
                                        <div class="table">
                                                <div class="table_header">
                                                        </div>
 
                                                        <div class="table_right">
-                                                               <h:inputText class="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">
+                                                               <h:inputText styleClass="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">
                                                                        <f:validator for="addressbookName" validatorId="AddressbookNameValidator" />
                                                                </h:inputText>
                                                        </div>
                                                </div>
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
                                                </div>
                                        </div>
                                </h:form>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
index 702312d826943741b59b002f82352d34f232b737..49e5038e699b0f19a7da570f4cb989457d7c3721 100644 (file)
@@ -33,7 +33,7 @@
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               #{userController.emailAddress}
+                                                                               #{contactController.emailAddress}
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -45,7 +45,7 @@
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{emailChangeController.emailAddress1}" required="true" />
+                                                                               <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -57,7 +57,7 @@
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{emailChangeController.emailAddress2}" required="true" />
+                                                                               <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -68,8 +68,8 @@
                                                <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
                                                </div>
                                        </h:form>
                                </div>
index bfd384d44e63cdf2e20e50e91a732843222dd847..183c1b5d820383eef3f0f320730c55f8829915f7 100644 (file)
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
                                                #{msg.LOGIN_CHANGE_PASSWORD_TITLE}
@@ -33,7 +33,7 @@
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{loginController.userPassword}" required="true" />
+                                                                               <h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -45,7 +45,7 @@
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{loginController.userPasswordRepeat}" required="true" />
+                                                                               <h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
                                                <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
                                                </div>
                                        </h:form>
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
index e4c482c9b25bb0ba13943ceea40308a5cd3fa143..72ad05df787f59d504bdcf67b09331d0da9df726 100644 (file)
                                        </div>
 
                                        <h:form id="login_change_personal_form">
-                                               <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
+                                               <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
                                                <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
                                                <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
                                                </div>
                                        </h:form>
                                </div>