From 89644553a53c91191d8c17aa8098d7acb8a76b8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 14 May 2018 23:40:10 +0200 Subject: [PATCH] Please cherry-pick: - 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 ( 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 for primary key handled over from URL (edit/delete/assign views again) -
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 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_]_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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../list/JobsBasicDataListWebViewBean.java | 23 ++ .../JobsAdminBranchOfficeWebRequestBean.java | 7 +- .../JobsBranchOfficeWebRequestBean.java | 188 ----------- .../JobsBranchOfficeWebRequestController.java | 31 -- .../list/JobsBranchOfficeListWebViewBean.java | 261 ++++++++++++++++ ...JobsBranchOfficeListWebViewController.java | 59 ++++ .../contact/JobsContactWebRequestBean.java | 36 --- .../beans/helper/JobsWebViewHelperBean.java | 144 ++++++--- .../JobsBranchOfficeConverter.java | 14 +- .../jjobs/filter/JobsNoCacheFilter.java | 16 +- ...JobsBranchOfficeEmailAddressValidator.java | 142 +++++++++ .../JobsBasicDataEmailAddressValidator.java | 2 +- ...JobsBranchOfficeEmailAddressValidator.java | 12 +- .../localization/generic_de_DE.properties | 50 ++- .../localization/generic_en_US.properties | 53 +++- web/WEB-INF/links.jsf.taglib.xml | 10 +- .../columns/admin_contact_data_columns.tpl | 15 +- .../admin_contact_data_columns_mini.tpl | 4 +- .../contact/admin_form_contact_data.tpl | 14 +- .../form_data/fax/admin_form_fax_data.tpl | 4 +- .../landline/admin_form_landline_data.tpl | 4 +- .../mobile/admin_form_mobile_data.tpl | 33 +- .../form_data/user/admin_form_user_data.tpl | 9 +- .../basic_data/admin_basic_data_links.tpl | 3 +- .../admin_branch_office_links.tpl | 3 +- .../mini/contact/admin_contact_links.tpl | 3 +- .../mini/country/admin_country_links.tpl | 3 +- .../department/admin_department_links.tpl | 3 +- .../mini/employee/admin_employee_links.tpl | 3 +- .../admin/links/mini/fax/admin_fax_links.tpl | 3 +- .../headquarter/admin_headquarter_links.tpl | 3 +- .../mini/landline/admin_landline_links.tpl | 3 +- .../links/mini/mobile/admin_mobile_links.tpl | 3 +- .../admin_mobile_provider_links.tpl | 3 +- .../opening_time/admin_opening_time_links.tpl | 3 +- .../links/mini/user/admin_user_links.tpl | 3 +- .../admin/links/user/admin_user_links.tpl | 3 +- .../admin/panel_grids/fax/admin_fax_data.tpl | 37 ++- .../landline/admin_landline_data.tpl | 37 ++- .../panel_grids/mobile/admin_mobile_data.tpl | 41 +-- .../form_data/form_country_selector.tpl | 3 +- .../input/panel_grid/fax_input_panel_grid.tpl | 10 +- .../panel_grid/landline_input_panel_grid.tpl | 10 +- .../panel_grid/mobile_input_panel_grid.tpl | 3 +- .../personal_title_selection_box.tpl | 3 +- .../opening_times_data_table.tpl | 45 +++ .../tags/profile/user/user_profile_link.tpl | 3 +- .../tags/table_rows/fax_input_table_row.tpl | 3 +- .../table_rows/landline_input_table_row.tpl | 3 +- .../user_profile_mode_table_row.tpl | 3 +- web/WEB-INF/templates.dist/admin_page.xhtml | 11 +- .../templates.dist/guest_login_page.xhtml | 11 +- web/WEB-INF/templates.dist/guest_page.xhtml | 11 +- web/WEB-INF/templates.dist/login_page.xhtml | 11 +- .../basic_data/admin_form_basic_data.tpl | 9 +- .../admin_form_branch_office_data.tpl | 37 ++- .../admin_form_branch_opening_time.tpl | 9 +- .../admin/contact/admin_contact_data_mini.tpl | 24 +- .../admin/contact/admin_show_contact_data.tpl | 5 +- .../admin/country/admin_form_country_data.tpl | 7 +- .../department/admin_form_department_data.tpl | 12 +- .../employee/admin_form_employee_data.tpl | 25 +- .../admin/fax/admin_form_add_contact_fax.tpl | 23 +- .../headquarter/admin_form_headquarter.tpl | 27 +- .../admin_form_headquarter_opening_time.tpl | 10 +- .../admin_form_add_contact_landline.tpl | 23 +- .../mobile/admin_form_add_contact_mobile.tpl | 25 +- .../admin_form_mobile_provider.tpl | 5 +- .../opening_time/admin_form_opening_time.tpl | 10 +- .../admin/user/admin_show_user_data.tpl | 58 ++-- .../admin/user/admin_show_user_data_mini.tpl | 18 +- .../templates/contact/form_contact_data.tpl | 5 +- .../guest_email_address_repeat_fields.tpl | 3 +- web/WEB-INF/templates/guest/guest_footer.tpl | 3 +- web/WEB-INF/templates/guest/guest_menu.tpl | 3 +- .../templates/guest/guest_privacy_terms.tpl | 3 +- .../templates/guest/user/guest_login_form.tpl | 20 +- .../register/guest_form_register_page1.tpl | 22 +- .../register/guest_form_register_page2.tpl | 22 +- .../register/guest_form_register_single.tpl | 22 +- ...ser_change_email_address_repeat_fields.tpl | 3 +- .../user/user_enter_current_password.tpl | 3 +- .../templates/login/user/user_footer.tpl | 3 +- .../templates/login/user/user_menu.tpl | 3 +- .../widgets/locale_change_widget.tpl | 11 +- web/WEB-INF/validators.jsf.taglib.xml | 22 +- web/WEB-INF/widgets.jsf.taglib.xml | 75 ++++- web/admin/admin_logout.xhtml | 25 +- .../basic_data/admin_basic_data_list.xhtml | 158 +++++++--- .../admin_branch_office_list.xhtml | 294 +++++++++++++----- web/admin/contact/admin_contact_delete.xhtml | 32 +- web/admin/contact/admin_contact_edit.xhtml | 41 ++- web/admin/contact/admin_contact_export.xhtml | 43 ++- web/admin/contact/admin_contact_list.xhtml | 30 +- web/admin/contact/admin_contact_show.xhtml | 18 +- .../unlink/admin_contact_fax_unlink.xhtml | 34 +- .../admin_contact_landline_unlink.xhtml | 27 +- .../unlink/admin_contact_mobile_unlink.xhtml | 25 +- web/admin/country/admin_country_delete.xhtml | 11 +- web/admin/country/admin_country_edit.xhtml | 11 +- web/admin/country/admin_country_list.xhtml | 27 +- .../department/admin_department_list.xhtml | 42 ++- web/admin/employee/admin_employee_list.xhtml | 44 +-- web/admin/fax/admin_fax_delete.xhtml | 29 +- web/admin/fax/admin_fax_edit.xhtml | 39 ++- web/admin/fax/admin_fax_list.xhtml | 23 +- web/admin/fax/admin_fax_show.xhtml | 25 +- .../headquarter/admin_headquarter_list.xhtml | 49 +-- web/admin/index.xhtml | 11 +- .../landline/admin_landline_delete.xhtml | 27 +- web/admin/landline/admin_landline_edit.xhtml | 37 ++- web/admin/landline/admin_landline_list.xhtml | 22 +- web/admin/landline/admin_landline_show.xhtml | 25 +- .../mobile/admin_contact_mobile_list.xhtml | 15 +- .../mobile/admin_contact_mobile_unlink.xhtml | 12 +- web/admin/mobile/admin_mobile_delete.xhtml | 27 +- web/admin/mobile/admin_mobile_edit.xhtml | 37 ++- web/admin/mobile/admin_mobile_list.xhtml | 22 +- web/admin/mobile/admin_mobile_show.xhtml | 25 +- .../admin_mobile_provider_delete.xhtml | 11 +- .../admin_mobile_provider_edit.xhtml | 11 +- .../admin_mobile_provider_list.xhtml | 39 ++- .../admin_mobile_provider_show.xhtml | 11 +- .../admin_opening_time_list.xhtml | 38 ++- web/admin/user/admin_user_activity_log.xhtml | 32 +- web/admin/user/admin_user_delete.xhtml | 30 +- web/admin/user/admin_user_edit.xhtml | 37 ++- web/admin/user/admin_user_export.xhtml | 43 ++- web/admin/user/admin_user_list.xhtml | 50 ++- web/admin/user/admin_user_lock.xhtml | 38 ++- .../admin_user_resend_confirmation_link.xhtml | 36 ++- web/admin/user/admin_user_show.xhtml | 18 +- web/admin/user/admin_user_unlock.xhtml | 42 ++- web/exception.xhtml | 11 +- web/guest/user/user_confirm_account.xhtml | 16 +- web/guest/user/user_list.xhtml | 32 +- web/guest/user/user_login.xhtml | 15 +- web/guest/user/user_lost_password.xhtml | 33 +- web/guest/user/user_profile.xhtml | 20 +- web/guest/user/user_register.xhtml | 15 +- web/guest/user/user_register_done.xhtml | 15 +- web/guest/user/user_register_page2.xhtml | 15 +- web/guest/user/user_resend_done.xhtml | 13 +- web/guest/user/user_resend_link.xhtml | 20 +- web/imprint.xhtml | 11 +- web/index.xhtml | 11 +- web/privacy.xhtml | 11 +- web/resources/css/custom.css | 28 +- web/terms.xhtml | 11 +- web/user/login_contact_data_saved.xhtml | 15 +- web/user/login_data_saved.xhtml | 13 +- web/user/login_edit_user_data.xhtml | 14 +- web/user/login_index.xhtml | 13 +- web/user/login_logout.xhtml | 22 +- .../login_user_change_email_address.xhtml | 32 +- web/user/login_user_change_password.xhtml | 32 +- .../login_user_change_personal_data.xhtml | 37 ++- web/user/login_user_contact_data_saved.xhtml | 15 +- web/user/login_user_data_saved.xhtml | 15 +- 159 files changed, 2736 insertions(+), 1440 deletions(-) create mode 100644 src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewBean.java create mode 100644 src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewController.java create mode 100644 src/java/org/mxchange/jjobs/validator/business/branchoffice/JobsBranchOfficeEmailAddressValidator.java create mode 100644 web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/list/JobsBasicDataListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/list/JobsBasicDataListWebViewBean.java index 833777ac..99117249 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/list/JobsBasicDataListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/list/JobsBasicDataListWebViewBean.java @@ -73,6 +73,11 @@ public class JobsBasicDataListWebViewBean extends BaseJobsBean implements JobsBa */ private List filteredBasicData; + /** + * Selected basic data + */ + private BasicData selectedBasicData; + /** * Default constructor */ @@ -168,6 +173,24 @@ public class JobsBasicDataListWebViewBean extends BaseJobsBean implements JobsBa this.filteredBasicData = filteredBasicData; } + /** + * Getter for selected basic data + *

+ * @return Selected basic data + */ + public BasicData getSelectedBasicData () { + return this.selectedBasicData; + } + + /** + * Setter for selected basic data + *

+ * @param selectedBasicData Selected basic data + */ + public void setSelectedBasicData (final BasicData selectedBasicData) { + this.selectedBasicData = selectedBasicData; + } + /** * Initializer method */ diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java index c0539c5d..aa65474f 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsAdminBranchOfficeWebRequestBean.java @@ -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.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController; 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 JobsAdminBranchOfficeWebRequestBean extends BaseJobsBean implements private Event branchOfficeAddedEvent; /** - * A general branch office controller (backing bean) + * A list branch office controller (backing bean) */ @Inject - private JobsBranchOfficeWebRequestController branchOfficeController; + private JobsBranchOfficeListWebViewController branchOfficeListController; /** * Owner/leader of branch office @@ -920,7 +921,7 @@ public class JobsAdminBranchOfficeWebRequestBean extends BaseJobsBean implements */ private boolean isBranchOfficeCreatedByRequiredData (final BranchOffice branchOffice) { // Get full list from other bean - final List branchOffices = this.branchOfficeController.allBranchOffices(); + final List branchOffices = this.branchOfficeListController.allBranchOffices(); // Default is not found boolean isFound = false; diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java index f7fa0ea9..bbafa8c8 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java @@ -16,24 +16,8 @@ */ package org.mxchange.jjobs.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.jjobs.beans.BaseJobsBean; /** @@ -50,184 +34,12 @@ public class JobsBranchOfficeWebRequestBean extends BaseJobsBean implements Jobs */ private static final long serialVersionUID = 5_028_697_360_461L; - /** - * A list of all branch offices - */ - private final List allBranchOffices; - - /** - * EJB for administrative purposes - */ - @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote") - private BranchOfficeSessionBeanRemote branchOfficeBean; - - /** - * A list of all branch offices (globally) - */ - @Inject - @NamedCache (cacheName = "branchOfficeCache") - private Cache branchOfficeCache; - - /** - * A list of filtered branch offices - */ - private List filteredBranchOffices; - /** * Default constructor */ public JobsBranchOfficeWebRequestBean () { // Call super constructor super(); - - // Init list - this.allBranchOffices = new LinkedList<>(); - } - - /** - * Observes events being fired when a branch office has been added. - *

- * @param event Event being fired - *

- * @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 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 - *

- * @return Filtered branch offices - */ - @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public List getFilteredBranchOffices () { - return this.filteredBranchOffices; - } - - /** - * Setter for a list of filtered branch offices - *

- * @param filteredBranchOffices Filtered branch offices - */ - @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter") - public void setFilteredBranchOffices (final List filteredBranchOffices) { - this.filteredBranchOffices = filteredBranchOffices; - } - - /** - * Initializer method - */ - @PostConstruct - public void initializeList () { - // Is cache there? - if (!this.branchOfficeCache.iterator().hasNext()) { - // Get whole list - final List 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> iterator = this.branchOfficeCache.iterator(); - - // Build up list - while (iterator.hasNext()) { - // GEt next element - final Cache.Entry next = iterator.next(); - - // Add to list - this.allBranchOffices.add(next.getValue()); - } - - // Sort list - this.allBranchOffices.sort(new Comparator() { - @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; } } diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestController.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestController.java index 2a60ccef..1739da41 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestController.java @@ -17,9 +17,6 @@ package org.mxchange.jjobs.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 JobsBranchOfficeWebRequestController extends Serializable { - /** - * Checks if given email address is already registered by an other branch - * office - *

- * @param emailAddress Email address - *

- * @return Whether the email address has been already registered - */ - Boolean isEmailAddressRegistered (final String emailAddress); - - /** - * Returns a list of all branch offices - *

- * @return A list of all branch offices - */ - List allBranchOffices (); - - /** - * Tries to find a branch office with given id number - *

- * @param branchOfficeId Branch office id - *

- * @return A branch office instance - *

- * @throws BranchOfficeNotFoundException If the branch office was not found - */ - BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException; - } diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewBean.java new file mode 100644 index 00000000..f9c5c970 --- /dev/null +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewBean.java @@ -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 . + */ +package org.mxchange.jjobs.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.jjobs.beans.BaseJobsBean; + +/** + * A list bean for branch offices + *

+ * @author Roland Häder + */ +@Named ("branchOfficeListController") +@ViewScoped +public class JobsBranchOfficeListWebViewBean extends BaseJobsBean implements JobsBranchOfficeListWebViewController { + + /** + * Serial number + */ + private static final long serialVersionUID = 5_028_697_360_462L; + + /** + * A list of all branch offices + */ + private final List allBranchOffices; + + /** + * EJB for administrative purposes + */ + @EJB (lookup = "java:global/jjobs-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 branchOfficeCache; + + /** + * A list of filtered branch offices + */ + private List filteredBranchOffices; + + /** + * Selected branch office instance + */ + private BranchOffice selectedBranchOffice; + + /** + * Default constructor + */ + public JobsBranchOfficeListWebViewBean () { + // Call super constructor + super(); + + // Init list + this.allBranchOffices = new LinkedList<>(); + } + + /** + * Observes events being fired when a branch office has been added. + *

+ * @param event Event being fired + *

+ * @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 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 + *

+ * @return Filtered branch offices + */ + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List getFilteredBranchOffices () { + return this.filteredBranchOffices; + } + + /** + * Setter for a list of filtered branch offices + *

+ * @param filteredBranchOffices Filtered branch offices + */ + @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter") + public void setFilteredBranchOffices (final List filteredBranchOffices) { + this.filteredBranchOffices = filteredBranchOffices; + } + + /** + * Getter for selected branch office + *

+ * @return Selected branch office + */ + public BranchOffice getSelectedBranchOffice () { + return this.selectedBranchOffice; + } + + /** + * Setter for selected branch office + *

+ * @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 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> iterator = this.branchOfficeCache.iterator(); + + // Build up list + while (iterator.hasNext()) { + // GEt next element + final Cache.Entry next = iterator.next(); + + // Add to list + this.allBranchOffices.add(next.getValue()); + } + + // Sort list + this.allBranchOffices.sort(new Comparator() { + @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/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewController.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewController.java new file mode 100644 index 00000000..f9b0eed3 --- /dev/null +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/list/JobsBranchOfficeListWebViewController.java @@ -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 . + */ +package org.mxchange.jjobs.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 + *

+ * @author Roland Häder + */ +public interface JobsBranchOfficeListWebViewController extends Serializable { + + /** + * Checks if given email address is already registered by an other branch + * office + *

+ * @param emailAddress Email address + *

+ * @return Whether the email address has been already registered + */ + Boolean isEmailAddressRegistered (final String emailAddress); + + /** + * Returns a list of all branch offices + *

+ * @return A list of all branch offices + */ + List allBranchOffices (); + + /** + * Tries to find a branch office with given id number + *

+ * @param branchOfficeId Branch office id + *

+ * @return A branch office instance + *

+ * @throws BranchOfficeNotFoundException If the branch office was not found + */ + BranchOffice findBranchOfficeById (final Long branchOfficeId) throws BranchOfficeNotFoundException; + +} diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java index d6a58e07..05ef266b 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java @@ -1252,18 +1252,6 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta * @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 JobsContactWebRequestBean extends BaseJobsBean implements JobsConta * @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 JobsContactWebRequestBean extends BaseJobsBean implements JobsConta * @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> iterator = this.contactCache.iterator(); diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java index 4ab1d734..6c506324 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java @@ -16,7 +16,6 @@ */ package org.mxchange.jjobs.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.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; -import org.mxchange.jjobs.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 JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe return sb.toString(); } + /** + * Returns the text representation of given country. If null is provided, an + * empty string is returned. + *

+ * @param country Country instance + *

+ * @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 JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe *

* @param employee Employable instance *

- * @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 JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe // 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 JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe 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 JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe } /** - * 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. *

- * @param receipt Receipt instance + * @param mobileNumber Mobile number to render *

- * @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. + *

+ * @param number Phone number to render + *

+ * @return Phone number + *

+ * @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 diff --git a/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java b/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java index 9f216c71..4e4c506e 100644 --- a/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/branchoffice/JobsBranchOfficeConverter.java @@ -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.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestBean; -import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestController; +import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewBean; +import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController; /** * Converter for branch office id <-> valid basic company data instance @@ -36,16 +36,16 @@ import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequest public class JobsBranchOfficeConverter implements Converter { /** - * Branch office EJB + * Branch office list controller */ - private static JobsBranchOfficeWebRequestController BRANCH_OFFICE_CONTROLLER; + private static JobsBranchOfficeListWebViewController 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(JobsBranchOfficeWebRequestBean.class).get(); + BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobsBranchOfficeListWebViewBean.class).get(); } // Is the value null or empty? @@ -65,7 +65,7 @@ public class JobsBranchOfficeConverter implements Converter { 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); diff --git a/src/java/org/mxchange/jjobs/filter/JobsNoCacheFilter.java b/src/java/org/mxchange/jjobs/filter/JobsNoCacheFilter.java index f74f4372..00817413 100644 --- a/src/java/org/mxchange/jjobs/filter/JobsNoCacheFilter.java +++ b/src/java/org/mxchange/jjobs/filter/JobsNoCacheFilter.java @@ -42,7 +42,7 @@ public class JobsNoCacheFilter implements Filter { @Override public void destroy () { - System.out.println("destroy!"); + System.out.println("destroy!"); //NOI18N } @Override @@ -52,10 +52,20 @@ public class JobsNoCacheFilter 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 JobsNoCacheFilter 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/jjobs/validator/business/branchoffice/JobsBranchOfficeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/business/branchoffice/JobsBranchOfficeEmailAddressValidator.java new file mode 100644 index 00000000..9294cc54 --- /dev/null +++ b/src/java/org/mxchange/jjobs/validator/business/branchoffice/JobsBranchOfficeEmailAddressValidator.java @@ -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 . + */ +package org.mxchange.jjobs.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.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewBean; +import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController; + +/** + * A validator for branch office email address validation + *

+ * @author Roland Häder + */ +@FacesValidator (value = "BranchOfficeEmailAddressValidator") +public class JobsBranchOfficeEmailAddressValidator extends BaseStringValidator { + + /** + * Branch office backing bean + */ + private static JobsBranchOfficeListWebViewController 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(JobsBranchOfficeEmailAddressValidator.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 JobsBranchOfficeEmailAddressValidator () { + this.allowEmptyRequiredData = Boolean.FALSE; + } + + /** + * Setter for allowEmptyRequiredData flag + *

+ * @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 ) + 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(JobsBranchOfficeListWebViewBean.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)); + } + } + +} diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java index c2d923f4..6fdf2cd5 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java @@ -37,7 +37,7 @@ import org.mxchange.jjobs.beans.business.basicdata.list.JobsBasicDataListWebView public class JobsBasicDataEmailAddressValidator extends BaseStringValidator { /** - * Branch office backing bean + * Basic company data backing bean */ private static JobsBasicDataListWebViewController BASIC_DATA_LIST_CONTROLLER; diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java index 9f70ba0a..b85bb94b 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java @@ -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.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestBean; -import org.mxchange.jjobs.beans.business.branchoffice.JobsBranchOfficeWebRequestController; +import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewBean; +import org.mxchange.jjobs.beans.business.branchoffice.list.JobsBranchOfficeListWebViewController; /** * A validator for branch office email address validation @@ -39,7 +39,7 @@ public class JobsBranchOfficeEmailAddressValidator extends BaseStringValidator { /** * Branch office backing bean */ - private static JobsBranchOfficeWebRequestController BRANCH_OFFICE_CONTROLLER; + private static JobsBranchOfficeListWebViewController BRANCH_OFFICE_LIST_CONTROLLER; /** * Email pattern @@ -115,13 +115,13 @@ public class JobsBranchOfficeEmailAddressValidator extends BaseStringValidator { 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(JobsBranchOfficeWebRequestBean.class).get(); + BRANCH_OFFICE_LIST_CONTROLLER = CDI.current().select(JobsBranchOfficeListWebViewBean.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 diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 964ba435..98abd4d6 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -1089,7 +1089,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! @@ -1177,3 +1177,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: diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 5c56a85e..ababf0f1 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -999,8 +999,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: @@ -1038,7 +1038,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 @@ -1070,3 +1070,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: diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml index f959474a..37501505 100644 --- a/web/WEB-INF/links.jsf.taglib.xml +++ b/web/WEB-INF/links.jsf.taglib.xml @@ -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://mxchange.org/jsf/core/links outputUserProfileLink diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl index d60ab1a2..3aba308b 100644 --- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl +++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl @@ -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" + > @@ -16,16 +17,16 @@ - - + + - - + + @@ -106,8 +107,8 @@ - - + + diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl index 72ad507f..a5a39ef6 100644 --- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl +++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl @@ -2,10 +2,10 @@ + xmlns:p="http://primefaces.org/ui" + > diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl index ee0a6e3e..c395bad6 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl @@ -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" + > - + @@ -60,7 +66,7 @@ value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" > - + @@ -68,7 +74,7 @@ - + diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl index 9d88fff9..08167961 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl @@ -2,10 +2,10 @@ + xmlns:p="http://primefaces.org/ui" + >

diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl index a185be6c..afd2b538 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl @@ -2,10 +2,10 @@ + xmlns:p="http://primefaces.org/ui" + >
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl index a5f194d5..08f09b27 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl @@ -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" + >
@@ -24,24 +25,20 @@ -
- -
+ -
- - - - - -
+ + + + + diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl index 08afc952..622f045d 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl @@ -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" + > - + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl index 3057d185..0dc520fa 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl @@ -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" + >
    diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl index 05b17d67..a852220c 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl @@ -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" + >
      diff --git a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl index 8a0e79c4..530852a9 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl @@ -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" + >
        diff --git a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl index 14e7bb93..ba232292 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl @@ -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" + >
          diff --git a/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl index 82e11453..425dcc8a 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl @@ -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" + >
            diff --git a/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl index d973950c..40f4e74b 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl @@ -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" + >
              diff --git a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl index 235e2f22..119a1fae 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl @@ -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" + >
                diff --git a/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl index 9819a417..3d8b895c 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl @@ -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" + >
                  diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl index c1d9c669..3f0ad22f 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl @@ -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" + >
                    diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl index 3c3c2745..79af6f03 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl @@ -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" + >
                      diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl index fcfb569a..fcce4e89 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl @@ -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" + >
                        diff --git a/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl index 18c56c79..25a987cc 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl @@ -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" + >
                          diff --git a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl index 10f5d659..16419815 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl @@ -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" + >
                            diff --git a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl index 89bc08e0..e9e31185 100644 --- a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl @@ -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" + > diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl index f2d28a72..292fbc86 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl @@ -11,12 +11,15 @@ - + - + @@ -24,36 +27,36 @@ - + - + - - + + - + - - + + - + - + - - + + - + - + - + - + diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl index 06da8970..0e8cc5e0 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl @@ -11,12 +11,15 @@ - + - + @@ -24,36 +27,36 @@ - + - + - - + + - + - - + + - + - + - - + + - + - + - + - + diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl index d9e70dd4..cebca29c 100644 --- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl @@ -11,54 +11,57 @@ - + - + - + - + - + - + - - + + - + - - + + - + - + - - + + - + - + - + - + diff --git a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl index 14ff97a7..37dd1926 100644 --- a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl +++ b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl @@ -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" + > + xmlns:p="http://primefaces.org/ui" + > - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl index 4c75c4be..686d2214 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl @@ -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" + > - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl index e8a03909..59b7ca91 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl @@ -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" + > + xmlns:p="http://primefaces.org/ui" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl index 1c2d1016..4e753cbe 100644 --- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl +++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl @@ -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" + > diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl index c8863cb1..d06b4836 100644 --- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl @@ -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" + > diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl index a3138286..8656827b 100644 --- a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl @@ -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" + > diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl index 32b9946f..4284af9f 100644 --- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl @@ -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" + > diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml index b3596073..709a670e 100644 --- a/web/WEB-INF/templates.dist/admin_page.xhtml +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml index e436b93f..e14db199 100644 --- a/web/WEB-INF/templates.dist/guest_login_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index 8e9942a2..30d9b698 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index 8de2f750..786273a0 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl index d9cfe262..c2e2bdb2 100644 --- a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl +++ b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl @@ -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" + > - + + xmlns:p="http://primefaces.org/ui" + > - + - - + + @@ -79,18 +91,23 @@ - + - + - + @@ -98,17 +115,17 @@ - + - + - + diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl index a3b1a93c..a88861b0 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_opening_time.tpl @@ -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" + > - + diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl index 9fc462c4..de37ded7 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl @@ -1,34 +1,42 @@ + + xmlns:p="http://primefaces.org/ui" + > - + - + - + - + - + - + - + diff --git a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl index a80df3f4..e8d7d88f 100644 --- a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl @@ -11,7 +11,10 @@ - + diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl index b525f218..5ba60c7f 100644 --- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl +++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl @@ -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" + > @@ -96,7 +97,7 @@
                            - +
                            @@ -112,7 +113,7 @@
                            - + diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl index 50ef8bad..a1b6e8b9 100644 --- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl +++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl @@ -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" + > - + - + diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl index df6c8692..86034372 100644 --- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl +++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl @@ -1,17 +1,23 @@ + + xmlns:p="http://primefaces.org/ui" + > - - + - + @@ -76,7 +82,12 @@ @TODO title="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND_TITLE}" --> - + diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl index 3d69f03b..f99fe227 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl @@ -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" + > - +
                            @@ -39,11 +40,19 @@ -
                            - - - -
                            + + + + +                             diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl index 97e6f3cd..8a3091f1 100644 --- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl +++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl @@ -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" + > - + - + - + @@ -77,22 +88,22 @@ - + - + - + - + diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl index 29fac7dd..2c688e8b 100644 --- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl +++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter_opening_time.tpl @@ -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" + > - + diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl index 9126c1ad..6b50af25 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl @@ -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" + > - +
                            @@ -39,13 +40,21 @@ -
                            - - - + + + + -
                            +                             diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl index fc02f15f..0b83dc6b 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl @@ -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" + > - +
                            @@ -28,7 +29,7 @@ - +
                            @@ -40,13 +41,21 @@ -
                            - - - + + + + -
                            +                             diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl index e8294d33..607d1b71 100644 --- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl +++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl @@ -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" + > @@ -24,7 +25,7 @@
                            - +
                            diff --git a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl index 73db01cb..02187981 100644 --- a/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl +++ b/web/WEB-INF/templates/admin/opening_time/admin_form_opening_time.tpl @@ -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" + > - + diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl index b0d5f7b2..c5d4537b 100644 --- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl @@ -1,16 +1,20 @@ + + xmlns:p="http://primefaces.org/ui" + > - - + @@ -18,61 +22,61 @@ - + - + - + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - + diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl index d828ab1a..2f836bb6 100644 --- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl @@ -1,16 +1,20 @@ + + xmlns:p="http://primefaces.org/ui" + > - - + @@ -39,8 +43,8 @@ - - + + diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index f0b6dced..93dc2349 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -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" + > @@ -74,7 +75,7 @@
                            - +
                            diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl index 733c9191..f463d497 100644 --- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl @@ -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" + >
                            diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index d4e92ffa..1b9e3559 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -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" + >
                              diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 4fad9677..c58beb58 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -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" + >
                              diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index f7c93e66..ca95206b 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -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" + >
                              diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl index 05d2b7de..4974b565 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -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" + > @@ -47,10 +48,19 @@
                              -
                              - - -
                              + + + + +                               diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl index 9f549db4..4b416b65 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl @@ -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" + > - +
                              @@ -84,10 +85,19 @@ -
                              - - -
                              + + + + +                               diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl index f1a04346..910cd9cf 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl @@ -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" + > - +
                              -
                              - - -
                              + + + + +                               diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl index f5f92bbf..a359818c 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl @@ -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" + > - +
                              @@ -88,10 +89,19 @@ -
                              - - -
                              + + + + +                               diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl index 071dca02..069004db 100644 --- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl @@ -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" + >
                              diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl index 347ce37a..81ad613f 100644 --- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl +++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl @@ -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" + >
                              diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl index 667776e8..d9f177d8 100644 --- a/web/WEB-INF/templates/login/user/user_footer.tpl +++ b/web/WEB-INF/templates/login/user/user_footer.tpl @@ -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" + >
                                diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl index 06e0c593..f707404a 100644 --- a/web/WEB-INF/templates/login/user/user_menu.tpl +++ b/web/WEB-INF/templates/login/user/user_menu.tpl @@ -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" + >
                                diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl index 5e75c095..20ad9836 100644 --- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl +++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl @@ -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" + > @@ -17,7 +18,13 @@ - + diff --git a/web/WEB-INF/validators.jsf.taglib.xml b/web/WEB-INF/validators.jsf.taglib.xml index e575a7ac..5c77789b 100644 --- a/web/WEB-INF/validators.jsf.taglib.xml +++ b/web/WEB-INF/validators.jsf.taglib.xml @@ -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://mxchange.org/jsf/core/validators emailAddressValidator @@ -44,6 +46,18 @@ along with this program. If not, see . false + + branchOfficeEmailAddressValidator + + BranchOfficeEmailAddressValidator + + + Whether email address is allowed to be empty. + allowEmptyRequiredData + java.lang.Boolean + false + + employeeEmailAddressValidator diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml index e30997d1..780a8ae3 100644 --- a/web/WEB-INF/widgets.jsf.taglib.xml +++ b/web/WEB-INF/widgets.jsf.taglib.xml @@ -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://mxchange.org/jsf/core/widgets outputMessageBox @@ -191,12 +193,6 @@ along with this program. If not, see . outputAdminFaxPanelGrid This tag renders a full p:panelGrid for administrative purposes for fax data. resources/tags/admin/panel_grids/fax/admin_fax_data.tpl - - renderShowLink - Whether this tag is used to show fax data (default true). - false - java.lang.Boolean - faxNumber The fax instance that provides the data for this tag. @@ -215,6 +211,12 @@ along with this program. If not, see . false java.lang.Boolean + + renderShowLink + Whether this tag is used to show fax data (default true). + false + java.lang.Boolean + showAdminMiniLinks Whether to show administrative links to other pages (default: true). @@ -441,4 +443,57 @@ along with this program. If not, see . org.mxchange.jcoreee.bean.faces.BaseFacesBean + + outputOpeningTimesDataTable + This tag renders a full p:dataTable for opening times. + resources/tags/opening_times/opening_times_data_table.tpl + + id + An id string for this tag. + true + java.lang.String + + + value + A list of OpeningTime objects. + true + java.util.List + + + widgetVar + Identifier for this widget (e.g. JavaScript). + true + java.lang.String + + + summary + A string or EL code for table attribute of same name. + true + java.lang.String + + + emptyMessage + A string or EL code for a message shown when no row was found. + true + java.lang.String + + + headerMessage + A string or EL code for a message shown above table rows. + true + java.lang.String + + + rows + Rows to show each page. + true + java.lang.Long + + + rendered + Whether this tag is being rendered by JSF engine (default: true). + false + java.lang.Boolean + + diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index 49427083..7f08038e 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -1,10 +1,12 @@ - + @@ -25,9 +27,14 @@ -
                                - -
                                + + + diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml index 42796918..19e829e9 100644 --- a/web/admin/basic_data/admin_basic_data_list.xhtml +++ b/web/admin/basic_data/admin_basic_data_list.xhtml @@ -1,12 +1,13 @@ - + @@ -17,16 +18,16 @@ - + - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - @@ -100,7 +108,7 @@ - + @@ -124,7 +132,7 @@ - + @@ -133,9 +141,37 @@ + + + + + + + + + + + + + + + + + + + + + - - + + @@ -143,10 +179,39 @@ + + + + + + + + + + + + + + + + - + @@ -160,17 +225,16 @@ diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index b447471a..013961e8 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -1,12 +1,14 @@ - + @@ -21,12 +23,12 @@ - - + + + + + + + + + + + + - - - + + + - + - - + + - - - - - - + + - + - - + + - - - + + + - + + + @@ -124,7 +155,7 @@ - + @@ -134,8 +165,8 @@ - - + + @@ -143,10 +174,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -160,17 +326,17 @@ @@ -179,47 +345,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + headerMessage="#{msg.ADMIN_LIST_BRANCH_OFFICE_OPENING_TIMES_HEADER}" + /> - + @@ -233,17 +375,17 @@ diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 28ede7ac..90ea0adb 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,6 +28,8 @@ + +
                                @@ -39,11 +43,13 @@ -
                                - - -
                                - + + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 720bb463..3eb39c69 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -1,16 +1,18 @@ - + - + @@ -25,8 +27,10 @@ - - + + + +
                                @@ -39,10 +43,19 @@ -
                                - - -
                                + + + + + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index c1e08163..a4ea57a9 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -1,11 +1,13 @@ - + @@ -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}" @@ -123,7 +124,7 @@ - + @@ -156,13 +157,13 @@ - - + + - +
                                @@ -171,11 +172,21 @@
                                -
                                - - + + + + -
                                +                                 diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 17c399fc..d5061708 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -1,12 +1,14 @@ - + @@ -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 @@ - - + + @@ -92,7 +93,10 @@ - + @@ -108,7 +112,7 @@ value="#{msg.BUTTON_RESET_FORM}" /> - + - + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index aed4126c..a8decc5d 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -1,18 +1,20 @@ - + - - + + @@ -30,6 +32,9 @@ + + +
                                @@ -49,9 +54,14 @@
                                -
                                - -
                                + + +                                 diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index a99ee79a..3fc338a4 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -1,11 +1,13 @@ - + @@ -47,9 +49,14 @@
                                -
                                - -
                                + + +                                 diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index 70535e96..3a3a9221 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -1,11 +1,13 @@ - + @@ -47,9 +49,12 @@
                                -
                                - -
                                + diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml index b6e0c25d..a700c290 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml index 795e272e..051b7ce2 100644 --- a/web/admin/country/admin_country_edit.xhtml +++ b/web/admin/country/admin_country_edit.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index c215b0ee..c68126ce 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -1,11 +1,13 @@ - + @@ -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}" @@ -73,27 +74,27 @@ - +
                                -
                                + + -
                                +
                                diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml index 751d2dab..0531ecd3 100644 --- a/web/admin/department/admin_department_list.xhtml +++ b/web/admin/department/admin_department_list.xhtml @@ -1,12 +1,13 @@ - + @@ -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}" @@ -41,7 +41,13 @@ - + + @@ -53,7 +59,7 @@ - + @@ -90,7 +96,7 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + @@ -152,8 +158,8 @@ - - + + @@ -164,7 +170,10 @@ - + @@ -178,13 +187,12 @@ - + @@ -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" @@ -41,7 +41,13 @@ - + + @@ -64,7 +70,7 @@ title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}" > - + @@ -129,8 +135,8 @@ - - + + @@ -141,27 +147,29 @@ - + - + - + - + - + @@ -26,6 +28,8 @@ + +
                                @@ -39,9 +43,12 @@
                                -
                                - -
                                +                                 diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index 5875d50e..08902b86 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,9 @@ - + + +
                                @@ -35,10 +39,19 @@ -
                                - - -
                                + + + + + diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml index ce5b9045..ceaacc20 100644 --- a/web/admin/fax/admin_fax_list.xhtml +++ b/web/admin/fax/admin_fax_list.xhtml @@ -1,11 +1,13 @@ - + @@ -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 @@ - + @@ -49,7 +50,7 @@ - + @@ -59,7 +60,7 @@ - + diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index c870e6a8..028f6359 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -1,16 +1,18 @@ - + - + @@ -25,7 +27,12 @@ - + diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml index 7202ff33..b8ee104b 100644 --- a/web/admin/headquarter/admin_headquarter_list.xhtml +++ b/web/admin/headquarter/admin_headquarter_list.xhtml @@ -1,11 +1,13 @@ - + @@ -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}" @@ -40,7 +41,13 @@ - + + @@ -111,8 +118,8 @@ - - + + @@ -123,7 +130,10 @@ - + @@ -143,7 +153,7 @@ /> - + - + @@ -196,7 +205,10 @@ - + @@ -210,13 +222,12 @@ - + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index 8792e541..1533c029 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -1,16 +1,18 @@ - + - + @@ -39,9 +41,12 @@
                                -
                                - -
                                +                                 diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 83861bd9..b744a62f 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,7 @@ - +
                                @@ -35,10 +37,19 @@ -
                                - - -
                                + + + + + diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml index 49368aea..7ec1716c 100644 --- a/web/admin/landline/admin_landline_list.xhtml +++ b/web/admin/landline/admin_landline_list.xhtml @@ -1,11 +1,12 @@ - + @@ -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 @@ - + @@ -49,7 +49,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index b5f1d6ca..34704153 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -1,16 +1,18 @@ - + - + @@ -25,7 +27,12 @@ - + diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml index 79c90088..7747849b 100644 --- a/web/admin/mobile/admin_contact_mobile_list.xhtml +++ b/web/admin/mobile/admin_contact_mobile_list.xhtml @@ -1,10 +1,12 @@ - + @@ -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}" diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml index 934ecdd7..753a0583 100644 --- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml +++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml @@ -1,9 +1,11 @@ - + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index 6b90c661..8a1b96ff 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -1,16 +1,18 @@ - + - + @@ -39,9 +41,12 @@
                                -
                                - -
                                +                                 diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index a58dcc1d..843c3e89 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,7 @@ - +
                                @@ -35,10 +37,19 @@ -
                                - - -
                                + + + + + diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index 34317e0e..908fbd90 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -1,11 +1,12 @@ - + @@ -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 @@ - + @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 3fcfb98e..a17d75fe 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -1,16 +1,18 @@ - + - + @@ -25,7 +27,12 @@ - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml index c79d8f37..7fba4ce1 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml index 2e125019..c50a139b 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index 58f0cb51..812b1750 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -1,11 +1,13 @@ - + @@ -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}" @@ -39,7 +40,13 @@ - + + @@ -82,8 +89,8 @@ - - + + @@ -94,27 +101,27 @@ - +
                                -
                                + + -
                                +                                 diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml index 8ab17cab..8a3bdecd 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/admin/opening_time/admin_opening_time_list.xhtml b/web/admin/opening_time/admin_opening_time_list.xhtml index 20b7f80f..124dc995 100644 --- a/web/admin/opening_time/admin_opening_time_list.xhtml +++ b/web/admin/opening_time/admin_opening_time_list.xhtml @@ -1,12 +1,13 @@ - + @@ -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}" @@ -41,7 +41,13 @@ - + + @@ -86,13 +92,13 @@ - + - + @@ -104,7 +110,10 @@                                 - + @@ -118,13 +127,12 @@ - + - + @@ -25,7 +27,15 @@ - + @@ -99,8 +109,8 @@ - - + + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index cdb85009..9cee8cba 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,7 @@ - +
                                @@ -50,10 +52,12 @@
                                -
                                - - -
                                +                                 diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index 85c12b4d..1eb1e939 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,7 @@ - +
                                @@ -37,10 +39,19 @@ -
                                - - -
                                + + + + +                                 diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index dbd24a44..d20da52b 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -1,11 +1,13 @@ - + @@ -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}" @@ -141,7 +142,7 @@ - + @@ -174,13 +175,13 @@ - - + + - +
                                @@ -189,11 +190,19 @@
                                -
                                - - - -
                                + + + +                                 diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index d3cff187..85ca02fa 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -1,12 +1,14 @@ - + @@ -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}" @@ -40,7 +41,13 @@ - + + @@ -130,8 +137,8 @@ - - + + @@ -142,7 +149,10 @@ - + @@ -152,7 +162,12 @@ @TODO title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}" --> - + - + - + - + @@ -26,7 +28,7 @@ - +
                                @@ -74,11 +76,19 @@
                                -
                                - - - -
                                + + + + +                                 diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml index f98b8b38..2dee8442 100644 --- a/web/admin/user/admin_user_resend_confirmation_link.xhtml +++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,7 @@ - +
                                @@ -42,11 +44,19 @@ -
                                - + + - -
                                + + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index ce4e42dd..01d63232 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -1,16 +1,18 @@ - + - + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index 4d29356d..662e9fa7 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -1,16 +1,18 @@ - + - + @@ -26,7 +28,7 @@ - +
                                @@ -82,8 +84,8 @@
                                - - + +
                                @@ -98,11 +100,19 @@
                                -
                                - - - -
                                + + + + +                                 diff --git a/web/exception.xhtml b/web/exception.xhtml index 4b2f57d0..7afe77fe 100644 --- a/web/exception.xhtml +++ b/web/exception.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index 00a99c69..66492692 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -1,15 +1,17 @@ - + - + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index d827bda4..54951ad2 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -1,12 +1,14 @@ - + @@ -19,12 +21,22 @@ - +
                                - + diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml index 0d6afa28..e3740a26 100644 --- a/web/guest/user/user_login.xhtml +++ b/web/guest/user/user_login.xhtml @@ -1,11 +1,12 @@ - + diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index 1da2041d..4d8ab913 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -1,11 +1,13 @@ - + @@ -56,10 +58,19 @@
                              -
                              - - -
                              + + + + +
                              diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index 66420c32..8fa534a6 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -1,16 +1,18 @@ - + - + @@ -35,7 +37,7 @@ - + diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml index c4a44350..fe329d41 100644 --- a/web/guest/user/user_register.xhtml +++ b/web/guest/user/user_register.xhtml @@ -1,11 +1,12 @@ - + diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml index e70c8a51..44768797 100644 --- a/web/guest/user/user_register_done.xhtml +++ b/web/guest/user/user_register_done.xhtml @@ -1,11 +1,12 @@ - + diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml index 35a27faf..ae96121f 100644 --- a/web/guest/user/user_register_page2.xhtml +++ b/web/guest/user/user_register_page2.xhtml @@ -1,11 +1,12 @@ - + diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml index d7b9a05d..f0502303 100644 --- a/web/guest/user/user_resend_done.xhtml +++ b/web/guest/user/user_resend_done.xhtml @@ -1,10 +1,11 @@ - + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index 05e09b10..0b7c8c66 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -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" + > @@ -52,10 +53,19 @@                               -
                              - - -
                              + + + + +                               diff --git a/web/imprint.xhtml b/web/imprint.xhtml index fa3b32bf..8170d16b 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/index.xhtml b/web/index.xhtml index e123ece4..f1119b9a 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 9190029f..7c6fb773 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css index ab78985e..464b0584 100644 --- a/web/resources/css/custom.css +++ b/web/resources/css/custom.css @@ -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; diff --git a/web/terms.xhtml b/web/terms.xhtml index 52f6cd3d..ad264bc8 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -1,9 +1,10 @@ - + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index 85b3ff79..c1b1bed2 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -1,11 +1,12 @@ - + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 4bbfadee..03a37e24 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -1,10 +1,11 @@ - + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 74eea351..5620a3b4 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -1,10 +1,12 @@ - + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 3ace4854..8d6cac9e 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -1,10 +1,11 @@ - + diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index 24b4cd59..f1023d5e 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -1,10 +1,11 @@ - + @@ -25,9 +26,12 @@ -
                              - -
                              + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 8d32c4d6..e0d6492d 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -1,11 +1,12 @@ - + @@ -46,10 +47,19 @@ -
                              - - -
                              + + + + + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 490c7a44..0634a43a 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -1,11 +1,12 @@ - + @@ -70,10 +71,19 @@ -
                              - - -
                              + + + + + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index a33aa2c2..ed17cba9 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -1,11 +1,12 @@ - + @@ -26,7 +27,10 @@ - +
                              @@ -38,10 +42,19 @@ -
                              - - -
                              + + + + +                               diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml index ec957690..312607c7 100644 --- a/web/user/login_user_contact_data_saved.xhtml +++ b/web/user/login_user_contact_data_saved.xhtml @@ -1,11 +1,12 @@ - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index 413e4ac0..44c0d7ac 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -1,11 +1,12 @@ - + -- 2.39.5