]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Tue, 31 Oct 2017 18:55:52 +0000 (19:55 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 31 Oct 2017 18:59:54 +0000 (19:59 +0100)
- added support for local i18n string bundles which may be useful when the
  application itself has i18n keys that could be "dynamic" (entered by
  administrator)
- all converters are now performing a CDI "lookup" and no EJB calls anymore
  which is nice for performance
- PrimeFaces have an upcoming feature when scripts and maybe CSS can be bundled
  which improves load performance of the web application
- but only with 6.2+ and with older versions this option is safely ignored
- removed CSS class "input" and other "2-corner rouded" styles, they may return
  in form of an own theme?

Signed-off-by: Roland Häder <roland@mxchange.org>
65 files changed:
.gitignore
src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java
src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java
src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java
src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java
src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.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/business/basicdata/FinancialsCompanyNameValidator.java
src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
src/java/org/mxchange/localization/generic_de_DE.properties
src/java/org/mxchange/localization/generic_en_US.properties
src/java/org/mxchange/localization/local_xx_XX.properties-dist [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl
web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl
web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.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/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_single.tpl
web/WEB-INF/templates/login/user/user_enter_current_password.tpl
web/WEB-INF/web.xml
web/admin/basic_company_data/admin_basic_company_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/opening_time/admin_opening_time_list.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_resend_link.xhtml
web/resources/css/custom.css
web/user/login_user_change_password.xhtml

index cf4a7c5b0dae6e64df0a9d42472e823cbac70ce2..22aa21b220e8555c5c69f9a41aac85e1cdb5ec46 100644 (file)
@@ -9,3 +9,6 @@ nbproject/*~
 /*.properties
 .~lock*
 .gitcommits
+
+# Local i18n strings
+local_*.properties
index e28f2bd5366a73c00dd2c2605201df19d0bb01ca..607a5b2ee2a2e1d9003d15969c36eccee8bf3880 100644 (file)
@@ -17,6 +17,7 @@
 package org.mxchange.jfinancials.beans;
 
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import org.mxchange.jcoreee.bean.faces.BaseFacesBean;
 
@@ -46,12 +47,21 @@ public abstract class BaseFinancialsBean extends BaseFacesBean {
                if (BaseFacesBean.getBundles().isEmpty()) {
                        // Load resource bundles, so it will be loaded from this JAR"
                        // 1) Generic
-                       ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.bundle", locale);
+                       ResourceBundle bundle = ResourceBundle.getBundle("org.mxchange.localization.generic", locale);
                        BaseFacesBean.getBundles().add(bundle);
 
                        // 2) Project-specific
                        bundle = ResourceBundle.getBundle("org.mxchange.localization.project", locale);
                        BaseFacesBean.getBundles().add(bundle);
+
+                       // Try the local file
+                       try {
+                               // 3) Local (not committed)
+                               bundle = ResourceBundle.getBundle("org.mxchange.localization.local", locale);
+                               BaseFacesBean.getBundles().add(bundle);
+                       } catch (final MissingResourceException ex) {
+                               // Cannot load it, it is okay here
+                       }
                }
        }
 
index df40a8c28b43702ebb216877d163a7f88004e5c0..83e5e5045e1164de6b0610b9fde7da8d78381138 100644 (file)
  */
 package org.mxchange.jfinancials.converter.business.basicdata;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsBasicCompanyDataConverter implements Converter<BasicData>
        public BasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (BASIC_DATA_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBusinessDataWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       BASIC_DATA_CONTROLLER = CDI.current().select(FinancialsBusinessDataWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 04e514c7958cc47974eb98723eca4dca1eae3653..fe0250819a7fbbc6bf33e7ff745a190791a90bff 100644 (file)
  */
 package org.mxchange.jfinancials.converter.business.branchoffice;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsBranchOfficeConverter implements Converter<BranchOffice>
        public BranchOffice getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (BRANCH_OFFICE_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               BRANCH_OFFICE_CONTROLLER = (FinancialsBranchOfficeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBranchOfficeWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       BRANCH_OFFICE_CONTROLLER = CDI.current().select(FinancialsBranchOfficeWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index a09d39962aaecddc0c98955d6a3e7bb364b66b7f..79ae0dc783d1b002f165b62e93add31cb529b41d 100644 (file)
  */
 package org.mxchange.jfinancials.converter.business.department;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentNotFoundException;
 import org.mxchange.jcontactsbusiness.model.department.Department;
 import org.mxchange.jfinancials.beans.business.department.FinancialsDepartmentWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsDepartmentConverter implements Converter<Department> {
        public Department getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (DEPARTMENT_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               DEPARTMENT_CONTROLLER = (FinancialsDepartmentWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsDepartmentWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       DEPARTMENT_CONTROLLER = CDI.current().select(FinancialsDepartmentWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 1e30c5c47b38f35ef03f7899944abea9b3e3b266..0c60106058bc9bfbc773b2272ce4af043b78c7ce 100644 (file)
  */
 package org.mxchange.jfinancials.converter.business.employee;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.employee.Employable;
 import org.mxchange.jfinancials.beans.business.employee.FinancialsEmployeeWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsEmployeeConverter implements Converter<Employable> {
        public Employable getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (EMPLOYEE_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               EMPLOYEE_CONTROLLER = (FinancialsEmployeeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsEmployeeWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       EMPLOYEE_CONTROLLER = CDI.current().select(FinancialsEmployeeWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index fc2040e489e046b32d9ab42d0692a98f9a3e6b87..6afd11da009618ee0e0e254d747d298230aab983 100644 (file)
  */
 package org.mxchange.jfinancials.converter.business.opening_time;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
 import org.mxchange.jfinancials.beans.business.opening_time.FinancialsOpeningTimeWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsCompanyOpeningTimeConverter implements Converter<OpeningT
        public OpeningTime getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (OPENING_TIMES_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               OPENING_TIMES_CONTROLLER = (FinancialsOpeningTimeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsOpeningTimeWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       OPENING_TIMES_CONTROLLER = CDI.current().select(FinancialsOpeningTimeWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 90afef45eba2cb418d248c2ac7620adef1ba4543..f22c29291c49e0f2103f0b8a30819ead1ddc0089 100644 (file)
  */
 package org.mxchange.jfinancials.converter.contact;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsContactConverter implements Converter<Contact> {
        public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (CONTACT_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsContactWebRequestBean.class.getSimpleName()));
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       CONTACT_CONTROLLER = CDI.current().select(FinancialsContactWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 522a15df1e53c274961d3ad9ba354b751982cfe1..e1fbde727d4cc052892af84785e079305c747c92 100644 (file)
  */
 package org.mxchange.jfinancials.converter.country;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcountry.exceptions.CountryNotFoundException;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jfinancials.beans.country.FinancialsCountryWebRequestBean;
@@ -48,16 +44,8 @@ public class FinancialsCountryConverter implements Converter<Country> {
        public Country getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (COUNTRY_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               COUNTRY_CONTROLLER = (FinancialsCountryWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsCountryWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       COUNTRY_CONTROLLER = CDI.current().select(FinancialsCountryWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 4a053f09e7f44f051011c0990df6ccfe3e55890c..9c4400ecdb484d94dace212ed96e18ebcf1f9ee7 100644 (file)
  */
 package org.mxchange.jfinancials.converter.fax;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
@@ -48,16 +44,8 @@ public class FinancialsFaxNumberConverter implements Converter<DialableFaxNumber
        public DialableFaxNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (PHONE_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       PHONE_CONTROLLER = CDI.current().select(FinancialsPhoneWebRequestBean.class).get();
                }
 
                // Log message
index e5e627b8146f75312f519a3baa4c679a8f01693b..f5443cfb4d9d10cf5ffc8673527ee916e9a232e6 100644 (file)
  */
 package org.mxchange.jfinancials.converter.landline;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
@@ -48,16 +44,8 @@ public class FinancialsLandLineNumberConverter implements Converter<DialableLand
        public DialableLandLineNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (PHONE_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       PHONE_CONTROLLER = CDI.current().select(FinancialsPhoneWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 35809f49bb640821dcad7e439d657f2d31e000e9..ae98949fc6f50465b3f8b7d046d7d5f7634a3948 100644 (file)
  */
 package org.mxchange.jfinancials.converter.mobile;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
@@ -48,16 +44,8 @@ public class FinancialsMobileNumberConverter implements Converter<DialableMobile
        public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (PHONE_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       PHONE_CONTROLLER = CDI.current().select(FinancialsPhoneWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index db73183b4188bb158eb46ab67f836ea721965d49..ae717d4238a341e2dc1ff0f8abe06c7843cded9a 100644 (file)
  */
 package org.mxchange.jfinancials.converter.mobileprovider;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.mobileprovider.FinancialsMobileProviderWebRequestBean;
 import org.mxchange.jfinancials.beans.mobileprovider.FinancialsMobileProviderWebRequestController;
 import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderNotFoundException;
@@ -47,16 +44,8 @@ public class FinancialsMobileProviderConverter implements Converter<MobileProvid
        public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (MOBILE_PROVIDER_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               MOBILE_PROVIDER_CONTROLLER = (FinancialsMobileProviderWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsMobileProviderWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
-                       }
+                       // Get bean from CDI directly
+                       MOBILE_PROVIDER_CONTROLLER = CDI.current().select(FinancialsMobileProviderWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 829bd6f75bfbaac48e7983935719066c9595aa0f..79a646f7a6abcf12056284ea214932a837c1f00a 100644 (file)
  */
 package org.mxchange.jfinancials.converter.user;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestBean;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
@@ -47,16 +44,8 @@ public class FinancialsUserConverter implements Converter<User> {
        public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (USER_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsUserWebRequestBean.class.getSimpleName()));
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       USER_CONTROLLER = CDI.current().select(FinancialsUserWebRequestBean.class).get();
                }
 
                // Is the value null or empty?
index 8d34d0cdaa8018b7de3d1806aa0a967e3db8af10..050ea27aec6ac560c7222fa1b225c6b697ea360a 100644 (file)
 package org.mxchange.jfinancials.validator.business.basicdata;
 
 import java.text.MessageFormat;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 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.jcoreee.validator.string.BaseStringValidator;
 import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean;
 import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController;
@@ -51,16 +49,8 @@ public class FinancialsCompanyNameValidator extends BaseStringValidator {
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
                // Is the instance there?
                if (BASIC_DATA_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBusinessDataWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       BASIC_DATA_CONTROLLER = CDI.current().select(FinancialsBusinessDataWebRequestBean.class).get();
                }
 
                // All accepted, required fields
index 7241549adbf8115b49ecfd28f8ce310da26eb8e3..4e5a43136bb1be71c18c268d87ec03aafb7b2b89 100644 (file)
@@ -18,14 +18,12 @@ package org.mxchange.jfinancials.validator.emailaddress;
 
 import java.text.MessageFormat;
 import java.util.regex.Pattern;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 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.jcoreee.validator.string.BaseStringValidator;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestBean;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController;
@@ -62,16 +60,8 @@ public class FinancialsEmailAddressValidator extends BaseStringValidator {
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
                // Is the instance there?
                if (CONTACT_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsContactWebRequestBean.class.getSimpleName()));
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       CONTACT_CONTROLLER = CDI.current().select(FinancialsContactWebRequestBean.class).get();
                }
 
                // The required field
index 8ef3cd9dc2360ac3aa2b910e4c32424cdbdbfbd2..741ad434b3b24e605934a334d9935a67046cfc21 100644 (file)
 package org.mxchange.jfinancials.validator.user;
 
 import java.text.MessageFormat;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 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.jcoreee.validator.number.BaseNumberValidator;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestBean;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController;
@@ -51,16 +49,8 @@ public class FinancialsUserIdValidator extends BaseNumberValidator {
        public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
                // Is the instance there?
                if (USER_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsUserWebRequestBean.class.getSimpleName()));
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       USER_CONTROLLER = CDI.current().select(FinancialsUserWebRequestBean.class).get();
                }
 
                // All accepted, required fields
index ac6b5bcaaa560a7d93068d58617baba312523853..7b5ca9768cf85284abdad3ee5dcf86b67ca26e18 100644 (file)
@@ -287,7 +287,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl f\u00fcr Gespr\u00e4che ausserh
 ADMIN_ENTER_COUNTRY_PHONE_CODE=Vorwahl f\u00fcr das Land:
 ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Beispiel: 49 f\u00fcr Deutschland)
 BUTTON_ADMIN_ADD_COUNTRY=L\u00e4nderdaten hinzuf\u00fcgen
-ADMIN_ID_NUMBER=Id-Nummer:
+ADMIN_HEADER_ID_NUMBER=Id-Nummer:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=L\u00e4ndercode:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Vorwahl ausserorts:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
@@ -319,7 +319,7 @@ ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Beispiel: %s@smsmail.anbieter.examp
 ADMIN_LIST_MOBILE_PROVIDER_NAME=Name:
 ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Vorwahl:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Land:
-ADMIN_LIST_ENTRY_CREATED=Erstellt:
+ADMIN_HEADER_ENTRY_CREATED=Erstellt:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Editieren oder l\u00f6schen des Handyanbieters
 ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen:
@@ -791,37 +791,36 @@ CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Auflisten von Stammdaten
 ADMIN_EMPTY_LIST_BASIC_COMPANY_DATA=Es befinden sich keine Stammdaten in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
 TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=Diese Tabelle listet Stammdaten auf.
-ADMIN_BASIC_COMPANY_DATA_ID=Id-Nummer:
+ADMIN_HEADER_BASIC_COMPANY_DATA_ID=Id-Nummer:
 #@TODO Please fix German umlauts!
 ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Stammdaten des Unternehmens anzeigen.
-ADMIN_ASSIGNED_USER=Zugew. Benutzer:
+ADMIN_HEADER_ASSIGNED_USER=Zugew. Benutzer:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Benutzerprofil des zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Stammdaten einen Benutzeraccount zuweisen.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Firmenname:
-ADMIN_CONTACT_PERSON=Ansprechpartner:
+ADMIN_HEADER_BASIC_DATA_COMPANY_NAME=Firmenname:
+ADMIN_HEADER_COMPANY_CONTACT_PERSON=Ansprechpartner:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Zeigt einen Mitarbeiter an, der als Ansprechpartner eingetragen ist.
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON=Zuweisen
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Weisst einen Mitarbeiter als Ansprechpartner des geschaftlichen Kontaktes zu.
 ADMIN_SHOW_FULL_CONTACT_DATA_TITLE=Zeigt das komplette Kontaktprofil an.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS=Anmerkungen:
-ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER=Haupttelefonnummer:
-ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER=Hauptfaxnummer:
+ADMIN_BASIC_DATA_COMPANY_COMMENTS=Anmerkungen:
+ADMIN_BASIC_DATA_PHONE_NUMBER=Haupttelefonnummer:
+ADMIN_BASIC_DATA_FAX_NUMBER=Hauptfaxnummer:
 #@TODO Please fix German umlauts!
 ADMIN_ADD_BASIC_COMPANY_DATA_TITLE=Geschaeftlichen Kontakt hinzufuegen
 ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein.
 #@TODO Please fix German umlauts!
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format.
 #@TODO Please fix German umlauts!
-ADMIN_BASIC_COMPANY_DATA_LEGEND=Basisdaten fuer geschaeftlichen Kontakt:
+ADMIN_BASIC_DATA_LEGEND=Basisdaten fuer geschaeftlichen Kontakt:
 #@TODO Please fix German umlauts!
-ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE=Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Firmenname:
-ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen inklusive Rechtsform ein.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH):
-ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse:
+ADMIN_BASIC_DATA_LEGEND_TITLE=Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.
+ADMIN_BASIC_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen inklusive Rechtsform ein.
+ADMIN_BASIC_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH):
+ADMIN_BASIC_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse:
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_ADD_BASIC_COMPANY_DATA=Basisdaten hinzufuegen
 ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert.
@@ -832,8 +831,8 @@ BUTTON_CHANGE_LOCALE_TITLE=Aendern Sie hier in der aktuellen Sitzung die angezei
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen:
 ADMIN_FEATURE_UNFINISHED_WARNING=Diese Funktion ist noch nicht fertiggestellt.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER=Steuernummer:
-ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
+ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER=Steuernummer:
+ADMIN_BASIC_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen:
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO=Firmenlogo auswaehlen:
@@ -845,12 +844,11 @@ ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE=Mitarbeiter als Kontakt
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS=Daten des Hauptsitzesz auswaehlen:
 LINK_COMPANY_WEBSITE_URL_TITLE=Link zur Unternehmenswebseite (neues Fenster)
 #@TODO Please fix German umlauts!
-ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Gruender
+ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER=Gruender
 #@TODO Please fix German umlauts!
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Daten des Unternehmensgruenders anzeigen.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Weisst diesem Firmeneintrag einen Unternehmensgruender zu.
-ADMIN_BASIC_COMPANY_DATA_CREATED=Eintrag erstellt
 ADMIN_USER_NAME_IS_REQUIRED=Bitte vergeben Sie einen Benutzernamen. Dieser muss unique sein.
 NO_WEBSITE_URL_ENTERED=Keine URL eingegeben.
 ADMIN_LINK_LIST_BRANCH_OFFICES=Filialen
@@ -916,7 +914,7 @@ ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Editieren der Faxnummer.
 ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Editieren von Grunddaten des Unternehmens.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens.
-ADMIN_ACTION_LINKS=Aktionen:
+ADMIN_HEADER_ACTION_LINKS=Aktionen:
 ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Erneut
 ADMIN_LINK_UNLOCK_SHORT=Entsperren
 ADMIN_LINK_LOCK_SHORT=Sperren
@@ -951,11 +949,11 @@ ADMIN_LIST_MOBILE_PROVIDERS_HEADER=Liste aller Mobilfunkanbieter
 SELECT_SHOWN_COLUMNS=Angezeigte Spalten
 ADMIN_LIST_BRANCH_OFFICES_HEADER=Alle Filialen auflisten
 LABEL_USERS=Benutzer
-FILTER_BY_MULTIPLE_USERS_TITLE=Liste durch Auswahl von ein oder mehr Benutzern durchsuchen.
+FILTER_BY_MULTIPLE_USERS_TITLE=Liste durch Auswahl von ein oder mehr Benutzern filtern.
 LABEL_COMPANIES=Unternehmen
-FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unternehmen durchsuchen.
+FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unternehmen filtern.
 LABEL_EMPLOYEES=Mitarbeiter
-FILTER_BY_MULTIPLE_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter durchsuchen.
+FILTER_BY_MULTIPLE_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter filtern.
 ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Filialnummer eingeben:
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_BRANCH_OFFICE=Filiale auswaehlen:
@@ -1027,7 +1025,7 @@ ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Loescht die Abteilung
 ADMIN_DEPARTMENT_ALREADY_CREATED=Die Abteilung existiert bereits im ausgewaehlten Unternehmen.
 ADMIN_LIST_DEPARTMENTS_HEADER=Alle Abteilungen auflisten
 #@TODO Please fix German umlauts!
-ADMIN_DEPARTMENT_I18N_KEY=Sprachschluessel:
+ADMIN_HEADER_I18N_KEY=Sprachschluessel:
 ADMIN_ENTER_DEPARTMENT_I18N_KEY=Sprachschluessel fuer Abteilung:
 ADMIN_DEPARTMENT_LEAD_EMPLOYEE=Abteilungsleiter:
 ADMIN_ADD_DEPARTMENT_TITLE=Neue Abteilung hinzuf\u00fcgen
@@ -1053,7 +1051,7 @@ TABLE_SUMMARY_ADMIN_LIST_OPENING_TIMES=Diese Tabelle listet alle bereits angeleg
 #@TODO Please fix German umlauts!
 ADMIN_EMPTY_LIST_OPENING_TIMES=Es befinden sich keine Oeffnungszeiten in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 LABEL_WEEK_DAYS=Wochentage
-FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE=Liste durch Auswahl von ein oder mehr Wochentagen durchsuchen.
+FILTER_BY_MULTIPLE_WEEK_DAYS_TITLE=Liste durch Auswahl von ein oder mehr Wochentagen filtern.
 #@TODO Please fix German umlauts!
 ADMIN_LIST_OPENING_TIMES_HEADER=Liste aller Oeffnungszeiten
 ADMIN_START_WEEK_DAY=Start-Wochentag:
@@ -1096,3 +1094,4 @@ ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND=Einzelne Oeffnungzeit der Filiale:
 ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE=Geben Sie hier eine einzelne Oeffnungszeit der Filiale ein.
 #@TODO Please fix German umlauts!
 ADMIN_OPENING_TIME_ALREADY_CREATED=Die Oeffnungzeit wurde bereits hinzugefuegt.
+ADMIN_NOT_ASSIGNED=Nicht zugewiesen
index 22c600b84339da8a3e2ba8c0494d8356173c6855..1f343143c2adfc33d796b6fb81a4f00c752f0157 100644 (file)
@@ -265,7 +265,7 @@ ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX=Prefix for calls outside local city: (m
 ADMIN_ENTER_COUNTRY_PHONE_CODE=Dial prefix for this country:
 ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE=(Example: 1 for U.S.A.)
 BUTTON_ADMIN_ADD_COUNTRY=Add country data
-ADMIN_ID_NUMBER=Id number:
+ADMIN_HEADER_ID_NUMBER=Id number:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE=Country code:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
@@ -297,7 +297,7 @@ ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE=(Example: %s@smsmail.provider.exampl
 ADMIN_LIST_MOBILE_PROVIDER_NAME=Name:
 ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX=Dial prefix:
 ADMIN_LIST_MOBILE_PROVIDER_COUNTRY=Country:
-ADMIN_LIST_ENTRY_CREATED=Created:
+ADMIN_HEADER_ENTRY_CREATED=Created:
 ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE=Edit or delete mobile provider
 ADMIN_USER_DATA_ENTER_PASSWORD=Enter password:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password:
@@ -771,31 +771,30 @@ PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=List basic company data
 CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Lists basic company data
 ADMIN_EMPTY_LIST_BASIC_COMPANY_DATA=There are currently no basic company data in database. Or your search criteria doesn't match anything.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=This table lists all basic company data.
-ADMIN_BASIC_COMPANY_DATA_ID=Id Number:
+ADMIN_HEADER_BASIC_COMPANY_DATA_ID=Id Number:
 ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Show details of this business contact.
-ADMIN_ASSIGNED_USER=Assigned user:
+ADMIN_HEADER_ASSIGNED_USER=Assigned user:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Shows assigned user profile.
 ADMIN_LINK_ASSIGN=Assign
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE=Assigns this business contact to a user account.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Company name:
-ADMIN_CONTACT_PERSON=Contact person:
+ADMIN_HEADER_BASIC_DATA_COMPANY_NAME=Company name:
+ADMIN_HEADER_COMPANY_CONTACT_PERSON=Contact person:
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Shows a single employee entry who has been assigned as contact person.
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON=Assign
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE=Assigns an employee as a contact person for given business contact.
 ADMIN_SHOW_FULL_CONTACT_DATA_TITLE=Shows complete contact profile.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS=Comments:
-ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER=Main phone number:
-ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER=Main fax number:
+ADMIN_BASIC_DATA_COMPANY_COMMENTS=Comments:
+ADMIN_BASIC_DATA_PHONE_NUMBER=Main phone number:
+ADMIN_BASIC_DATA_FAX_NUMBER=Main fax number:
 ADMIN_ADD_BASIC_COMPANY_DATA_TITLE=Add new business contact
 ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA=Please enter at least company name including legal status.
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid.
-ADMIN_BASIC_COMPANY_DATA_LEGEND=Basic data for business contact:
+ADMIN_BASIC_DATA_LEGEND=Basic data for business contact:
 #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.
-ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE=Enter basic data for a business contact.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME=Company name:
-ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name including legal status.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.):
-ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS=Main email address:
+ADMIN_BASIC_DATA_LEGEND_TITLE=Enter basic data for a business contact.
+ADMIN_BASIC_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name including legal status.
+ADMIN_BASIC_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.):
+ADMIN_BASIC_DATA_COMPANY_EMAIL_ADDRESS=Main email address:
 BUTTON_ADMIN_ADD_BASIC_COMPANY_DATA=Add basic data
 #Fehler: Falscher Aufruf der Anmeldeseite, da die Eingangsseite als Anmeldeseite fungiert.
 ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Wrong request on registration page as the index page serves as registration page.
@@ -803,18 +802,17 @@ BUTTON_CHANGE_LOCALE=Change
 BUTTON_CHANGE_LOCALE_TITLE=Change here in your current session the used language for text output.
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Choose company founder:
 ADMIN_FEATURE_UNFINISHED_WARNING=This feature is not yet finished.
-ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER=Tax number:
-ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL=Website URL:
+ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER=Tax number:
+ADMIN_BASIC_DATA_COMPANY_WEBSITE_URL=Website URL:
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER=Select user to assign with company:
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO=Choose company logo:
 URL_NOT_MATCHING_REGULAR_EXPRESSION=The entered URL does not match the common form.
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE=Choose employee as contact person:
 ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS=Choose headquarters:
 LINK_COMPANY_WEBSITE_URL_TITLE=Link to company's web site (new window)
-ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER=Founder
+ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER=Founder
 ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder.
 ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry.
-ADMIN_BASIC_COMPANY_DATA_CREATED=Entry created
 ADMIN_USER_NAME_IS_REQUIRED=Please enter a user name. This must be unique.
 NO_WEBSITE_URL_ENTERED=No URL entered.
 ADMIN_LINK_LIST_BRANCH_OFFICES=Branch offices
@@ -868,7 +866,7 @@ ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Deletes a fax number.
 ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Edit of a fax number.
 ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edit of basic data of company.
 ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Deletes basic data of company.
-ADMIN_ACTION_LINKS=Actions:
+ADMIN_HEADER_ACTION_LINKS=Actions:
 ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Resend
 ADMIN_LINK_UNLOCK_SHORT=Unlock
 ADMIN_LINK_LOCK_SHORT=Lock
@@ -954,7 +952,7 @@ ADMIN_LINK_EDIT_DEPARTMENT_TITLE=Edit of a department
 ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Deletes a department.
 ADMIN_DEPARTMENT_ALREADY_CREATED=The department already exists in selected company.
 ADMIN_LIST_DEPARTMENTS_HEADER=List all departments
-ADMIN_DEPARTMENT_I18N_KEY=I18n key:
+ADMIN_HEADER_I18N_KEY=I18n key:
 ADMIN_ENTER_DEPARTMENT_I18N_KEY=I18n key for department:
 ADMIN_DEPARTMENT_LEAD_EMPLOYEE=Department leader:
 ADMIN_ADD_DEPARTMENT_TITLE=Add new department
@@ -1006,3 +1004,4 @@ BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME=Add opening time to branch office
 ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND=Single opening time of branch office:
 ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE=Enter single opening time of branch office.
 ADMIN_OPENING_TIME_ALREADY_CREATED=The opening time has already been added.
+ADMIN_NOT_ASSIGNED=Not assigned
diff --git a/src/java/org/mxchange/localization/local_xx_XX.properties-dist b/src/java/org/mxchange/localization/local_xx_XX.properties-dist
new file mode 100644 (file)
index 0000000..ca62262
--- /dev/null
@@ -0,0 +1,15 @@
+# Copyright (C) 2016, 2017 Roland H\u00e4der
+#
+# 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/>.
+
index 57ccb99cb38bf015774022038544585a536847a8..d29069f09ee57db016c70b2684c756087af3aa74 100644 (file)
                        <core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
 
                        <p:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
-                       <p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
+                       <p:inputText id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
 
                        <p:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
-                       <p:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
+                       <p:inputText id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
 
                        <p:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
-                       <p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
+                       <p:inputText id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
 
                        <p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-                       <p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
+                       <p:inputText id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
 
                        <p:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-                       <p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                       <p:inputText id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
-                       <p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+                       <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
 
                        <p:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-                       <p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                       <p:inputText id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
                        </p:inputText>
 
                        <p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
-                       <p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+                       <p:inputText id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
 
                        <p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
                        <core:outputCountrySelector id="country" value="#{adminContactController.contactCountry}" />
@@ -56,7 +56,7 @@
                        <core:inputMobileNumberPanelGrid targetController="#{adminContactController}" />
 
                        <p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
-                       <p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator for="emailAddress" validatorId="EmailAddressValidator" />
                                <f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" />
                        </p:inputText>
@@ -65,7 +65,7 @@
                        <p:calendar id="contactBirthday" value="#{contactController.birthday}" />
 
                        <p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
-                       <p:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="35" />
+                       <p:inputTextarea id="contactComment" value="#{adminContactController.comment}" rows="7" cols="35" />
                </p:panelGrid>
        </p:fieldset>
 
index c7f5137c307027d90d1c6d0f1500a28c4a46d8ce..9d88fff9e191e5d418e3e71ee9c3c5d0f2fc0410 100644 (file)
@@ -15,7 +15,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <p:outputLabel for="faxNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <p:outputLabel for="faxNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
index bda5f4c80cf29316856c3036fa4649768f617a39..a185be6ccae6d85d11decebb4dccb81c28779dad 100644 (file)
@@ -15,7 +15,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <p:outputLabel for="landLineNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <p:outputLabel for="landLineNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
index 4637f5ddbfb7abfc4150c3afea62453eb2edb41c..a5f194d549347d8517345a5d2451ddf09f6c49dc 100644 (file)
@@ -15,7 +15,7 @@
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
                                </div>
 
                                <div class="table-right-medium">
@@ -54,7 +54,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+                                       <p:inputText id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
                                                <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
index 8f38ce10dc3511f60e862509bb7c8ac42d4adeff..a986d6cd04d271a416df4eef890b68e825a56ecc 100644 (file)
                <p:fieldset legend="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}">
                        <p:panelGrid columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                                <p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-                               <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
+                               <p:inputText id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
 
                                <p:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
-                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+                               <p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 
                                <p:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
-                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+                               <p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 
                                <p:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
                                <p:selectBooleanCheckbox id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
index cc9b16ccbc224acb59420e965d89c1fc243e2853..f6dace4c60ef89d22a334fd579505d13ae6163a4 100644 (file)
@@ -18,7 +18,7 @@
 
                <h:column>
                        <h:panelGroup>
-                               <p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
+                               <p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
                                <h:outputText id="faxNumberId" styleClass="table-data-field" value="#{faxNumber.phoneId}" />
 
index 81292c97d0dc2342e17ec015b9766e6442f73df5..b29634e1f38db9c5bd1bd1f3d11e8f5a63a4293c 100644 (file)
@@ -18,7 +18,7 @@
 
                <h:column>
                        <h:panelGroup>
-                               <p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
+                               <p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
                                <h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
 
index a61cddcbcaa5b1a10f3b17debef0d334d5f37fed..9152d8fa3f43ccd9b1090ea092d75988069ca5fb 100644 (file)
@@ -17,7 +17,7 @@
                </f:facet>
 
                <h:column>
-                       <p:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
+                       <p:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
                        <h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
                </h:column>
index 2f878ff255440f424cf684be9438637e220c460a..6b3f892515e2dae81ea5f83c6206652197151eea 100644 (file)
@@ -9,11 +9,11 @@
        <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
                <core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
 
-               <p:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+               <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
                        <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                </p:inputText>
 
-               <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+               <p:inputText id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
                        <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                </p:inputText>
        </p:panelGrid>
index fda61234696f009440af87dbf35efca55fb0deb5..4c75c4be865c545b53329c50f0d8736da641f061 100644 (file)
@@ -9,11 +9,11 @@
        <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
                <core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
 
-               <p:inputText styleClass="input" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+               <p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
                        <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
                </p:inputText>
 
-               <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+               <p:inputText id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
                        <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
                </p:inputText>
        </p:panelGrid>
index 237d59029671715b4426eaf72913c1de72830254..e8a039098e6038473ca1954fede5856319771c82 100644 (file)
@@ -17,7 +17,7 @@
                        <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                </p:selectOneMenu>
 
-               <p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+               <p:inputText id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
                        <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                </p:inputText>
        </p:panelGrid>
index 64a4ddc64d37a8665529c51c9aa943a97288be2b..c8863cb143b17d006b778e65337e1f0f93da3251 100644 (file)
 
                <p:column>
                        <core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
-                       <p:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+                       <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
                                <f:validator validatorId="PhoneNumberValidator" />
                        </p:inputText>
-                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+                       <p:inputText id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
                                <f:validator validatorId="PhoneNumberValidator" />
                        </p:inputText>
                </p:column>
index a017c5f196233656464b8843f2b4b11c5fa7eccd..a3138286ace320ec32d62a9548df6ee0563de9c4 100644 (file)
 
                <p:column>
                        <core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
-                       <p:inputText styleClass="input" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+                       <p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
                                <f:validator validatorId="PhoneNumberValidator" />
                        </p:inputText>
-                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+                       <p:inputText id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
                                <f:validator validatorId="PhoneNumberValidator" />
                        </p:inputText>
                </p:column>
index 036d19cc5a87d5a29118e034340f975ced9fd95e..5f98fa8227c0b3d4d82f7a8713f1c95eacd93515 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-@TODO: title="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE}"
+@TODO: title="#{msg.ADMIN_BASIC_DATA_LEGEND_TITLE}"
 -->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:p="http://primefaces.org/ui">
 
        <h:panelGroup styleClass="para" layout="block">
-               <p:fieldset legend="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND}">
+               <p:fieldset legend="#{msg.ADMIN_BASIC_DATA_LEGEND}">
                        <p:panelGrid columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
-                               <p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
-                               <p:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminBasicCompanyDataController.companyName}">
+                               <p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME}" />
+                               <p:inputText
+                                       id="companyName"
+                                       value="#{adminBasicCompanyDataController.companyName}"
+                                       size="30"
+                                       maxlength="200"
+                                       required="true"
+                                       requiredMessage="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_REQUIRED}"
+                                       >
                                        <f:validator validatorId="CompanyNameValidator" />
                                        <f:attribute name="checkExisting" value="false" />
                                </p:inputText>
 
-                               <p:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS}" />
-                               <p:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminBasicCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <p:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_DATA_COMPANY_EMAIL_ADDRESS}" />
+                               <p:inputText id="companyEmailAddress" size="20" maxlength="255" value="#{adminBasicCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                        <f:validator validatorId="EmailAddressValidator" />
                                        <f:attribute name="allowEmptyValue" value="true" />
                                </p:inputText>
                                <p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO}" />
                                <core:outputMessageBox id="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
 
-                               <p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER}" />
-                               <p:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyTaxNumber}" />
+                               <p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_DATA_COMPANY_TAX_NUMBER}" />
+                               <p:inputText id="companyTaxNumber" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyTaxNumber}" />
 
-                               <p:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL}" />
-                               <p:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
+                               <p:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_DATA_COMPANY_WEBSITE_URL}" />
+                               <p:inputText id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminBasicCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
                                        <f:validator validatorId="UrlValidator" />
                                        <f:attribute name="allowEmptyValue" value="true" />
                                </p:inputText>
                                        <f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
                                </p:selectOneMenu>
 
-                               <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER}" />
+                               <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_DATA_PHONE_NUMBER}" />
                                <core:inputLandLineNumberPanelGrid targetController="#{adminBasicCompanyDataController}" />
 
-                               <p:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER}" />
+                               <p:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_DATA_FAX_NUMBER}" />
                                <core:inputFaxNumberPanelGrid targetController="#{adminBasicCompanyDataController}" />
 
-                               <p:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS}" />
+                               <p:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_DATA_COMPANY_COMMENTS}" />
                                <p:inputTextarea
-                                       styleClass="input"
                                        id="companyComments"
+                                       value="#{adminBasicCompanyDataController.companyComments}"
                                        rows="7"
                                        cols="25"
-                                       value="#{adminBasicCompanyDataController.companyComments}"
                                        />
                        </p:panelGrid>
                </p:fieldset>
index 3cfbf3f109d30a2bf95be454c2c6a54ca6055c8a..dd6db1701343197b60c869dff8fa49aa82621ec7 100644 (file)
@@ -50,7 +50,7 @@
                        </p:selectOneMenu>
 
                        <p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-                       <p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator validatorId="EmailAddressValidator" />
                                <f:attribute name="allowEmptyValue" value="true" />
                        </p:inputText>
                        <core:inputFaxNumberPanelGrid targetController="#{adminBranchOfficeController}" />
 
                        <p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
-                       <p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
+                       <p:inputText id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
                </p:panelGrid>
        </p:fieldset>
 
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}">
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-                       <p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
+                       <p:inputText id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
 
                        <p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-                       <p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
+                       <p:inputText id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
                                <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-                       <p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
+                       <p:inputText id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
                                <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
                        </p:inputText>
 
                        <p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-                       <p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
+                       <p:inputText id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
                                <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-                       <p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+                       <p:inputText id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
                                <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
                        </p:inputText>
 
                        <p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-                       <p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
+                       <p:inputText id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
 
                        <p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
                        <core:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
index cfe51e9f2e1480dd4715d56bebe60671679599ca..d4980f5381ab87e95d5952b0bfd4a134c9191098 100644 (file)
@@ -22,7 +22,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
+                                       <p:inputText id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
                                                <f:validator validatorId="AbroadDialValidator" />
                                        </p:inputText>
                                </div>
@@ -38,7 +38,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+                                       <p:inputText id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
                                                <f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
                                        </p:inputText>
 
@@ -56,7 +56,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+                                       <p:inputText id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </p:inputText>
                                </div>
@@ -89,7 +89,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
+                                       <p:inputText 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" />
                                        </p:inputText>
                                </div>
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
+                                       <p:inputText 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" />
                                        </p:inputText>
 
index 750eff43b46bcaa8187037eea0b94ed6fea587c9..add54f3f882196dbd28f1a12db803a2b1b996417 100644 (file)
@@ -11,7 +11,7 @@
        <p:fieldset legend="#{msg.ADMIN_DEPARTMENT_LEGEND}">
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="departmentI18nKey" value="#{msg.ADMIN_ENTER_DEPARTMENT_I18N_KEY}" />
-                       <p:inputText styleClass="input" id="departmentI18nKey" size="2" maxlength="10" value="#{adminDepartmentController.departmentI18nKey}" required="true" requiredMessage="#{msg.ADMIN_DEPARTMENT_I18N_KEY_REQUIRED}" />
+                       <p:inputText id="departmentI18nKey" size="2" maxlength="10" value="#{adminDepartmentController.departmentI18nKey}" required="true" requiredMessage="#{msg.ADMIN_DEPARTMENT_I18N_KEY_REQUIRED}" />
 
                        <p:outputLabel for="departmentCompany" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_COMPANY}" />
                        <p:selectOneMenu
index 78dfa304cffdc0eb883ba90654c5d213992793f0..f3834ade0dc5ee584c34dddcd7c68c2b05276e42 100644 (file)
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
-                       <p:inputText styleClass="input" id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                       <p:inputText id="employeeEmailAddress" size="20" maxlength="255" value="#{adminEmployeeController.employeeEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
                                <f:validator validatorId="EmailAddressValidator" />
                                <f:attribute name="allowEmptyValue" value="true" />
                        </p:inputText>
 
                        <p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_STAFF_NUMBER}" />
-                       <p:inputText styleClass="input" id="employeeStaffNumber" size="2" maxlength="10" value="#{adminEmployeeController.employeeStaffNumber}" />
+                       <p:inputText id="employeeStaffNumber" size="2" maxlength="10" value="#{adminEmployeeController.employeeStaffNumber}" />
                </p:panelGrid>
        </p:fieldset>
 
@@ -79,7 +79,7 @@
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND}">
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full">
                        <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
-                       <p:inputText styleClass="input" id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
+                       <p:inputText id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
 
                        <p:outputLabel for="employeeDepartment" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_DEPARTMENT}" />
                        <p:selectOneMenu
index 430fbb957ba11f3e685e953f4b42277cbc537168..e8294d333c34f0e8ca015c1900a18552c0c61bc4 100644 (file)
@@ -23,7 +23,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+                                       <p:inputText id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
                                                <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
                                        </p:inputText>
                                </div>
@@ -39,7 +39,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
+                                       <p:inputText id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
                                </div>
@@ -51,7 +51,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
+                                       <p:inputText id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
                                </div>
                        </h:panelGroup>
 
index c5c008f169c1fbe8d9bca9f08a287b4329b01626..bccd00b26d945c7f19e478c1e4c9efde3def1fa1 100644 (file)
@@ -22,6 +22,7 @@
 
                        <f:loadBundle var="msg" basename="org.mxchange.localization.generic" />
                        <f:loadBundle var="project" basename="org.mxchange.localization.project" />
+                       <f:loadBundle var="local" basename="org.mxchange.localization.local" />
 
                        <h:outputStylesheet name="/css/custom.css" />
 
index 1798080faacd77d714d83b822c072ed7e07c87e2..34dbce394763779c40d5602f17cf36f9b2b18a06 100644 (file)
@@ -25,7 +25,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
+                                       <p:inputText id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -41,7 +41,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
+                                       <p:inputText 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" />
                                        </p:inputText>
                                </div>
@@ -57,7 +57,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
+                                       <p:inputText id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -73,7 +73,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p: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}">
+                                       <p:inputText 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" />
                                        </p:inputText>
                                </div>
@@ -89,7 +89,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+                                       <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
                                </div>
                        </h:panelGroup>
 
                                </div>
 
                                <div class="table-right-medium">
-                                       <p: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}">
+                                       <p:inputText 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" />
                                        </p:inputText>
                                </div>
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
+                                       <p:inputText id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
                                <div class="table-right-medium">
                                        <core:outputCountrySelector styleClass="select" id="landLineCountry" value="#{contactController.landLineCountry}" />
 
-                                       <p:inputText styleClass="input" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+                                       <p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </p:inputText>
 
-                                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
+                                       <p:inputText id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
                                <div class="table-right-medium">
                                        <core:outputCountrySelector styleClass="select" id="faxCountry" value="#{contactController.faxCountry}" />
 
-                                       <p:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                       <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
 
-                                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+                                       <p:inputText id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
index da53f249881326424fce7bd7d8083aa0d4b11132..15d237764ecbe2c52fdb40487555c00f3432a663 100644 (file)
@@ -12,7 +12,7 @@
                </div>
 
                <div class="table-right-medium">
-                       <p: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}">
+                       <p:inputText 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" />
                        </p:inputText>
                </div>
@@ -28,7 +28,7 @@
                </div>
 
                <div class="table-right-medium">
-                       <p:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+                       <p:inputText id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
        </h:panelGroup>
 
index 01c94d24cd96f97750c35e44ade70e98150ab506..05d2b7ded6e0fa16a3b87260210868b5fe5cf4d2 100644 (file)
@@ -24,7 +24,7 @@
                                                </div>
 
                                                <div class="table-right">
-                                                       <p:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+                                                       <p:inputText id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
                                        </h:panelGroup>
 
@@ -38,7 +38,7 @@
                                                </div>
 
                                                <div class="table-right">
-                                                       <p:inputText type="secret" styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+                                                       <p:inputText type="secret" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
                                        </h:panelGroup>
 
index 1f1bb430144a385c53eca6979dd1e2c1541dc510..9f549db4c2788fc596c9d0761b859e5a127d3361 100644 (file)
@@ -25,7 +25,7 @@
                                                        </div>
 
                                                        <div class="table-right-medium">
-                                                               <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+                                                               <p:inputText id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -45,7 +45,7 @@
                                                        </div>
 
                                                        <div class="table-right-medium">
-                                                               <p:inputText type="secret" 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}" />
+                                                               <p:inputText type="secret" 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>
 
@@ -59,7 +59,7 @@
                                                        </div>
 
                                                        <div class="table-right-medium">
-                                                               <p:inputText type="secret" 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}" />
+                                                               <p:inputText type="secret" 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>
 
index 924a5103252a7b49ebf9a2344d7b22d82ac0f800..f5f92bbf34a54c15b8e17a3d96f1ce720ac8c4f6 100644 (file)
@@ -27,7 +27,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+                                                               <p:inputText id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -47,7 +47,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
+                                                               <p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -61,7 +61,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
+                                                               <p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
                                                        </div>
                                                </h:panelGroup>
 
index 1410005c8755a0675392ea15ef58da77646d526b..347ce37a0ef2c9148784727bd1c6134b004819ba 100644 (file)
@@ -18,7 +18,7 @@
                                </div>
 
                                <div class="table-right">
-                                       <p:inputText type="secret" styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+                                       <p:inputText type="secret" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
                                                <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
                                        </p:inputText>
                                </div>
index 3e85fbc2c818ed9a77b9ecefe503d4c1106aa674..0514515115cc64997c3cb3cc83ab57eeafc4979b 100644 (file)
         <param-name>primefaces.THEME</param-name>
         <param-value>bootstrap</param-value>
     </context-param>
+    <context-param>
+        <description>Whether PrimeFaces should collect all scripts and bundle it automatically.</description>
+        <param-name>primefaces.COLLECT_SCRIPTS</param-name>
+        <param-value>true</param-value>
+    </context-param>
     <context-param>
         <description>Refresh perioid of facelets.</description>
         <param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
index f75eb4faecdbdd61e0f1ce14616b4d9429b90dcb..3f1fb166bc24a683132fde4ecf50df527a3be632 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_ID}" sortBy="#{basicData.basicDataId}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_COMPANY_DATA_ID}" sortBy="#{basicData.basicDataId}" filterable="false">
                                        <p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{basicData.companyUserOwner.userName}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{basicData.companyUserOwner.userName}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{basicData.companyName}" filterBy="#{basicData.companyName}" filterMatchMode="contains">
                                        <h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
                                                <h:outputText value="#{basicData.companyName}" />
                                        </h:outputLink>
@@ -86,7 +86,7 @@
                                        <h:outputText value="#{basicData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_PERSON}" sortBy="#{basicData.companyContactEmployee}" filterBy="#{basicData.companyContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{basicData.companyContactEmployee}" filterBy="#{basicData.companyContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" sortBy="#{basicData.companyFounder}" filterBy="#{basicData.companyFounder}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_FOUNDER}" sortBy="#{basicData.companyFounder}" filterBy="#{basicData.companyFounder}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_CREATED}" sortBy="#{basicData.companyCreated}">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{basicData.companyCreated}">
                                        <h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
                                                <f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
                                        <links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
                                </p:column>
                        </p:dataTable>
index bac9b466691fe6b41ac6615d3398c40b6211bad1..01d31d8a3565f8924109aadfb4ddccb3dfd9b8d0 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{branchOffice.branchId}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{branchOffice.branchId}" filterable="false">
                                        <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
                                                <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{branchOffice.branchUserOwner.userName}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{branchOffice.branchUserOwner.userName}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{branchOffice.branchCompany.companyName}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{branchOffice.branchCompany.companyName}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        <h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" title="#{branchOffice.branchStreet} #{branchOffice.branchHouseNumber} (#{msg.DATA_STORE} #{branchOffice.branchStore}, #{msg.DATA_SUITE_NUMBER} #{branchOffice.branchSuiteNumber})" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_CONTACT_PERSON}" sortBy="#{branchOffice.branchContactEmployee.employeePersonalData}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_COMPANY_CONTACT_PERSON}" sortBy="#{branchOffice.branchContactEmployee.employeePersonalData}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{branchOffice.branchCreated}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{branchOffice.branchCreated}" filterable="false">
                                        <h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
                                                <f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
                                        <links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
                                </p:column>
                        </p:dataTable>
index f0cce0acdf8b70f5fa6a41ec412033d86050e208..cab7c664cd24c9c048a8f8d9401b6f6facca8436 100644 (file)
@@ -73,7 +73,7 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
+                                               <h:outputText value="#{msg.ADMIN_HEADER_ENTRY_CREATED}" />
                                        </f:facet>
 
                                        <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
@@ -83,7 +83,7 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                                               <h:outputText value="#{msg.ADMIN_HEADER_ACTION_LINKS}" />
                                        </f:facet>
 
                                        <links:outputContactAdminMiniLinks contact="#{contact}" />
index f74bb0808ba76e940bdd4e42e8f1731fbc7696f6..3b7aff02f4e0d5411229e9d9bb9c5cbb9aa8268e 100644 (file)
@@ -30,7 +30,7 @@
                                >
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                               <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
                                        </f:facet>
 
                                        <p:link outcome="admin_show_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
@@ -64,7 +64,7 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                                               <h:outputText value="#{msg.ADMIN_HEADER_ACTION_LINKS}" />
                                        </f:facet>
 
                                        <links:outputCountryAdminMiniLinks country="#{country}" />
index e1a7ce903fc2ed65c6063de6a8a6147be04e7ec9..a019fee0b7409b0b7bf7068b16a3559a293c6de7 100644 (file)
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{department.departmentId}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{department.departmentId}" filterable="false">
                                        <p:link outcome="admin_show_department" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{department.departmentId}">
                                                <f:param name="departmentId" value="#{department.departmentId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_DEPARTMENT_I18N_KEY}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
-                                       <h:outputText value="#{project[department.departmentI18nKey]}" />
+                               <p:column headerText="#{msg.ADMIN_HEADER_I18N_KEY}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
+                                       <h:outputText value="#{local[department.departmentI18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{department.departmentCompany}" filterBy="#{department.departmentCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner.userName}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{department.departmentUserOwner.userName}" filterBy="#{department.departmentUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{department.departmentCreated}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{department.departmentCreated}" filterable="false">
                                        <h:outputText id="departmentCreated" value="#{department.departmentCreated.time}">
                                                <f:convertDateTime for="departmentCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
                                        <links:outputDepartmentAdminMiniLinks department="#{department}" />
                                </p:column>
                        </p:dataTable>
index 73b199729b0ca9cb26b85adcc6635e6590ac7d9d..12f307b9f56d5e3f8ebe81cb0b222ef454d37221 100644 (file)
@@ -47,7 +47,7 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{employee.employeeId}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{employee.employeeId}" filterable="false">
                                        <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}" value="#{employee.employeeId}">
                                                <f:param name="employeeId" value="#{employee.employeeId}" />
                                        </p:link>
@@ -78,7 +78,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner.userName}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{employee.employeeUserOwner.userName}" filterBy="#{employee.employeeUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{employee.employeeCompany.companyName}" filterBy="#{employee.employeeCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_HEADER_BASIC_DATA_COMPANY_NAME}" sortBy="#{employee.employeeCompany.companyName}" filterBy="#{employee.employeeCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                        <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty employee.employeeEmailAddress}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{employee.employeeCreated}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{employee.employeeCreated}" filterable="false">
                                        <h:outputText id="employeeCreated" value="#{employee.employeeCreated.time}">
                                                <f:convertDateTime for="employeeCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
                                        <links:outputEmployeeAdminMiniLinks employee="#{employee}" />
                                </p:column>
                        </p:dataTable>
index 787415fb85c9dcaae726a15a57f915b8bfee3557..46db0f3e841b0d807e639827222fa03a49c337a6 100644 (file)
@@ -28,7 +28,7 @@
                        >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
                                </f:facet>
 
                                <p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
index 0b0d87def1aa9c8c52d38ec5218004b26fd3d9ec..f2a19b6b1d568d805952b69382785309245019d2 100644 (file)
@@ -28,7 +28,7 @@
                        >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
                                </f:facet>
 
                                <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
index f224219b70cedfa075c291c015abbf8a868f0b40..d1c6fef232942a646fbce0b1c362c7c3fcf18346 100644 (file)
@@ -28,7 +28,7 @@
                        >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ADMIN_HEADER_ID_NUMBER}" />
                                </f:facet>
 
                                <p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
index b9f44055a726ba1a0b06a2baf0f727f149b08533..89752965501976b6adbd5405faae915c5165c9b0 100644 (file)
@@ -44,7 +44,7 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
                                        <p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
                                                <f:param name="providerId" value="#{mobileProvider.providerId}" />
                                        </p:link>
                                        <h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{mobileProvider.providerEntryCreated}">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{mobileProvider.providerEntryCreated}">
                                        <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}">
                                                <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
                                        <links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
                                </p:column>
                        </p:dataTable>
index de7973ff4892c69429c8eff44c3d4d68010fd4d1..420f0c6099d5899c46574ae37d1657db77b02a20 100644 (file)
@@ -47,7 +47,7 @@
                                        </p:panelGrid>
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{openingTime.openingId}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{openingTime.openingId}" filterable="false">
                                        <p:link outcome="admin_show_opening_time" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" value="#{openingTime.openingId}">
                                                <f:param name="openingId" value="#{openingTime.openingId}" />
                                        </p:link>
@@ -99,7 +99,7 @@
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
                                        <links:outputOpeningTimeAdminMiniLinks openingTime="#{openingTime}" />
                                </p:column>
                        </p:dataTable>
index bf764c23ab4408cc445167320cb50cee908ed485..cdb85009b10d29ec211fd6f97cf33341c48a3dc1 100644 (file)
@@ -46,7 +46,7 @@
                                        </div>
 
                                        <div class="table-right75-medium">
-                                               <p:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
+                                               <p:inputTextarea id="userDeleteReason" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                        </div>
                                </h:panelGroup>
 
index 54f122a883ccb7e2071af82a0ef2f1bc974fb3f6..fdd0c1408d4aa34a0f0417c5fa1471db89adeacb 100644 (file)
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{user.userCreated}" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{user.userCreated}" filterable="false">
                                        <h:outputText id="userCreated" value="#{user.userCreated.time}">
                                                <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false" filterable="false">
                                        <links:outputUserAdminMiniLinks user="#{user}" />
                                </p:column>
                        </p:dataTable>
index f6cd92b793527d73446c30423c269478b2130166..2e20cc4e21edff67fc4980d45b6729f00f77f875 100644 (file)
@@ -70,7 +70,7 @@
                                        </div>
 
                                        <div class="table-right-medium">
-                                               <p:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+                                               <p:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                        </div>
                                </h:panelGroup>
 
index c1a04a22466db55ba7562e93bac470c92cf766fd..1da2041debb4d01b225a989b9e9bb6d777a97bbd 100644 (file)
@@ -37,7 +37,7 @@
                                                                </div>
 
                                                                <div class="table-right">
-                                                                       <p:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                                       <p:inputText id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
                                                                </div>
                                                        </h:panelGroup>
 
@@ -51,7 +51,7 @@
                                                                </div>
 
                                                                <div class="table-right">
-                                                                       <p:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                                       <p:inputText id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
                                                                </div>
                                                        </h:panelGroup>
                                                </fieldset>
index cbbe90695c69b928990eb259c93d66886ebf794b..db76dc5cd8f1cf1de357513f07dba411da0d5d00 100644 (file)
@@ -35,7 +35,7 @@
                                                </div>
 
                                                <div class="table-right">
-                                                       <p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+                                                       <p:inputText id="emailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
                                                                <f:validator validatorId="EmailAddressValidator" />
                                                        </p:inputText>
                                                </div>
index e53c08d35ffacbd5c51063adb8a4cd7b3ebea2fe..0c03ee1aa56836162984bd0fdebc301c9c932629 100644 (file)
@@ -234,11 +234,6 @@ ul.navbar-horizontal li.footer-copyright {
        border: 1px solid grey;
 }
 
-#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset {
-       border-top-right-radius: 8px;
-       border-bottom-left-radius: 8px;
-}
-
 #menu-content-wrapper {
        overflow: auto;
 }
index 3c946f6dcab9dc27ce963c5909976836596ea71d..490c7a442a2936d2548e01d4e8548b5174796d03 100644 (file)
@@ -42,7 +42,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+                                                               <p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -56,7 +56,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+                                                               <p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>