]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Mon, 14 May 2018 21:40:10 +0000 (23:40 +0200)
committerRoland Häder <roland@mxchange.org>
Mon, 14 May 2018 22:19:52 +0000 (00:19 +0200)
- introduced list view-scoped backing bean for branch offices, including
  interface, which will hold the list for pagination and filtering/sorting as
  @RequestScoped annotated beans will be reset even on each AJAX requests
- according to the change from "general" (request-scoped) to "list"
  (view-scoped) backing bean, also renamed class fields in converters/validators
- private methods should not throw exceptions as they cannot be tested with
  unit tests
- added new bean helper method renderCountry()
- also include department name in renderEmployee(), if applyable
- moved all receipt/product-related renderFoo() methods away to their own beans
  resulting in lesser conflicts on cherry-picking to other projects
- rewrote bean helper methods "renderFoo()" a bit
- added Accept: text/xml in case of AJAX requests (BalusC, thank you again)
- added validator for branch office's email address
- fixed relative path in project.properties (ops, NetBean's fault?)
- added template for opening times data
- fixed end of all ui:composition tags: > must be in new line to allow easy
  adding (only a line added, not 2 existing modified) of new "imports"
- rewrote admin_basic_data_list.xtml to new way, with global search and details
  p:dialog being dynamically loaded (cool PF!)
- same rewrite for admin_branch_office_list.xtml (still other views like
  edit/delete/assign will be missing)
- remove for="someId" where really not needed (<f:convertDateTime> was already
  within the tag where for="x" was pointing to)
- removed not needed "imports" of XML namespaces
- changed admin_contact_data_min.tpl to p:column (was h:column)
- onPostback had some side effects like overwriting values, still some edit
  views may not work as expected (changer to PrimeFaces)
- added required <h:inputHidden> for primary key handled over from URL
  (edit/delete/assign views again)
- <div class="table-footer"> is discouraged as this is plain HTML and no
  engine-controlled JSF tag
- reformatted over-long JSF/PF tags to have each attribute in its own line
- form-admin-edit-user was incorrect (copy-paste) in a contact view, fixed
- removed no longer used tableStyleClass attribute
- *Created.time handled over to <f:convertDateTime> is maybe wrong, just
  *Created is really okay here
- removed styleClass="submit|reset"
- added process="@form" but this is only a workaround according to BalusC on
  stackoverflow.com (thank you for all your value contributions!!!)
- admin_[show_]<fax|landline|mobile|user>_data.tpl were all still using
  h:column, now fixed to p:column
- moved comment block out of ui:composition, else it will show up in HTML code
  and may even confuse the JSF engine?
- removed some CSS attributes from discouraged custom.css as there is now a
  theme around, include .table* classes
- added a lot more i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>
161 files changed:
nbproject/project.properties
src/java/org/mxchange/jfinancials/beans/business/basicdata/list/FinancialsBasicDataListWebViewBean.java
src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestController.java
src/java/org/mxchange/jfinancials/beans/business/branchoffice/list/FinancialsBranchOfficeListWebViewBean.java [new file with mode: 0644]
src/java/org/mxchange/jfinancials/beans/business/branchoffice/list/FinancialsBranchOfficeListWebViewController.java [new file with mode: 0644]
src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebViewHelperBean.java
src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java
src/java/org/mxchange/jfinancials/filter/FinancialsNoCacheFilter.java
src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsBranchOfficeEmailAddressValidator.java [new file with mode: 0644]
src/java/org/mxchange/jfinancials/validator/emailaddress/basicdata/FinancialsBasicDataEmailAddressValidator.java
src/java/org/mxchange/jfinancials/validator/emailaddress/branchoffice/FinancialsBranchOfficeEmailAddressValidator.java
src/java/org/mxchange/localization/generic_de_DE.properties
src/java/org/mxchange/localization/generic_en_US.properties
web/WEB-INF/links.jsf.taglib.xml
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
web/WEB-INF/resources/tags/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_edit_form_mobile_data.tpl
web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl
web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
web/WEB-INF/resources/tags/admin/links/user/admin_user_links.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/country/form_data/form_country_selector.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/input/selection_box/personal_title_selection_box.tpl
web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/profile/user/user_profile_link.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/resources/tags/table_rows/user_profile_mode_table_row.tpl
web/WEB-INF/templates.dist/admin_page.xhtml
web/WEB-INF/templates.dist/guest_login_page.xhtml
web/WEB-INF/templates.dist/guest_page.xhtml
web/WEB-INF/templates.dist/login_page.xhtml
web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl
web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl
web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl
web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/menu/project.tpl
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
web/WEB-INF/templates/contact/form_contact_data.tpl
web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/guest/user/guest_login_form.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
web/WEB-INF/templates/login/user/user_enter_current_password.tpl
web/WEB-INF/templates/login/user/user_footer.tpl
web/WEB-INF/templates/login/user/user_menu.tpl
web/WEB-INF/templates/widgets/locale_change_widget.tpl
web/WEB-INF/validators.jsf.taglib.xml
web/WEB-INF/widgets.jsf.taglib.xml
web/admin/admin_logout.xhtml
web/admin/basic_data/admin_basic_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_export.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/contact/admin_contact_show.xhtml
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/country/admin_country_delete.xhtml
web/admin/country/admin_country_edit.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_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/headquarter/admin_headquarter_list.xhtml
web/admin/index.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_contact_mobile_list.xhtml
web/admin/mobile/admin_contact_mobile_unlink.xhtml
web/admin/mobile/admin_mobile_delete.xhtml
web/admin/mobile/admin_mobile_edit.xhtml
web/admin/mobile/admin_mobile_list.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_show.xhtml
web/admin/opening_time/admin_opening_time_list.xhtml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_edit.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_lock.xhtml
web/admin/user/admin_user_resend_confirmation_link.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml
web/exception.xhtml
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_done.xhtml
web/guest/user/user_resend_link.xhtml
web/imprint.xhtml
web/index.xhtml
web/privacy.xhtml
web/resources/css/custom.css
web/terms.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_index.xhtml
web/user/login_logout.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml
web/user/login_user_data_saved.xhtml

index 00979137dcf4f104e76ab53e716d9c7bb9875738..d5c14d1797628b44b8fcce6c91f4072006afc16b 100644 (file)
@@ -126,7 +126,7 @@ javadoc.windowtitle=JFinancials Web Application
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
-project.jfinancials-core=../../NetBeansProjects/jfinancials-core
+project.jfinancials-core=../jfinancials-core
 project.jfinancials-lib=../jfinancials-lib
 project.license=agpl30
 reference.jfinancials-core.jar=${project.jfinancials-core}/dist/jfinancials-core.jar
index fc91ae9c2c3596a4e643cf95615db6696cf0fbbe..5219557ad2c4c60b6fa49ff41e39e23238b41c3a 100644 (file)
@@ -73,6 +73,11 @@ public class FinancialsBasicDataListWebViewBean extends BaseFinancialsBean imple
         */
        private List<BasicData> filteredBasicData;
 
+       /**
+        * Selected basic data
+        */
+       private BasicData selectedBasicData;
+
        /**
         * Default constructor
         */
@@ -168,6 +173,24 @@ public class FinancialsBasicDataListWebViewBean extends BaseFinancialsBean imple
                this.filteredBasicData = filteredBasicData;
        }
 
+       /**
+        * Getter for selected basic data
+        * <p>
+        * @return Selected basic data
+        */
+       public BasicData getSelectedBasicData () {
+               return this.selectedBasicData;
+       }
+
+       /**
+        * Setter for selected basic data
+        * <p>
+        * @param selectedBasicData Selected basic data
+        */
+       public void setSelectedBasicData (final BasicData selectedBasicData) {
+               this.selectedBasicData = selectedBasicData;
+       }
+
        /**
         * Initializer method
         */
index 7a809934d6745ca0894d41f49cb1fcd71549947c..176ed02b87179485e1c892bff0730e256856ed46 100644 (file)
@@ -40,6 +40,7 @@ import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
 import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewController;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
@@ -124,10 +125,10 @@ public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsBea
        private Event<ObservableBranchOfficeAddedEvent> branchOfficeAddedEvent;
 
        /**
-        * A general branch office controller (backing bean)
+        * A list branch office controller (backing bean)
         */
        @Inject
-       private FinancialsBranchOfficeWebRequestController branchOfficeController;
+       private FinancialsBranchOfficeListWebViewController branchOfficeListController;
 
        /**
         * Owner/leader of branch office
@@ -920,7 +921,7 @@ public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsBea
         */
        private boolean isBranchOfficeCreatedByRequiredData (final BranchOffice branchOffice) {
                // Get full list from other bean
-               final List<BranchOffice> branchOffices = this.branchOfficeController.allBranchOffices();
+               final List<BranchOffice> branchOffices = this.branchOfficeListController.allBranchOffices();
 
                // Default is not found
                boolean isFound = false;
index 9a287b16d03a9fc2ae9312d902c1655ce274a7c7..5928b2e67e4eff15280514b51d735cd699d2d794 100644 (file)
  */
 package org.mxchange.jfinancials.beans.business.branchoffice;
 
-import fish.payara.cdi.jsr107.impl.NamedCache;
-import java.text.MessageFormat;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.PostConstruct;
-import javax.cache.Cache;
-import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent;
-import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 
 /**
@@ -50,184 +34,12 @@ public class FinancialsBranchOfficeWebRequestBean extends BaseFinancialsBean imp
         */
        private static final long serialVersionUID = 5_028_697_360_461L;
 
-       /**
-        * A list of all branch offices
-        */
-       private final List<BranchOffice> allBranchOffices;
-
-       /**
-        * EJB for administrative purposes
-        */
-       @EJB (lookup = "java:global/jfinancials-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote")
-       private BranchOfficeSessionBeanRemote branchOfficeBean;
-
-       /**
-        * A list of all branch offices (globally)
-        */
-       @Inject
-       @NamedCache (cacheName = "branchOfficeCache")
-       private Cache<Long, BranchOffice> branchOfficeCache;
-
-       /**
-        * A list of filtered branch offices
-        */
-       private List<BranchOffice> filteredBranchOffices;
-
        /**
         * Default constructor
         */
        public FinancialsBranchOfficeWebRequestBean () {
                // Call super constructor
                super();
-
-               // Init list
-               this.allBranchOffices = new LinkedList<>();
-       }
-
-       /**
-        * Observes events being fired when a branch office has been added.
-        * <p>
-        * @param event Event being fired
-        * <p>
-        * @throws NullPointerException If the parameter or it's carried instance is
-        * null
-        * @throws IllegalArgumentException If the branchId is zero or lower
-        */
-       public void afterBranchOfficeAddedEvent (@Observes final ObservableBranchOfficeAddedEvent event) {
-               // Validate parameter
-               if (null == event) {
-                       // Throw NPE
-                       throw new NullPointerException("event is null"); //NOI18N
-               } else if (event.getBranchOffice() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("event.branchOffice is null"); //NOI18N
-               } else if (event.getBranchOffice().getBranchId() == null) {
-                       // Throw it again
-                       throw new NullPointerException("event.branchOffice.branchId is null"); //NOI18N
-               } else if (event.getBranchOffice().getBranchId() < 1) {
-                       // Throw IAE
-                       throw new IllegalArgumentException(MessageFormat.format("event.branchOffice.branchId={0} is not valid", event.getBranchOffice().getBranchId())); //NOI18N
-               }
-
-               // Add instance to cache
-               this.branchOfficeCache.put(event.getBranchOffice().getBranchId(), event.getBranchOffice());
-               this.allBranchOffices.add(event.getBranchOffice());
-       }
-
-       @Override
-       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
-       public List<BranchOffice> allBranchOffices () {
-               return this.allBranchOffices;
-       }
-
-       @Override
-       public BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException {
-               // Validate parameter
-               if (null == branchOfficeId) {
-                       // Throw NPE
-                       throw new NullPointerException("branchOfficeId is null"); //NOI18N
-               } else if (branchOfficeId < 1) {
-                       // Throw IAE
-                       throw new IllegalArgumentException(MessageFormat.format("branchOfficeId={0} is invalid", branchOfficeId)); //NOI18N
-               } else if (!this.branchOfficeCache.containsKey(branchOfficeId)) {
-                       // Not found
-                       throw new BranchOfficeNotFoundException(branchOfficeId);
-               }
-
-               // Get it from cache
-               final BranchOffice branchOffice = this.branchOfficeCache.get(branchOfficeId);
-
-               // Return it
-               return branchOffice;
-       }
-
-       /**
-        * Getter for a list of filtered branch offices
-        * <p>
-        * @return Filtered branch offices
-        */
-       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
-       public List<BranchOffice> getFilteredBranchOffices () {
-               return this.filteredBranchOffices;
-       }
-
-       /**
-        * Setter for a list of filtered branch offices
-        * <p>
-        * @param filteredBranchOffices Filtered branch offices
-        */
-       @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
-       public void setFilteredBranchOffices (final List<BranchOffice> filteredBranchOffices) {
-               this.filteredBranchOffices = filteredBranchOffices;
-       }
-
-       /**
-        * Initializer method
-        */
-       @PostConstruct
-       public void initializeList () {
-               // Is cache there?
-               if (!this.branchOfficeCache.iterator().hasNext()) {
-                       // Get whole list
-                       final List<BranchOffice> branchOffices = this.branchOfficeBean.allBranchOffices();
-
-                       // Add all
-                       for (final BranchOffice branchOffice : branchOffices) {
-                               // Add it to cache
-                               this.branchOfficeCache.put(branchOffice.getBranchId(), branchOffice);
-                       }
-               }
-
-               // Is the list empty, but filled cache?
-               if (this.allBranchOffices.isEmpty() && this.branchOfficeCache.iterator().hasNext()) {
-                       // Get iterator
-                       final Iterator<Cache.Entry<Long, BranchOffice>> iterator = this.branchOfficeCache.iterator();
-
-                       // Build up list
-                       while (iterator.hasNext()) {
-                               // GEt next element
-                               final Cache.Entry<Long, BranchOffice> next = iterator.next();
-
-                               // Add to list
-                               this.allBranchOffices.add(next.getValue());
-                       }
-
-                       // Sort list
-                       this.allBranchOffices.sort(new Comparator<BranchOffice>() {
-                               @Override
-                               public int compare (final BranchOffice o1, final BranchOffice o2) {
-                                       return o1.getBranchId() > o2.getBranchId() ? 1 : o1.getBranchId() < o2.getBranchId() ? -1 : 0;
-                               }
-                       });
-               }
-       }
-
-       @Override
-       public Boolean isEmailAddressRegistered (final String emailAddress) {
-               // Validate parameter
-               if (null == emailAddress) {
-                       // Throw NPE
-                       throw new NullPointerException("emailAddress is null"); //NOI18N
-               } else if (emailAddress.isEmpty()) {
-                       // Throw IAE
-                       throw new IllegalArgumentException("emailAddress is empty"); //NOI18N
-               }
-
-               // Default is not found
-               boolean isFound = false;
-
-               // Check all entries
-               for (final BranchOffice branchOffice : this.allBranchOffices()) {
-                       // Is email address used?
-                       if (Objects.equals(branchOffice.getBranchEmailAddress(), emailAddress)) {
-                               // Found it
-                               isFound = true;
-                               break;
-                       }
-               }
-
-               // Return flag
-               return isFound;
        }
 
 }
index 5cc185fc17fcff7ff47e503dddd8627a4231fab1..a9511211438865840d6764548a6ce6f90ce2e2ae 100644 (file)
@@ -17,9 +17,6 @@
 package org.mxchange.jfinancials.beans.business.branchoffice;
 
 import java.io.Serializable;
-import java.util.List;
-import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 
 /**
  * An interface for general branch office controller
@@ -28,32 +25,4 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
  */
 public interface FinancialsBranchOfficeWebRequestController extends Serializable {
 
-       /**
-        * Checks if given email address is already registered by an other branch
-        * office
-        * <p>
-        * @param emailAddress Email address
-        * <p>
-        * @return Whether the email address has been already registered
-        */
-       Boolean isEmailAddressRegistered (final String emailAddress);
-
-       /**
-        * Returns a list of all branch offices
-        * <p>
-        * @return A list of all branch offices
-        */
-       List<BranchOffice> allBranchOffices ();
-
-       /**
-        * Tries to find a branch office with given id number
-        * <p>
-        * @param branchOfficeId Branch office id
-        * <p>
-        * @return A branch office instance
-        * <p>
-        * @throws BranchOfficeNotFoundException If the branch office was not found
-        */
-       BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException;
-
 }
diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/list/FinancialsBranchOfficeListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/list/FinancialsBranchOfficeListWebViewBean.java
new file mode 100644 (file)
index 0000000..ad8a2f1
--- /dev/null
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2017, 2018 Free Software Foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.beans.business.branchoffice.list;
+
+import fish.payara.cdi.jsr107.impl.NamedCache;
+import java.text.MessageFormat;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.PostConstruct;
+import javax.cache.Cache;
+import javax.ejb.EJB;
+import javax.enterprise.event.Observes;
+import javax.faces.view.ViewScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent;
+import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote;
+import org.mxchange.jfinancials.beans.BaseFinancialsBean;
+
+/**
+ * A list bean for branch offices
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@Named ("branchOfficeListController")
+@ViewScoped
+public class FinancialsBranchOfficeListWebViewBean extends BaseFinancialsBean implements FinancialsBranchOfficeListWebViewController {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 5_028_697_360_462L;
+
+       /**
+        * A list of all branch offices
+        */
+       private final List<BranchOffice> allBranchOffices;
+
+       /**
+        * EJB for administrative purposes
+        */
+       @EJB (lookup = "java:global/jfinancials-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote")
+       private BranchOfficeSessionBeanRemote branchOfficeBean;
+
+       /**
+        * A list of all branch offices (globally)
+        */
+       @Inject
+       @NamedCache (cacheName = "branchOfficeCache")
+       private transient Cache<Long, BranchOffice> branchOfficeCache;
+
+       /**
+        * A list of filtered branch offices
+        */
+       private List<BranchOffice> filteredBranchOffices;
+
+       /**
+        * Selected branch office instance
+        */
+       private BranchOffice selectedBranchOffice;
+
+       /**
+        * Default constructor
+        */
+       public FinancialsBranchOfficeListWebViewBean () {
+               // Call super constructor
+               super();
+
+               // Init list
+               this.allBranchOffices = new LinkedList<>();
+       }
+
+       /**
+        * Observes events being fired when a branch office has been added.
+        * <p>
+        * @param event Event being fired
+        * <p>
+        * @throws NullPointerException If the parameter or it's carried instance is
+        * null
+        * @throws IllegalArgumentException If the branchId is zero or lower
+        */
+       public void afterBranchOfficeAddedEvent (@Observes final ObservableBranchOfficeAddedEvent event) {
+               // Validate parameter
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getBranchOffice() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.branchOffice is null"); //NOI18N
+               } else if (event.getBranchOffice().getBranchId() == null) {
+                       // Throw it again
+                       throw new NullPointerException("event.branchOffice.branchId is null"); //NOI18N
+               } else if (event.getBranchOffice().getBranchId() < 1) {
+                       // Throw IAE
+                       throw new IllegalArgumentException(MessageFormat.format("event.branchOffice.branchId={0} is not valid", event.getBranchOffice().getBranchId())); //NOI18N
+               }
+
+               // Add instance to cache
+               this.branchOfficeCache.put(event.getBranchOffice().getBranchId(), event.getBranchOffice());
+               this.allBranchOffices.add(event.getBranchOffice());
+       }
+
+       @Override
+       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+       public List<BranchOffice> allBranchOffices () {
+               return this.allBranchOffices;
+       }
+
+       @Override
+       public BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException {
+               // Validate parameter
+               if (null == branchOfficeId) {
+                       // Throw NPE
+                       throw new NullPointerException("branchOfficeId is null"); //NOI18N
+               } else if (branchOfficeId < 1) {
+                       // Throw IAE
+                       throw new IllegalArgumentException(MessageFormat.format("branchOfficeId={0} is invalid", branchOfficeId)); //NOI18N
+               } else if (!this.branchOfficeCache.containsKey(branchOfficeId)) {
+                       // Not found
+                       throw new BranchOfficeNotFoundException(branchOfficeId);
+               }
+
+               // Get it from cache
+               final BranchOffice branchOffice = this.branchOfficeCache.get(branchOfficeId);
+
+               // Return it
+               return branchOffice;
+       }
+
+       /**
+        * Getter for a list of filtered branch offices
+        * <p>
+        * @return Filtered branch offices
+        */
+       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+       public List<BranchOffice> getFilteredBranchOffices () {
+               return this.filteredBranchOffices;
+       }
+
+       /**
+        * Setter for a list of filtered branch offices
+        * <p>
+        * @param filteredBranchOffices Filtered branch offices
+        */
+       @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter")
+       public void setFilteredBranchOffices (final List<BranchOffice> filteredBranchOffices) {
+               this.filteredBranchOffices = filteredBranchOffices;
+       }
+
+       /**
+        * Getter for selected branch office
+        * <p>
+        * @return Selected branch office
+        */
+       public BranchOffice getSelectedBranchOffice () {
+               return this.selectedBranchOffice;
+       }
+
+       /**
+        * Setter for selected branch office
+        * <p>
+        * @param selectedBranchOffice Selected branch office
+        */
+       public void setSelectedBranchOffice (final BranchOffice selectedBranchOffice) {
+               this.selectedBranchOffice = selectedBranchOffice;
+       }
+
+       /**
+        * Initializer method
+        */
+       @PostConstruct
+       public void initializeList () {
+               // Is cache there?
+               if (!this.branchOfficeCache.iterator().hasNext()) {
+                       // Get whole list
+                       final List<BranchOffice> branchOffices = this.branchOfficeBean.allBranchOffices();
+
+                       // Add all
+                       for (final BranchOffice branchOffice : branchOffices) {
+                               // Add it to cache
+                               this.branchOfficeCache.put(branchOffice.getBranchId(), branchOffice);
+                       }
+               }
+
+               // Is the list empty, but filled cache?
+               if (this.allBranchOffices.isEmpty() && this.branchOfficeCache.iterator().hasNext()) {
+                       // Get iterator
+                       final Iterator<Cache.Entry<Long, BranchOffice>> iterator = this.branchOfficeCache.iterator();
+
+                       // Build up list
+                       while (iterator.hasNext()) {
+                               // GEt next element
+                               final Cache.Entry<Long, BranchOffice> next = iterator.next();
+
+                               // Add to list
+                               this.allBranchOffices.add(next.getValue());
+                       }
+
+                       // Sort list
+                       this.allBranchOffices.sort(new Comparator<BranchOffice>() {
+                               @Override
+                               public int compare (final BranchOffice o1, final BranchOffice o2) {
+                                       return o1.getBranchId() > o2.getBranchId() ? 1 : o1.getBranchId() < o2.getBranchId() ? -1 : 0;
+                               }
+                       });
+               }
+       }
+
+       @Override
+       public Boolean isEmailAddressRegistered (final String emailAddress) {
+               // Validate parameter
+               if (null == emailAddress) {
+                       // Throw NPE
+                       throw new NullPointerException("emailAddress is null"); //NOI18N
+               } else if (emailAddress.isEmpty()) {
+                       // Throw IAE
+                       throw new IllegalArgumentException("emailAddress is empty"); //NOI18N
+               }
+
+               // Default is not found
+               boolean isFound = false;
+
+               // Check all entries
+               for (final BranchOffice branchOffice : this.allBranchOffices()) {
+                       // Is email address used?
+                       if (Objects.equals(branchOffice.getBranchEmailAddress(), emailAddress)) {
+                               // Found it
+                               isFound = true;
+                               break;
+                       }
+               }
+
+               // Return flag
+               return isFound;
+       }
+
+       @Override
+       protected Object clone () throws CloneNotSupportedException {
+               return super.clone(); //To change body of generated methods, choose Tools | Templates.
+       }
+
+}
diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/list/FinancialsBranchOfficeListWebViewController.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/list/FinancialsBranchOfficeListWebViewController.java
new file mode 100644 (file)
index 0000000..c65108b
--- /dev/null
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017, 2018 Free Software Foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.beans.business.branchoffice.list;
+
+import java.io.Serializable;
+import java.util.List;
+import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+
+/**
+ * An interface for general branch office controller
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+public interface FinancialsBranchOfficeListWebViewController extends Serializable {
+
+       /**
+        * Checks if given email address is already registered by an other branch
+        * office
+        * <p>
+        * @param emailAddress Email address
+        * <p>
+        * @return Whether the email address has been already registered
+        */
+       Boolean isEmailAddressRegistered (final String emailAddress);
+
+       /**
+        * Returns a list of all branch offices
+        * <p>
+        * @return A list of all branch offices
+        */
+       List<BranchOffice> allBranchOffices ();
+
+       /**
+        * Tries to find a branch office with given id number
+        * <p>
+        * @param branchOfficeId Branch office id
+        * <p>
+        * @return A branch office instance
+        * <p>
+        * @throws BranchOfficeNotFoundException If the branch office was not found
+        */
+       BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException;
+
+}
index 35c5b6b1a8349d0d02d8c1a6ed818dfc730745b7..2c267a5ccde8a21ce0d3dc48e5d8b79183fa261f 100644 (file)
@@ -1252,18 +1252,6 @@ public class FinancialsContactWebRequestBean extends BaseFinancialsBean implemen
         * @param contact Contact instance
         */
        private void copyContact (final Contact contact) {
-               // Is the instance valid?
-               if (null == contact) {
-                       // Throw NPE
-                       throw new NullPointerException("contact is null"); //NOI18N
-               } else if (contact.getContactId() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("contact.contactId is null"); //NOI18N
-               } else if (contact.getContactId() < 1) {
-                       // Not valid id number
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
-               }
-
                // Copy all fields:
                // - base data
                this.setPersonalTitle(contact.getContactPersonalTitle());
@@ -1310,18 +1298,6 @@ public class FinancialsContactWebRequestBean extends BaseFinancialsBean implemen
         * @param contact Contact instance to remove
         */
        private void removeContact (final Contact contact) {
-               // Is the instance valid?
-               if (null == contact) {
-                       // Throw NPE
-                       throw new NullPointerException("contact is null"); //NOI18N
-               } else if (contact.getContactId() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("contact.contactId is null"); //NOI18N
-               } else if (contact.getContactId() < 1) {
-                       // Not valid id number
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
-               }
-
                // Remove from general list
                if (!this.contactCache.remove(contact.getContactId())) {
                        // Did not remove contact
@@ -1339,18 +1315,6 @@ public class FinancialsContactWebRequestBean extends BaseFinancialsBean implemen
         * @param contact Contact instance to add uniquely
         */
        private void uniqueAddContact (final Contact contact) {
-               // Is the instance valid?
-               if (null == contact) {
-                       // Throw NPE
-                       throw new NullPointerException("contact is null"); //NOI18N
-               } else if (contact.getContactId() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("contact.contactId is null"); //NOI18N
-               } else if (contact.getContactId() < 1) {
-                       // Not valid id number
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
-               }
-
                // Get iterator from list
                final Iterator<Cache.Entry<Long, Contact>> iterator = this.contactCache.iterator();
 
index 35b09af82e468f90073e6c990343168114c44d71..a2709ec322696b0e4857840f7d13e559092510fb 100644 (file)
@@ -16,7 +16,6 @@
  */
 package org.mxchange.jfinancials.beans.helper;
 
-import java.text.DateFormat;
 import java.text.MessageFormat;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
@@ -31,16 +30,17 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.department.Department;
 import org.mxchange.jcontactsbusiness.model.employee.Employable;
 import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
+import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController;
-import org.mxchange.jfinancials.model.receipt.BillableReceipt;
 import org.mxchange.jphone.events.fax.created.CreatedFaxNumberEvent;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
 import org.mxchange.jphone.events.landline.created.CreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.mobile.created.CreatedMobileNumberEvent;
 import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
+import org.mxchange.jphone.model.phonenumbers.DialableNumber;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
@@ -534,6 +534,31 @@ public class FinancialsWebViewHelperBean extends BaseFinancialsBean implements F
                return sb.toString();
        }
 
+       /**
+        * Returns the text representation of given country. If null is provided, an
+        * empty string is returned.
+        * <p>
+        * @param country Country instance
+        * <p>
+        * @return Country's text representation
+        */
+       public String renderCountry (final Country country) {
+               // Default is empty string, so let's get started
+               final StringBuilder sb = new StringBuilder(20);
+
+               // Is a country given?
+               if (country instanceof Country) {
+                       // Yes, then render it
+                       sb.append(this.getMessageFromBundle(country.getCountryI18nKey()));
+                       sb.append(" ("); //NOI18N
+                       sb.append(country.getCountryCode());
+                       sb.append(")"); //NOI18N
+               }
+
+               // Return it
+               return sb.toString();
+       }
+
        /**
         * Returns the department's name and name of assigned company. If null is
         * provided, an empty string is returned.
@@ -565,7 +590,7 @@ public class FinancialsWebViewHelperBean extends BaseFinancialsBean implements F
         * <p>
         * @param employee Employable instance
         * <p>
-        * @return Contact's full name
+        * @return A string representing an employee
         */
        public String renderEmployee (final Employable employee) {
                // Default is empty string, so let's get started
@@ -573,15 +598,10 @@ public class FinancialsWebViewHelperBean extends BaseFinancialsBean implements F
 
                // Is employee set?
                if (employee instanceof Employable) {
-                       // Then create name
-                       sb.append(employee.getEmployeeNumber());
-
-                       // Is a department found?
-                       if (employee.getEmployeeDepartment() instanceof Department) {
-                               // Then add it's name to it
-                               sb.append(" ("); //NOI18N
-                               sb.append(this.renderDepartment(employee.getEmployeeDepartment()));
-                               sb.append(")"); //NOI18N
+                       // Is the number given?
+                       if (employee.getEmployeeNumber() != null) {
+                               // Then create name
+                               sb.append(employee.getEmployeeNumber());
                        }
 
                        // Is contact data found?
@@ -590,10 +610,34 @@ public class FinancialsWebViewHelperBean extends BaseFinancialsBean implements F
                                final String contactName = this.renderContact(employee.getEmployeePersonalData());
 
                                // Is it given?
-                               if (contactName != null) {
+                               if (contactName != null && !contactName.isEmpty()) {
+                                       // Only add braces when employee number is given
+                                       if (employee.getEmployeeNumber() != null) {
+                                               sb.append(" ("); //NOI18N
+                                       }
+
                                        // Then add it
-                                       sb.append(" ("); //NOI18N
                                        sb.append(contactName);
+
+                                       // Only add braces when employee number is given
+                                       if (employee.getEmployeeNumber() != null) {
+                                               sb.append(")"); //NOI18N
+                                       }
+                               }
+                       }
+
+                       // Is a department found?
+                       if (employee.getEmployeeDepartment() instanceof Department) {
+                               // Only add braces when employee number is given
+                               if (employee.getEmployeeNumber() != null || employee.getEmployeePersonalData() instanceof Contact) {
+                                       sb.append(" ("); //NOI18N
+                               }
+
+                               // Add department name
+                               sb.append(this.renderDepartment(employee.getEmployeeDepartment()));
+
+                               // Only add braces when employee number is given
+                               if (employee.getEmployeeNumber() != null || employee.getEmployeePersonalData() instanceof Contact) {
                                        sb.append(")"); //NOI18N
                                }
                        }
@@ -649,35 +693,61 @@ public class FinancialsWebViewHelperBean extends BaseFinancialsBean implements F
        }
 
        /**
-        * Returns the receipt. If null is provided, an empty string is returned.
+        * Renders given mobile number (land-line and fax number). If null is
+        * provided, an empty string is returned.
         * <p>
-        * @param receipt Receipt instance
+        * @param mobileNumber Mobile number to render
         * <p>
-        * @return Product name
+        * @return Mobile number
         */
-       public String renderReceipt (final BillableReceipt receipt) {
+       public String renderMobileNumber (final DialableMobileNumber mobileNumber) {
                // Default is empty string, so let's get started
-               final StringBuilder sb = new StringBuilder(50);
-
-               // Is receipt set?
-               if (receipt instanceof BillableReceipt) {
-                       // Add relevant data
-                       sb.append(this.getMessageFromBundle("RECEIPT_ISSUED")).append(" "); //NOI18N
-                       sb.append(DateFormat.getInstance().format(receipt.getReceiptIssued())).append(", "); //NOI18N
-                       sb.append(this.getMessageFromBundle("PAYMENT_TYPE")).append(" "); //NOI18N
-                       sb.append(this.getMessageFromBundle(receipt.getReceiptPaymentType().getI18nKey()));
-
-                       // Is receipt number included?
-                       if (receipt.getReceiptNumber() != null) {
-                               // Append it
-                               sb.append(", ").append(this.getMessageFromBundle("RECEIPT_NUMBER")).append(" "); //NOI18N
-                               sb.append(receipt.getReceiptNumber());
-                       }
+               final StringBuilder sb = new StringBuilder(20);
 
-                       // Add company (over branch office)
+               // Is a phone number given?
+               if (mobileNumber instanceof DialableMobileNumber) {
+                       // Yes, then render it
+                       sb.append(mobileNumber.getMobileProvider().getProviderCountry().getCountryAbroadDialPrefix());
+                       sb.append(mobileNumber.getMobileProvider().getProviderCountry().getCountryPhoneCode());
                        sb.append(" ("); //NOI18N
-                       sb.append(receipt.getReceiptBranchOffice().getBranchCompany().getCompanyName());
-                       sb.append(")"); //NOI18N
+                       sb.append(mobileNumber.getMobileProvider().getProviderDialPrefix());
+                       sb.append(") "); //NOI18N
+                       sb.append(mobileNumber.getPhoneNumber());
+               }
+
+               // Return it
+               return sb.toString();
+       }
+
+       /**
+        * Renders given phone number (land-line and fax number). If null is
+        * provided, an empty string is returned.
+        * <p>
+        * @param number Phone number to render
+        * <p>
+        * @return Phone number
+        * <p>
+        * @throws IllegalArgumentException If a mobile number is provided
+        */
+       public String renderPhoneNumber (final DialableNumber number) {
+               // Validate parameter
+               if (number instanceof DialableMobileNumber) {
+                       // Not allowed here
+                       throw new IllegalArgumentException("Mobile numbers cannot be rendered with this method. Please use renderMobileNumber() instead."); //NOI18N
+               }
+
+               // Default is empty string, so let's get started
+               final StringBuilder sb = new StringBuilder(20);
+
+               // Is a phone number given?
+               if (number instanceof DialableNumber) {
+                       // Yes, then render it
+                       sb.append(number.getPhoneCountry().getCountryAbroadDialPrefix());
+                       sb.append(number.getPhoneCountry().getCountryPhoneCode());
+                       sb.append(" ("); //NOI18N
+                       sb.append(number.getPhoneAreaCode());
+                       sb.append(") "); //NOI18N
+                       sb.append(number.getPhoneNumber());
                }
 
                // Return it
index fecbc631eedc2373888817c0c27c5a349d2ab1b6..cabd9b344cb91cd7f49c4a8f0bf0a166a1110193 100644 (file)
@@ -24,8 +24,8 @@ import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
 import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestBean;
-import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestController;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewBean;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewController;
 
 /**
  * Converter for branch office id <-> valid basic company data instance
@@ -36,16 +36,16 @@ import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOffi
 public class FinancialsBranchOfficeConverter implements Converter<BranchOffice> {
 
        /**
-        * Branch office EJB
+        * Branch office list controller
         */
-       private static FinancialsBranchOfficeWebRequestController BRANCH_OFFICE_CONTROLLER;
+       private static FinancialsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER;
 
        @Override
        public BranchOffice getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
-               if (null == BRANCH_OFFICE_CONTROLLER) {
+               if (null == BRANCH_OFFICE_LIST_CONTROLLER) {
                        // Get bean from CDI directly
-                       BRANCH_OFFICE_CONTROLLER = CDI.current().select(FinancialsBranchOfficeWebRequestBean.class).get();
+                       BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(FinancialsBranchOfficeListWebViewBean.class).get();
                }
 
                // Is the value null or empty?
@@ -65,7 +65,7 @@ public class FinancialsBranchOfficeConverter implements Converter<BranchOffice>
                        final Long branchOfficeId = Long.valueOf(submittedValue);
 
                        // Try to get user instance from it
-                       branchOffice = BRANCH_OFFICE_CONTROLLER.findBranchOfficeById(branchOfficeId);
+                       branchOffice = BRANCH_OFFICE_LIST_CONTROLLER.findBranchOfficeById(branchOfficeId);
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);
index 044da91ad4b288217ed7ed54a1921c881bff03ca..95edc6af0e2e601d5be59ffafc5d96e53383faef 100644 (file)
@@ -42,7 +42,7 @@ public class FinancialsNoCacheFilter implements Filter {
 
        @Override
        public void destroy () {
-               System.out.println("destroy!");
+               System.out.println("destroy!"); //NOI18N
        }
 
        @Override
@@ -52,10 +52,20 @@ public class FinancialsNoCacheFilter implements Filter {
                final HttpServletResponse res = (HttpServletResponse) response;
 
                // Is the request URI not starting with resource identifier?
-               if (!req.getRequestURI().startsWith(req.getContextPath() + ResourceHandler.RESOURCE_IDENTIFIER)) {
+               if (!req.getPathInfo().startsWith(ResourceHandler.RESOURCE_IDENTIFIER)) {
+                       // Set non-caching header
                        res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); //NOI18N
                        res.setHeader("Pragma", "no-cache"); // //NOI18N
                        res.setDateHeader("Expires", 0); // //NOI18N
+
+                       // Is AJAX given?
+                       final Boolean isAjax = "true".equals(req.getParameter("javax.faces.partial.ajax")); //NOI18N
+
+                       // Is AJAX?
+                       if (isAjax) {
+                               // Set Accept header
+                               res.setHeader("Accept", "text/xml"); //NOI18N
+                       }
                }
 
                // Continue filtering
@@ -64,7 +74,7 @@ public class FinancialsNoCacheFilter implements Filter {
 
        @Override
        public void init (final FilterConfig filterConfig) throws ServletException {
-               System.out.println("init!");
+               System.out.println("init!"); //NOI18N
        }
 
 }
diff --git a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsBranchOfficeEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsBranchOfficeEmailAddressValidator.java
new file mode 100644 (file)
index 0000000..c3964fa
--- /dev/null
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2016 - 2018 Free Software Foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.validator.business.basicdata;
+
+import java.text.MessageFormat;
+import 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 org.mxchange.jcoreee.validator.string.BaseStringValidator;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewBean;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewController;
+
+/**
+ * A validator for branch office email address validation
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesValidator (value = "BranchOfficeEmailAddressValidator")
+public class FinancialsBranchOfficeEmailAddressValidator extends BaseStringValidator {
+
+       /**
+        * Branch office backing bean
+        */
+       private static FinancialsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER;
+
+       /**
+        * Email pattern
+        */
+       private static final String EMAIL_REGEX = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"; //NOI18N
+
+       /**
+        * Pattern matcher
+        */
+       private static final Pattern PATTERN_MATCHER = Pattern.compile(FinancialsBranchOfficeEmailAddressValidator.EMAIL_REGEX);
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 187_536_745_607_196L;
+
+       /**
+        * Whether empty data is allowed
+        */
+       private Boolean allowEmptyRequiredData;
+
+       /**
+        * Default constructor
+        */
+       public FinancialsBranchOfficeEmailAddressValidator () {
+               this.allowEmptyRequiredData = Boolean.FALSE;
+       }
+
+       /**
+        * Setter for allowEmptyRequiredData flag
+        * <p>
+        * @param allowEmptyRequiredData Whether empty values are allowed
+        */
+       public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) {
+               this.allowEmptyRequiredData = allowEmptyRequiredData;
+       }
+
+       @Override
+       public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+               // The required field
+               final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
+
+               // Pre-validation (example: not null, not a string, empty string ...)
+               super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData);
+
+               // Is the email address empty and allowed?
+               if (null == value && this.allowEmptyRequiredData) {
+                       // Then accept this here
+                       return;
+               } else if (null == value) {
+                       // Abort here
+                       throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N
+               }
+
+               // Get string from object ... ;-)
+               // @TODO Add IDN support (GNU lib?) Search for emailAddressRepeat
+               final String emailAddress = String.valueOf(value).trim();
+
+               // Checks if the email address matches a regex ("low-level" check)
+               // @TODO Should also be done by <f:validatorRegex />)
+               final boolean matches = PATTERN_MATCHER.matcher(emailAddress).matches(); //NOI18N
+
+               // Is the email address valid?
+               if (!matches) {
+                       // Generate message
+                       String message = MessageFormat.format("Email address {0} does not match regular expression.", emailAddress); //NOI18N
+
+                       // Not matching
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message));
+               }
+
+               // Get client id (aka form id)
+               final String clientId = component.getClientId();
+
+               // Is the instance there?
+               if (null == BRANCH_OFFICE_LIST_CONTROLLER) {
+                       // Get bean from CDI directly
+                       BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(FinancialsBranchOfficeListWebViewBean.class).get();
+               }
+
+               // Is it registered?
+               final Boolean isRegistered = BRANCH_OFFICE_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress);
+
+               // Is the email address already registered?
+               if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N
+                       // Generate message
+                       final String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N
+
+                       // No, then abort here
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message));
+               } else if ((clientId.endsWith("resendEmailAddress")) && (!isRegistered)) { //NOI18N
+                       // Generate message
+                       final String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N
+
+                       // No, then abort here
+                       throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message));
+               }
+       }
+
+}
index cdf0c3a0e37c3fae391182d99a33b425857ef955..b2500bd43fe9d86e3261e0899963be88e2d9c33f 100644 (file)
@@ -37,7 +37,7 @@ import org.mxchange.jfinancials.beans.business.basicdata.list.FinancialsBasicDat
 public class FinancialsBasicDataEmailAddressValidator extends BaseStringValidator {
 
        /**
-        * Branch office backing bean
+        * Basic company data backing bean
         */
        private static FinancialsBasicDataListWebViewController BASIC_DATA_LIST_CONTROLLER;
 
index a3952b1a5afec012fbd979bee0e8c0af05b3648e..70bf98222b1bc5e31332e86390f77a31e9e8e32d 100644 (file)
@@ -25,8 +25,8 @@ import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
-import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestBean;
-import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestController;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewBean;
+import org.mxchange.jfinancials.beans.business.branchoffice.list.FinancialsBranchOfficeListWebViewController;
 
 /**
  * A validator for branch office email address validation
@@ -39,7 +39,7 @@ public class FinancialsBranchOfficeEmailAddressValidator extends BaseStringValid
        /**
         * Branch office backing bean
         */
-       private static FinancialsBranchOfficeWebRequestController BRANCH_OFFICE_CONTROLLER;
+       private static FinancialsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER;
 
        /**
         * Email pattern
@@ -115,13 +115,13 @@ public class FinancialsBranchOfficeEmailAddressValidator extends BaseStringValid
                final String clientId = component.getClientId();
 
                // Is the instance there?
-               if (null == BRANCH_OFFICE_CONTROLLER) {
+               if (null == BRANCH_OFFICE_LIST_CONTROLLER) {
                        // Get bean from CDI directly
-                       BRANCH_OFFICE_CONTROLLER = CDI.current().select(FinancialsBranchOfficeWebRequestBean.class).get();
+                       BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(FinancialsBranchOfficeListWebViewBean.class).get();
                }
 
                // Is it registered?
-               final Boolean isRegistered = BRANCH_OFFICE_CONTROLLER.isEmailAddressRegistered(emailAddress);
+               final Boolean isRegistered = BRANCH_OFFICE_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress);
 
                // Is the email address already registered?
                if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N
index b232c43a53ba77380d60f883806187760f827da6..826fbf2564e1c47f082655408cead9ebccae5b3e 100644 (file)
@@ -1082,7 +1082,7 @@ TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES=Diese Tabelle listet Filialen auf.
 #@TODO Please fix German umlauts!
 ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES=Es wurden noch keine Oeffnungszeiten fuer eine neue Filiale hinzugefuegt.
 #@TODO Please fix German umlauts!
-ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=Oeffnungszeiten der neuen Filiale auflisten
+ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=Oeffnungszeiten der Filiale auflisten
 #@TODO Please fix German umlauts!
 ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME_TITLE=Oeffnungszeit zur Filiale hinzufuegen
 #@TODO Please fix German umlauts!
@@ -1170,3 +1170,51 @@ ADMIN_LINK_LIST_OPENING_TIMES_TITLE=Listet alle Oeffnungszeiten auf.
 LABEL_PAYMENT_TYPES=Bezahlungsarten
 BRANCH_OFFICE=Filiale:
 USER_HEADER=Benutzer:
+ADMIN_SINGLE_BRANCH_OFFICE_DETAILS_HEADER=Details zu einer einzelnen Filiale
+ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE=Grunddaten der Filiale
+ADMIN_BRANCH_OFFICE_ADDRESS_TAB_TITLE=Adressdaten der Filiale
+ADMIN_BRANCH_OFFICE_BASIC_DETAILS_HEADER=Grundaten zur Filiale (Id-Nummer {0}):
+BRANCH_OFFICE_ID_NUMBER_TITLE=Id-Nummer zum Eintrag der Filiale
+BRANCH_OFFICE_NUMBER_HEADER=Filialnummer:
+BRANCH_OFFICE_NUMBER_TITLE=Nummer der Filiale
+ASSIGNED_BASIC_DATA_HEADER=Grunddaten des Unternehmens:
+ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE=Grunddaten des Unternehmens zur Filiale
+ASSIGNED_CONTACT_PERSON_HEADER=Kontaktperson:
+ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE=Der Filiale zugewiesene Kontaktperson
+NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=Es ist keine Kontaktperson der Filiale zugewiesen.
+ASSIGNED_OWNER_EMPLOYEE_HEADER=Besitzer oder Leiter:
+ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE=Zugewiesener Besitzer oder Leiter der Filiale
+NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=Es ist kein Besitzer oder Leiter der Filiale zugewiesen.
+ASSIGNED_USER_OWNER_HEADER=Besitzender Benutzer:
+ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE=Der Filiale zugewiesener "besitzender" Benutzer
+NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE=Es ist kein "besitzender" Benutzer der Filiale zugewiesen.
+EMAIL_ADDRESS_HEADER=Email-Adresse:
+EMAIL_ADDRESS_OF_BRANCH_OFFICE_TITLE=Email-Adresse der Filiale
+BRANCH_OFFICE_HAS_NO_EMAIL_ADDRESS=Die Filiale hat keine Email-Adresse
+LANDLINE_NUMBER_HEADER=Festnetznummer:
+ASSIGNED_LANDLINE_NUMBER_OF_BRANCH_OFFICE_TITLE=Der Filiale zugewiesene Festnetznummer
+NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=Es ist keine Festnetznummer der Filiale zugewiesen.
+FAX_NUMBER_HEADER=Faxnummer:
+ASSIGNED_FAX_NUMBER_OF_BRANCH_OFFICE_TITLE=Der Filiale zugewiesene Faxnummer.
+NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=Es ist keine Faxnummer der Filiale zugewiesen.
+ADMIN_BRANCH_OFFICE_ADDRESS_DETAILS_HEADER=Adressdaten der Filiale Id {0}:
+STREET_NAME_HEADER=Strassenname:
+STREET_NAME_OF_BRANCH_OFFICE_TITLE=Strassenname der Filiale
+HOUSE_NUMBER_HEADER=Hausnummer:
+HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=Hausnummer der Filiale
+LAST_HOUSE_NUMBER_HEADER=Letzte Hausnummer:
+LAST_HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=Letzte Hausnummer der Filiale
+HOUSE_NUMBER_EXTENSION_HEADER=Hausnummerzusatz:
+HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=Hausnummerzusatz der Filiale
+STORE_HEADER=Geschoss:
+STORE_OF_BRANCH_OFFICE_TITLE=Geschoss der Filiale
+SUITE_NUMBER_HEADER=Suite-Nummer:
+ZIP_CODE_HEADER=Postleitzahl:
+ZIP_CODE_OF_BRANCH_OFFICE_TITLE=Postleitzahl der Filiale
+CITY_HEADER=Stadt:
+CITY_OF_BRANCH_OFFICE_TITLE=Stadt der Filiale
+COUNTRY_HEADER=Land:
+COUNTRY_OF_BRANCH_OFFICE_TITLE=Land der Filiale
+#@TODO Please fix German umlauts!
+ADMIN_OPENING_TIMES_TAB_TITLE=Oeffnungszeiten
+TAX_NUMBER_HEADER=Steuernummer:
index ca01156b8d2157f378c6f8f913af9a0303ee1717..543786d21b7f6070c17d001b7686e5f96dd70fc1 100644 (file)
@@ -986,8 +986,8 @@ ADMIN_LIST_USERS_HEADER=List of all users
 ADMIN_BRANCH_OFFICE_OPENING_TIMES_LEGEND=Opening times of branch office:
 TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES=This table lists new opening times of this branch office.
 TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES=This table lists branch offices.
-ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES=There are no opening times for a new branch office beging setup.
-ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=List opening times of a new branch office
+ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES=There are no opening times for a new branch office being setup.
+ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER=List opening times of a branch office
 ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME_TITLE=Add opening time to branch office
 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:
@@ -1025,7 +1025,7 @@ ADMIN_HEADQUARTER_COUNTRY_REQUIRED=Please choose a country for headquarter.
 BUTTON_ADMIN_ADD_HEADQUARTER=Add headquarter
 ADMIN_HEADQUARTER_OPENING_TIMES_LEGEND=Opening times of headquarter:
 TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER_OPENING_TIMES=This table lists new opening times for headquarter.
-ADMIN_EMPTY_LIST_HEADQUARTER_OPENING_TIMES=There are no opening times for a new headquarter beging setup.
+ADMIN_EMPTY_LIST_HEADQUARTER_OPENING_TIMES=There are no opening times for a new headquarter being setup.
 ADMIN_LIST_HEADQUARTER_OPENING_TIMES_HEADER=List opening times of a new headquarter
 ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE=Add opening time to headquarter
 BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME=Add opening time to headquarter
@@ -1057,3 +1057,50 @@ ADMIN_LINK_LIST_OPENING_TIMES_TITLE=Lists all opening times.
 LABEL_PAYMENT_TYPES=Payment types
 BRANCH_OFFICE=Branch office:
 USER_HEADER=User:
+ADMIN_SINGLE_BRANCH_OFFICE_DETAILS_HEADER=Details of a single branch office
+ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE=Branch office basic data
+ADMIN_BRANCH_OFFICE_ADDRESS_TAB_TITLE=Address data of branch office
+ADMIN_BRANCH_OFFICE_BASIC_DETAILS_HEADER=Basic branch office details (id number {0}):
+BRANCH_OFFICE_ID_NUMBER_TITLE=Id number of branch office record
+BRANCH_OFFICE_NUMBER_HEADER=Branch office number:
+BRANCH_OFFICE_NUMBER_TITLE=Number of branch office
+ASSIGNED_BASIC_DATA_HEADER=Basic data of company:
+ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE=Basic company data to branch office
+ASSIGNED_CONTACT_PERSON_HEADER=Contact person:
+ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE=Assigned contact person of branch office
+NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=No contact person is assigned to branch office.
+ASSIGNED_OWNER_EMPLOYEE_HEADER=Owner or leader:
+ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE=Assigned owner or leader of branch office
+NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE=No owner or leader assigned to branch office.
+ASSIGNED_USER_OWNER_HEADER=Owning user:
+ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE=Assigned "owning" user of branch office
+NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE=No "owning" user assigned to branch office.
+EMAIL_ADDRESS_HEADER=Email address:
+EMAIL_ADDRESS_OF_BRANCH_OFFICE_TITLE=Email address of branch office
+BRANCH_OFFICE_HAS_NO_EMAIL_ADDRESS=Branch office has no email address.
+LANDLINE_NUMBER_HEADER=Land-line number:
+ASSIGNED_LANDLINE_NUMBER_OF_BRANCH_OFFICE_TITLE=Assigned land-line number of branch office
+NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=No land-line number is assigned to branch office.
+FAX_NUMBER_HEADER=Fax number:
+ASSIGNED_FAX_NUMBER_OF_BRANCH_OFFICE_TITLE=Assigned fax number of branch office.
+NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE=No fax number is assigned to branch office.
+ADMIN_BRANCH_OFFICE_ADDRESS_DETAILS_HEADER=Address data of branch office id number {0}:
+STREET_NAME_HEADER=Street name:
+STREET_NAME_OF_BRANCH_OFFICE_TITLE=Street name of branch office
+HOUSE_NUMBER_HEADER=House number:
+HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=House number of branch office
+LAST_HOUSE_NUMBER_HEADER=Last house number:
+LAST_HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE=Last house number of branch office
+HOUSE_NUMBER_EXTENSION_HEADER=House number extension:
+HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=House number extension of branch office
+STORE_HEADER=Store:
+STORE_OF_BRANCH_OFFICE_TITLE=Store of branch office
+SUITE_NUMBER_HEADER=Suite number:
+ZIP_CODE_HEADER=ZIP code:
+ZIP_CODE_OF_BRANCH_OFFICE_TITLE=ZIP code of branch office
+CITY_HEADER=City:
+CITY_OF_BRANCH_OFFICE_TITLE=City of branch office
+COUNTRY_HEADER=Country:
+COUNTRY_OF_BRANCH_OFFICE_TITLE=Country of branch office
+ADMIN_OPENING_TIMES_TAB_TITLE=Opening times
+TAX_NUMBER_HEADER=Tax number:
index f959474a847113b6eb8cd4563a0c1922ecf4f6dc..37501505a9397c2c595a8d4afb7aeeb567cc3357 100644 (file)
@@ -15,10 +15,12 @@ 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/>.
 -->
-<facelet-taglib version="2.2"
-                               xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+<facelet-taglib
+       version="2.2"
+       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
+>
        <namespace>http://mxchange.org/jsf/core/links</namespace>
        <tag>
                <tag-name>outputUserProfileLink</tag-name>
index f79cb3cecae025d9abd8dd041c95d17a3bd16f24..149e971a4f1e9d8d938fbfea611466b896c8772d 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:column>
                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
        <p:column>
                <p:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
 
-               <h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated.time}">
-                       <f:convertDateTime for="contactCreated" type="both" />
+               <h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated}">
+                       <f:convertDateTime type="both" />
                </h:outputText>
        </p:column>
 
        <p:column>
                <p:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
 
-               <h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated.time}">
-                       <f:convertDateTime for="contactUpdated" type="both" />
+               <h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated}">
+                       <f:convertDateTime type="both" />
                </h:outputText>
        </p:column>
 
        <p:column>
                <p:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-               <h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday.time}">
-                       <f:convertDateTime for="contactBirthday" type="date" />
+               <h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday}">
+                                               <f:convertDateTime type="date" dateStyle="medium" />
                </h:outputText>
        </p:column>
 
index d5ff8f9942af09de4e69a43340ffdcc96e29ed30..b94c64c95434e22971753442bba2f721bc1c5cd0 100644 (file)
@@ -2,10 +2,10 @@
 <!-- @TODO maybe later add phone numbers as "main" numbers? //-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:column>
                <p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
index ee0a6e3eb1c578931bc1b0805412aee2fbd71bbb..c395bad6ed377047e73581565151bc5647e94618 100644 (file)
@@ -6,13 +6,19 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <!--
        @TODO title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
        -->
        <p:fieldset legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" rendered="#{empty rendered or rendered}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
                        <core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
 
@@ -60,7 +66,7 @@
                                value="#{adminContactController.houseNumber}"
                                validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}"
                                >
-                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
@@ -68,7 +74,7 @@
 
                        <p:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
                        <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" />
+                               <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>
 
                        <p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
index 9d88fff9e191e5d418e3e71ee9c3c5d0f2fc0410..081679613234c8cda6ed12c0d44863ea55428682 100644 (file)
@@ -2,10 +2,10 @@
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
                <fieldset class="fieldset">
index a185be6ccae6d85d11decebb4dccb81c28779dad..afd2b53848c575fd7fa99a1b1011f78f557cec0a 100644 (file)
@@ -2,10 +2,10 @@
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
                <fieldset class="fieldset">
index d938eb34d4203b9c95d2238938185e2063709472..14c66d21d6e78c2ed624d20c287366ddf36da860 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
                <fieldset class="fieldset">
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
-                                       <p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+                               <p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
 
-                                       <p:selectOneMenu
-                                               id="mobileProvider"
-                                               value="#{adminPhoneController.mobileProvider}"
-                                               filter="true"
-                                               filterMatchMode="contains"
-                                               required="true"
-                                               requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
-                                               >
-                                               <f:converter converterId="MobileProviderConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-                                       </p:selectOneMenu>
+                               <p:selectOneMenu
+                                       id="mobileProvider"
+                                       value="#{adminPhoneController.mobileProvider}"
+                                       filter="true"
+                                       filterMatchMode="contains"
+                                       required="true"
+                                       requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
+                                       >
+                                       <f:converter converterId="MobileProviderConverter" />
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                       <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+                               </p:selectOneMenu>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error-container" layout="block">
index 08afc952d9ab55920e3ed9e6c987780d7ac79998..622f045da5a0a16ca3a3bc210fdf08f1e786f171 100644 (file)
@@ -5,14 +5,19 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <!--
        @TODO title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}"
        -->
        <ui:fragment rendered="#{not empty mode}">
                <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:panelGrid
+                               columns="2"
+                               columnClasses="ui-grid-col-4,ui-grid-col-8"
+                               styleClass="ui-noborder"
+                               >
                                <p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
                                <p:inputText id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
 
index 3057d1856fece12b54a2537fee469bc0d5c22dde..0dc520fa6d16047da641625b990f426d41531df8 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 05b17d67c4a023379144049d9339f3c3c624cd07..a852220c342174983ca6177e130a8d41ee8421ed 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 8a0e79c458c7d9259c689caa18e67e9df247534d..530852a9daa28ef0c40bff63dba53b58254ff36f 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 14e7bb93af41a04ccae860da8403fe045bce3a63..ba2322924430b4ece3d26b22fe85c740af39e6ff 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 82e1145340f6a68f14bff80c979a07fed0f2de28..425dcc8abf207723f698f445763c0d2011753c6f 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index d973950c558087eebc454b954e7cd517b86f300a..40f4e74b3dab14e2a2a5d57856dd86fc47be4f04 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 235e2f22b59296fbe33bfa0ade57aa882ee32d61..119a1fae71e58893c0d2afa96090325764969bcf 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 9819a4175a786daef04f165a36823c1d4b9f9da3..3d8b895c1aa14197afdd760e875a851f7b1204c8 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index c4845dc986205a59ec6aa453191f38cdd93107f4..5998b7f4f0c43fb95a29f298bc088605c8b7a271 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 3c3c27455cdf322fe67472d9e5cacacf4d94099a..79af6f0369ef0258a3dc7ab159a557980df159ea 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index fcfb569a7700b6b8529a89c38b6169197d2938d3..fcce4e8949c9f70397020c8e0bf4b140f80e760a 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 18c56c79aa1c5f8e3bca7b61e0cba687b47a6c38..25a987cccac563591b5ab3fd48613d2368fc26f1 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 10f5d659e70643589fd64bb9ff02ef997f730037..164198155a99b28ac2800f34573da07fd35313fb 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:fragment rendered="#{empty rendered or rendered}">
                <ul class="navbar-mini">
index 89bc08e0df260446b1b9636eef994ffc44c45853..e9e31185d7598d3b8038ddf895cb00afa71c8efb 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="table" layout="block">
                <h:panelGroup styleClass="table-header" layout="block" rendered="#{not empty renderHeader and renderHeader}">
index f2d28a72f059f3d1c6e79d47572c7dbe2f92ec47..292fbc867470f2e8da1628fbc2d0ca3a75942245 100644 (file)
        <!--
        @TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}"
        -->
-       <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
+       <p:panelGrid
+               columns="2"
+               rendered="#{empty rendered or rendered == true}"
+               >
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_SHOW_FAX_NUMBER_DATA_HEADER}" />
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <h:panelGroup>
                                <p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
 
                                <p:message for="faxNumberId" />
                        </h:panelGroup>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="faxNumber" styleClass="table-data-field" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
-               </h:column>
+                       <h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-                       <h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
+                       <h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-                       <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
+                       <h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+               <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
+                               <links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
                        </h:panelGroup>
-               </h:column>
+               </p:column>
        </p:panelGrid>
 </ui:composition>
index 06da89709991e8c3e3937b7f2e597e3a5ba16364..0e8cc5e05bb3c5fea25b8316bfe637db6faad3d7 100644 (file)
        <!--
        @TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}"
        -->
-       <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
+       <p:panelGrid
+               columns="2"
+               rendered="#{empty rendered or rendered == true}"
+               >
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_DATA_HEADER}" />
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <h:panelGroup>
                                <p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
 
                                <p:message for="landLineNumberId" />
                        </h:panelGroup>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
-               </h:column>
+                       <h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-                       <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
+                       <h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-                       <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
+                       <h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+               <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
+                               <links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
                        </h:panelGroup>
-               </h:column>
+               </p:column>
        </p:panelGrid>
 </ui:composition>
index d9e70dd4a0d32b908bff2bd5f666dcdc1c3e013e..cebca29ce1a23f3e21763d6a4f03c52e85763624 100644 (file)
        <!--
        @TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}"
        -->
-       <p:panelGrid columns="2" styleClass="table table-full" rendered="#{empty rendered or rendered == true}">
+       <p:panelGrid
+               columns="2"
+               rendered="#{empty rendered or rendered == true}"
+               >
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_DATA_HEADER}" />
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <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>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
                        <p:link id="mobileProvider" outcome="admin_show_mobile_provider">
                                <h:outputText styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerName}" />
                                <f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
                        </p:link>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
-               </h:column>
+                       <h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-                       <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
+                       <h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-                       <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
+                       <h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+               <p:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
+                               <links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink == true}" />
                        </h:panelGroup>
-               </h:column>
+               </p:column>
        </p:panelGrid>
 </ui:composition>
index 14ff97a745b59c6f70f02bc52abdda8c9f257ff2..37dd1926ad61caad34d3089500d37ab709a432f1 100644 (file)
@@ -3,7 +3,8 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:selectOneMenu
                id="#{id}"
index fea581065aba0a43677542b6ebad8d5bf30e694d..b0c6c6ac59e3192c59c94674deda2948bfd427b1 100644 (file)
@@ -4,9 +4,15 @@
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
+       <p:panelGrid
+               layout="grid"
+               columns="3"
+               styleClass="ui-noborder"
+               rendered="#{empty rendered or rendered == true}"
+               >
                <core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
 
                <p:inputText
index 161f7212e5c59f328f401559253a9649721c90b0..82120ec86e4d4e08db233fafe0f3c1c5b7123d36 100644 (file)
@@ -4,9 +4,15 @@
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <p:panelGrid layout="grid" columns="3" styleClass="table table-full ui-noborder" rendered="#{empty rendered or rendered == true}">
+       <p:panelGrid
+               layout="grid"
+               columns="3"
+               styleClass="ui-noborder"
+               rendered="#{empty rendered or rendered == true}"
+               >
                <core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
 
                <p:inputText
index 8e88242d240c8307109eeb31dfff73c54b5316f2..90eb57871bd7134e45449b55a2cd27c82dc3ed1e 100644 (file)
@@ -3,7 +3,8 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:panelGrid layout="grid" columns="2" rendered="#{empty rendered or rendered == true}">
                <p:selectOneMenu
index 904f825c5b296c15ba9ec8ba86ac701707dab609..b8a305350df1fbf0ddbc5b90075942437b9b3859 100644 (file)
@@ -3,7 +3,8 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:selectOneRadio
                id="personalTitle"
diff --git a/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl b/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
new file mode 100644 (file)
index 0000000..87118f5
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
+       <p:dataTable
+               id="#{id}"
+               var="openingTime"
+               value="#{value}"
+               rows="#{rows}"
+               reflow="true"
+               summary="#{summary}"
+               emptyMessage="#{emptyMessage}"
+               widgetVar="#{widgetWar}"
+               rendered="#{empty rendered or rendered}"
+               >
+
+               <f:facet name="header">
+                       <h:outputText value="#{headerMessage}" />
+               </f:facet>
+
+               <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
+                       <h:outputText value="#{openingTime.openingStartDay.toString()}" />
+               </p:column>
+
+               <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
+                       <h:outputText value="#{openingTime.openingEndDay.toString()}" />
+               </p:column>
+
+               <p:column headerText="#{msg.ADMIN_START_TIME}">
+                       <h:outputText value="#{openingTime.openingStartTime}">
+                               <f:convertDateTime type="time" timeStyle="short" />
+                       </h:outputText>
+               </p:column>
+
+               <p:column headerText="#{msg.ADMIN_END_TIME}">
+                       <h:outputText value="#{openingTime.openingEndTime}">
+                               <f:convertDateTime type="time" timeStyle="short" />
+                       </h:outputText>
+               </p:column>
+       </p:dataTable>
+</ui:composition>
index 1c2d101672294f59258f188f9cdde030e2511304..4e753cbe7b1c7fac376b91e1fce3c98f8de1a9aa 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <core:outputMessageBox id="nonpublic-user-profile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
index c8863cb143b17d006b778e65337e1f0f93da3251..d06b48364a3a59d99026239ee49dae9957f52a32 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:row rendered="#{empty rendered or rendered == true}">
                <p:outputLabel for="faxNumber" value="#{labelMessage}" />
index a3138286ace320ec32d62a9548df6ee0563de9c4..8656827b6000b81e9a4948b25d1493345a0cc42d 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:row rendered="#{empty rendered or rendered == true}">
                <p:outputLabel for="landLineNumber" value="#{labelMessage}" />
index 32b9946f0be555c950e45d96369c7d451d40a733..4284af9ffb7fc3754007b5e69b23f55f0f4e498d 100644 (file)
@@ -3,7 +3,8 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:row rendered="#{empty rendered or rendered == true}">
                <p:outputLabel for="profileMode" value="#{labelMessage}" />
index b35960739e5e26bbff612c223a2dba4643e17349..709a670e2b8a6b4e7eb13abffc173b306b065fed 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
index e436b93f8177604b7a33138d9cde370892e62da4..e14db199db5c72d59df0826be9fd65458c4bd721 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
index 8e9942a29bf635b2e3a70cccfb21c5de6b2af0e1..30d9b698694a8af35d0e06099fbf222b8de10e63 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
index 8de2f750f02d4cebb79cbcef8a2f76c8bb1138c2..786273a09df476c16e225e7aeee4404de003dd24 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
index 2f831a990f70da27907d81659744b776cedde530..aad4093eefd898203815b0ae6856c5c38a98f44a 100644 (file)
@@ -9,11 +9,16 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block">
                <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:panelGrid
+                               columns="2"
+                               columnClasses="ui-grid-col-4,ui-grid-col-8"
+                               styleClass="ui-noborder"
+                               >
                                <p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME}" />
                                <p:inputText
                                        id="companyName"
index c8c5a4cf24776bba88b622aaa03c4eb6cecf0d18..087447128ced5921b79f35eac2634946adfc016a 100644 (file)
@@ -8,10 +8,16 @@
        xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BASIC_DATA_BRANCH_OFFICE}" />
                        <p:selectOneMenu
                                id="branchCompany"
@@ -70,7 +76,7 @@
                                value="#{adminBranchOfficeController.branchEmailAddress}"
                                validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
                                >
-                               <validator:basicDataEmailAddressValidator allowEmptyRequiredData="true" />
+                               <validator:branchOfficeEmailAddressValidator allowEmptyRequiredData="true" />
                        </p:inputText>
 
                        <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_LAND_LINE_NUMBER}" />
        </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:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
                        <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 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" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="branchLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
                        <p:inputText id="branchLastHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-                               <f:validateLongRange for="branchLastHouseNumber" minimum="1" maximum="500" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="branchHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
 
                        <p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
                        <p:inputText id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
+                               <f:validateLongRange minimum="-5" maximum="200" />
                        </p:inputText>
 
                        <p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
                        <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" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
                        <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" />
+                               <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>
 
                        <p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
index a3b1a93c8790d410119dadc607db3761d6476721..a88861b0b3c927913726c40d94e7649b07e699ae 100644 (file)
@@ -6,10 +6,15 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
-               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="4"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder">
                        <p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
                        <p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
                        <p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
index 9fc462c429a5b6dea025c4232afd879b0a758e50..de37ded7ad106d0299b0297c396ae869dd1cf2f3 100644 (file)
@@ -1,34 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <p:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+       <p:panelGrid
+               id="show_contact"
+               columns="3"
+               rendered="#{not empty beanHelper.contact}"
+               >
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
                        <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
                        <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
                        <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
-               </h:column>
+               </p:column>
        </p:panelGrid>
 </ui:composition>
index a80df3f4247297fac76b0c10e89ea1783f3f7872..e8d7d88f27581c61bd743d6f1c17b78a961d36f6 100644 (file)
        <!--
        @TOD summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}"
        -->
-       <p:panelGrid id="show_contact" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+       <p:panelGrid
+               columns="3"
+               rendered="#{not empty beanHelper.contact}"
+               >
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
                                <f:param value="#{beanHelper.contact.contactId}" />
index b525f218d5ed1636c0ca49f1c6a1acb83f0704e2..5ba60c7f5dd74f7f507a01fe7d5cc144eed018a9 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
@@ -96,7 +97,7 @@
 
                                <div class="table-right-medium">
                                        <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" />
+                                               <f:validateLongRange minimum="0" maximum="99" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
 
                                <div class="table-right-medium">
                                        <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" />
+                                               <f:validateLongRange minimum="0" maximum="99" />
                                        </p:inputText>
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
index 50ef8bad266e90c934a4078a2d4dffebb3de7ae1..a1b6e8b9b584678f1ae05019ca34f52501c37121 100644 (file)
@@ -6,10 +6,16 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <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:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="departmentI18nKey" value="#{msg.ADMIN_ENTER_DEPARTMENT_I18N_KEY}" />
                        <p:inputText
                                id="departmentI18nKey"
@@ -42,7 +48,7 @@
                                >
                                <f:converter converterId="BranchOfficeConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+                               <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="departmentHeadquarter" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_HEADQUARTER}" />
index ca95d35b57b97d3e252581f5a60b091ad6d3d04c..4440c7ad5e57722a510d1c03bdec12a17f7a646d 100644 (file)
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <!--
-       @TODO title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="employeeBasicData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
                        <p:selectOneMenu
                                id="employeeBasicData"
@@ -35,7 +41,7 @@
                                >
                                <f:converter converterId="BranchOfficeConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+                               <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="employeePersonalData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
        @TODO title="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND_TITLE}"
        -->
        <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 ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
                        <p:inputText id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
 
index 3d69f03b3e9862cd36729ca3ac12321f92cce783..f99fe2273a610d7ea5bba2467a3de202e07f74f0 100644 (file)
@@ -5,12 +5,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <core:outputMessageBox id="error-helper-contact-add-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-full" layout="block">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
                        </div>
 
                        <core:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       action="#{adminContactPhoneController.doLinkMainFaxNumber()}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 2f5abe8582abadfbc713d5fe6741e63c9acdbc57..53ab8ec2af54bbdc285102671539369230768722 100644 (file)
@@ -8,10 +8,16 @@
        xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:fieldset legend="#{msg.ADMIN_HEADQUARTER_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="headquarterCompanyName" value="#{msg.ADMIN_HEADQUARTER_COMPANY_NAME}" />
                        <p:inputText
                                id="headquarterCompanyName"
        </p:fieldset>
 
        <p:fieldset legend="#{msg.ADMIN_HEADQUARTER_ADDRESS_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="headquarterStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
                        <p:inputText id="headquarterStreet" size="20" maxlength="255" value="#{adminHeadquarterController.headquarterStreet}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_STREET_NAME_REQUIRED}" />
 
                        <p:outputLabel for="headquarterHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
                        <p:inputText id="headquarterHouseNumber" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_HOUSE_NUMBER_REQUIRED}">
-                               <f:validateLongRange for="headquarterHouseNumber" minimum="1" maximum="500" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="headquarterHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
 
                        <p:outputLabel for="headquarterLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
                        <p:inputText id="headquarterLastHouseNumber" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-                               <f:validateLongRange for="headquarterLastHouseNumber" minimum="1" maximum="500" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="headquarterStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
                        <p:inputText id="headquarterStore" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                               <f:validateLongRange for="headquarterStore" minimum="-5" maximum="200" />
+                               <f:validateLongRange minimum="-5" maximum="200" />
                        </p:inputText>
 
                        <p:outputLabel for="headquarterSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
                        <p:inputText id="headquarterSuiteNumber" size="3" maxlength="5" value="#{adminHeadquarterController.headquarterSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-                               <f:validateLongRange for="headquarterSuiteNumber" minimum="1" maximum="500" />
+                               <f:validateLongRange minimum="1" maximum="500" />
                        </p:inputText>
 
                        <p:outputLabel for="headquarterZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
                        <p:inputText id="headquarterZipCode" size="5" maxlength="6" value="#{adminHeadquarterController.headquarterZipCode}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_ZIP_CODE_REQUIRED}">
-                               <f:validateLongRange for="headquarterZipCode" minimum="1" maximum="99999" />
+                               <f:validateLongRange minimum="1" maximum="99999" />
                        </p:inputText>
 
                        <p:outputLabel for="headquarterCity" value="#{msg.ADMIN_DATA_CITY}" />
index 29fac7ddafb6b4837d0d5a468d6e60fa8c732db0..2c688e8bfae215474a4e377872c85395e1a5c319 100644 (file)
@@ -6,10 +6,16 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
-               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="4"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
                        <p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
                        <p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
index 9126c1adde0d7c79f813d4d9ac064fd755fae2ce..6b50af2594648fddaa75b8e4c7b3ee5b129090a4 100644 (file)
@@ -5,12 +5,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <core:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-full" layout="block">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
                        </div>
 
                        <core:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}"
+                                       >
                                        <f:param name="contactId" value="#{param.contactId}" />
                                </p:commandButton>
-                       </div>
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 887a46b75f3178cb4e9685ef899bd50945e59a2e..4ba698e70cd0f423e701475203199f1a3b7de523 100644 (file)
@@ -2,7 +2,8 @@
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:submenu label="#{project.ADMIN_MENU_RECEIPTS_TITLE}">
                <p:menuitem title="#{project.ADMIN_LINK_LIST_RECEIPTS_TITLE}" outcome="admin_list_receipts" value="#{project.ADMIN_LINK_LIST_RECEIPTS}" />
index fc02f15fda3fac58785267332ea0f838e64879b6..0b83dc6b2e5654a8a08aecf993b2ba8b6adaa698 100644 (file)
@@ -5,12 +5,13 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-full" layout="block">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
                        </div>
@@ -28,7 +29,7 @@
                                        <p:selectOneMenu styleClass="select" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
                                                <f:converter converterId="MobileNumberConverter" />
                                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
+                                               <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}" />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>
                        <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
                        <core:inputMobileNumberPanelGrid targetController="#{adminPhoneController}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}"
+                                       >
                                        <f:param name="contactId" value="#{param.contactId}" />
                                </p:commandButton>
-                       </div>
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index e8294d333c34f0e8ca015c1900a18552c0c61bc4..607d1b716da85388965791056ed47451a73a4e66 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}" />
@@ -24,7 +25,7 @@
 
                                <div class="table-right-medium">
                                        <p:inputText id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
-                                               <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
+                                               <f:validateLongRange minimum="0" maximum="9999" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
index 73db01cbdaf9cfc2b1319fbe3fedcd4866aeebdb..021879819c1b2e20a3f9a416a0f22f9e8df5e1aa 100644 (file)
@@ -6,10 +6,16 @@
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <p:fieldset legend="#{msg.ADMIN_OPENING_TIME_LEGEND}">
-               <p:panelGrid layout="grid" columns="4" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid
+                       layout="grid"
+                       columns="4"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
                        <p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
                        <p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
                        <p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
index b0d5f7b2a1f6920dbacee74686e6a3620ad190d9..c5d4537b8ec42357f795600cadde1a89b7203071 100644 (file)
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <!--
-       @TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
-       -->
-       <p:panelGrid styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
+       <p:panelGrid
+               columns="3"
+               rendered="#{not empty beanHelper.user}"
+               >
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
                        <h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
-               </h:column>
+               </p:column>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <h:column>
+                       <p:column>
                                <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
                                <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
-                       </h:column>
+                       </p:column>
                </ui:fragment>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
-                               <f:convertDateTime for="userCreated" type="both" />
+                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-                       <h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated.time}">
-                               <f:convertDateTime for="userUpdated" type="both" />
+                       <h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
                        <h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
                        <h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
-                       <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
-                               <f:convertDateTime for="userLastLocked" type="both" />
+                       <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
                        <h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
-               </h:column>
+               </p:column>
 
                <core:outputContactDataGridColumns />
        </p:panelGrid>
index d828ab1a25024973f235ea0e4c2798a20e094e40..2f836bb6d2f08248133d9f2ae09e79fd075f3c8c 100644 (file)
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <!--
-       @TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
-       -->
-       <p:panelGrid styleClass="table table-full" columns="2" rendered="#{not empty beanHelper.user}">
+       <p:panelGrid
+               columns="2"
+               rendered="#{not empty beanHelper.user}"
+               >
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
@@ -39,8 +43,8 @@
                <p:column>
                        <p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
-                               <f:convertDateTime for="userCreated" type="both" />
+                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
                </p:column>
 
index f0b6dced394dce4a8b190da4437b210d10791f49..93dc2349d66df645720f89fa69d8a0dee5da3902 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
@@ -74,7 +75,7 @@
 
                                <div class="table-right-medium">
                                        <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" />
+                                               <f:validateLongRange minimum="1" maximum="500" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
index 733c9191abae5371a0a9dc85eb457a3dba9854fe..f463d49729dcce18ee4a5f051ff9921fb144ede5 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="table-row" layout="block">
                <div class="table-left-medium">
index d4e92ffa015aec6ce9c2a2ea54d01ed3e04eb87f..1b9e3559d4a68b9b081976b774405a642e6a5c4f 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="footer">
                <ul class="navbar-horizontal">
index 4fad967765fe3025163e3e94dff6d6493bc40b5b..c58beb5821ee9265ba8a6eaa37dbd79f7cfb9cd0 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
index f7c93e66f17cf0dae6e55b6b82e088dae5a2d851..ca95206b893d3bd85e37199fc1b6f803fcfb29b8 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset">
index 05d2b7ded6e0fa16a3b87260210868b5fe5cf4d2..4974b565e78c274047f062d9768a29da7a3f581c 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                <h:form id="form_user_login">
                                        </h:panelGroup>
                                </fieldset>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               action="#{userLoginController.doUserLogin()}"
+                                               value="#{msg.BUTTON_USER_LOGIN}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index 9f549db4c2788fc596c9d0761b859e5a127d3361..4b416b655576c7cb445ab19a28e7fe0957bce29e 100644 (file)
@@ -4,10 +4,11 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table table-full" layout="block">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
                        </div>
 
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <p:commandButton styleClass="submit" type="submit" id="submit_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}"
+                                       action="#{userRegistrationController.doRegisterMultiPage1()}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index f1a04346d1403de629aab06660d92ee9ce4b12d4..910cd9cf91e008bb57931c9fcd5a803006f53d38 100644 (file)
@@ -4,20 +4,30 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table table-full" layout="block">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
                        </div>
 
                        <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_FINISH_REGISTRATION}"
+                                       action="#{userRegistrationController.doFinishRegistration()}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index f5f92bbf34a54c15b8e17a3d96f1ce720ac8c4f6..a359818c293f972e75311fed1b0a392a3ad2c638 100644 (file)
@@ -4,10 +4,11 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table table-full" layout="block">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
                        </div>
 
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <p:commandButton styleClass="submit" type="submit" id="submit_finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_FINISH_REGISTRATION}"
+                                       action="#{userRegistrationController.doFinishRegistration()}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 071dca02cf51c3ec9a18f22a23a1a568dda18c05..069004db25c9433314c40c629be145d40a8339ea 100644 (file)
@@ -5,7 +5,8 @@
        xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="table-row" layout="block">
                <div class="table-left">
index 347ce37a0ef2c9148784727bd1c6134b004819ba..81ad613f04b86a20707ac339c2efff28b436fa44 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block">
                <fieldset class="fieldset">
index 667776e84297b7f94ccb961e198c9c0be281a4d5..d9f177d85a061c571c78c33f8f114bbd0b8c6e9d 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="footer">
                <ul class="navbar-horizontal">
index 06e0c593e01e41bc43bd43bb8e50b55bcbc8acab..f707404a332d0a2b2d2bd0ee239731350d844e6d 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
index 5e75c095d849ec7cf929ae05a6699d6e42245db1..20ad983620ec121076cdf6e944c80addbf11b8c5 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:form id="form-change-locale">
                <p:outputPanel styleClass="ui-g">
                        </p:outputPanel>
 
                        <p:outputPanel styleClass="ui-g-12 ui-md-6">
-                               <p:commandButton styleClass="submit" type="submit" actionListener="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       actionListener="#{localizationController.doChangeLocale()}"
+                                       value="#{msg.BUTTON_CHANGE_LOCALE}"
+                                       title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}"
+                                       />
                        </p:outputPanel>
                </p:outputPanel>
        </h:form>
index e575a7ac6a8a3ff09ea05f7d47e0d939a2b474b6..5c77789b34603c8831d565047b6176fb6e75f96c 100644 (file)
@@ -15,10 +15,12 @@ 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/>.
 -->
-<facelet-taglib version="2.2"
-                               xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+<facelet-taglib
+       version="2.2"
+       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
+>
        <namespace>http://mxchange.org/jsf/core/validators</namespace>
        <tag>
                <tag-name>emailAddressValidator</tag-name>
@@ -44,6 +46,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>false</required>
                </attribute>
        </tag>
+       <tag>
+               <tag-name>branchOfficeEmailAddressValidator</tag-name>
+               <validator>
+                       <validator-id>BranchOfficeEmailAddressValidator</validator-id>
+               </validator>
+               <attribute>
+                       <description>Whether email address is allowed to be empty.</description>
+                       <name>allowEmptyRequiredData</name>
+                       <type>java.lang.Boolean</type>
+                       <required>false</required>
+               </attribute>
+       </tag>
        <tag>
                <tag-name>employeeEmailAddressValidator</tag-name>
                <validator>
index a29e127bb6cd12a7fac51f87671885f9c11c5d31..917ae0a3aa4e9ef93cbf605fc8f06cb64637a8e3 100644 (file)
@@ -15,10 +15,12 @@ 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/>.
 -->
-<facelet-taglib version="2.2"
-                               xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-                               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd">
+<facelet-taglib
+       version="2.2"
+       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
+>
        <namespace>http://mxchange.org/jsf/core/widgets</namespace>
        <tag>
                <tag-name>outputMessageBox</tag-name>
@@ -191,12 +193,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                <tag-name>outputAdminFaxPanelGrid</tag-name>
                <description>This tag renders a full p:panelGrid for administrative purposes for fax data.</description>
                <source>resources/tags/admin/panel_grids/fax/admin_fax_data.tpl</source>
-               <attribute>
-                       <name>renderShowLink</name>
-                       <description>Whether this tag is used to show fax data (default true).</description>
-                       <required>false</required>
-                       <type>java.lang.Boolean</type>
-               </attribute>
                <attribute>
                        <name>faxNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
@@ -215,6 +211,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>false</required>
                        <type>java.lang.Boolean</type>
                </attribute>
+               <attribute>
+                       <name>renderShowLink</name>
+                       <description>Whether this tag is used to show fax data (default true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
                <attribute>
                        <name>showAdminMiniLinks</name>
                        <description>Whether to show administrative links to other pages (default: true).</description>
@@ -459,4 +461,57 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.Boolean</type>
                </attribute>
        </tag>
+       <tag>
+               <tag-name>outputOpeningTimesDataTable</tag-name>
+               <description>This tag renders a full p:dataTable for opening times.</description>
+               <source>resources/tags/opening_times/opening_times_data_table.tpl</source>
+               <attribute>
+                       <name>id</name>
+                       <description>An id string for this tag.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>value</name>
+                       <description>A list of OpeningTime objects.</description>
+                       <required>true</required>
+                       <type>java.util.List</type>
+               </attribute>
+               <attribute>
+                       <name>widgetVar</name>
+                       <description>Identifier for this widget (e.g. JavaScript).</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>summary</name>
+                       <description>A string or EL code for table attribute of same name.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>emptyMessage</name>
+                       <description>A string or EL code for a message shown when no row was found.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>headerMessage</name>
+                       <description>A string or EL code for a message shown above table rows.</description>
+                       <required>true</required>
+                       <type>java.lang.String</type>
+               </attribute>
+               <attribute>
+                       <name>rows</name>
+                       <description>Rows to show each page.</description>
+                       <required>true</required>
+                       <type>java.lang.Long</type>
+               </attribute>
+               <attribute>
+                       <name>rendered</name>
+                       <description>Whether this tag is being rendered by JSF engine (default: true).</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
+       </tag>
 </facelet-taglib>
index 494270833e29b7ac4e9e9215e5c13bf19206a00a..7f08038efd252f43ebb98992d113668acc593f8f 100644 (file)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               action="#{userLoginController.doAdminLogout()}"
+                                               value="#{msg.BUTTON_USER_LOGOUT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 42796918253afc442b07d53c9f4aa9392391b235..19e829e902c12ecb48e360656defa99720b18c32 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BASIC_DATA}" />
        </ui:define>
 
        <ui:define name="content">
-               <h:form id="form-list-basic-company-data">
+               <h:form id="form-list-basic-data">
                        <p:dataTable
                                id="basicDataList"
                                var="basicData"
                                value="#{basicDataListController.allBasicData}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                filteredValue="#{basicDataListController.filteredBasicData}"
                                rows="10"
+                               rowKey="#{basicData.basicDataId}"
                                reflow="true"
                                resizableColumns="true"
                                rowsPerPageTemplate="5,10,20,50,100"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_DATA}"
                                emptyMessage="#{msg.ADMIN_EMPTY_LIST_BASIC_DATA}"
                                widgetVar="basicDataList"
+                               selectionMode="single"
+                               selection="#{basicDataListController.selectedBasicData}"
+                               skipChildren="true"
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
-                                               <h:outputText value="#{msg.ADMIN_LIST_BASIC_DATA_HEADER}" />
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
+
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
+                                                       <p:inputText id="globalFilter" onkeyup="PF('basicDataList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+                                               </p:panelGrid>
+
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
+
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
 
-                                               <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
                                                        <p:columnToggler datasource="basicDataList" trigger="toggler" />
-                                               </h:panelGroup>
+                                               </p:outputPanel>
                                        </p:panelGrid>
                                </f:facet>
 
+                               <p:ajax
+                                       event="rowSelect"
+                                       update=":master:form-list-basic-data:basic-data-details"
+                                       oncomplete="PF('basicDataDialog').show()"
+                                       />
+
                                <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{basicData.basicDataId}" filterable="false">
                                        <p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" value="#{basicData.basicDataId}">
                                                <f:param name="basicDataId" value="#{basicData.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_USERS}"
-                                                       onchange="PF('basicDataList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
-                                                       >
-                                                       <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
-                                               <f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
-                                       </p:link>
-
-                                       <p:link outcome="admin_assign_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
-                                               <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                                       </p:link>
-                               </p:column>
-
                                <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" 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}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
+                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyContactEmployee)}" rendered="#{not empty basicData.companyContactEmployee}">
                                                <f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
                                        </p:link>
 
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
+                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_COMPANY_FOUNDER_TITLE}" value="#{beanHelper.renderEmployee(basicData.companyFounder)}" rendered="#{not empty basicData.companyFounder}">
                                                <f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
                                        </p:link>
 
                                        </p:link>
                                </p:column>
 
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{basicData.companyUserOwner}" filterBy="#{basicData.companyUserOwner}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_USERS}"
+                                                       onchange="PF('basicDataList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="UserConverter" />
+                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(basicData.companyUserOwner)}" rendered="#{not empty basicData.companyUserOwner}">
+                                               <f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
+                                       </p:link>
+
+                                       <p:link outcome="admin_assign_basic_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
+                                               <f:param name="basicDataId" value="#{basicData.basicDataId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{msg.TAX_NUMBER_HEADER}" sortBy="#{basicData.companyTaxNumber}" filterBy="#{basicData.companyTaxNumber}" filterMatchMode="contains">
+                                       <h:outputText value="#{basicData.companyTaxNumber}" />
+                               </p:column>
+
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{basicData.companyCreated}">
-                                       <h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
-                                               <f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       <h:outputText id="companyCreated" value="#{basicData.companyCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                                        <links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
                                </p:column>
                        </p:dataTable>
+
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{msg.ADMIN_SINGLE_BASIC_DATA_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="basicDataDialog"
+                               position="top"
+                               responsive="true"
+                               >
+                               <p:outputPanel id="basic-data-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty basicDataListController.selectedBasicData}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{msg.ADMIN_BASIC_DATA_DETAILS_HEADER}">
+                                                               <f:param value="#{basicDataListController.selectedBasicData.companyName}" />
+                                                               <f:param value="#{basicDataListController.selectedBasicData.basicDataId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{msg.BASIC_DATA_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{basicDataListController.selectedBasicData.basicDataId}" />
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
                </h:form>
 
                <h:form>
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_BASIC_DATA_TITLE}" />
                                </f:facet>
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
                                                        action="#{adminBasicCompanyDataController.addBusinessBasicData()}"
-                                                       update=":master:form-list-basic-company-data:basicDataList"
+                                                       update=":master:form-list-basic-data:basicDataList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index 4fc44e875fc827c4b3c832361ec99bc80a008ff4..013961e8cf4b97538b7384f0b3d5549be4bb9b9c 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
                        <p:dataTable
                                id="branchOfficeList"
                                var="branchOffice"
-                               value="#{branchOfficeController.allBranchOffices()}"
-                               tableStyleClass="table table-full"
+                               value="#{branchOfficeListController.allBranchOffices()}"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               filteredValue="#{branchOfficeController.filteredBranchOffices}"
+                               filteredValue="#{branchOfficeListController.filteredBranchOffices}"
                                rows="10"
+                               rowKey="#{branchOffice.branchId}"
                                reflow="true"
                                resizableColumns="true"
                                rowsPerPageTemplate="5,10,20,50,100"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}"
                                emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICES}"
                                widgetVar="branchOfficeList"
+                               selectionMode="single"
+                               selection="#{branchOfficeListController.selectedBranchOffice}"
+                               skipChildren="true"
                                >
 
                                <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
-                                               <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
+
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
+                                                       <p:inputText id="globalFilter" onkeyup="PF('branchOfficeList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+                                               </p:panelGrid>
+
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
+
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
 
-                                               <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
                                                        <p:columnToggler datasource="branchOfficeList" trigger="toggler" />
-                                               </h:panelGroup>
+                                               </p:outputPanel>
                                        </p:panelGrid>
                                </f:facet>
 
+                               <p:ajax
+                                       event="rowSelect"
+                                       update=":master:form-list-branch-offices:branchOffice-details"
+                                       oncomplete="PF('branchOfficeDialog').show()"
+                                       />
+
                                <p:column headerText="#{msg.ID_NUMBER_HEADER}" 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_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
-                                                       label="#{msg.LABEL_USERS}"
+                                                       label="#{msg.LABEL_COMPANIES}"
                                                        onchange="PF('branchOfficeList').filter()"
                                                        updateLabel="true"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
-                                                       <f:converter converterId="UserConverter" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+                                                       <f:converter converterId="BasicCompanyDataConverter" />
+                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
-                                               <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
-                                       </p:link>
-
-                                       <p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
-                                               <f:param name="branchId" value="#{branchOffice.branchId}" />
+                                       <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+                                               <f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_BASIC_DATA_COMPANY_NAME_HEADER}" sortBy="#{branchOffice.branchCompany}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{branchOffice.branchUserOwner}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
                                                        filterMatchMode="contains"
-                                                       label="#{msg.LABEL_COMPANIES}"
+                                                       label="#{msg.LABEL_USERS}"
                                                        onchange="PF('branchOfficeList').filter()"
                                                        updateLabel="true"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
                                                        >
-                                                       <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                                                       <f:converter converterId="UserConverter" />
+                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(branchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
-                                               <f:param name="basicDataId" value="#{branchOffice.branchCompany.basicDataId}" />
+                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOffice.branchUserOwner)}" rendered="#{not empty branchOffice.branchUserOwner}">
+                                               <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
+                                       </p:link>
+
+                                       <p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+                                               <f:param name="branchId" value="#{branchOffice.branchId}" />
                                        </p:link>
                                </p:column>
 
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
+                                       <p:link outcome="admin_show_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOffice.branchContactEmployee)}" rendered="#{not empty branchOffice.branchContactEmployee}">
                                                <f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
                                        </p:link>
 
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" 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 id="branchCreated" value="#{branchOffice.branchCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                                        <links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
                                </p:column>
                        </p:dataTable>
+
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{msg.ADMIN_SINGLE_BRANCH_OFFICE_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="branchOfficeDialog"
+                               position="top"
+                               responsive="true"
+                               >
+                               <p:outputPanel id="branchOffice-details">
+                                       <p:tabView>
+                                               <p:tab title="#{msg.ADMIN_BRANCH_OFFICE_DATA_TAB_TITLE}">
+                                                       <p:panelGrid columns="2" rendered="#{not empty branchOfficeListController.selectedBranchOffice}">
+                                                               <f:facet name="header">
+                                                                       <h:outputFormat value="#{msg.ADMIN_BRANCH_OFFICE_BASIC_DETAILS_HEADER}">
+                                                                               <f:param value="#{branchOfficeListController.selectedBranchOffice.branchId}" />
+                                                                       </h:outputFormat>
+                                                               </f:facet>
+
+                                                               <p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{msg.BRANCH_OFFICE_ID_NUMBER_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchId}" />
+
+                                                               <p:outputLabel value="#{msg.BRANCH_OFFICE_NUMBER_HEADER}" title="#{msg.BRANCH_OFFICE_NUMBER_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchNumber}" />
+
+                                                               <p:outputLabel value="#{msg.ASSIGNED_BASIC_DATA_HEADER}" title="#{msg.ASSIGNED_BASIC_DATA_TO_BRANCH_OFFICE_TITLE}" />
+                                                               <p:link outcome="admin_show_basic_data" target="_blank" value="#{beanHelper.renderBasicData(branchOfficeListController.selectedBranchOffice.branchCompany)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
+                                                                       <f:param name="basicDataId" value="#{branchOfficeListController.selectedBranchOffice.branchCompany.basicDataId}" />
+                                                               </p:link>
+
+                                                               <p:outputLabel value="#{msg.ASSIGNED_CONTACT_PERSON_HEADER}" title="#{msg.ASSIGNED_CONTACT_PERSON_TO_BRANCH_OFFICE_TITLE}" />
+                                                               <p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_CONTACT_PERSON_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchContactEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}">
+                                                                       <f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
+                                                               </p:link>
+                                                               <h:outputText value="#{msg.NO_CONTACT_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchContactEmployee}" />
+
+                                                               <p:outputLabel value="#{msg.ASSIGNED_OWNER_EMPLOYEE_HEADER}" title="#{msg.ASSIGNED_OWNER_EMPLOYEE_TO_BRANCH_OFFICE_TITLE}" />
+                                                               <p:link outcome="admin_show_employee" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_EMPLOYEE_TITLE}" value="#{beanHelper.renderEmployee(branchOfficeListController.selectedBranchOffice.branchOwnerEmployee)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}">
+                                                                       <f:param name="employeeId" value="#{branchOfficeListController.selectedBranchOffice.branchContactEmployee.employeeId}" />
+                                                               </p:link>
+                                                               <h:outputText value="#{msg.NO_OWNER_EMPLOYEE_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchOwnerEmployee}" />
+
+                                                               <p:outputLabel value="#{msg.ASSIGNED_USER_OWNER_HEADER}" title="#{msg.ASSIGNED_USER_OWNER_TO_BRANCH_OFFICE_TITLE}" />
+                                                               <p:link outcome="admin_show_user" target="_blank" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_OWNER_USER_TITLE}" value="#{beanHelper.renderUser(branchOfficeListController.selectedBranchOffice.branchUserOwner)}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchUserOwner}">
+                                                                       <f:param name="userId" value="#{branchOfficeListController.selectedBranchOffice.branchUserOwner.userId}" />
+                                                               </p:link>
+                                                               <h:outputText value="#{msg.NO_USER_ASSIGNED_AS_OWNER_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchUserOwner}" />
+
+                                                               <p:outputLabel value="#{msg.EMAIL_ADDRESS_HEADER}" title="#{msg.EMAIL_ADDRESS_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputLink value="mailto:#{branchOfficeListController.selectedBranchOffice.branchEmailAddress}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchEmailAddress}" />
+                                                               <h:outputText value="#{msg.BRANCH_OFFICE_HAS_NO_EMAIL_ADDRESS}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchEmailAddress}" />
+
+                                                               <p:outputLabel value="#{msg.LANDLINE_NUMBER_HEADER}" title="#{msg.ASSIGNED_LANDLINE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <p:link
+                                                                       outcome="admin_show_landline"
+                                                                       value="#{beanHelper.renderPhoneNumber(branchOfficeListController.selectedBranchOffice.branchLandLineNumber)}"
+                                                                       target="_blank"
+                                                                       title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+                                                                       rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchLandLineNumber}"
+                                                                       >
+                                                                       <f:param name="phoneId" value="#{branchOfficeListController.selectedBranchOffice.branchLandLineNumber.phoneId}" />
+                                                               </p:link>
+                                                               <h:outputText value="#{msg.NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchLandLineNumber}" />
+
+                                                               <p:outputLabel value="#{msg.FAX_NUMBER_HEADER}" title="#{msg.ASSIGNED_FAX_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <p:link
+                                                                       outcome="admin_show_fax"
+                                                                       value="#{beanHelper.renderPhoneNumber(branchOfficeListController.selectedBranchOffice.branchFaxNumber)}"
+                                                                       target="_blank"
+                                                                       title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+                                                                       rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}"
+                                                                       >
+                                                                       <f:param name="phoneId" value="#{branchOfficeListController.selectedBranchOffice.branchFaxNumber.phoneId}" />
+                                                               </p:link>
+                                                               <h:outputText value="#{msg.NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}" />
+                                                       </p:panelGrid>
+                                               </p:tab>
+
+                                               <p:tab title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_TAB_TITLE}">
+                                                       <p:panelGrid columns="2" rendered="#{not empty branchOfficeListController.selectedBranchOffice}">
+                                                               <f:facet name="header">
+                                                                       <h:outputFormat value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_DETAILS_HEADER}">
+                                                                               <f:param value="#{branchOfficeListController.selectedBranchOffice.branchId}" />
+                                                                       </h:outputFormat>
+                                                               </f:facet>
+
+                                                               <p:outputLabel value="#{msg.STREET_NAME_HEADER}" title="#{msg.STREET_NAME_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchStreet}" />
+
+                                                               <p:outputLabel value="#{msg.HOUSE_NUMBER_HEADER}" title="#{msg.HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchHouseNumber}" />
+
+                                                               <p:outputLabel value="#{msg.LAST_HOUSE_NUMBER_HEADER}" title="#{msg.LAST_HOUSE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchLastHouseNumber}" />
+
+                                                               <p:outputLabel value="#{msg.HOUSE_NUMBER_EXTENSION_HEADER}" title="#{msg.HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchHouseNumberExtension}" />
+
+                                                               <p:outputLabel value="#{msg.STORE_HEADER}" title="#{msg.STORE_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchStore}" />
+
+                                                               <p:outputLabel value="#{msg.SUITE_NUMBER_HEADER}" title="#{msg.SUITE_NUMBER_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchSuiteNumber}" />
+
+                                                               <p:outputLabel value="#{msg.ZIP_CODE_HEADER}" title="#{msg.ZIP_CODE_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchZipCode}" />
+
+                                                               <p:outputLabel value="#{msg.CITY_HEADER}" title="#{msg.CITY_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{branchOfficeListController.selectedBranchOffice.branchCity}" />
+
+                                                               <p:outputLabel value="#{msg.COUNTRY_HEADER}" title="#{msg.COUNTRY_OF_BRANCH_OFFICE_TITLE}" />
+                                                               <h:outputText value="#{beanHelper.renderCountry(branchOfficeListController.selectedBranchOffice.branchCountry)}" />
+                                                       </p:panelGrid>
+                                               </p:tab>
+
+                                               <p:tab title="#{msg.ADMIN_OPENING_TIMES_TAB_TITLE}">
+                                                       <core:outputOpeningTimesDataTable
+                                                               id="branchOpeningTimeDetailList"
+                                                               value="#{branchOfficeListController.selectedBranchOffice.branchOpeningTimes}"
+                                                               rows="10"
+                                                               summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES}"
+                                                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES}"
+                                                               widgetVar="branchOpeningTimeDetailList"
+                                                               headerMessage="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}"
+                                                               />
+                                               </p:tab>
+                                       </p:tabView>
+                               </p:outputPanel>
+                       </p:dialog>
                </h:form>
 
-               <h:form>
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+               <h:form id="form-add-branch-office">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_TITLE}" />
                                </f:facet>
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
                                                        action="#{adminBranchOfficeController.addBranchOffice()}"
                                                        update=":master:form-list-branch-offices:branchOfficeList"
+                                                       oncomplete="PF('branchOfficeList').filter()"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
 
                <h:form id="form-list-branch-opening-time">
                        <p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIMES_LEGEND}">
-                               <p:dataTable
+                               <core:outputOpeningTimesDataTable
                                        id="branchOpeningTimeList"
-                                       var="openingTime"
                                        value="#{adminBranchOfficeController.branchOpeningTimes}"
-                                       tableStyleClass="table table-full"
                                        rows="10"
-                                       reflow="true"
                                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES}"
                                        emptyMessage="#{msg.ADMIN_EMPTY_LIST_BRANCH_OFFICE_OPENING_TIMES}"
                                        widgetVar="branchOpeningTimeList"
-                                       >
-
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}" />
-                                       </f:facet>
-
-                                       <p:column headerText="#{msg.ADMIN_START_WEEK_DAY}">
-                                               <h:outputText value="#{openingTime.openingStartDay.toString()}" />
-                                       </p:column>
-
-                                       <p:column headerText="#{msg.ADMIN_END_WEEK_DAY}">
-                                               <h:outputText value="#{openingTime.openingEndDay.toString()}" />
-                                       </p:column>
-
-                                       <p:column headerText="#{msg.ADMIN_START_TIME}">
-                                               <h:outputText value="#{openingTime.openingStartTime.time}">
-                                                       <f:convertDateTime type="time" timeStyle="short" />
-                                               </h:outputText>
-                                       </p:column>
-
-                                       <p:column headerText="#{msg.ADMIN_END_TIME}">
-                                               <h:outputText value="#{openingTime.openingEndTime.time}">
-                                                       <f:convertDateTime type="time" timeStyle="short" />
-                                               </h:outputText>
-                                       </p:column>
-                               </p:dataTable>
+                                       headerMessage="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}"
+                                       />
                        </p:fieldset>
                </h:form>
 
                <h:form id="form-admin-add-branch-opening-time">
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME_TITLE}" />
                                </f:facet>
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME}"
                                                        action="#{adminBranchOfficeController.addOpeningTime()}"
                                                        update=":master:form-list-branch-opening-time:branchOpeningTimeList"
+                                                       oncomplete=""
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index 28ede7acc79921a573aa80db7fc9bb870ebd795d..90ea0adb0d36c5167d78c8b62ec33ad0c5e0e739 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,6 +28,8 @@
                <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.contact}">
+                       <h:inputHidden value="#{adminContactController.contactId}" />
+
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
-                               </div>
-                       </h:panelGroup>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}"
+                                       action="#{adminContactController.deleteContactData()}"
+                                       />
+                               </p:panelGrid>
                </h:form>
        </ui:define>
 </ui:composition>
index 720bb4639051cded284a016b2e62cbc47b3aa2ab..3eb39c69675a2143f2924d6fca8d7c7597b53090 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
        <ui:define name="content">
                <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-               <h:form id="form-admin-edit-user" rendered="#{not empty beanHelper.contact}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+               <h:form id="form-admin-edit-contact" rendered="#{not empty beanHelper.contact}">
+                       <h:inputHidden value="#{adminContactController.contactId}" />
+
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
                                                <f:param value="#{beanHelper.contact.contactId}" />
 
                                <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}"
+                                               action="#{adminContactController.editContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 7e1b93419c40359c0aa1878ad8b22253b9ae2ae2..9e8ab677a17734d3f174981f0909f594d7d8d281 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
@@ -21,7 +23,6 @@
                                id="table_export_contacts"
                                var="contact"
                                value="#{contactController.allContacts()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                rows="10"
                                emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
                                        </f:facet>
 
                                        <h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
-                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                               <f:convertDateTime type="date" dateStyle="medium" />
                                        </h:outputText>
                                </p:column>
 
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       <h:outputText id="contactCreated" value="#{contact.contactCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
                                </div>
                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
-                                               <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               ajax="false"
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}"
+                                               >
+
+                                               <p:dataExporter
+                                                       type="xls"
+                                                       target="table_export_contacts"
+                                                       fileName="all_contacts"
+                                                       />
                                        </p:commandButton>
-                               </div>
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 17c399fca4994fa0018d7aaa26f7ecbe8134ce6f..d50617083314a30c9638f9c336facaebb72b58ac 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
@@ -22,7 +24,6 @@
                                id="contactList"
                                var="contact"
                                value="#{contactController.allContacts()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                rows="10"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}"
@@ -76,8 +77,8 @@
                                                <h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       <h:outputText id="contactCreated" value="#{contact.contactCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                </h:form>
 
                <h:form>
-                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
                                </f:facet>
                                                value="#{msg.BUTTON_RESET_FORM}"
                                                />
                                        <p:commandButton
-                                               styleClass="submit"
+                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_CONTACT}"
                                                action="#{adminContactController.addContact()}"
index 3449be65b1f07f66f741bbbae6030ea865eff846..7eb7a6ff6bdb249d4647a25ba4e91d7fd564eda7 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
index aed4126c65e7396bd18eca8532bb4a541e29f9fb..a8decc5d80b59f3c55ddd943bdfe41f289b32d9e 100644 (file)
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
                        <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -30,6 +32,9 @@
                <core:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
                <h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
+                       <h:inputHidden value="#{adminContactPhoneController.contact}" />
+                       <h:inputHidden value="#{adminContactPhoneController.phoneId}" />
+
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
                                        <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}"
+                                               action="#{adminContactPhoneController.unlinkFaxContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index a99ee79ae83b70a735f094ed770fef9787c27921..3fc338a464269c1574e8e16b82ad02bd0717ecc1 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                                        <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}"
+                                               action="#{adminContactPhoneController.unlinkLandLineContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index 70535e96e79a823dfefff1cb377004b64162092e..3a3a92218b811085a5e0a4c3a00940e9eed4f351 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                                        <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-                               </div>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}"
+                                       action="#{adminContactPhoneController.unlinkMobileContactData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
 
index b6e0c25d1e56e8cb2f7f8a0e419ef4793cdeca49..a700c29038aaa5a398d0cd7c1f9cff79a818b40d 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
index 795e272e7ac33704d4bddb326aa744dfc4898553..051b7ce224dcff0b6f5e11dbf6e67c7dcd4b1575 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
index c215b0ee01ee7597caa2bf797d41c6e7e92cf2e7..c68126ce100ffefa35b2ceb1ccb433ec5c155c4f 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
@@ -21,7 +23,6 @@
                                id="countryList"
                                var="country"
                                value="#{countryController.allCountries()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                rows="10"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}"
                </h:form>
 
                <h:form>
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
                                </div>
 
                                <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
-                               <div class="table-footer">
+                               <p:panelGrid columns="2" layout="grid">
                                        <p:commandButton
-                                               styleClass="reset"
                                                type="reset"
                                                value="#{msg.BUTTON_RESET_FORM}"
                                                />
+
                                        <p:commandButton
-                                               styleClass="submit"
+                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}"
                                                action="#{adminCountryController.addCountry()}"
                                                update=":master:form-list-countries:countryList"
                                                />
-                               </div>
+                               </p:panelGrid>
                        </h:panelGroup>
 
                        <div class="para notice">
index 6fe368d06535c6ac6049f45310ef1d161868f7cb..1ac1f068612c5dea08055bc729e4d8b6e26a321e 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_DEPARTMENTS}" />
@@ -22,7 +23,6 @@
                                id="departmentList"
                                var="department"
                                value="#{departmentController.allDepartments()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                filteredValue="#{departmentController.filteredDepartments}"
                                                <h:outputText value="#{msg.ADMIN_LIST_DEPARTMENTS_HEADER}" />
 
                                                <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
                                                        <p:columnToggler datasource="departmentList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
@@ -53,7 +59,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{department.departmentI18nKey}" filterBy="#{department.departmentI18nKey}" filterMatchMode="contains">
+                               <p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{local[department.departmentI18nKey]}" filterBy="#{local[department.departmentI18nKey]}" filterMatchMode="contains">
                                        <h:outputText value="#{local[department.departmentI18nKey]}" />
                                </p:column>
 
@@ -88,7 +94,7 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="BranchOfficeConverter" />
-                                                       <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+                                                       <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" 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 id="departmentCreated" value="#{department.departmentCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                </h:form>
 
                <h:form>
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_DEPARTMENT_TITLE}" />
                                </f:facet>
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_DEPARTMENT_DATA}"
                                                        action="#{adminDepartmentController.addDepartment()}"
index a4932ee8717acd4d656154f9f0746addd91c5b61..a3293b123c9cc21a66bcae7d5b2a0bc4dbe1c6d0 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_EMPLOYEE}" />
@@ -23,7 +24,6 @@
                                var="employee"
                                value="#{employeeController.allEmployees()}"
                                filteredValue="#{employeeController.filteredEmployees}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                rows="10"
                                                <h:outputText value="#{msg.ADMIN_LIST_EMPLOYEES_HEADER}" />
 
                                                <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
                                                        <p:columnToggler datasource="employeeList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
@@ -64,7 +70,7 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
                                                        <f:converter converterId="BranchOfficeConverter" />
-                                                       <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+                                                       <f:selectItems value="#{branchOfficeListController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" 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 id="employeeCreated" value="#{employee.employeeCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                </h:form>
 
                <h:form>
-                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_EMPLOYEE_TITLE}" />
                                </f:facet>
 
                                <h:outputText value="#{msg.ADMIN_ADD_EMPLOYEE_MINIMUM_DATA}" />
 
-                               <h:column>
+                               <p:column>
                                        <ui:include src="/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl" />
-                               </h:column>
+                               </p:column>
 
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}"
                                                        action="#{adminEmployeeController.addEmployee()}"
index 56c31d4ef547d4accaae2204fd9a1887d0633e4a..c1dad067f2a69b087538b550a37d015605c1bd53 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,6 +28,8 @@
                <core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
                <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
+                       <h:inputHidden value="#{adminPhoneController.phoneId}" />
+
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
-                               </div>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_FAX}"
+                                       action="#{adminPhoneController.deleteFaxData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 5875d50edc98befee6121222307ac8e6ed8e1b4a..08902b866859308fae260368596badfdf2411e48 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,9 @@
                <core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
                <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:inputHidden value="#{adminPhoneController.phoneId}" />
+
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.faxNumber.phoneId}" />
 
                                <core:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}"
+                                               action="#{adminPhoneController.doChangeFaxNumber()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index ce5b904565cd9e49b3bda59aee9d0e2d3ca54d9e..ceaacc2006d25be9628313018bed4da90ad619ce 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
@@ -20,7 +22,6 @@
                        id="table_list_fax"
                        var="faxNumber"
                        value="#{phoneController.allFaxNumbers()}"
-                       tableStyleClass="table table-full"
                        paginator="true"
                        rows="10"
                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}"
@@ -41,7 +42,7 @@
                                        <p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_FAX_NUMBER}" />
                                </f:facet>
 
-                               <h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+                               <h:outputText id="faxNumber" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
                        </p:column>
 
                        <p:column>
@@ -49,7 +50,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
                                </f:facet>
 
-                               <h:outputText value="#{faxNumber.phoneEntryCreated.time}">
+                               <h:outputText value="#{faxNumber.phoneEntryCreated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
@@ -59,7 +60,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
                                </f:facet>
 
-                               <h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
+                               <h:outputText value="#{faxNumber.phoneEntryUpdated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
index cc654ef513891150453a2b1edc49ba60d2d93bbe..8258af9b7d63545600ea4613f02d6798272a769a 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
        <ui:define name="content">
                <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
 
-               <p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-full">
+               <p:dataTable
+                       id="contact_fax_link"
+                       var="contact"
+                       value="#{contactPhoneController.allCurrentFaxNumberContacts()}"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+                       >
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />
index 7202ff33f490b9f4ef921d3fca4b3076287712e9..b8ee104b60666c74d5cf4b1e26f86c87a9680528 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_HEADQUARTER}" />
@@ -21,7 +23,6 @@
                                id="headquarterList"
                                var="headquarter"
                                value="#{headquarterController.allHeadquarter()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                filteredValue="#{headquarterController.filteredHeadquarter}"
                                                <h:outputText value="#{msg.ADMIN_LIST_HEADQUARTER_HEADER}" />
 
                                                <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
                                                        <p:columnToggler datasource="headquarterList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{headquarter.headquarterCreated}" filterable="false">
-                                       <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated.time}">
-                                               <f:convertDateTime for="headquarterCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                </h:form>
 
                <h:form>
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_HEADQUARTER_TITLE}" />
                                </f:facet>
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}"
                                                        action="#{adminHeadquarterController.addHeadquarter()}"
                                        id="headquarterOpeningTimeList"
                                        var="openingTime"
                                        value="#{adminHeadquarterController.headquarterOpeningTimes}"
-                                       tableStyleClass="table table-full"
                                        rows="10"
                                        reflow="true"
                                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_HEADQUARTER_OPENING_TIMES}"
                                        </p:column>
 
                                        <p:column headerText="#{msg.ADMIN_START_TIME}">
-                                               <h:outputText value="#{openingTime.openingStartTime.time}">
+                                               <h:outputText value="#{openingTime.openingStartTime}">
                                                        <f:convertDateTime type="time" timeStyle="short" />
                                                </h:outputText>
                                        </p:column>
 
                                        <p:column headerText="#{msg.ADMIN_END_TIME}">
-                                               <h:outputText value="#{openingTime.openingEndTime.time}">
+                                               <h:outputText value="#{openingTime.openingEndTime}">
                                                        <f:convertDateTime type="time" timeStyle="short" />
                                                </h:outputText>
                                        </p:column>
                </h:form>
 
                <h:form id="form-admin-add-headquarter-opening-time">
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE}" />
                                </f:facet>
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}"
                                                        action="#{adminHeadquarterController.addOpeningTime()}"
index 1dbb4db726c97efe0e02fe06fe77c2852f2d61a4..be454f8c22c62c91f52d77a26a5441e8337c87aa 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
index 8792e5417b9fcac422fcf8debbe7eda682ca9feb..1533c029e0dadd4a97c87e949b76dd08f0feec8a 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
                                        <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
-                               </div>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}"
+                                       action="#{adminPhoneController.deleteLandLineData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 83861bd96f5416699cc88974173f719c525c038a..b744a62fd0608b98f14eede5796efb3a091c2bea 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
                <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
 
                                <core:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}"
+                                               action="#{adminPhoneController.doChangeLandLineNumber()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 8d999514a38da5b2611217e27067339046b6b2e3..730b47acdc0904b31b992ce7601bd3d33d8973e4 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
@@ -20,7 +21,6 @@
                        id="table_list_landline"
                        var="landLineNumber"
                        value="#{phoneController.allLandLineNumbers()}"
-                       tableStyleClass="table table-full"
                        paginator="true"
                        rows="10"
                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}"
@@ -41,7 +41,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+                               <h:outputText value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
                        </p:column>
 
                        <p:column>
@@ -49,7 +49,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
+                               <h:outputText value="#{landLineNumber.phoneEntryCreated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
@@ -59,7 +59,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
+                               <h:outputText value="#{landLineNumber.phoneEntryUpdated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
index 97bd9d8e7399f73a0c12b8012d77d76e3e7483f5..3c2604804d4931e0052c70aacd0edf665b1b9919 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
        <ui:define name="content">
                <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
 
-               <p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-full">
+               <p:dataTable
+                       id="contact_landline_link"
+                       var="contact"
+                       value="#{contactPhoneController.allCurrentLandLineNumberContacts()}"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+                       >
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
index 79c900887a68522610d50650e374264800a491d7..7747849baef88e0be3024cfcefb8aab386866069 100644 (file)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
@@ -19,7 +21,6 @@
                        id="table_list_mobiles"
                        var="mobile"
                        value="#{phoneController.allMobileNumbers()}"
-                       tableStyleClass="table table-full"
                        paginator="true"
                        rows="10"
                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}"
index 934ecdd7762553beb0c0a8f02dbe19bf8408e036..753a0583875ea3e97a6d3848ec147eed434261ef 100644 (file)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
index 6b90c6612b6a0a11001f8c06739d6ef7c872d38e..8a1b96ffd54e01655aacee000af5a55df1310469 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
                                        <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
-                               </div>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}"
+                                       action="#{adminPhoneController.deleteMobileData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index a58dcc1de2091bfb1f0eb969fe61f1c0c0ef8ce4..843c3e890f476999c48ad1a88c9322f9aa657803 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
                <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.mobileNumber.phoneId}" />
 
                                <core:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}"
+                                               action="#{adminPhoneController.doUpdateMobileNumber()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 34317e0ebb0cada02a0ab0cc8261e130a0f2b8b0..908fbd906904f78c35cab6409b0bd7af8fef86a6 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
@@ -20,7 +21,6 @@
                        id="mobileNumberList"
                        var="mobileNumber"
                        value="#{phoneController.allMobileNumbers()}"
-                       tableStyleClass="table table-full"
                        paginator="true"
                        rows="10"
                        summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}"
@@ -51,7 +51,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
                                </f:facet>
 
-                               <h:outputText value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
+                               <h:outputText value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
                        </p:column>
 
                        <p:column>
@@ -59,7 +59,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
                                </f:facet>
 
-                               <h:outputText value="#{mobileNumber.phoneEntryCreated.time}">
+                               <h:outputText value="#{mobileNumber.phoneEntryCreated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
@@ -69,7 +69,7 @@
                                        <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
                                </f:facet>
 
-                               <h:outputText value="#{mobileNumber.phoneEntryUpdated.time}">
+                               <h:outputText value="#{mobileNumber.phoneEntryUpdated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
index 59cde9268050930f75d28c60c8e4ec96f9f342aa..57749b617f23b4e7dc949b0a34abb10d93ba0238 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
        <ui:define name="content">
                <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
 
-               <p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-full">
+               <p:dataTable
+                       id="contact_mobile_link"
+                       var="contact"
+                       value="#{contactPhoneController.allCurrentMobileNumberContacts()}"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+                       >
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.mobileNumber.phoneId}" />
index c79d8f37357df391f02a85c4bbd0c32fd1d3617d..7fba4ce16369976860c48c4ee8037e39cb51eb53 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
index 2e1250196e256fa4b9fd406944cb7b7d88c099a2..c50a139b344501052a5f62b1b03c809478755a58 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
index 58f0cb51b59a8edf7a70a64c42672460d78b3e5c..812b17507f3f2ee8034cb0737793b5509a76619c 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
@@ -21,7 +23,6 @@
                                id="mobileProviderList"
                                var="mobileProvider"
                                value="#{mobileProviderController.allMobileProviders()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                filteredValue="#{mobileProviderController.filteredMobileProviders}"
                                        <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDERS_HEADER}" />
 
-                                               <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                               <p:commandButton
+                                                       id="toggler"
+                                                       type="button"
+                                                       value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                       styleClass="column-selector"
+                                                       />
+
                                                <p:columnToggler datasource="mobileProviderList" trigger="toggler" />
                                        </p:panelGrid>
                                </f:facet>
@@ -82,8 +89,8 @@
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{mobileProvider.providerEntryCreated}">
-                                       <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}">
-                                               <f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       <h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                </h:form>
 
                <h:form>
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
                                </div>
 
                                <ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
-                               <div class="table-footer">
+                               <p:panelGrid columns="2" layout="grid">
                                        <p:commandButton
-                                               styleClass="reset"
                                                type="reset"
                                                value="#{msg.BUTTON_RESET_FORM}"
                                                />
+
                                        <p:commandButton
-                                               styleClass="submit"
+                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}"
                                                action="#{adminMobileProviderController.addMobileProvider()}"
                                                update=":master:form-list-mobile-provider:mobileProviderList"
                                                />
-                               </div>
+                               </p:panelGrid>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para notice" layout="block">
index 8ab17cab9f158a279700486b9da4c70c6f411b1a..8a3bdecd409664cb966217ba168a7d428c95fba3 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
index 20b7f80fc8f5f0b3c136e88fecb7c9ca30215ab3..124dc995158bcf66662f73e873ab5c808cc0804a 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_OPENING_TIMES}" />
@@ -22,7 +23,6 @@
                                id="openingTimeList"
                                var="openingTime"
                                value="#{openingTimeController.allOpeningTimes()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                filteredValue="#{openingTimeController.filteredOpeningTimes}"
                                                <h:outputText value="#{msg.ADMIN_LIST_OPENING_TIMES_HEADER}" />
 
                                                <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
                                                        <p:columnToggler datasource="openingTimeList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid>
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_START_TIME}" sortBy="#{openingTime.openingStartTime}" filterBy="#{openingTime.openingStartTime}" filterable="false">
-                                       <h:outputText value="#{openingTime.openingStartTime.time}">
+                                       <h:outputText value="#{openingTime.openingStartTime}">
                                                <f:convertDateTime type="time" timeStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                                <p:column headerText="#{msg.ADMIN_END_TIME}" sortBy="#{openingTime.openingEndTime}" filterBy="#{openingTime.openingEndTime}" filterable="false">
-                                       <h:outputText value="#{openingTime.openingEndTime.time}">
+                                       <h:outputText value="#{openingTime.openingEndTime}">
                                                <f:convertDateTime type="time" timeStyle="short" />
                                        </h:outputText>
                                </p:column>
                </h:form>
 
                <h:form>
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_OPENING_TIME_TITLE}" />
                                </f:facet>
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
                                                <p:commandButton
-                                                       styleClass="reset"
                                                        type="reset"
                                                        value="#{msg.BUTTON_RESET_FORM}"
                                                        />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_OPENING_TIME}"
                                                        action="#{adminOpeningTimeController.addOpeningTime()}"
index 4c3e06ef36143c740139750b2834aa7ddc7edff1..6f0b9b241020bfd13c0571615da9801717f3e44f 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
        <ui:define name="content">
                <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+               <p:dataTable
+                       id="table_user_activity_log"
+                       var="userActivity"
+                       value="#{userActivityController.fetchCurrentUsersActivityLog()}"
+                       paginator="true"
+                       rows="10"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}"
+                       rendered="#{not empty beanHelper.user}"
+                       >
                        <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
                                </f:facet>
 
-                               <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
-                                       <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+                               <h:outputText id="userCreated" value="#{userActivity.activityTimestamp}">
+                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
                        </p:column>
                </p:dataTable>
index cdb85009b10d29ec211fd6f97cf33341c48a3dc1..9cee8cba5df827c5b8ac72946653e0992f44ed0c 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
-                               </div>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_USER}"
+                                       action="#{adminUserController.deleteUserData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 85c12b4df39ac7901f1a7869dddd565df348d69e..1eb1e9395d154876672f06da435237cf8f3db83f 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
                                </div>
 
                                <core:outputAdminUserDataFormFields mode="edit" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_USER}"
+                                               action="#{adminUserController.editUserData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index d29e695a00b1aa87bab420e57403c08419d81636..78e1d41514ae98194c9f342a6d87e2ca0e8d7e88 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
@@ -21,7 +23,6 @@
                                id="table_export_users"
                                var="user"
                                value="#{userController.allUsers()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                rows="10"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}"
                                        </f:facet>
 
                                        <h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
-                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                               <f:convertDateTime type="date" dateStyle="medium" />
                                        </h:outputText>
                                </p:column>
 
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       <h:outputText id="contactCreated" value="#{user.userContact.contactCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                </div>
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                               <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-                                       </p:commandButton>
-                               </div>
+                               <p:commandButton
+                                       ajax="false"
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}"
+                                       >
+
+                                       <p:dataExporter
+                                               type="xls"
+                                               target="table_export_users"
+                                               fileName="all_users"
+                                               />
+                               </p:commandButton>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index d3cff187a679c8bffe8c4ec3df277dab642b1d1d..85ca02fac1f2c043cb21e36ba1ad081ad6b6fe87 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
@@ -22,7 +24,6 @@
                                id="userList"
                                var="user"
                                value="#{userController.allUsers()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                filteredValue="#{userController.filteredUsers}"
                                        <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
                                                <h:outputText value="#{msg.ADMIN_LIST_USERS_HEADER}" />
 
-                                               <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                               <p:commandButton
+                                                       id="toggler"
+                                                       type="button"
+                                                       value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                       styleClass="column-selector"
+                                                       />
+
                                                <p:columnToggler datasource="userList" trigger="toggler" />
                                        </p:panelGrid>
                                </f:facet>
                                </p:column>
 
                                <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" 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 id="userCreated" value="#{user.userCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                </h:form>
 
                <h:form>
-                       <p:panelGrid columns="1" styleClass="table table-full" layout="grid">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                </f:facet>
                                @TODO title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}"
                                -->
                                <p:fieldset legend="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-3,ui-grid-col-9" styleClass="table table-full ui-noborder" layout="grid">
+                                       <p:panelGrid
+                                               columns="2"
+                                               columnClasses="ui-grid-col-3,ui-grid-col-9"
+                                               styleClass="ui-noborder"
+                                               layout="grid"
+                                               >
                                                <p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
                                                <p:selectOneMenu
                                                        id="userContact"
 
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
-                                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
 
                                                <p:commandButton
-                                                       styleClass="submit"
+                                                       process="@form"
                                                        type="submit"
                                                        id="submit_add_user"
                                                        value="#{msg.BUTTON_ADMIN_ADD_USER}"
index 2e20cc4e21edff67fc4980d45b6729f00f77f875..461d8a69d95619c4363cb29fd33b636d83513c6c 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-user-lock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-                                       <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               action="#{adminUserController.lockUserAccount()}"
+                                               value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index f98b8b384ef63b418f9bef72a177c033fa6557de..2dee8442114f6f542696f63a86c9b0a9a10f9730 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-user-resend" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
                                        <h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
 
-                                       <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
-                               </div>
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               action="#{adminUserController.resendConfirmationLink()}"
+                                               value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index ce4e42ddd88a943671a39b5ae90ad8237e11634a..01d63232a42bb55fcb7573507c702c18ce8d24e4 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
index 4d29356da14a524cdd82264434c34714469a4f63..662e9fa797cb9733cfc7aac8cb8950ca0cb2aa10 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,7 +28,7 @@
                <core:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
                <h:form id="form-admin-user-unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
                                                <f:param value="#{beanHelper.user.userName}" />
@@ -82,8 +84,8 @@
                                        </div>
 
                                        <div class="table-data-field">
-                                               <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
-                                                       <f:convertDateTime for="userLastLocked" type="both" />
+                                               <h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked}">
+                                                       <f:convertDateTime type="both" />
                                                </h:outputText>
                                        </div>
                                </h:panelGroup>
                                        </div>
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-                                       <p:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               action="#{adminUserController.unlockUserAccount()}"
+                                               value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index 4b2f57d03813aed3780134813501846c725bda5f..7afe77fef4959b0e6673f57706bea459088f55b4 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
index 00a99c690ea2bb9841b9548e9978e02fb6b3c140..6649269257ecc50906021184ad70f3b9281e9622 100644 (file)
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-                       <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+                       <f:viewAction action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
                </f:metadata>
        </ui:define>
 
index d827bda49c2d35aacdab90c6edcd18ab6a12d5a8..54951ad2a6818953a2ad94462c0bc6b080a96108 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
        <ui:define name="content">
                <core:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
 
-               <h:panelGroup styleClass="table table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+               <h:panelGroup
+                       layout="block"
+                       rendered="#{featureController.isFeatureEnabled('user_list')}"
+                       >
                        <div class="table-header">
                                <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
                        </div>
 
-                       <p:dataTable id="userList" var="user" value="#{userController.allUsers()}" tableStyleClass="table" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_USER_LIST}">
+                       <p:dataTable
+                               id="userList"
+                               var="user"
+                               value="#{userController.allUsers()}"
+                               paginator="true"
+                               rows="10"
+                               summary="#{msg.TABLE_SUMMARY_USER_LIST}"
+                               >
                                <ui:fragment rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
                                        <p:column>
                                                <f:facet name="header">
index 0d6afa28196b4feb33e9127919a76f5457053759..e3740a26cd56e95fec26b4b098715af151a6a2ef 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
index 1da2041debb4d01b225a989b9e9bb6d777a97bbd..4d8ab913a36bcd30a53e8e1ba527f77cd2c1551c 100644 (file)
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
                                                        </h:panelGroup>
                                                </fieldset>
 
-                                               <div class="table-footer">
-                                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
-                                               </div>
+                                               <p:panelGrid columns="2" layout="grid">
+                                                       <p:commandButton
+                                                               type="reset"
+                                                               value="#{msg.BUTTON_RESET_FORM}"
+                                                               />
+
+                                                       <p:commandButton
+                                                               process="@form"
+                                                               type="submit"
+                                                               value="#{msg.BUTTON_CONTINUE_STEP_2}"
+                                                               action="#{passwordRecoveryController.doLostPasswordStep2()}"
+                                                               />
+                                               </p:panelGrid>
                                        </h:panelGroup>
                                </h:form>
                        </div>
index 66420c32f39b406e101817141f605436890d61ed..8fa534a6ff0b00a7d25740ecca0ef12b7cf5f14a 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -35,7 +37,7 @@
                        <core:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
                        <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <p:panelGrid styleClass="table table-full">
+                               <p:panelGrid>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
                                        </f:facet>
index c4a44350bed159391134ea68597255641733242c..fe329d411d336f6b855f4b094ad06f3df82a5442 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
index e70c8a513fffbbd96f1814f1ec3ff5138dfd6854..44768797d6adbff75791ec63bd058b2ef40aaa7a 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
index 35a27fafa836d9dc168b99e9dd8cbd57fa5778ea..ae96121fa1ed5987bd5c5e44b1bed32a5082baf6 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
index d7b9a05d1c205bad58c1e581927ac4ef46714fbc..f0502303167846447840605779f0721e3d08587d 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
index 05e09b101a6762c665f5c21370a2de54b3cd7ae0..0b7c8c66bef466440835a8433961682ce2427d6b 100644 (file)
@@ -7,7 +7,8 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
                                        <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}"
+                                               action="#{userResendConfirmationController.doResendLink()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index fa3b32bf78688da2d9659e86d06ae3b4b31d08fa..8170d16b2bd5833e041aa4bbcead39b151ee9749 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
index e123ece41b9920acd7d4a4b5f0d7546c3d3f9d68..f1119b9a9027b5ff32d72d707fe5480f44f83d04 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
index 9190029fccd4c95363c22ce803bf536c32eb1366..7c6fb7733130647ee3661a7cbbde87f668053e79 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
index ab78985e70c9054bb49ca71b756dd45fbd57df63..464b05847d89b8a64b25348a89cc10cf64c00914 100644 (file)
@@ -1,8 +1,6 @@
 body {
-       background-color: white;
-       font-size: 14px;
-       font-family: sans-serif;
-       color: black;
+       font-size: 0.9em !important;
+       font-family: sans-serif !important;
        margin: 0px;
 }
 
@@ -38,10 +36,6 @@ a:link:hover, a:visited:hover {
        overflow: auto;
 }
 
-.table-footer {
-       margin: 2px;
-}
-
 .page-header a:link, .page-header a:visited {
        color: white;
        font-weight : bold;
@@ -54,24 +48,6 @@ a:link:hover, a:visited:hover {
        text-decoration : underline;
 }
 
-table, .table {
-       margin: 0px;
-       padding: 0px;
-}
-
-.table {
-       width: 500px;
-}
-
-.table-footer {
-       margin: 2px;
-}
-
-.table-full {
-       margin: 0 auto;
-       width: 100%;
-}
-
 .table-row {
        width: 100%;
        min-height: 20px;
index 52f6cd3dfcf7be2443d6a2c31e3157eda0db6b57..ad264bc898a4973b7f542e1615e8ca7bad512700 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
index 85b3ff79e7ab7a13063a6925b8d93c2962a3d9ed..c1b1bed2ee4f64b80f2df833ef90a3ee6fa18da5 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
index 4bbfadee1d54094f88a2b98315fc17a1cd15bd45..03a37e2412a5749cab61a86a97c4a57fcbe7d4ea 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
index 74eea351eea386d7fe6c2caacecdf67657e75045..5620a3b4cd925c60b5a7db0fe2ca2d918c98fd02 100644 (file)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
index 3ace4854aa39c506a5407e333947ed9874a9d6ef..8d6cac9e7d1f99b33790cb8d6f5d974b1f865f42 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
index 24b4cd59efc96045f644fec10d13f5f5d0cd2893..f1023d5ead70931e7da992cacea6f91976a68ea8 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-                               </div>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_USER_LOGOUT}"
+                                       action="#{userLoginController.doUserLogout()}"
+                                       />
                        </h:panelGroup>
                </h:form>
 
index 8d32c4d6636860e16ea9d26b75dbd1f2f7eb5926..e0d6492d3c205b877800ed6b7e7a23e1f4bfa8af 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
 
                                <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}"
+                                               action="#{userEmailChangeController.doUserChangeEmailAddress()}"
+                                               />
+                               </p:panelGrid>
                        </h:form>
                </h:panelGroup>
 
index 490c7a442a2936d2548e01d4e8548b5174796d03..0634a43a0eb7ccb586175e32a5550f651a528b57 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-                                       <div class="table-footer">
-                                               <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <p:commandButton styleClass="submit" type="submit" id="submit_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-                                       </div>
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       process="@form"
+                                                       type="submit"
+                                                       value="#{msg.BUTTON_USER_CHANGE_PASSWORD}"
+                                                       action="#{userPasswordController.doChangePassword()}"
+                                                       />
+                                       </p:panelGrid>
                                </h:panelGroup>
                        </h:form>
                </ui:fragment>
index a33aa2c247d61dfc84066cab3ed34fa9fec08fc7..ed17cba99caafbf9ab6091af8d2a79ef2b42044c 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>
 
-               <h:panelGroup styleClass="table table-full" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+               <h:panelGroup
+                       layout="block"
+                       rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+                       >
                        <div class="table-header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
                        </div>
 
                                <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               process="@form"
+                                               type="submit"
+                                               value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}"
+                                               action="#{userController.doChangePersonalData()}"
+                                               />
+                               </p:panelGrid>
                        </h:form>
                </h:panelGroup>
        </ui:define>
index ec9576904b1fb4d9232479bfb9c0346d4de2da63..312607c7b5ccc9aad5931f7af4998b376010ac04 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
index 413e4ac0cd4dee7d51fd6601d8d03fd3b2253f1b..44c0d7aca68822348a9480e24ac3e9dafb69e958 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />