]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 26 Aug 2017 20:42:41 +0000 (22:42 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 26 Aug 2017 20:49:40 +0000 (22:49 +0200)
- rewrote message-box tag to have 2 CSS classes, one for the whole (alert) box,
  one for the message itself
- renamed a lot CSS classes/ids to more common naming covention: foo-bar and
  not foo_bar
- renamed i18n string to ADMIN_FEATURE_UNFINISHED_WARNING as this can be generic
- other small CSS rewrites

Signed-off-by: Roland Häder <roland@mxchange.org>
132 files changed:
src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsAdminBusinessDataWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebSessionBean.java
src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBusinessContactConverter.java
src/java/org/mxchange/jfinancials/converter/business/company_employee/FinancialsCompanyEmployeeConverter.java
src/java/org/mxchange/jfinancials/converter/business/headquarters/FinancialsCompanyHeadquartersConverter.java
src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java
src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java [new file with mode: 0644]
src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
src/java/org/mxchange/jfinancials/validator/names/FinancialsNameValidator.java
src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java
src/java/org/mxchange/jfinancials/validator/phone/abroad/FinancialsAbroadDialValidator.java
src/java/org/mxchange/jfinancials/validator/phone/number/FinancialsPhoneNumberValidator.java
src/java/org/mxchange/jfinancials/validator/privacy_terms/FinancialsPrivacyTermsCheckboxValidator.java
src/java/org/mxchange/jfinancials/validator/url/FinancialsUrlValidator.java
src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
web/WEB-INF/resources/tags/messages/message_box.tpl
web/WEB-INF/resources/tags/messages/message_box_mini.tpl [deleted file]
web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
web/WEB-INF/templates/admin/admin_footer.tpl
web/WEB-INF/templates/admin/admin_menu.tpl
web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_links.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/admin/user/admin_show_user_data.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
web/WEB-INF/templates/admin/user/admin_user_links.tpl
web/WEB-INF/templates/base.tpl
web/WEB-INF/templates/contact/form_contact_data.tpl
web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/guest/user/guest_login_form.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
web/WEB-INF/templates/input_fields/fax_input_fields.tpl
web/WEB-INF/templates/input_fields/landline_input_fields.tpl
web/WEB-INF/templates/login/user/user_base.tpl
web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
web/WEB-INF/templates/login/user/user_enter_current_password.tpl
web/WEB-INF/templates/login/user/user_footer.tpl
web/WEB-INF/templates/login/user/user_menu.tpl
web/WEB-INF/templates/user/user_not_logged_in.tpl
web/WEB-INF/templates/user/user_profile_link.tpl
web/WEB-INF/templates/user/userid_error.tpl
web/WEB-INF/widgets.jsf.taglib.xml
web/admin/admin_logout.xhtml
web/admin/business_contacts/admin_business_contacts_list.xhtml
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_export.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/contact/admin_contact_show.xhtml
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_contact_mobile_list.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_edit.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_link.xhtml
web/resources/css/default.css
web/resources/css/layout.css
web/user/login_contact_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_logout.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml

index 78826580d7de0c83d46823e32845535039eeaccb..42441a6114383afe8d68774ef107242303cfd12f 100644 (file)
@@ -31,8 +31,7 @@ import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemo
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData;
 import org.mxchange.jcontactsbusiness.employee.Employee;
-import org.mxchange.jcontactsbusiness.events.basicdata.added.BusinessBasicDataAddedEvent;
-import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableBusinessBasicDataAddedEvent;
+import org.mxchange.jcontactsbusiness.events.basicdata.added.AdminAddedBusinessBasicDataEvent;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException;
 import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData;
 import org.mxchange.jcountry.data.Country;
@@ -42,6 +41,7 @@ import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
 
 /**
  * An administrative business contact bean (controller)
@@ -67,7 +67,7 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon
         */
        @Inject
        @Any
-       private Event<ObservableBusinessBasicDataAddedEvent> businessDataAddedEvent;
+       private Event<ObservableAdminAddedBusinessBasicDataEvent> businessDataAddedEvent;
 
        /**
         * Comments for this company
@@ -234,7 +234,7 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon
                        BusinessBasicData updatedBasicData = this.adminBusinessDataBean.addCompanyBasicData(basicData);
 
                        // Fire event
-                       this.businessDataAddedEvent.fire(new BusinessBasicDataAddedEvent(updatedBasicData));
+                       this.businessDataAddedEvent.fire(new AdminAddedBusinessBasicDataEvent(updatedBasicData));
                } catch (final BusinessDataAlreadyAddedException e) {
                        // Does already exist
                        throw new FacesException(e);
index 1e416c5397ab5bae083ca65cea550a94c0c004c9..f13a4bd2376a97ba73f885f67c11c1a2b78dbc09 100644 (file)
  */
 package org.mxchange.jfinancials.beans.business.basicdata;
 
+import java.text.MessageFormat;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Observes;
 import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -28,6 +30,7 @@ import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
@@ -120,6 +123,37 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll
                super();
        }
 
+       /**
+        * Observers events being fired when an administrator has added company
+        * basic data.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminAddedBasicCompanyDataEvent (@Observes final ObservableAdminAddedBusinessBasicDataEvent event) {
+               // Is the parameter valid?
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null");
+               } else if (event.getBasicData() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.basicData is null");
+               } else if (event.getBasicData().getCompanyDataId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.basicData.companyDataId is null");
+               } else if (event.getBasicData().getCompanyDataId() < 1) {
+                       // Throw IAE
+                       throw new IllegalArgumentException(MessageFormat.format("event.basicData.companyDataId={0} is invalid", event.getBasicData().getCompanyDataId()));
+               } else if (event.getBasicData().getCompanyName() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.basicData.companyName is null");
+               } else if (event.getBasicData().getCompanyName().isEmpty()) {
+                       // Throw IAE again
+                       throw new IllegalArgumentException("event.basicData.companyName is empty");
+               }
+
+               // Add it to list
+               this.businessContacts.add(event.getBasicData());
+       }
 
        /**
         * Returns a list of all business contacts
index 27f973d4012bcad033393c8afaba60c02dc93860..1a9ecaee56a43433c1ecf1a390c72bfe56736c3d 100644 (file)
@@ -25,7 +25,6 @@ import javax.faces.convert.FacesConverter;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException;
@@ -36,12 +35,12 @@ import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundE
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "BusinessContactConverter")
-public class FinancialsBusinessContactConverter implements Converter {
+public class FinancialsBusinessContactConverter implements Converter<BusinessBasicData> {
 
        /**
         * Business contact EJB
         */
-       private static BusinessDataSessionBeanRemote BUSINESS_CONTACT_BEAN;
+       private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
 
        /**
         * Default constructor
@@ -50,7 +49,7 @@ public class FinancialsBusinessContactConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -62,14 +61,14 @@ public class FinancialsBusinessContactConverter implements Converter {
 
                // Is the bean there?
                // @TODO Requires this synchronization or is it (sync) confusing the container?
-               if (null == FinancialsBusinessContactConverter.BUSINESS_CONTACT_BEAN) {
+               if (null == FinancialsBusinessContactConverter.BASIC_DATA_BEAN) {
                        // Try to get it
                        try {
                                // Get initial context
                                Context initialContext = new InitialContext();
 
                                // ... and user controller
-                               FinancialsBusinessContactConverter.BUSINESS_CONTACT_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N
+                               FinancialsBusinessContactConverter.BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N
                        } catch (final NamingException ex) {
                                // Continue to throw it
                                throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -84,7 +83,7 @@ public class FinancialsBusinessContactConverter implements Converter {
                        Long contactId = Long.valueOf(submittedValue);
 
                        // Try to get user instance from it
-                       businessContact = FinancialsBusinessContactConverter.BUSINESS_CONTACT_BEAN.findBasicDataById(contactId);
+                       businessContact = FinancialsBusinessContactConverter.BASIC_DATA_BEAN.findBasicDataById(contactId);
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);
@@ -98,18 +97,15 @@ public class FinancialsBusinessContactConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final BusinessBasicData value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof Contact)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Contact.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((BusinessBasicData) value).getCompanyDataId());
+               return String.valueOf(value.getCompanyDataId());
        }
 
 }
index e2126984c7bc3824b411b619b9f65da9086ed259..3698e94fbcbc34c708ce6cebdd549ce1e308f4e7 100644 (file)
@@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoun
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CompanyEmployeeConverter")
-public class FinancialsCompanyEmployeeConverter implements Converter {
+public class FinancialsCompanyEmployeeConverter implements Converter<Employee> {
 
        /**
         * CompanyEmployee EJB
@@ -49,7 +49,7 @@ public class FinancialsCompanyEmployeeConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public Employee getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -68,7 +68,7 @@ public class FinancialsCompanyEmployeeConverter implements Converter {
                                Context initialContext = new InitialContext();
 
                                // ... and user controller
-                               FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.company_employee.CompanyEmployeeSessionBeanRemote"); //NOI18N
+                               FinancialsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N
                        } catch (final NamingException ex) {
                                // Continue to throw it
                                throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -97,18 +97,15 @@ public class FinancialsCompanyEmployeeConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final Employee value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof Employee)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Employee.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((Employee) value).getEmployeeId());
+               return String.valueOf(value.getEmployeeId());
        }
 
 }
index 927584cecd724ec207aee372fb47bee4b7164e0a..a596dbc7f4aaeeca9a432279b3a9e32bf52b96cd 100644 (file)
@@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CompanyHeadquartersConverter")
-public class FinancialsCompanyHeadquartersConverter implements Converter {
+public class FinancialsCompanyHeadquartersConverter implements Converter<HeadquartersData> {
 
        /**
         * CompanyEmployee EJB
@@ -49,7 +49,7 @@ public class FinancialsCompanyHeadquartersConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public HeadquartersData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -97,18 +97,15 @@ public class FinancialsCompanyHeadquartersConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final HeadquartersData value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof HeadquartersData)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement HeadquartersData.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((HeadquartersData) value).getHeadquartersId());
+               return String.valueOf(value.getHeadquartersId());
        }
 
 }
index 3516acd8a9b11918118c03d095ea7e11c0b9ad49..6d3f2fae0934ac14b3ec6cb00290d6a64462684f 100644 (file)
@@ -35,7 +35,7 @@ import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "ContactConverter")
-public class FinancialsContactConverter implements Converter {
+public class FinancialsContactConverter implements Converter<Contact> {
 
        /**
         * Contact EJB
@@ -49,7 +49,7 @@ public class FinancialsContactConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -97,18 +97,15 @@ public class FinancialsContactConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final Contact value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof Contact)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Contact.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((Contact) value).getContactId());
+               return String.valueOf(value.getContactId());
        }
 
 }
index 51796b694048d6d039ca4490a2b27bff97ffcce2..f7d568308b4cb99c84c3400c4ef5693f4bd69577 100644 (file)
@@ -36,7 +36,7 @@ import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CountryConverter")
-public class FinancialsCountryConverter implements Converter {
+public class FinancialsCountryConverter implements Converter<Country> {
 
        /**
         * Country bean
@@ -50,7 +50,7 @@ public class FinancialsCountryConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public Country getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -109,18 +109,15 @@ public class FinancialsCountryConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final Country value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof Country)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Country.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((Country) value).getCountryId());
+               return String.valueOf(value.getCountryId());
        }
 
 }
index 075887d814847a283791c7ba9999a7537cdd87ce..b2c21469698acf410926b6d813e6d2565a3c7f07 100644 (file)
@@ -26,7 +26,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
 
@@ -36,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "FaxNumberConverter")
-public class FinancialsFaxNumberConverter implements Converter {
+public class FinancialsFaxNumberConverter implements Converter<DialableFaxNumber> {
 
        /**
         * Phone EJB
@@ -50,7 +49,7 @@ public class FinancialsFaxNumberConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public DialableFaxNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Log message
                // @TODO Not possible here: this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: context={1},component={2},submittedValue={3} - CALLED!", this.getClass().getSimpleName(), context, component, submittedValue)); //NOI18N
 
@@ -105,18 +104,15 @@ public class FinancialsFaxNumberConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final DialableFaxNumber value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof DialableNumber)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((DialableNumber) value).getPhoneId());
+               return String.valueOf(value.getPhoneId());
        }
 
 }
index 60b887009b7f26bf828d4c82d9ec8ca93df461c6..f0f8faf5022e4fc1f17fc836b8636bd805fbea72 100644 (file)
@@ -26,7 +26,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
 
@@ -36,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "LandLineNumberConverter")
-public class FinancialsLandLineNumberConverter implements Converter {
+public class FinancialsLandLineNumberConverter implements Converter<DialableLandLineNumber> {
 
        /**
         * Phone EJB
@@ -50,7 +49,7 @@ public class FinancialsLandLineNumberConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public DialableLandLineNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -98,18 +97,15 @@ public class FinancialsLandLineNumberConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final DialableLandLineNumber value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof DialableNumber)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((DialableNumber) value).getPhoneId());
+               return String.valueOf(value.getPhoneId());
        }
 
 }
index 737c6acb2f18bd8361d88bef0497f86f35a575d1..6091eec5eb6d5da339447a0e22fd3b7bc17a82aa 100644 (file)
@@ -26,7 +26,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
 
@@ -36,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "MobileNumberConverter")
-public class FinancialsMobileNumberConverter implements Converter {
+public class FinancialsMobileNumberConverter implements Converter<DialableMobileNumber> {
 
        /**
         * Phone EJB
@@ -50,7 +49,7 @@ public class FinancialsMobileNumberConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -98,18 +97,15 @@ public class FinancialsMobileNumberConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final DialableMobileNumber value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof DialableNumber)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((DialableNumber) value).getPhoneId());
+               return String.valueOf(value.getPhoneId());
        }
 
 }
index 4d104a429d58ae3377c2434f3697d0ada4796211..d99ae480e15e2ffdff2c550828deb2e9ed37f201 100644 (file)
@@ -36,7 +36,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "MobileProviderConverter")
-public class FinancialsMobileProviderConverter implements Converter {
+public class FinancialsMobileProviderConverter implements Converter<MobileProvider> {
 
        /**
         * Mobile provider bean
@@ -50,7 +50,7 @@ public class FinancialsMobileProviderConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -109,18 +109,15 @@ public class FinancialsMobileProviderConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final MobileProvider value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof MobileProvider)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement MobileProvider.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((MobileProvider) value).getProviderId());
+               return String.valueOf(value.getProviderId());
        }
 
 }
index 1db850b9044993c43040a30b78683f30f7648e7d..a4cdd0a2e2223e70f2e5f7ae0bc42c5f031f74c8 100644 (file)
@@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "UserConverter")
-public class FinancialsUserConverter implements Converter {
+public class FinancialsUserConverter implements Converter<User> {
 
        /**
         * User EJB
@@ -49,7 +49,7 @@ public class FinancialsUserConverter implements Converter {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -97,17 +97,15 @@ public class FinancialsUserConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final User value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof User)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement User.", value.getClass().getSimpleName())); //NOI18N
                }
 
                // Return id number
-               return String.valueOf(((User) value).getUserId());
+               return String.valueOf(value.getUserId());
        }
+
 }
index cc663cbe0163d0089f5cd80490623ae6bbf1eee0..14b69664524bee166028b6f16a9c5a7e8470354b 100644 (file)
  */
 package org.mxchange.jfinancials.validator.birthday;
 
-import java.text.MessageFormat;
 import java.util.Date;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.convert.ConverterException;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.date.BaseDateValidator;
 
 /**
@@ -35,7 +29,7 @@ import org.mxchange.jcoreee.validator.date.BaseDateValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("BirthdayValidator")
-public class FinancialsBirthdayValidator extends BaseDateValidator implements Validator {
+public class FinancialsBirthdayValidator extends BaseDateValidator {
 
        /**
         * Serial number
@@ -44,17 +38,8 @@ public class FinancialsBirthdayValidator extends BaseDateValidator implements Va
 
        /**
         * Default constructor
-        * @TODO Get rid of this
         */
        public FinancialsBirthdayValidator () {
-               // Try to get it
-               try {
-                       // Get initial context
-                       Context initialContext = new InitialContext();
-               } catch (final NamingException ex) {
-                       // Continue to throw it
-                       throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
-               }
        }
 
        @Override
diff --git a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
new file mode 100644 (file)
index 0000000..b67bc4d
--- /dev/null
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.validator.business.basicdata;
+
+import java.text.MessageFormat;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.ConverterException;
+import javax.faces.validator.FacesValidator;
+import javax.faces.validator.ValidatorException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcoreee.validator.string.BaseStringValidator;
+
+/**
+ * A validator for company names
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesValidator ("CompanyNameValidator")
+public class FinancialsCompanyNameValidator extends BaseStringValidator {
+
+       /**
+        * Business contact EJB
+        */
+       private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 57_283_657_476_561L;
+
+       @Override
+       public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+               // All accepted, required fields
+               String[] requiredFields = {"companyName"}; //NOI18N
+
+               // Pre-validation (example: not null, not a string, empty string ...)
+               super.preValidate(context, component, value, requiredFields, false);
+
+               // Convert name to string (now securely checked in BaseStringValidator)
+               String companyName = (String) value;
+
+               // Default is to check on existing names
+               Boolean checkExisting = Boolean.TRUE;
+
+               // Is attribute "allowEmptyValue" set?
+               if (component.getAttributes().containsKey("checkExisting")) { //NOI18N
+                       // Get attribute
+                       Object attribute = component.getAttributes().get("checkExisting"); //NOI18N
+
+                       // Make sure, it is Boolean as no String is accepted anymore
+                       if (!(attribute instanceof String)) {
+                               // Not valid attribute, please use "true" or "false" (default)
+                               throw new IllegalArgumentException("checkExisting must be of type String. Please use \"true\" or \"false\" for f:attribute value."); //NOI18N
+                       }
+
+                       // Securely cast it
+                       checkExisting = Boolean.parseBoolean((String) attribute);
+               }
+
+               // Is the bean not yet set?
+               // @TODO Requires this synchronization or is it (sync) confusing the container?
+               if (null == FinancialsCompanyNameValidator.BASIC_DATA_BEAN) {
+                       // Try to get it
+                       try {
+                               // Get initial context
+                               Context initialContext = new InitialContext();
+
+                               // ... and user controller
+                               FinancialsCompanyNameValidator.BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N
+                       } catch (final NamingException ex) {
+                               // Continue to throw it
+                               throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
+                       }
+               }
+
+               // Check if name is already used
+               Boolean nameExists = FinancialsCompanyNameValidator.BASIC_DATA_BEAN.isCompanyNameUsed(companyName);
+
+               // Is the user id valid?
+               if ((!nameExists) && (checkExisting)) {
+                       // Format message
+                       String message = MessageFormat.format("No basic data found with comany name {0}.", companyName);
+
+                       // Name does not exist
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message)); //NOI18N
+               } else if ((nameExists) && (!checkExisting)) {
+                       // Format message
+                       String message = MessageFormat.format("Found basic data with comany name {0}.", companyName);
+
+                       // Name already exists
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message)); //NOI18N
+               }
+       }
+
+}
index 5fc6056b9314f81ea57718ebf07c23ea5b7b4cd0..92ff97c6c77bbb990447b863fd1d1317aafac257 100644 (file)
@@ -22,7 +22,6 @@ import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -36,7 +35,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("EmailAddressValidator")
-public class FinancialsEmailAddressValidator extends BaseStringValidator implements Validator {
+public class FinancialsEmailAddressValidator extends BaseStringValidator {
 
        /**
         * Contact session-scoped bean
@@ -113,7 +112,7 @@ public class FinancialsEmailAddressValidator extends BaseStringValidator impleme
                        String message = MessageFormat.format("Email address {0} does not match regular expression.", emailAddress); //NOI18N
 
                        // Not matching
-                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message));
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message));
                }
 
                // Is the bean not yet set?
index 786c5f2935ff4c2b6fbbdac45ccdebf714e67af4..8d88c254e6be8a07c9a8f6c085f84409a149a592 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.jfinancials.validator.names;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("NameValidator")
-public class FinancialsNameValidator extends BaseStringValidator implements Validator {
+public class FinancialsNameValidator extends BaseStringValidator {
 
        /**
         * Serial number
index 29c04248ac55551a9a0015d9e668526fdc88928d..2fbb0b211941835cf1bb84c1ee7a6410b1924b23 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.jfinancials.validator.password;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UserPasswordValidator")
-public class FinancialsUserPasswordValidator extends BaseStringValidator implements Validator {
+public class FinancialsUserPasswordValidator extends BaseStringValidator {
 
        /**
         * Serial number
@@ -52,7 +51,7 @@ public class FinancialsUserPasswordValidator extends BaseStringValidator impleme
                // Test it here
                if (!UserUtils.ifPasswordMatches(container, this.userLoginController.getLoggedInUser())) {
                        // Password mismatches
-                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
                }
                 */
        }
index 616640ddade295b43d2ea8e9a131af0d1e237cf8..a810d3165688e62d576465825f164e2b2d457b42 100644 (file)
@@ -21,9 +21,8 @@ import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
-import org.mxchange.jcoreee.validator.BaseObjectValidator;
+import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
 /**
  * A validator for phone, fax and mobile numbers
@@ -31,7 +30,7 @@ import org.mxchange.jcoreee.validator.BaseObjectValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("AbroadDialValidator")
-public class FinancialsAbroadDialValidator extends BaseObjectValidator implements Validator {
+public class FinancialsAbroadDialValidator extends BaseStringValidator {
 
        /**
         * Serial number
@@ -59,11 +58,11 @@ public class FinancialsAbroadDialValidator extends BaseObjectValidator implement
                                // Not valid range? (1 - 99, very rude)
                                if (number < 1 || number > 99) {
                                        // Not allowed
-                                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, MessageFormat.format("Number {0} is not between 1 and 99 inclusive.", number), MessageFormat.format("The entered number {0} is not in the range of 1 and 99 inclusive. This cannot be used as abroad dial prefix. Alternatively enter international '+' sign.", number))); //NOI18N
+                                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, MessageFormat.format("Number {0} is not between 1 and 99 inclusive.", number), MessageFormat.format("The entered number {0} is not in the range of 1 and 99 inclusive. This cannot be used as abroad dial prefix. Alternatively enter international '+' sign.", number))); //NOI18N
                                }
                        } catch (final NumberFormatException ex) {
                                // Didn't work
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "No number or + entered", "No number or + sign has been entered."), ex); //NOI18N
+                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, "No number or + entered", "No number or + sign has been entered."), ex); //NOI18N
                        }
                }
        }
index 3f9096b81c4b1488091ad50d0f4999ea397b7013..502609c17bf2529f440c509768210f580e8cf553 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.jfinancials.validator.phone.number;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("PhoneNumberValidator")
-public class FinancialsPhoneNumberValidator extends BaseNumberValidator implements Validator {
+public class FinancialsPhoneNumberValidator extends BaseNumberValidator {
 
        /**
         * Serial number
index 93c7d232b6d544c421f8334fd357f636b77fe8d7..f97b3b194022a0489b1188a93fc83b774a6a4679 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.jfinancials.validator.privacy_terms;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("PrivacyTermsCheckboxValidator")
-public class FinancialsPrivacyTermsCheckboxValidator extends BaseBooleanValidator implements Validator {
+public class FinancialsPrivacyTermsCheckboxValidator extends BaseBooleanValidator {
 
        /**
         * Serial number
index 9ec2b0590b8da2433c23c44a92d98a81bf8f505b..8e367ff16207f76d2e38a2f1644a4175bf2a70f4 100644 (file)
@@ -22,7 +22,6 @@ import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
@@ -33,7 +32,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UrlValidator")
-public class FinancialsUrlValidator extends BaseStringValidator implements Validator {
+public class FinancialsUrlValidator extends BaseStringValidator {
 
        /**
         * Pattern matcher
@@ -104,7 +103,7 @@ public class FinancialsUrlValidator extends BaseStringValidator implements Valid
                        String message = MessageFormat.format("URL {0} does not match regular expression.", url); //NOI18N
 
                        // Not matching
-                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message));
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message));
                }
        }
 
index f43f7d0dc80416993f61ef44f329831bee65700c..0f32f99ee7ed6493692787ca5c929de62e158d24 100644 (file)
@@ -22,7 +22,6 @@ import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.ConverterException;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -36,7 +35,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UserIdValidator")
-public class FinancialsUserIdValidator extends BaseNumberValidator implements Validator {
+public class FinancialsUserIdValidator extends BaseNumberValidator {
 
        /**
         * Remote bean
index 0a390ec590f21447480f4529b0032447f8c396f6..58205dadee6320fc62a576ba8ef91cf818fdce68 100644 (file)
@@ -814,30 +814,25 @@ GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Bitte wiederholen Sie das eingege
 PAGE_TITLE_ADMIN_AREA=Administration
 #@TODO Please fix German umlauts!
 ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE=Geschaeftliche Kontakte
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=Stammdaten auflisten
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Listet Stammdaten auf
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Stammdaten exportieren
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exportiert Stammdaten
+PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Stammdaten auflisten
 #@TODO Please fix German umlauts!
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=Geschaeftskontakte auflisten
+CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Auflisten von Stammdaten
 #@TODO Please fix German umlauts!
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Listet geschaeftliche Kontakte auf
+ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=Es befinden sich keine Stammdaten in der Datenbank.
 #@TODO Please fix German umlauts!
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Geschaeftliche Kontakte exportieren
-#@TODO Please fix German umlauts!
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exportiert geschaeftliche Kontakte
-#@TODO Please fix German umlauts!
-PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Geschaeftliche Kontakte auflisten
-#@TODO Please fix German umlauts!
-CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Auflisten von geschaeftlichen Kontakt
-#@TODO Please fix German umlauts!
-ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=Es befinden sich keine geschaeftlichen Kontakte in der Datenbank.
-#@TODO Please fix German umlauts!
-TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=Tabelle listet geschaeftliche Kontakte auf.
+TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=Tabelle listet Stammdaten auf.
 ADMIN_BUSINESS_BASIC_DATA_ID=Id-Nummer:
 #@TODO Please fix German umlauts!
-ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Details des geschaeftlichen Kontaktes anzeigen.
+ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Details des Stammdatens anzeigen.
 ADMIN_BUSINESS_BASIC_DATA_OWNER_ID=Zugew. Benutzer:
 ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Benutzerprofil des zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
-ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Geschaeftlichen Kontakt einen Benutzeraccount zuweisen.
+ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Stammdaten einen Benutzeraccount zuweisen.
 ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME=Firmenname:
 ADMIN_BUSINESS_BASIC_DATA_CONTACT_PERSON=Ansprechpartner:
 ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE=Zeigt einen Mitarbeiter an, der als Ansprechpartner eingetragen ist.
@@ -871,7 +866,7 @@ BUTTON_CHANGE_LOCALE_TITLE=Aendern Sie hier in der aktuellen Sitzung die angezei
 ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET=Fehler: Parameter "labelMessage" nicht gesetzt.
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen:
-ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED=Das Hochladen des Firmenlogos ist noch nicht fertig gestellt.
+ADMIN_FEATURE_UNFINISHED_WARNING=Diese Funktion ist noch nicht fertiggestellt.
 ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Steuernummer:
 ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen:
index 024324fcbb3d04c695c0138a8ef1adc3e9152790..3863838b17af494a673a804822bc8b877db87b5f 100644 (file)
@@ -795,14 +795,14 @@ GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Please enter a password. This must match
 GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Please repeat the entered password. This done to confirm the password.
 PAGE_TITLE_ADMIN_AREA=Administration
 ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE=Business contacts
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=List business contacts
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Lists business contacts
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Export business contacts
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exports business contacts
-PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=List business contacts
-CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Lists business contacts
-ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=There are currently no business contacts in database.
-TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=This table lists business contacts.
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=List basic company data
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Lists basic company data
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Export basic company data
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exports basic company data
+PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=List basic company data
+CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Lists basic company data
+ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=There are currently no basic company data in database.
+TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=This table lists basic company data.
 ADMIN_BUSINESS_BASIC_DATA_ID=Id Number:
 ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Show details of this business contact.
 ADMIN_BUSINESS_BASIC_DATA_OWNER_ID=Assigned user:
@@ -835,7 +835,7 @@ BUTTON_CHANGE_LOCALE=Change
 BUTTON_CHANGE_LOCALE_TITLE=Change here in your current session the used language for text output.
 ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET=Error: Parameter "labelMessage" not set.
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Choose company founder:
-ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED=The upload of the company logo is currently unfinished.
+ADMIN_FEATURE_UNFINISHED_WARNING=This feature is not yet finished.
 ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Tax number:
 ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Website URL:
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Select user to assign with company:
index 1bfcb98a8e16443f35517e6e193bea413e30a88a..963e838f14e64876a306834cb1dda0866d9a275b 100644 (file)
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <h:column>
-               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+               <h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-               <h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
+               <h:outputText id="contactId" styleClass="table-data-field" value="#{beanHelper.contact.contactId}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+               <h:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
 
-               <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.contact.contactCreated.time}">
+               <h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated.time}">
                        <f:convertDateTime for="contactCreated" type="both" />
                </h:outputText>
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+               <h:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
 
-               <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.contact.contactUpdated.time}">
+               <h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated.time}">
                        <f:convertDateTime for="contactUpdated" type="both" />
                </h:outputText>
        </h:column>
 
        <h:column>
-               <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+               <h:outputLabel for="isOwnContact" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
-               <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.contact.isOwnContact()}" />
+               <h:outputText id="isOwnContact" styleClass="table-data-field" value="#{beanHelper.contact.isOwnContact()}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+               <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
+               <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+               <h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
+               <h:outputText id="contactTitle" styleClass="table-data-field" value="#{beanHelper.contact.contactTitle}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+               <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+               <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+               <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+               <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+               <h:outputLabel for="contactStreet" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
-               <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.contact.contactStreet}" />
+               <h:outputText id="contactStreet" styleClass="table-data-field" value="#{beanHelper.contact.contactStreet}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+               <h:outputLabel for="contactHouseNumber" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
-               <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumber}" />
+               <h:outputText id="contactHouseNumber" styleClass="table-data-field" value="#{beanHelper.contact.contactHouseNumber}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+               <h:outputLabel for="contactHouseNumberExtension" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
 
-               <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
+               <h:outputText id="contactHouseNumberExtension" styleClass="table-data-field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactCountry" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+               <h:outputLabel for="contactCountry" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
 
-               <h:outputText id="contactCountry" styleClass="table_data_field" value="#{beanHelper.contact.contactCountry.countryCode}" />
+               <h:outputText id="contactCountry" styleClass="table-data-field" value="#{beanHelper.contact.contactCountry.countryCode}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+               <h:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
-               <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.contact.contactZipCode}" />
+               <h:outputText id="contactZipCode" styleClass="table-data-field" value="#{beanHelper.contact.contactZipCode}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+               <h:outputLabel for="contactCity" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CITY}" />
 
-               <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.contact.contactCity}" />
+               <h:outputText id="contactCity" styleClass="table-data-field" value="#{beanHelper.contact.contactCity}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
                </h:outputLink>
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+               <h:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-               <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.contact.contactBirthday.time}">
+               <h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday.time}">
                        <f:convertDateTime for="contactBirthday" type="date" />
                </h:outputText>
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactComment" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
+               <h:outputLabel for="contactComment" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
 
-               <h:outputText id="contactComment" styleClass="table_data_field" value="#{beanHelper.contact.contactComment}" />
+               <h:outputText id="contactComment" styleClass="table-data-field" value="#{beanHelper.contact.contactComment}" />
        </h:column>
 </ui:composition>
index f510a317ba37797eea3d794d750a7f66eddce2c0..10ced2d52f0460f0fd5eefdca79cc8db659bbd32 100644 (file)
@@ -7,33 +7,33 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <h:column>
-               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+               <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
+               <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+               <h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
+               <h:outputText id="contactTitle" styleClass="table-data-field" value="#{beanHelper.contact.contactTitle}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+               <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+               <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+               <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+               <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
                        <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
                </h:outputLink>
        </h:column>
index 6eb85ec1314e969a6651ca4d259e70acbbd25e05..95b819abece531e4c5e861c1a4aa0a7b3164227a 100644 (file)
@@ -5,28 +5,28 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <h:panelGroup styleClass="message_box" layout="block" rendered="#{rendered}">
-               <div class="message_header">
+       <h:panelGroup styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered}">
+               <div class="message-header">
                        <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
                </div>
 
                <ui:fragment rendered="#{not empty message}">
-                       <ui:fragment rendered="#{not empty styleClass}">
+                       <ui:fragment rendered="#{not empty messageStyleClass}">
                                <div class="para">
-                                       <h:outputText styleClass="#{styleClass}" value="#{message}" />
+                                       <h:outputText styleClass="#{messageStyleClass}" value="#{message}" />
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{empty styleClass}">
+                       <ui:fragment rendered="#{empty messageStyleClass}">
                                <div class="para">
-                                       <h:outputText styleClass="okay" value="#{message}" />
+                                       <h:outputText styleClass="alert-info" value="#{message}" />
                                </div>
                        </ui:fragment>
                </ui:fragment>
 
                <ui:fragment rendered="#{empty message}">
-                       <div class="errors para">
-                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+                       <div class="para">
+                               <h:outputText styleClass="alert-danger" value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
                        </div>
                </ui:fragment>
        </h:panelGroup>
diff --git a/web/WEB-INF/resources/tags/messages/message_box_mini.tpl b/web/WEB-INF/resources/tags/messages/message_box_mini.tpl
deleted file mode 100644 (file)
index 893620e..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core">
-
-       <h:panelGroup styleClass="message_box_mini" layout="block" rendered="#{rendered}">
-               <div class="message_header">
-                       <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
-               </div>
-
-               <ui:fragment rendered="#{not empty message}">
-                       <ui:fragment rendered="#{not empty styleClass}">
-                               <div class="para">
-                                       <h:outputText styleClass="#{styleClass}" value="#{message}" />
-                               </div>
-                       </ui:fragment>
-
-                       <ui:fragment rendered="#{empty styleClass}">
-                               <div class="para">
-                                       <h:outputText styleClass="okay" value="#{message}" />
-                               </div>
-                       </ui:fragment>
-               </ui:fragment>
-
-               <ui:fragment rendered="#{empty message}">
-                       <div class="errors para">
-                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
-                       </div>
-               </ui:fragment>
-       </h:panelGroup>
-</ui:composition>
index 3b0981e044ba327a487c303fdb0010f780220575..f4cbe83abdeee2a5a44041eae27ee657782fe382 100644 (file)
@@ -6,20 +6,20 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" styleClass="errors" rendered="#{empty labelMessage}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
 
        <ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
-               <h:panelGroup styleClass="table_row" layout="block">
-                       <div class="table_left_medium">
+               <h:panelGroup styleClass="table-row" layout="block">
+                       <div class="table-left-medium">
                                <h:outputLabel for="mobileNumber" value="#{labelMessage}" />
                        </div>
 
-                       <div class="table_right_medium">
+                       <div class="table-right-medium">
                                <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
                                        <f:converter converterId="MobileProviderConverter" />
-                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                        <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                                </h:selectOneMenu>
 
@@ -30,7 +30,7 @@
                </h:panelGroup>
 
                <h:panelGroup styleClass="error_container" layout="block">
-                       <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       <h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                </h:panelGroup>
        </ui:fragment>
 </ui:composition>
index 3609e807db01130e525dab27e65f43fbdbddc417..c28166e726b09ed0eb9c56ee2fcfdeeedd0707f4 100644 (file)
@@ -6,24 +6,24 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController and (empty rendered or rendered)}">
-               <h:panelGroup styleClass="table_row" layout="block">
-                       <div class="table_left_medium">
+               <h:panelGroup styleClass="table-row" layout="block">
+                       <div class="table-left-medium">
                                <h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                        </div>
 
-                       <div class="table_right_medium">
+                       <div class="table-right-medium">
                                <h:selectOneMenu styleClass="select" id="userPersonalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
-                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
                                        <f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
                                </h:selectOneMenu>
                        </div>
                </h:panelGroup>
 
                <h:panelGroup styleClass="error_container" layout="block">
-                       <h:message for="userPersonalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       <h:message for="userPersonalTitle" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                </h:panelGroup>
        </ui:fragment>
 </ui:composition>
index c94a608756afa9de5806d71a70e3737d94ce1fb4..086ad4fead15961ff9b37079119f74c51a283a06 100644 (file)
@@ -6,17 +6,17 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" styleClass="errors" rendered="#{empty labelMessage}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
 
        <ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
-               <h:panelGroup styleClass="table_row" layout="block">
-                       <div class="table_left_medium">
+               <h:panelGroup styleClass="table-row" layout="block">
+                       <div class="table-left-medium">
                                <h:outputLabel for="profileMode" value="#{labelMessage}" />
                        </div>
 
-                       <div class="table_right_medium">
+                       <div class="table-right-medium">
                                <h:selectOneMenu styleClass="select" id="profileMode" value="#{targetController.userProfileMode}">
                                        <f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
                                </h:selectOneMenu>
@@ -24,7 +24,7 @@
                </h:panelGroup>
 
                <h:panelGroup styleClass="error_container" layout="block">
-                       <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                       <h:message for="personalTitle" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                </h:panelGroup>
        </ui:fragment>
 </ui:composition>
index b569c98d5d3a519f937e2bed37c4ad3773288f70..eeeb4add577be120d68a5fea443f91fba0d2948a 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="footer">
-               <ul class="footer_nav">
+               <ul class="navbar-horizontal">
                        <li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
                </ul>
        </div>
index 92bf06fb3a1238aa9e7998a4d5d4e19216c7a43f..d4e83b006e9fb376dceab8e7bc1101899c54159e 100644 (file)
@@ -7,7 +7,7 @@
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
                        </div>
 
@@ -15,7 +15,7 @@
                                <li><h:link title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" /></li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
                        </div>
 
@@ -24,7 +24,7 @@
                                <li><h:link title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" /></li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
                        </div>
 
@@ -34,7 +34,7 @@
                        </ul>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('business_contacts')}">
-                               <div class="menu_header">
+                               <div class="menu-header">
                                        <h:outputText value="#{msg.ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE}" />
                                </div>
 
@@ -44,7 +44,7 @@
                                </ul>
                        </ui:fragment>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}" />
                        </div>
 
@@ -54,7 +54,7 @@
                                <li><h:link title="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS}" /></li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_COUNTRY_TITLE}" />
                        </div>
 
@@ -62,7 +62,7 @@
                                <li><h:link title="#{msg.LINK_ADMIN_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.LINK_ADMIN_LIST_COUNTRIES}" /></li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
                        </div>
 
@@ -70,7 +70,7 @@
                                <li><h:link title="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER}" /></li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.ADMIN_MENU_LOGOUT_TITLE}" />
                        </div>
 
index dbff90071f92d7ad7ab78828da8ba76ce6acf4c6..45e2f5535ce7bcc27773198d5893fc9be20b8985 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
                                <h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyName" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}" />
+                               <div class="table-right-medium">
+                                       <h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
+                                               <f:validator validatorId="CompanyNameValidator" />
+                                               <f:attribute name="checkExisting" value="false" />
+                                       </h:inputText>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="companyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                                <f:validator validatorId="EmailAddressValidator" />
                                                <f:attribute name="allowEmptyValue" value="true" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="companyEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:outputText styleClass="warnings" value="#{msg.ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED}" />
+                               <div class="table-right-medium">
+                                       <widgets:outputMessageBox message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyLogo" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="companyLogo" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminCompanyDataController.companyTaxNumber}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyTaxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="companyTaxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
                                                <f:validator validatorId="UrlValidator" />
                                                <f:attribute name="allowEmptyValue" value="true" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyWebsiteUrl" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="companyWebsiteUrl" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="companyUserOwner" value="#{adminCompanyDataController.companyUserOwner}">
                                                <f:converter converterId="UserConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyUserOwner" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="companyUserOwner" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_CONTACT_EMPLOYEE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="companyContactEmployee" value="#{adminCompanyDataController.companyContactEmployee}">
                                                <f:converter converterId="CompanyEmployeeConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyContactEmployee" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="companyContactEmployee" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="companyFounder" value="#{adminCompanyDataController.companyFounder}">
                                                <f:converter converterId="CompanyEmployeeConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyFounder" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="companyFounder" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_HEADQUARTERS}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="companyHeadQuarters" value="#{adminCompanyDataController.companyHeadQuarters}">
                                                <f:converter converterId="CompanyHeadquartersConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyHeadQuarters" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="companyHeadQuarters" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_BUSINESS_DATA_PHONE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="landLineCountryCode" value="#{adminCompanyDataController.landLineCountry}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminCompanyDataController.landLineCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
+                                       <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
                                                <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_BUSINESS_DATA_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{adminCompanyDataController.faxCountry}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminCompanyDataController.faxCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
+                                       <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="companyComments" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_COMMENTS}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputTextarea styleClass="input" id="companyComments" rows="7" cols="25" value="#{adminCompanyDataController.companyComments}" />
                                </div>
                        </h:panelGroup>
index e4d35cb921fb88f716e9199df8c0d8ef981f77e8..f196a1953b27d72d0a0d775dbf72dd5bbeb8fec1 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.contact}">
+       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.contact}">
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
                                <f:param value="#{beanHelper.contact.contactId}" />
                </f:facet>
 
                <h:column>
-                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                       <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
+                       <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                       <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+                       <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                       <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+                       <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
                </h:column>
        </h:panelGrid>
 </ui:composition>
index 639d3d013a96138b243facea34c8f7270c8f3190..907110d776057969582a0ff8d6a663cfb5a6a570 100644 (file)
@@ -6,14 +6,14 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.contact}">
-               <div class="table_header">
+               <div class="table-header">
                        <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
                </div>
 
-               <h:panelGroup styleClass="table_row" layout="block">
+               <h:panelGroup styleClass="table-row" layout="block">
                        <ul>
                                <li>
                                        <h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
@@ -23,7 +23,7 @@
 
                                <li>
                                        <h:link outcome="admin_delete_contact" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}">
-                                               <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_CONTACT}" />
+                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_CONTACT}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </h:link>
                                </li>
index 6b86ed4982a01bbb118aef7dea9585966279c161..59ac6584a89f6018f85a3d7be1f3df97e28c0f5b 100644 (file)
 
                        <widgets:outputPersonalTitleTableRow targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="title" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <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>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <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>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
+                                       <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
                                                <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminContactController.faxCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+                                       <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
 
                        <widgets:outputMobileNumberTableRow targetController="#{adminContactController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                                <f:validator validatorId="EmailAddressValidator" />
                                                <f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="emailAddress" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="emailAddress" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
                                                <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="contactBirthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
                                </div>
                        </h:panelGroup>
index 5fb4f0c716191a4245f1e966c0cfc68c1b633449..bfe0d9572f01c7dd7f20edb26c36255927ae4094 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.contact}">
+       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.contact}">
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
                                <f:param value="#{beanHelper.contact.contactId}" />
index da4401285551acf77474a7129293ea15b7336ee8..d80453c925272243e8042ae958215137c7ba8f0f 100644 (file)
                                <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
                                                <f:validator validatorId="AbroadDialValidator" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <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:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <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>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryI18nKey" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryI18nKey" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <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:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryIsLocalPrefixRequired" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryIsLocalPrefixRequired" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
                                                <f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
                                                <f:validateLongRange for="countryPhoneCode" minimum="0" maximum="99" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="countryPhoneCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="countryPhoneCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 80fda5a59f8d300c27ccbee7e8c07ff25b250020..bad5b479d726acb876736f3c397dc17483bd8433 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
index 568d8bdfca71b6f6ba858f9027b7812780b570b4..bba847e14193eef28af445ab8af77caee292c9f1 100644 (file)
@@ -6,49 +6,49 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
-       <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
+       <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="faxNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-                               <h:outputText id="faxNumberId" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneId}" />
+                               <h:outputText id="faxNumberId" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneId}" />
 
-                               <h:message for="faxNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="faxNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
+                       <h:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="faxNumber" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
+                       <h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="faxCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                       <h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-                       <h:outputText id="faxCreated" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
+                       <h:outputText id="faxCreated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
                                <f:convertDateTime for="contactCreated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="faxUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                       <h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-                       <h:outputText id="faxUpdated" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneEntryUpdated.time}">
+                       <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryUpdated.time}">
                                <f:convertDateTime for="contactUpdated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-                       <div class="table_data_field">
+                       <div class="table-data-field">
                                <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_links.tpl">
                                        <ui:param name="isShowPage" value="#{isShowPage}" />
                                </ui:include>
index 4c60d5aea236c00b89e3c5fb6c3d9c7261609584..c9bb240ecb325866b27fa28a28b43510aaa615e8 100644 (file)
@@ -6,37 +6,37 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
-               <ul class="mini_nav">
+               <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
                                                <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
                                        <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                </h:link>
                        </li>
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_unlink_contact_fax">
-                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_delete_fax">
-                                       <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                </h:link>
                        </li>
index f7c8841eb4a84664f6929853059490a5ffd13469..6ab382d135163f93560b78bd2f2d75d84d880541 100644 (file)
@@ -6,11 +6,11 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
                        </div>
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id=" " value="#{adminPhoneController.faxNumber}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id=" " value="#{adminPhoneController.faxNumber}">
                                                <f:converter converterId="FaxNumberConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
                                                <ui:param name="targetController" value="#{adminContactPhoneController}" />
                                        </ui:include>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                <h:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
                        </div>
index 2355ffaff5fe348784c14fe033fe04f0b4240141..35b66744ccb3a8e2289a4cfce1497105a2437986 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.faxNumber}">
                <fieldset class="fieldset" id="fax_data">
                                <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 6b866a079b600e3c347e12e37c4492b536001ef2..22d08e9e8be4a6fefd6e147be8ccf757b7ac3aa5 100644 (file)
@@ -6,11 +6,11 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
                        </div>
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
                                                <f:converter converterId="LandLineNumberConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                <h:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
                                        <f:param name="contactId" value="#{param.contactId}" />
index cdf8995132174b648648466807f7a645561fab50..bb9afb036ee336b980209b46c68856a994ec4d90 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.landLineNumber}">
                <fieldset class="fieldset" id="landline_data">
                                <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 584733601d21ca465ad227a4a29f85d9480103b0..460f4f53c43b740ce44c3deb9e605e3ea9750ed7 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
index 4ea3a777e7f2d9cf03df7861550f9f3a8df668cb..7fe0086616fe488b21da6e41ead26eb284abe808 100644 (file)
@@ -6,49 +6,49 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
+       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="landLineNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-                               <h:outputText id="landLineNumberId" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneId}" />
+                               <h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneId}" />
 
-                               <h:message for="landLineNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="landLineNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
+                       <h:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="landLineNumber" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
+                       <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="landLineCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                       <h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-                       <h:outputText id="landLineCreated" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
+                       <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
                                <f:convertDateTime for="contactCreated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="landLineUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                       <h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-                       <h:outputText id="landLineUpdated" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneEntryUpdated.time}">
+                       <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryUpdated.time}">
                                <f:convertDateTime for="contactUpdated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-                       <div class="table_data_field">
+                       <div class="table-data-field">
                                <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_links.tpl">
                                        <ui:param name="isShowPage" value="#{isShowPage}" />
                                </ui:include>
index f20ec2d555e68f491f8167a2ce33808c703ee91c..ec0c7db30164bdfafc7af6fe488e80f48578515a 100644 (file)
@@ -6,37 +6,37 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
-               <ul class="mini_nav">
+               <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>
                        </li>
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_unlink_contact_landline">
-                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_delete_landline">
-                                       <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:link>
                        </li>
index 2e62ae93bfb3b60c2f7c665c74f4b9dd9f8b90d5..2f9e444a066949600ab0e759ac626eca162848af 100644 (file)
@@ -6,11 +6,11 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
                        </div>
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
                                                <f:converter converterId="MobileNumberConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
@@ -38,8 +38,8 @@
 
                        <widgets:outputMobileNumberTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                <h:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
                                        <f:param name="contactId" value="#{param.contactId}" />
index 0a978f2d35b948d37deec1ae977970afd87287f8..ef10a6516184f8290dc48ce34eb7311563ee6d90 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+       <h:outputText styleClass="alert-danger" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile">
        </h:form>
index 0b5f36a2f2cf865a5d8f72ac6d96c0cb51577989..9eb576d108f2961e6869eeaf177750fa1758f309 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.mobileNumber}">
                <fieldset class="fieldset" id="mobile_data">
                                <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
                                                <f:converter converterId="MobileProviderConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="mobileProvider" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
                                                <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
@@ -55,7 +55,7 @@
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index d847f8bb041e06e4aaa554589f010a0e29a4a5d3..8328e23fa1849df4367a873310774b2b671a22e2 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}"
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}"
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
index af3b3f224e933627e374503dd6d4e39dfab45d93..cee89993df8a95b5d45e7fd2ea86d1adccf6ea5e 100644 (file)
@@ -6,58 +6,58 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
+       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+                               <h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-                               <h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneId}" />
+                               <h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneId}" />
 
-                               <h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+                       <h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
                        <h:link id="mobileProvider" outcome="admin_show_mobile_provider">
-                               <h:outputText styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
+                               <h:outputText styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
                                <f:param name="providerId" value="#{beanHelper.mobileNumber.mobileProvider.providerId}" />
                        </h:link>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+                       <h:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
+                       <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="mobileCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                       <h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-                       <h:outputText id="mobileCreated" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
+                       <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
                                <f:convertDateTime for="contactCreated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="mobileUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                       <h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-                       <h:outputText id="mobileUpdated" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
+                       <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
                                <f:convertDateTime for="contactUpdated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+                       <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-                       <div class="table_data_field">
+                       <div class="table-data-field">
                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
                                        <ui:param name="isShowPage" value="#{isShowPage}" />
                                </ui:include>
index 9f9d2f1820516d83b2622d6e5170dabb2822c528..08d3b88de18788de738b3e3adaffd5008aeea86d 100644 (file)
@@ -6,37 +6,37 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
        <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-               <ul class="mini_nav">
+               <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
                                                <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
                                        <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </h:link>
                        </li>
 
                        <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <li class="mini_link">
+                               <li class="navlink-mini">
                                        <h:link outcome="admin_unlink_contact_mobile">
-                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
-                       <li class="mini_link">
+                       <li class="navlink-mini">
                                <h:link outcome="admin_delete_mobile">
-                                       <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
                                        <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </h:link>
                        </li>
index 00d1cf0e1838562ed437210b2893c3afea27f575..bb704c3b1e043f1b4e07451a8edef73d06fef0f4 100644 (file)
                                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <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>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="providerDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="providerMailPattern" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
                                                <f:converter converterId="CountryConverter" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
index a2c3dab36d9c9d45236799c1ae8d51954832cd54..d81fba613fa5734183404431b65f827b452ba0a0 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" styleClass="errors" rendered="#{empty mode}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty mode}" />
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
                <fieldset class="fieldset" id="login_data">
                                <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
                                </div>
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
                                </div>
                        </h:panelGroup>
index 5eda467a0a6c92449b2006e93cbec65fabbbe11b..67a5f7c8244210565a225967b1c8852f1bc8e07d 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.user}">
+       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.user}">
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
                                <f:param value="#{beanHelper.user.userName}" />
                </f:facet>
 
                <h:column>
-                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+                       <h:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
-                       <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
+                       <h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
                </h:column>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:column>
-                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+                               <h:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
-                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
+                               <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
                        </h:column>
                </ui:fragment>
 
                <h:column>
-                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+                       <h:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
+                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
                                <f:convertDateTime for="userCreated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+                       <h:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-                       <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
+                       <h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated.time}">
                                <f:convertDateTime for="userUpdated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+                       <h:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+                       <h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+                       <h:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
-                       <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+                       <h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+                       <h:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
-                       <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
+                       <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
                                <f:convertDateTime for="userLastLocked" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userLastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+                       <h:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
-                       <h:outputText id="userLastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
+                       <h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
                </h:column>
 
                <widgets:outputContactDataGridColumns />
index 9748ffefac2d0851df7dc64c32b9d0d3cf78dd8b..bf1fdef403b13db671e9d2a2ae8ba43fe9e7fb0c 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.user}">
+       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.user}">
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
                                <f:param value="#{beanHelper.user.userName}" />
@@ -15,9 +15,9 @@
                </f:facet>
 
                <h:column>
-                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+                       <h:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
-                       <h:panelGroup styleClass="table_data_field" layout="block">
+                       <h:panelGroup styleClass="table-data-field" layout="block">
                                <h:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                </h:link>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:column>
-                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+                               <h:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
-                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
+                               <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
                        </h:column>
                </ui:fragment>
 
                <h:column>
-                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+                       <h:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
+                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
                                <f:convertDateTime for="userCreated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+                       <h:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+                       <h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
                </h:column>
 
                <widgets:outputContactDataGridColumns />
index c8e817bf9f756e3acdc24c6731287f4323ae05ba..a95ef3c6e02671474c658c88077718bb022853a4 100644 (file)
@@ -6,14 +6,14 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-               <div class="table_header">
+               <div class="table-header">
                        <h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
                </div>
 
-               <h:panelGroup styleClass="table_row" layout="block">
+               <h:panelGroup styleClass="table-row" layout="block">
                        <ul>
                                <li>
                                        <h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
@@ -43,7 +43,7 @@
 
                                <li>
                                        <h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
-                                               <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" />
                                                <f:param name="userId" value="#{beanHelper.user.userId}" />
                                        </h:link>
                                </li>
index a2d46cd3b00344099c67cfb620129d438f540872..5aff9ae443ab3813456af2e5e5a35d94aa2914c1 100644 (file)
                        </h:head>
 
                        <h:body>
-                               <div id="top">
-                                       <div id="page_header">
-                                               <div id="page_title">
-                                                       <h1>
-                                                               <h:outputText value="JFinancials" />
-                                                               <h:outputText value=" - " />
-                                                               <ui:insert name="title">
-                                                                       <h:outputText value="Default title" />
-                                                               </ui:insert>
-                                                       </h1>
-                                               </div>
+                               <h:panelGroup styleClass="page-header-container" layout="block">
+                                       <div id="page-header">
+                                               <h1>
+                                                       <h:outputText value="JFinancials" />
+                                                       <h:outputText value=" - " />
+                                                       <ui:insert name="title">
+                                                               <h:outputText value="Default title" />
+                                                       </ui:insert>
+                                               </h1>
                                        </div>
-                               </div>
+                               </h:panelGroup>
 
-                               <h:panelGroup id="menu_content" layout="block">
-                                       <div id="left">
+                               <h:panelGroup id="menu-content-wrapper" layout="block">
+                                       <div id="left-menu-container">
                                                <ui:insert name="menu">
                                                        <h:outputText value="Default menu" />
                                                </ui:insert>
@@ -50,8 +48,8 @@
                                                <ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
                                        </div>
 
-                                       <h:panelGroup id="content_outer" class="left_content" layout="block">
-                                               <div id="content_header">
+                                       <h:panelGroup id="content_outer" class="content-container" layout="block">
+                                               <div id="content-header">
                                                        <ui:insert name="content_header">
                                                                <h:outputText value="Default content header" />
                                                        </ui:insert>
                                        </h:panelGroup>
                                </h:panelGroup>
 
-                               <h:panelGroup id="page_footer" layout="block">
+                               <h:panelGroup id="page-footer" layout="block">
                                        <ui:insert name="footer">
                                                <h:outputText value="Default footer" />
                                        </ui:insert>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:messages showDetail="true" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                </h:panelGroup>
                        </h:body>
                </f:view>
index a42ec3d0db76dec0209a00d317a58fbb8bc33047..8f10f6e7d915dbf4d11326b27410eba9699ace6b 100644 (file)
 
                        <widgets:outputPersonalTitleTableRow targetController="#{contactController}" />
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
                                                <f:validator for="familyName" validatorId="NameValidator" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
                                </div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange minimum="1" maximum="99999" />
                                        </h:inputText>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                        </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
                                                <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
                                        </h:inputText>
                        </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:message for="birthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
                        </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="landLineCountry" value="#{contactController.landLineCountry}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+                                       <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="faxCountry" value="#{contactController.faxCountry}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}">
                                                <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                       <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
 
                        <widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
 
-                       <h:panelGroup styleClass="table_row" layout="block">
+                       <h:panelGroup styleClass="table-row" layout="block">
                                <div class="para notice">
                                        <ul>
                                                <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
index d930846ffc4ea59c53d9cbb3196f697a25357631..b11e37df73d430b0839229e5a28dfc1be854ad86 100644 (file)
@@ -6,12 +6,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <h:panelGroup styleClass="table_row" layout="block">
-               <div class="table_left_medium">
+       <h:panelGroup styleClass="table-row" layout="block">
+               <div class="table-left-medium">
                        <h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
                </div>
 
-               <div class="table_right_medium">
+               <div class="table-right-medium">
                        <h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator validatorId="EmailAddressValidator" />
                        </h:inputText>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
-               <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               <h:message for="emailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
        </h:panelGroup>
 
-       <h:panelGroup styleClass="table_row" layout="block">
-               <div class="table_left_medium">
+       <h:panelGroup styleClass="table-row" layout="block">
+               <div class="table-left-medium">
                        <h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
                </div>
 
-               <div class="table_right_medium">
+               <div class="table-right-medium">
                        <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
-               <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               <h:message for="emailAddressRepeat" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
        </h:panelGroup>
 </ui:composition>
index 13f1a363fc73e90ee5fa9fa4751c991f186a1661..09ae7da11d52157ea8d5cd0f5dd34456fe1b19cc 100644 (file)
@@ -6,31 +6,31 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="footer">
-               <ul class="footer_nav">
-                       <li class="footer_link">
+               <ul class="navbar-horizontal">
+                       <li class="navlink-horizontal">
                                <h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
                        </li>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="user_resend_link" title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" value="#{msg.LINK_GUEST_RESEND_LINK}" />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
                                </li>
                        </ui:fragment>
index 778b49465c208c8eefd7b0585ad65bcfbaa9d037..6410f8ff8abd62ae7b0841a28e832598e88871da 100644 (file)
@@ -7,7 +7,7 @@
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.MENU_HOME_TITLE}" />
                        </div>
 
@@ -17,7 +17,7 @@
                                </li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.MENU_USER_TITLE}" />
                        </div>
 
index bb86d274e1806d508abb99046fd90306ef614f58..ee73b84a54383a101cce9896917dc9a1f0de7e2e 100644 (file)
                                <h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left25">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left25">
                                        <h:selectBooleanCheckbox styleClass="checkbox" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
 
-                               <div class="table_right75">
+                               <div class="table-right75">
                                        <!-- @TODO Find something better //-->
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
                                        <h:outputText value="&#160;" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="privacy" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left25">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left25">
                                        <h:selectBooleanCheckbox styleClass="checkbox" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
                                                <f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
                                        </h:selectBooleanCheckbox>
                                </div>
 
-                               <div class="table_right75">
+                               <div class="table-right75">
                                        <!-- @TODO Find something better //-->
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
                                        <h:outputText value="&#160;" />
@@ -48,7 +48,7 @@
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                               <h:message for="terms" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 10aee0b6061fc4361351572f541ce90647f546f3..48a8a828a1dc85f4324378daa1ef714a479e773f 100644 (file)
@@ -8,7 +8,7 @@
        <h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                <h:form id="form_user_login">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
                                </div>
 
                                                <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
                                        </legend>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left">
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
                                                        <h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
                                                </div>
 
-                                               <div class="table_right">
+                                               <div class="table-right">
                                                        <h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
                                        </h:panelGroup>
 
                                        <h:panelGroup styleClass="error_container" layout="block">
-                                               <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               <h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                        </h:panelGroup>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left">
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
                                                        <h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
                                                </div>
 
-                                               <div class="table_right">
+                                               <div class="table-right">
                                                        <h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
                                        </h:panelGroup>
 
                                        <h:panelGroup styleClass="error_container" layout="block">
-                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                               <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                        </h:panelGroup>
                                </fieldset>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
                <h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
+                       <h:outputText styleClass="alert-danger" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
                </h:panelGroup>
        </h:panelGroup>
 </ui:composition>
index 36eea09ee94575a58672ce319878f53d0c1d7808..ec56da6963230012cb71d4920de6d1817b227fba 100644 (file)
@@ -6,8 +6,8 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
                        </div>
 
                                        </legend>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left_medium">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
                                                                <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
                                                        </div>
 
-                                                       <div class="table_right_medium">
+                                                       <div class="table-right-medium">
                                                                <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <div class="para"></div>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left_medium">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
                                                                <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                        </div>
 
-                                                       <div class="table_right_medium">
+                                                       <div class="table-right-medium">
                                                                <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left_medium">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                        </div>
 
-                                                       <div class="table_right_medium">
+                                                       <div class="table-right-medium">
                                                                <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
 
                                                <div class="para notice">
@@ -83,8 +83,8 @@
 
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                <h:commandButton styleClass="submit" type="submit" id="continueRegisterPage1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
                        </div>
                </h:panelGroup>
index b695fece38ff19de2e96805f33184d9a5bcffaac..eecb49426109cc5003a0320a60623e49fdd68471 100644 (file)
@@ -6,15 +6,15 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
                        </div>
 
                        <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
                        </div>
                </h:panelGroup>
index a3c7829d77514287334ed076ec58cb4cdefd74a8..16505b77ad51c4a48c72e03a21fc50e703bca55a 100644 (file)
@@ -6,8 +6,8 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
                        </div>
 
                                        </legend>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left">
                                                                <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <div class="table-right">
                                                                <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <div class="para"></div>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left">
                                                                <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <div class="table-right">
                                                                <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <div class="table-right">
                                                                <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
 
                                                <div class="para notice">
@@ -87,8 +87,8 @@
 
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                <h:commandButton styleClass="submit" type="submit" id="finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
                        </div>
                </h:panelGroup>
index 95ca0792ff4bacaae78fb5d5e772f67ec4543229..10541dab2c5c589db1d6e9aeacc0bfe668a85f63 100644 (file)
@@ -6,16 +6,16 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select right_space" id="faxCountry" value="#{targetController.faxCountry}">
+               <h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
                        <f:converter converterId="CountryConverter" />
-                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                        <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                </h:selectOneMenu>
 
-               <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+               <h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
                        <f:validator validatorId="PhoneNumberValidator" />
                </h:inputText>
 
index 6cfeb9d42b57077e366b9c8a14f8e109f77abd02..1aac8a2b47ed1c3a279896695b7d28cd86adda38 100644 (file)
@@ -6,16 +6,16 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
        <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.landLineCountry}">
+               <h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
                        <f:converter converterId="CountryConverter" />
-                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                        <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
                </h:selectOneMenu>
 
-               <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+               <h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
                        <f:validator validatorId="PhoneNumberValidator" />
                </h:inputText>
 
index 8b576f324cc1d976e05dc57981b43633a0856cad..9732eb92dc62fe923813bbff2e0764c7fc58e574 100644 (file)
@@ -7,14 +7,15 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
        <ui:define name="title">
-               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" -  />
+               <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA} - " />
+
                <ui:insert name="login_title">
                        <h:outputText value="Default login title" />
                </ui:insert>
        </ui:define>
 
        <ui:define name="menu">
-               <widgets:outputMessageBoxMini message="#{msg.USER_NOT_LOGGED_IN}" styleClass="errors" rendered="#{not userLoginController.isUserLoggedIn()}" />
+               <widgets:outputMessageBox message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
index 31e7b0880c9aeeb6b7c85b394fe88cdc1b1b79b2..f57c93e3c12b5fb0086952062511b5597a1f7d18 100644 (file)
@@ -6,12 +6,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <h:panelGroup styleClass="table_row" layout="block">
-               <div class="table_left">
+       <h:panelGroup styleClass="table-row" layout="block">
+               <div class="table-left">
                        <h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
                </div>
 
-               <div class="table_right">
+               <div class="table-right">
                        <h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator validatorId="EmailAddressValidator" />
                        </h:inputText>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
-               <h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               <h:message for="emailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
        </h:panelGroup>
 
-       <h:panelGroup styleClass="table_row" layout="block">
-               <div class="table_left">
+       <h:panelGroup styleClass="table-row" layout="block">
+               <div class="table-left">
                        <h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
                </div>
 
-               <div class="table_right">
+               <div class="table-right">
                        <h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{userEmailChangeController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
-               <h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+               <h:message for="emailAddressRepeat" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
        </h:panelGroup>
 </ui:composition>
index c94c5fb895f3857c593f7f812470c90d6e08e96a..1a630826e8b27f7588f49ceb94aca3aa59cfb440 100644 (file)
                                <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
                        </legend>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left">
                                        <h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
                                </div>
 
-                               <div class="table_right">
+                               <div class="table-right">
                                        <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
                                                <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
                                        </h:inputSecret>
@@ -24,7 +24,7 @@
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="currentPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 5682983c0a88cd8e854dc24e5de878b8d21f6743..ec6d264ce923f08f2339a89c9fae0728891f416c 100644 (file)
@@ -6,25 +6,25 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="footer">
-               <ul class="footer_nav">
-                       <li class="footer_link">
+               <ul class="navbar-horizontal">
+                       <li class="navlink-horizontal">
                                <h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
                        </li>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
-                               <li class="footer_link">
+                               <li class="navlink-horizontal">
                                        <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
                                </li>
                        </ui:fragment>
index 59e33252ee3a8ee31a914ccd9df5a26f932ca8c7..bda479895d83e307e9f22f519cd9acc0f610f20b 100644 (file)
@@ -7,7 +7,7 @@
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.MENU_HOME_TITLE}" />
                        </div>
 
@@ -28,7 +28,7 @@
                        </ul>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data') or featureController.isFeatureEnabled('change_user_password') or featureController.isFeatureEnabled('user_change_email_address')}">
-                               <div class="menu_header">
+                               <div class="menu-header">
                                        <h:outputText value="#{msg.MENU_USER_EDIT_PROFILE_TITLE}" />
                                </div>
 
@@ -53,7 +53,7 @@
                                </ul>
                        </ui:fragment>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.MENU_APPLICATIONS_TITLE}" />
                        </div>
 
@@ -63,7 +63,7 @@
                                </li>
                        </ul>
 
-                       <div class="menu_header">
+                       <div class="menu-header">
                                <h:outputText value="#{msg.MENU_LOGOUT_TITLE}" />
                        </div>
 
index b8a98d6b9f8567d8b7e5054d7e297d0e6509d6c6..a50b340e74d43e41760d6f8cb44d88270b05c5f6 100644 (file)
@@ -10,8 +10,8 @@
                        <h:outputText value="#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}" />
                </div>
 
-               <div class="para errors">
-                       <h:outputText value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
+               <div class="para">
+                       <h:outputText styleClass="alert-danger" value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
                </div>
        </h:panelGroup>
 </ui:composition>
index ef2dade0c01fb720318f24140b852fa6eb63435c..6eff0a40540adf739be26a8435801938f8baa473 100644 (file)
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" styleClass="errors" rendered="#{empty user}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
 
        <h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
index 0d45fc32c7b720963fad2d6f203833974a40ff92..1e3c408231191194218e951b42796eaab84819ec 100644 (file)
@@ -6,12 +6,12 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <h:panelGroup styleClass="table" layout="block">
-               <div class="table_header">
+               <div class="table-header">
                        <h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
                </div>
 
                <div class="para">
-                       <h:messages errorClass="errors" fatalClass="fatals" infoClass="infos" warnClass="warnings" showDetail="true" />
+                       <h:messages errorClass="alert-danger" fatalClass="alert-danger" infoClass="infos" warnClass="alert-warning" showDetail="true" />
                </div>
        </h:panelGroup>
 </ui:composition>
index 61d3769bdb1fa6ca1a7c4b6918d040fea85709bc..aa4259be262eea06bcd9127da1ba2b39885dc654 100644 (file)
@@ -37,30 +37,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.Boolean</type>
                </attribute>
                <attribute>
-                       <name>styleClass</name>
-                       <description>The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message.</description>
+                       <name>boxStyleClass</name>
+                       <description>The optional CSS style class to be forwarded to the container div of the whole message box. Default is ".message_box" .</description>
                        <required>false</required>
                        <type>java.lang.String</type>
                </attribute>
-       </tag>
-       <tag>
-               <tag-name>outputMessageBoxMini</tag-name>
-               <description>This tag renders a style-able and customizable mini message for any kind of messages that the user should see. It is similar to outputMessageBox tag but it renders a smaller box instead.</description>
-               <source>resources/tags/messages/message_box_mini.tpl</source>
-               <attribute>
-                       <name>message</name>
-                       <description>The message that should be place into the message box. You may also use EL code here that resolves to a message string.</description>
-                       <required>true</required>
-                       <type>java.lang.String</type>
-               </attribute>
-               <attribute>
-                       <name>rendered</name>
-                       <description>Whether this tag is being rendered by JSF engine.</description>
-                       <required>false</required>
-                       <type>java.lang.Boolean</type>
-               </attribute>
                <attribute>
-                       <name>styleClass</name>
+                       <name>messageStyleClass</name>
                        <description>The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message.</description>
                        <required>false</required>
                        <type>java.lang.String</type>
index 70fa64a706531def4914a6fa49c454ddc4530947..d385e3b883095405f1116496a3ab02f648bb94c1 100644 (file)
@@ -16,7 +16,7 @@
        <ui:define name="content">
                <h:form id="form_admin_logout">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
                                </div>
 
@@ -24,7 +24,7 @@
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
+                               <div class="table-footer">
                                        <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
                                </div>
                        </h:panelGroup>
index 51f5e9c8e222a432daaf300221b9b0e54121c905..e64935f7552907d6770575494bbd7d63cb86aae2 100644 (file)
@@ -15,9 +15,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" styleClass="errors" rendered="#{companyDataController.allCompanyBasicData().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{companyDataController.allCompanyBasicData().isEmpty()}" />
 
-               <h:dataTable id="table_list_business_contacts" var="companyData" value="#{companyDataController.allCompanyBasicData()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not companyDataController.allCompanyBasicData().isEmpty()}">
+               <h:dataTable id="table_list_business_contacts" var="companyData" value="#{companyDataController.allCompanyBasicData()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not companyDataController.allCompanyBasicData().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_ID}" />
@@ -92,8 +92,8 @@
                </h:dataTable>
 
                <h:form id="form_admin_add_business_basic_data">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_TITLE}" />
                                </div>
 
 
                                <ui:include src="/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminCompanyDataController.addBusinessBasicData()}" />
                                </div>
                        </h:panelGroup>
index d5bbb266081d41c554770cfd3ab18b10289078fd..f8fcb08b915b6c078ac7a9c7ac67dbf724f89b70 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
                                                <f:param value="#{beanHelper.contact.contactId}" />
                                        </h:outputFormat>
@@ -38,9 +38,9 @@
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="button-danger" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
index 870179ac41144441b92411f9ba7bbc266355a647..b1371aff764b76545aca9c684f8c2f32c3205b1a 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
                                                <f:param value="#{beanHelper.contact.contactId}" />
                                        </h:outputFormat>
@@ -40,8 +40,8 @@
                                        <ui:param name="mode" value="edit" />
                                </ui:include>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
                                </div>
                        </h:panelGroup>
index 403c9c0451500143f70d2b759d86d0b6d6afedd5..2ac0f0f9487fe8e91b8dcd201bdfc9b36786f90b 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
 
                <h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
-                       <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
+                       <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
                                <p:column exportable="false">
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
                                </div>
 
                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table_footer">
+                               <div class="table-footer">
                                        <h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
                                                <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
                                        </h:commandButton>
index 3024149a01020af6d31b8ce228d625a3f83dd195..a2b8c2a07237e6470af79790d3849a91e5af3665 100644 (file)
@@ -15,9 +15,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
 
-               <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
+               <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
@@ -72,8 +72,8 @@
                </h:dataTable>
 
                <h:form id="form_admin_add_contact">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
                                </div>
 
@@ -85,8 +85,8 @@
                                        <ui:param name="allowEmptyRequiredData" value="true" />
                                </ui:include>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
                                </div>
                        </h:panelGroup>
index 1b7add6bff81290123e7c8368cad265b14440a6f..810e231054f3f3f36d4532485513aee6c1c52d92 100644 (file)
@@ -22,7 +22,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="para" layout="block">
index db7cd3da87709adffb31181ffe67bec317e93817..4bc0c6dd05cc7795ac9038aef8430381ecc519fe 100644 (file)
@@ -26,7 +26,7 @@
        <ui:define name="content">
                <h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
                                </div>
 
                                        </ui:include>
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="button-warning" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
                        <f:param value="#{adminContactPhoneController.phoneId}" />
                        <f:param value="#{adminContactPhoneController.contact.contactId}" />
                </h:outputFormat>
index f1189be195964e86ad1e04e6411c0ef7be194305..fb5e086b4eb60deb84e44dd9c90e1c2388f71b1a 100644 (file)
@@ -24,7 +24,7 @@
        <ui:define name="content">
                <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
                                </div>
 
                                        </ui:include>
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="button-warning" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                        <f:param value="#{beanHelper.contact.contactId}" />
                </h:outputFormat>
index 1c7bcbea5bd3a9142abf6018f279b0468e3825f4..c6ac5964452db1b565a3b3e757c985d90e07e646 100644 (file)
@@ -24,7 +24,7 @@
        <ui:define name="content">
                <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
                                </div>
 
                                        </ui:include>
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="button-warning" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
                        <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                        <f:param value="#{beanHelper.contact.contactId}" />
                </h:outputFormat>
index 3498fbd09833744d124bb5f20a7f95b5e05ae540..831eca61335125c548c50b1e43d266aa11ba0c39 100644 (file)
@@ -14,7 +14,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
+               <h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
                </h:dataTable>
 
                <h:form id="form_add_country">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
                                </div>
 
                                <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
                                </div>
                        </h:panelGroup>
index 71b1adb256ea4684efbb857c4fbecdff1f98eed2..a1d048dba2b358a80c2a14c8763272e836fa2172 100644 (file)
@@ -24,7 +24,7 @@
        <ui:define name="content">
                <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
                                </div>
 
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="button-danger" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
        </ui:define>
 </ui:composition>
index de2d24c5a5636f4ecabb9e15bb52eb5dae5419ad..6d4379e1748534c0ff3fc343ac787d0731520ceb 100644 (file)
@@ -23,8 +23,8 @@
 
        <ui:define name="content">
                <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                        </h:outputFormat>
 
                                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
        </ui:define>
 </ui:composition>
index ee19c3133a683f0aede2414e10bb6167aeaa4d22..019fcef36c1f070e94ea6b01cf269a3ac41fe42f 100644 (file)
@@ -15,7 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
+               <h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
@@ -55,6 +55,6 @@
                        </h:column>
                </h:dataTable>
 
-               <widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" styleClass="errors" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" styleClass="alert-danger" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
        </ui:define>
 </ui:composition>
index 8d736fe59c0e8d242406dc950bb24d1ead925afe..80e06a10da171f7294f8a88cbb886b7c47104de2 100644 (file)
@@ -25,7 +25,7 @@
                        <ui:param name="isShowPage" value="true" />
                </ui:include>
 
-               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />
                        </f:facet>
 
                        <h:column>
-                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+                               <h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                               <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+                               <h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                               <h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                               <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                               <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                               <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                               <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+                               <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-                               <div class="table_data_field">
-                                       <ul class="mini_nav">
-                                               <li class="mini_link">
+                               <div class="table-data-field">
+                                       <ul class="navbar-mini">
+                                               <li class="navlink-mini">
                                                        <h:link outcome="admin_unlink_contact_fax">
-                                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </h:link>
index 9fe165699717a8f3965331e888ab774c015447ef..3ea49916625507e31e36ff569578e84c6bdb5e0b 100644 (file)
@@ -24,7 +24,7 @@
        <ui:define name="content">
                <h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
                                </div>
 
                                        <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="button-danger" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
        </ui:define>
 </ui:composition>
index 41f2290c34e53ebcaf0f2256389226fd5518c132..1c95ee011b7455d2104bc969bf94192b6e68dad7 100644 (file)
@@ -23,8 +23,8 @@
 
        <ui:define name="content">
                <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:outputFormat>
 
                                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
        </ui:define>
 </ui:composition>
index 476e41dedb85436093e8037d5acbd208519705da..c615e6e1105ee76880d1da23b3dde54f1b5cb449 100644 (file)
@@ -15,7 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
+               <h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
@@ -55,6 +55,6 @@
                        </h:column>
                </h:dataTable>
 
-               <widgets:outputMessageBox message="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" styleClass="errors" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
        </ui:define>
 </ui:composition>
index c5d2293c77326ae3761ee90e3a968b77e66e4602..8bcc57bc6f6b0ff16f1aa39748214207edcc0018 100644 (file)
@@ -25,7 +25,7 @@
                        <ui:param name="isShowPage" value="true" />
                </ui:include>
 
-               <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+               <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
                                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                        </f:facet>
 
                        <h:column>
-                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+                               <h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
                                <h:link id="contactId" outcome="admin_show_contact">
-                                       <h:outputText styleClass="table_data_field" value="#{contact.contactId}" />
+                                       <h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                               <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+                               <h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                               <h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                               <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                               <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                               <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                               <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+                               <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-                               <div class="table_data_field">
-                                       <ul class="mini_nav">
-                                               <li class="mini_link">
+                               <div class="table-data-field">
+                                       <ul class="navbar-mini">
+                                               <li class="navlink-mini">
                                                        <h:link outcome="admin_unlink_contact_landline">
-                                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </h:link>
index 9534375aa12dcce84ffb977dd2de007d87e7610a..4380011126797e662cb31b708dcaef7b14c762db 100644 (file)
@@ -14,7 +14,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+               <h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
index ae167478a44cbf24950ccaa1ce9b76257af0e777..6dca40b06dddb6669decb737482f8fda334ce5a0 100644 (file)
@@ -24,7 +24,7 @@
        <ui:define name="content">
                <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
                                </div>
 
                                        <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="button-danger" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
        </ui:define>
 </ui:composition>
index 3849590f4522fb4d6ae521e9dc1a2b343cb3a4e9..89558499fff89a7764da8d55a2f8594ea6a25f0f 100644 (file)
@@ -23,8 +23,8 @@
 
        <ui:define name="content">
                <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                                        </h:outputFormat>
 
                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
        </ui:define>
 </ui:composition>
index ded4c7b1e2e14f1c2c00ac20aaedfb529ceaa6c6..ff224432d0b6a7dd93ed60d4a013bd1d88d584ce 100644 (file)
@@ -15,7 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+               <h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
@@ -65,6 +65,6 @@
                        </h:column>
                </h:dataTable>
 
-               <widgets:outputMessageBox message="#{msg.ADMIN_LIST_MOBILE_EMPTY}" styleClass="errors" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_LIST_MOBILE_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
        </ui:define>
 </ui:composition>
index 23d480fdf348bb818c4f92b8311fd6746e64bcaa..d654570c9be6870cc5113a9cb5d482827802e380 100644 (file)
@@ -25,7 +25,7 @@
                        <ui:param name="isShowPage" value="true" />
                </ui:include>
 
-               <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+               <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
                                        <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                        </f:facet>
 
                        <h:column>
-                               <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+                               <h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                               <h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                               <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+                               <h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-                               <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+                               <h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                               <h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-                               <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+                               <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                               <h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-                               <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+                               <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                               <h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
                                        <h:outputText value="#{contact.contactEmailAddress}" />
                                </h:outputLink>
                        </h:column>
 
                        <h:column>
-                               <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+                               <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-                               <div class="table_data_field">
-                                       <ul class="mini_nav">
-                                               <li class="mini_link">
+                               <div class="table-data-field">
+                                       <ul class="navbar-mini">
+                                               <li class="navlink-mini">
                                                        <h:link outcome="admin_unlink_contact_mobile">
-                                                               <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
                                                                <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </h:link>
index 0a7ac74978c1cd8894ca4d35d5dfd78ae9af31c7..6beca96232f78844bfb1ce6f04a6b75877893e81 100644 (file)
@@ -14,7 +14,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
+               <h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
                </h:dataTable>
 
                <h:form id="form_add_mobile_provider">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
                                </div>
 
                                <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
                                </div>
                        </h:panelGroup>
index 12f2fb9612fe71ff8bd6c46433238449011ab9ea..7d93ed7eeed7272c8cefd415ef2e8c817ee69cf8 100644 (file)
@@ -22,9 +22,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+               <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
index c6afca17596c2d22e940c80df5d034b1a3c3d425..31212c78e36e6a04f0a2c1b3b2919468650c8c39 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                                <f:param value="#{beanHelper.user.userId}" />
 
                                <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left25_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left25-medium">
                                                <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
                                        </div>
 
-                                       <div class="table_right75_medium">
+                                       <div class="table-right75-medium">
                                                <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="button-danger" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
index 28b714e789cb9b9a5ebb807860c4e00a67ff8477..e83971238f153ec2c84972ec8b3dfa7a295b83e9 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
                                </div>
 
@@ -38,8 +38,8 @@
                                        <ui:param name="mode" value="edit" />
                                </ui:include>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
                                </div>
                        </h:panelGroup>
index f33d68da4df21b1720447e778c835d0a3b3e8e8c..e2542a2b7a0a0d80941da99cbd95ba359678edb3 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
                <h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-                       <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+                       <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
                                <p:column exportable="false">
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                </div>
 
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table_footer">
+                               <div class="table-footer">
                                        <h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
                                                <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
                                        </h:commandButton>
index fda0cf0937041d97bd71cc2bb30d4761c00fa03e..f08378c93f0ed608cdd3ff0fa5944b4cf4882ce2 100644 (file)
@@ -15,9 +15,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
-               <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
+               <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_USER_ID}" />
@@ -89,9 +89,9 @@
                        </h:column>
                </h:dataTable>
 
-               <h:panelGroup styleClass="table_medium" layout="block">
+               <h:panelGroup styleClass="table table-medium" layout="block">
                        <h:form id="form_admin_add_user">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                </div>
 
                                                        <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
                                                </legend>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left_medium">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
                                                                <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
                                                        </div>
 
-                                                       <div class="table_right_medium">
+                                                       <div class="table-right-medium">
                                                                <h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
-                                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                                        <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                </h:selectOneMenu>
                                                        </div>
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
                                </div>
                        </h:form>
index 5a7ef3dbc3c44ac2407b2599c042477a2cb0e5b9..9c5be08512acbaa2d0f602a46bb5449c53bda124 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                                <f:param value="#{beanHelper.user.userId}" />
                                        </h:outputFormat>
                                </div>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:outputFormat id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:outputFormat id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
-                                       <div class="table_left_medium">
+                               <h:panelGroup styleClass="table-row" layout="block">
+                                       <div class="table-left-medium">
                                                <h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
                                        </div>
 
-                                       <div class="table_right_medium">
+                                       <div class="table-right-medium">
                                                <h:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                        <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
index 4e15d4927ae9bc566b513e7b59cc003fcdd03247..74b2cb58441c87221900b3fba74e84c9d3dd547d 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                                <f:param value="#{beanHelper.user.userId}" />
                                        <h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                        <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
index c535aa8993c57cf16279990aa92296c50d3cd86d..37c80d32d31a303c3b37ef5f618b986c00f19116 100644 (file)
@@ -22,7 +22,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
index 11dc6c3481cf4528cf8a55e7ce5d7ade9611ebb8..7b80ca88d6a329297d15f3234cadc024f9849a9c 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                                <f:param value="#{beanHelper.user.userId}" />
                                </div>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <div class="table_data_label">
+                                       <div class="table-data-label">
                                                <h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
                                        </div>
 
-                                       <div class="table_data_field">
+                                       <div class="table-data-field">
                                                <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
                                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                                </h:link>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <div class="table_data_label">
+                                       <div class="table-data-label">
                                                <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                        </div>
 
-                                       <div class="table_data_field">
+                                       <div class="table-data-field">
                                                <h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                        </div>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <div class="table_data_label">
+                                       <div class="table-data-label">
                                                <h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
                                        </div>
 
-                                       <div class="table_data_field">
+                                       <div class="table-data-field">
                                                <h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
                                        </div>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <div class="table_data_label">
+                                       <div class="table-data-label">
                                                <h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
                                        </div>
 
-                                       <div class="table_data_field">
+                                       <div class="table-data-field">
                                                <h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
                                        </div>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <div class="table_data_label">
+                                       <div class="table-data-label">
                                                <h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
                                        </div>
 
-                                       <div class="table_data_field">
+                                       <div class="table-data-field">
                                                <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
                                                        <f:convertDateTime for="userLastLocked" type="both" />
                                                </h:outputText>
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <div class="table_data_label">
+                                       <div class="table-data-label">
                                                <h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
                                        </div>
 
-                                       <div class="table_data_field">
+                                       <div class="table-data-field">
                                                <h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                        <h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
 
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                        <f:param value="#{beanHelper.user.userName}" />
                        <f:param value="#{beanHelper.user.userId}" />
                </h:outputFormat>
index dd9774d33ae81e31163a50704eceba5e814a379a..cd128315a7b223b771a3d2417e2459b925fd508c 100644 (file)
        <ui:define name="content">
                <ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
                        <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
                                </div>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
+                               <h:panelGroup styleClass="table-row" layout="block">
                                        <h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
                                                <f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                                <f:param value="#{beanHelper.user.userContact.contactFirstName}" />
@@ -37,9 +37,9 @@
                                </h:panelGroup>
                        </h:panelGroup>
 
-                       <widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+                       <widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" styleClass="errors" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
+               <widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>
index 842385a2be77591e93d3bbe4604635f1c1399ba1..0332d854e24f871075d48702855c60118a90e9f5 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+                       <div class="table-header">
                                <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
                        </div>
 
-                       <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
+                       <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table-header-column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
                                <h:column>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.USER_NAME}" />
@@ -41,6 +41,6 @@
                        </h:dataTable>
                </h:panelGroup>>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
        </ui:define>
 </ui:composition>
index 5a3130ee4fc64b4386e953ccd49aa1dbf1e970cd..6e744173a2ec39c4fde0d931a240cf97721754b6 100644 (file)
@@ -33,6 +33,6 @@
                        </h:panelGroup>
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
        </ui:define>
 </ui:composition>
index 47d3c46075d4d66ce6a35f48ab760be630c39cb4..cfbada39537d9779e69583a35a8864a66631f6b2 100644 (file)
@@ -19,7 +19,7 @@
                        <div id="user_lost_password_content">
                                <h:form id="form_lost_password">
                                        <h:panelGroup styleClass="table" layout="block">
-                                               <div class="table_header">
+                                               <div class="table-header">
                                                        <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
                                                </div>
 
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
                                                        </legend>
 
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left">
+                                                       <h:panelGroup styleClass="table-row" layout="block">
+                                                               <div class="table-left">
                                                                        <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
                                                                </div>
 
-                                                               <div class="table_right">
+                                                               <div class="table-right">
                                                                        <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
                                                                </div>
                                                        </h:panelGroup>
 
-                                                       <div class="table_header">
+                                                       <div class="table-header">
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
                                                        </div>
 
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left">
+                                                       <h:panelGroup styleClass="table-row" layout="block">
+                                                               <div class="table-left">
                                                                        <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
                                                                </div>
 
-                                                               <div class="table_right">
+                                                               <div class="table-right">
                                                                        <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
                                                                </div>
                                                        </h:panelGroup>
                                                </fieldset>
 
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <div class="table-footer">
+                                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                        <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
                                                </div>
                                        </h:panelGroup>
@@ -62,6 +62,6 @@
                        </div>
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
        </ui:define>
 </ui:composition>
index d1f84f151c459ee65315c30420865c4c28b0ad60..a021c3ea88c1b1f94187cb405e426abc38791949 100644 (file)
                                <ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
                        </ui:fragment>
 
-                       <widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" styleClass="errors" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+                       <widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
                                <div align="center">
-                                       <h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
+                                       <h:panelGrid styleClass="table" headerClass="table-header" footerClass="table-footer">
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
                                                </f:facet>
@@ -45,6 +45,6 @@
                        </ui:fragment>
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" styleClass="errors" rendered="#{not userController.isPublicUserProfileEnabled()}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
        </ui:define>
 </ui:composition>
index 0d6ebf81469a9069447c4b7f0b92244e5e6b8fc2..25eee9631654acde1097e505a8759dcad01a7966 100644 (file)
@@ -35,8 +35,8 @@
                        </h:panelGroup>
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" styleClass="errors" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
        </ui:define>
 </ui:composition>
index c65dbad0d75d654c1aa3638ce73020ab4c79513c..658b73eef39e54bc5df917fde1c7ebdfad1dcb00 100644 (file)
@@ -15,7 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
index 285ec9adc388ad08b122256bd5899ff34e5e9fc3..ca1280e3f2a675ef160b1350a0523cecc3956e02 100644 (file)
@@ -17,7 +17,7 @@
        <ui:define name="content">
                <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
                                </div>
 
                                                <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
                                        </legend>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left">
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
                                                        <h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
                                                </div>
 
-                                               <div class="table_right">
+                                               <div class="table-right">
                                                        <h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
                                                                <f:validator validatorId="EmailAddressValidator" />
                                                        </h:inputText>
                                </fieldset>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+                                       <h:message for="resendEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
                                </h:panelGroup>
 
-                               <h:panelGroup styleClass="table_row" layout="block">
+                               <h:panelGroup styleClass="table-row" layout="block">
                                        <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
        </ui:define>
 </ui:composition>
index 3d226fe72dc89957a0d78cf83402d910e0cca9ca..9a84a10022682cb00482325fa89878c4a97e3ee4 100644 (file)
@@ -1,9 +1,10 @@
 body {
-       background-color: #ffffff;
+       background-color: white;
        font-size: 12px;
        font-family: sans-serif;
-       color: #000000;
+       color: black;
        margin: 0px;
+       line-height: 14px;
 }
 
 h1 {
index f86f0a3be65f5d0fc419f2071c297a81b66b6e81..03c3e9d6889e144e7fca65381ff20343f36babf1 100644 (file)
@@ -4,68 +4,62 @@ div, table {
 }
 /**/
 
-#page_title {
-       border-bottom: 1px solid #AFAFAF;
+#page-header {
+       border-bottom: 1px solid grey;
+       line-height: 20px;
 }
 
-#top {
+.page-header-container {
        position: relative;
-       background-color: #036fab;
-       color: #ffffff;
+       background-color: steelblue;
+       color: white;
        padding: 5px;
        margin: 0px 0px 10px 0px;
 }
 
-#page_footer {
+#page-footer {
        position: relative;
-       background-color: #c2dfef;
+       background-color: lightblue;
        padding: 5px;
        margin: 10px 0px 0px 0px;
 }
 
-#left {
+#left-menu-container {
        float: left;
-       background-color: #ece3a5;
+       background-color: khaki;
        padding: 5px;
        width: 170px;
 }
 
-#right {
-       float: right;
-       background-color: #ece3a5;
-       padding: 5px;
-       width: 150px;
-}
-
 .center_content {
        position: relative;
        background-color: #dddddd;
        padding: 5px;
 }
 
-.left_content {
+.content-container {
        padding-right: 5px;
        padding-bottom: 5px;
        margin-left: 190px;
 }
 
-.table_footer {
+.table-footer {
        margin: 2px;
 }
 
-#top a:link, #top a:visited {
-       color: #ffffff;
+.page-header-container a:link, .page-header-container a:visited {
+       color: white;
        font-weight : bold;
        text-decoration: none;
 }
 
-#top a:link:hover, #top a:visited:hover  {
-       color: #000000;
+.page-header-container a:link:hover, .page-header-container a:visited:hover  {
+       color: black;
        font-weight : bold;
        text-decoration : underline;
 }
 
-table, .table, .table_medium {
+table, .table, .table-medium {
        margin: 0px;
        padding: 0px;
 }
@@ -74,68 +68,69 @@ table, .table, .table_medium {
        width: 500px;
 }
 
-.table_footer {
+.table-footer {
        margin: 2px;
 }
 
-.table_medium {
+.table-medium {
        width: 650px;
 }
 
-.table_full {
+.table-full {
+       margin: 0 auto;
        width: 100%;
 }
 
-.table_row {
+.table-row {
        width: 100%;
        min-height: 20px;
        margin: 2px;
        overflow: auto;
 }
 
-.table_left {
+.table-left {
        width: 250px;
        min-height: 20px;
        float: left;
 }
 
-.table_right {
+.table-right {
        width: 200px;
        min-height: 20px;
        float: right;
 }
 
-.table_left25 {
+.table-left25 {
        width: 20px;
        min-height: 20px;
        float: left;
 }
 
-.table_right75 {
+.table-right75 {
        width: 430px;
        min-height: 20px;
        float: right;
 }
 
-.table_left_medium {
+.table-left-medium {
        width: 300px;
        min-height: 20px;
        float: left;
 }
 
-.table_right_medium {
+.table-right-medium {
        width: 300px;
        min-height: 20px;
        float: right;
 }
 
-.table_left25_medium {
+.table-left25-medium {
        width: 150px;
        min-height: 20px;
        float: left;
 }
 
-.table_right75_medium {
+.table-right75-medium {
        width: 490px;
        min-height: 20px;
        float: right;
@@ -145,7 +140,7 @@ table, .table, .table_medium {
        padding: 5px;
 }
 
-ul.footer_nav, ul.mini_nav {
+ul.navbar-horizontal, ul.navbar-mini {
        display: block;
        text-align: center;
        list-style: none;
@@ -153,20 +148,20 @@ ul.footer_nav, ul.mini_nav {
        padding: 0px;
 }
 
-ul.footer_nav li.footer_link, ul.mini_nav li.mini_link {
+ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini {
        display: block;
        float: left;
 }
 
-ul.footer_nav li.footer_link {
+ul.navbar-horizontal li.navlink-horizontal {
        width: 100px;
 }
 
-ul.mini_nav li.mini_link {
+ul.navbar-mini li.navlink-mini {
        padding: 1px;
 }
 
-ul.footer_nav li.footer_copyright {
+ul.navbar-horizontal li.footer_copyright {
        float: right;
        width: 300px;
        margin-right: 10px;
@@ -177,30 +172,30 @@ ul.footer_nav li.footer_copyright {
        padding-left: 5px;
 }
 
-.menu_header {
+.menu-header {
        font-weight: bold;
 }
 
-.table_header, .table_label, .message_header {
+.table-header {
        text-align: center;
        font-weight: bold;
 }
 
-.table_data_label, .table_data_field {
+.table-data-label, .table-data-field {
        display: block;
        border: 1px solid #aaaaaa;
        border-top-right-radius: 8px;
        border-bottom-left-radius: 8px;
 }
 
-.table_data_label {
+.table-data-label {
        font-weight: bold;
-       background-image: linear-gradient(#eeeeee, #bbbbbb);
+       background-image: linear-gradient(#eeeeee, #aaaaaa);
        height: 16px;
        padding-left: 4px;
 }
 
-.table_data_field {
+.table-data-field {
        background-color: #f5f5f5;
        vertical-align: top;
        padding-top: 1px;
@@ -211,24 +206,25 @@ ul.footer_nav li.footer_copyright {
        min-height: 15px;
 }
 
-#content_header {
-       border-color: #888888;
+#content-header {
+       border-color: grey;
        background-image: linear-gradient(#eeeeee, #aaaaaa);
        font-weight: bold;
        font-size: 18px;
        margin-bottom: 20px;
        padding-left: 5px;
+       line-height: 20px;
 }
 
-.table_header_column {
+.table-header-column {
        width: 100px;
 }
 
-.table_header_column25 {
+.table-header-column25 {
        width: 25%;
 }
 
-.table_data_column {
+.table-data-column {
        width: 100px;
 }
 
@@ -236,141 +232,138 @@ ul.footer_nav li.footer_copyright {
        text-align: right;
 }
 
-.errors {
+.alert-danger {
        color: red;
 }
 
-.errors:hover {
+.alert-danger:hover {
        cursor: not-allowed;
 }
 
-.fatals {
-       color: red;
-       font-weight: bold;
+.alert-warning {
+       color: orange;
 }
 
-.infos {
+.alert-info {
        color: cornflowerblue;
 }
 
-.warnings {
-       color: gold;
-}
-
-.message_box, .message_box_mini {
-       border: 1px solid #888888;
+.message-container {
+       border: 1px solid grey;
        border-top-right-radius: 8px;
        border-bottom-left-radius: 8px;
-       background-color: #f0f0fa;
+       background-color: ghostwhite;
 }
 
-.message_box {
+.message-medium {
        width: 400px;
 }
 
-.message_box_mini {
+.message-auto {
+       margin: auto 0px;
+}
+
+.message-mini {
        width: 160px;
 }
 
-.message_header {
-       border-bottom: 1px solid #888888;
+.message-header {
+       border-bottom: 1px solid grey;
        background-image: linear-gradient(#eeeeee, #aaaaaa);
        border-top-right-radius: 8px;
+       line-height: 18px;
+       text-align: center;
+       font-weight: bold;
 }
 
-.okay {
-       color: #00aa00;
-}
-
-.user_status_confirmed, .customer_status_confirmed {
+.user-status-confirmed, .customer-status-confirmed {
        color: #00aa00;
 }
 
-.user_status_unconfirmed, .customer_status_unconfirmed {
+.user-status-unconfirmed, .customer-status-unconfirmed {
        color: #00aaaa;
 }
 
-.user_status_locked, .customer_status_locked {
+.user-status-locked, .customer-status-locked {
        color: #aa0000;
 }
 
-.unlink_link {
+.link-warning {
        color: #aaaa00;
 }
 
-.delete_link {
+.link-danger {
        color: #aa0000;
 }
 
-.right_space {
+.divider-right {
        margin-right: 2px;
 }
 
-#content_header, .input, .select, .submit, .reset, .delete_button, .unlink_button, .fieldset {
-       border: 1px solid #888888;
+#content-header, .input, .select, .submit, .reset, .button-danger, .button-warning, .fieldset {
+       border: 1px solid grey;
        border-top-right-radius: 8px;
        border-bottom-left-radius: 8px;
 }
 
 .checkbox {
-       border: 1px solid #888888;
+       border: 1px solid grey;
 }
 
 input, textarea, select, option {
        background-color: #fbfbfb;
 }
 
-.submit, .reset, .delete_button, .unlink_button {
+.submit, .reset, .button-danger, .button-warning {
        cursor: pointer;
 }
 
-input:hover, textarea:hover, select:hover, option:hover {
-       border-color: #666666;
-       background-color: #eeeeee;
+.fieldset {
+       padding: 5px;
 }
 
-.delete_button:hover {
-       border-color: #dd0000;
-       background-color: #aa0000;
-       color: #eeeeee;
+.input {
+       padding-left: 4px;
+       padding-right: 4px;
 }
 
-.unlink_button:hover {
-       border-color: #dddd00;
-       background-color: #cccc00;
-       color: #eeeeee;
+#menu-content-wrapper {
+       overflow: auto;
 }
 
-.delete_button {
+.button-danger {
        border-color: #ee0000;
        background-color: #880000;
-       color: #ffffff;
+       color: white;
 }
 
-.unlink_button {
+.button-warning {
        border-color: #eeee00;
        background-color: #aaaa00;
-       color: #ffffff;
+       color: white;
 }
 
-.fieldset {
-       padding: 5px;
+input:hover, textarea:hover, select:hover, option:hover {
+       border-color: #666666;
+       background-color: #eeeeee;
 }
 
-.input {
-       padding-left: 4px;
-       padding-right: 4px;
+.button-danger:hover {
+       border-color: #dd0000;
+       background-color: #aa0000;
+       color: #eeeeee;
 }
 
-#menu_content {
-       overflow: auto;
+.button-warning:hover {
+       border-color: #dddd00;
+       background-color: #cccc00;
+       color: #eeeeee;
 }
-
-#menu_content::after {
+#menu-content-wrapper::after {
        clear: both;
 }
 
-.table_row::after {
+.table-row::after {
        clear: both;
 }
 
index f02abb66078f8464a6954265494080c797889960..e2a2cbcae5b59f2a5697d9209ade3b498c789774 100644 (file)
@@ -17,7 +17,7 @@
        <ui:define name="content">
                <widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
index 481cca5aef06ed5945930faea2098f69c30349fa..44336717883bb0180318d46a73e97a50a61fb774 100644 (file)
@@ -15,7 +15,7 @@
 
        <ui:define name="content">
                <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <div class="table_header">
+                       <div class="table-header">
                                <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
                        </div>
 
index f8620d57b5b73c718ac7125a18c4c729e50ad981..c80d0acc1129def60e7e9ae7de6707ea03da6bad 100644 (file)
@@ -16,7 +16,7 @@
        <ui:define name="content">
                <h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
                                </div>
 
@@ -24,7 +24,7 @@
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
+                               <div class="table-footer">
                                        <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
                                </div>
                        </h:panelGroup>
index fedd9d48bd6c54ecdd7809a5ee53a100c24329fd..77e5d7dd559b7967e7f631c5793055ad042271f7 100644 (file)
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
 
                <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
-                       <div class="table_header">
+                       <div class="table-header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                        </div>
 
                                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
                                        </legend>
 
-                                       <h:panelGroup styleClass="table_row" layout="block">
-                                               <div class="table_left">
+                                       <h:panelGroup styleClass="table-row" layout="block">
+                                               <div class="table-left">
                                                        <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
                                                </div>
 
-                                               <div class="table_right">
+                                               <div class="table-right">
                                                        <h:outputText value="#{contactController.emailAddress}" />
                                                </div>
                                        </h:panelGroup>
@@ -45,8 +45,8 @@
 
                                <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton class="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
                                </div>
                        </h:form>
index 9d641961a092508c811e136ac6ead0324bbe7f2c..829bb87eebb1c13bdc011be7557bd3eb2a6b1e2f 100644 (file)
@@ -20,7 +20,7 @@
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <h:form id="form_user_change_password">
                                <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-                                       <div class="table_header">
+                                       <div class="table-header">
                                                <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
                                        </div>
 
                                                        <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
                                                </legend>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left">
                                                                <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <div class="table-right">
                                                                <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left">
                                                                <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <div class="table-right">
                                                                <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
                                        </fieldset>
 
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <div class="table-footer">
+                                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 90150c04aaec1af4a17dbd5c7103f13dac818150..f77c383eee03fc1a5aa7572718fcc7d1db98e91c 100644 (file)
@@ -15,8 +15,8 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <div class="table-header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
                        </div>
 
 
                                <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                        <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
                                </div>
                        </h:form>
                </h:panelGroup>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
index 713b4b0f59417e812c3c0c98d9e2a56a89d2c341..047074190907f0ae76130d49d02229a3c0f4691d 100644 (file)
@@ -17,7 +17,7 @@
        <ui:define name="content">
                <widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
                        <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />