From 98125d19e385b0be143bc4a273dc81c3082f53f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 17 Sep 2017 01:17:32 +0200 Subject: [PATCH] Please cherry-pick: - introduced custom JSF tag widgets:outputCountrySelector which renders a nice country-selection box for forms - removed id from fieldset, no need to "over-id" things - rewrote administrative mobilde provider list to more PrimeFaces, like filterable and dragable columns, responsiveness - added more i18n strings for above new stuff - added new property "filteredMobileProviders" for filtering mobile providers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../JobsMobileProviderWebRequestBean.java | 27 ++++- .../JobsProfileModeWebApplicationBean.java | 22 +++- ...bsProfileModeWebApplicationController.java | 8 -- .../localization/bundle_de_DE.properties | 8 ++ .../localization/bundle_en_US.properties | 5 + web/WEB-INF/links.jsf.taglib.xml | 22 ++-- .../contact/admin_form_contact_data.tpl | 20 +--- .../form_data/fax/admin_form_fax_data.tpl | 2 +- .../landline/admin_form_landline_data.tpl | 2 +- .../mobile/admin_form_mobile_data.tpl | 2 +- .../form_data/user/admin_form_user_data.tpl | 2 +- .../form_data/form_country_selector.tpl | 14 +++ .../tags/table_rows/fax_input_table_row.tpl | 6 +- .../table_rows/landline_input_table_row.tpl | 6 +- .../user_profile_mode_table_row.tpl | 2 +- .../admin_form_basic_company_data.tpl | 14 +-- .../admin_form_branch_offices_data.tpl | 20 +--- .../admin/country/admin_form_country_data.tpl | 2 +- .../admin_form_mobile_provider.tpl | 8 +- .../templates/contact/form_contact_data.tpl | 40 +++---- .../templates/guest/guest_privacy_terms.tpl | 2 +- .../templates/guest/user/guest_login_form.tpl | 2 +- .../register/guest_form_register_page1.tpl | 2 +- .../register/guest_form_register_single.tpl | 2 +- .../user/user_enter_current_password.tpl | 2 +- web/WEB-INF/widgets.jsf.taglib.xml | 73 +++++++++--- web/admin/mobile/admin_mobile_list.xhtml | 2 +- .../admin_mobile_provider_list.xhtml | 105 ++++++++++-------- web/admin/user/admin_user_list.xhtml | 2 +- web/guest/user/user_lost_password.xhtml | 2 +- web/guest/user/user_resend_link.xhtml | 8 +- web/resources/css/layout.css | 4 + .../login_user_change_email_address.xhtml | 2 +- web/user/login_user_change_password.xhtml | 2 +- 34 files changed, 252 insertions(+), 190 deletions(-) create mode 100644 web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java index b15390ed..32fd055e 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java @@ -53,6 +53,11 @@ public class JobsMobileProviderWebRequestBean extends BaseJobsController impleme */ private final List allMobileProviders; + /** + * A list of filtered mobile providers + */ + private List filteredMobileProviders; + /** * Remote EJB for mobile providers (regular) */ @@ -111,11 +116,31 @@ public class JobsMobileProviderWebRequestBean extends BaseJobsController impleme return this.allMobileProviders; } + /** + * Getter for filtered mobile provider list + *

+ * @return Filtered mobile providers + */ + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List getFilteredMobileProviders () { + return this.filteredMobileProviders; + } + + /** + * Getter for filtered mobile provider list + *

+ * @param filteredMobileProviders Filtered mobile providers + */ + @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter") + public void setFilteredMobileProviders (final List filteredMobileProviders) { + this.filteredMobileProviders = filteredMobileProviders; + } + /** * Post-construction method */ @PostConstruct - public void init () { + public void initCache () { // Is cache there? if (!this.mobileProviderCache.iterator().hasNext()) { // Get whole list diff --git a/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java index be774621..88f82973 100644 --- a/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java @@ -16,6 +16,9 @@ */ package org.mxchange.jjobs.beans.profilemode; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jjobs.beans.BaseJobsController; @@ -35,18 +38,29 @@ public class JobsProfileModeWebApplicationBean extends BaseJobsController implem */ private static final long serialVersionUID = 835_482_364_189L; + /** + * A list of all profile modes + */ + private final List allProfileModes; + /** * Default constructor */ public JobsProfileModeWebApplicationBean () { // Call super constructor super(); + + // Init list + this.allProfileModes = Arrays.asList(ProfileMode.values()); } - @Override - public ProfileMode[] getAllProfileModes () { + /** + * Getter for all profile modes as array + *

+ * @return All profile modes as list + */ + public List allProfileModes () { // Return it - return ProfileMode.values(); + return Collections.unmodifiableList(this.allProfileModes); } - } diff --git a/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java index dd028c06..bcdefa60 100644 --- a/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java @@ -17,7 +17,6 @@ package org.mxchange.jjobs.beans.profilemode; import java.io.Serializable; -import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; /** * An interface for data beans @@ -26,11 +25,4 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ public interface JobsProfileModeWebApplicationController extends Serializable { - /** - * Getter for all profile modes as array - *

- * @return All profile modes as array - */ - ProfileMode[] getAllProfileModes (); - } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 3a0d94c1..9c116087 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -957,3 +957,11 @@ ADMIN_LANDLINE_NUMBER_LIST_EMPTY=Es befinden sich keine Festnetznummern in der D ADMIN_MOBILE_NUMBER_LIST_EMPTY=Es befinden sich keine Mobilfunknummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen. #@TODO Please fix German umlauts! ADMIN_CONTACT_MOBILE_LIST_EMPTY=Es befinden sich keine Mobilfunknummern von Kontakten in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen. +#@TODO Please fix German umlauts! +ADMIN_MOBILE_PROVIDER_COUNTRY_REQUIRED=Bitte waehlen Sie ein Land fuer den Mobilfunkanbieter aus. +#@TODO Please fix German umlauts! +COUNTRIES=Laender +#@TODO Please fix German umlauts! +FILTER_BY_MULTIPLE_COUNTRY_TITLE=Liste durch Auswahl von ein oder mehr Laendern durchsuchen. +ADMIN_LIST_MOBILE_PROVIDERS_HEADER=Liste aller Mobilfunkanbieter +SELECT_SHOWN_COLUMNS=Angezeigte Spalten diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 5e9de62e..35600bc5 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -908,3 +908,8 @@ ADMIN_FAX_NUMBER_LIST_EMPTY=There are no fax numbers in database. Or your search ADMIN_LANDLINE_NUMBER_LIST_EMPTY=There are no land-line numbers in database. Or your search criteria doesn't match anything. ADMIN_MOBILE_NUMBER_LIST_EMPTY=There are no mobile numbers in database. Or your search criteria doesn't match anything. ADMIN_CONTACT_MOBILE_LIST_EMPTY=There are no mobile numbers of contacts in database. Or your search criteria doesn't match anything. +ADMIN_MOBILE_PROVIDER_COUNTRY_REQUIRED=Please select a country for mobile provider. +COUNTRIES=Countries +FILTER_BY_MULTIPLE_COUNTRY_TITLE=Filter list by selecting one or more countries. +ADMIN_LIST_MOBILE_PROVIDERS_HEADER=List of all mobile providers +SELECT_SHOWN_COLUMNS=Shown columns diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml index af8b7edd..0c395769 100644 --- a/web/WEB-INF/links.jsf.taglib.xml +++ b/web/WEB-INF/links.jsf.taglib.xml @@ -32,7 +32,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -61,7 +61,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -90,7 +90,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -119,7 +119,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -142,7 +142,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -165,7 +165,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -188,7 +188,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -211,7 +211,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -234,7 +234,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -257,7 +257,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -292,7 +292,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean 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 88ea9ee1..91ff24de 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 @@ -8,7 +8,7 @@ xmlns:p="http://primefaces.org/ui"> -

+
@@ -137,11 +137,7 @@
- - - - - + @@ -155,11 +151,7 @@
- - - - - + @@ -177,11 +169,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 781eb0d9..8a8d2c01 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 @@ -8,7 +8,7 @@ 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 62d64ef0..2453119c 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 @@ -8,7 +8,7 @@ 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 101bd595..25ddc379 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 @@ -8,7 +8,7 @@ xmlns:p="http://primefaces.org/ui"> -
+
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 c06c52ae..de66672f 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 @@ -8,7 +8,7 @@ xmlns:p="http://primefaces.org/ui"> -
+
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 new file mode 100644 index 00000000..aa2227aa --- /dev/null +++ b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl @@ -0,0 +1,14 @@ + + + + + + + + + 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 f63bbd6e..16c868df 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 @@ -14,11 +14,7 @@
- - - - - + 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 e1891b82..df8d6e65 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 @@ -14,11 +14,7 @@
- - - - - + 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 d1409ce1..56a3987b 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 @@ -15,7 +15,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl index 3c71f186..42911da2 100644 --- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl +++ b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl @@ -8,7 +8,7 @@ xmlns:p="http://primefaces.org/ui"> -
+
@@ -170,11 +170,7 @@
- - - - - + @@ -204,11 +200,7 @@
- - - - - + diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl index 48dd6e59..f0d990dd 100644 --- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl +++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl @@ -8,7 +8,7 @@ xmlns:p="http://primefaces.org/ui"> -
+
@@ -90,11 +90,7 @@
- - - - - + @@ -124,11 +120,7 @@
- - - - - + @@ -256,11 +248,7 @@
- - - - - +
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 5a0802d0..cfe51e9f 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 @@ -11,7 +11,7 @@ -
+
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 156b795d..194d90fc 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 @@ -1,6 +1,7 @@ -
+
@@ -60,10 +61,7 @@
- - - - +
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 12406604..0619039d 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -12,7 +12,7 @@ -
+
@@ -125,9 +125,9 @@ - - - + + +
@@ -141,9 +141,9 @@
- - - + + +
@@ -151,17 +151,13 @@
- - - - - +
- - - + + +
@@ -169,11 +165,7 @@
- - - - - + @@ -199,11 +191,7 @@
- - - - - + @@ -228,7 +216,7 @@ -
+
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index 69651c92..80e67acd 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -7,7 +7,7 @@ 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 59511d9a..185c785a 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -13,7 +13,7 @@
-
+
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 cc803e85..eaa13ad3 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 @@ -13,7 +13,7 @@
-
+
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 6dff4156..312208e1 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 @@ -15,7 +15,7 @@
-
+
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 c4947264..1410005c 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 @@ -7,7 +7,7 @@ xmlns:p="http://primefaces.org/ui"> -
+
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml index bfc829d9..9860efe3 100644 --- a/web/WEB-INF/widgets.jsf.taglib.xml +++ b/web/WEB-INF/widgets.jsf.taglib.xml @@ -38,7 +38,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -72,7 +72,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -97,7 +97,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -121,7 +121,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -145,7 +145,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -162,7 +162,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -179,7 +179,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -196,7 +196,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -236,7 +236,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -271,7 +271,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -306,7 +306,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -336,7 +336,7 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean @@ -360,9 +360,56 @@ along with this program. If not, see . rendered - Whether this tag is being rendered by JSF engine. + Whether this tag is being rendered by JSF engine (default: true). false java.lang.Boolean + + outputCountrySelector + This tag renders a selection box for all available countries. + resources/tags/country/form_data/form_country_selector.tpl + + rendered + Whether this tag is being rendered by JSF engine (default: true). + false + java.lang.Boolean + + + allowNone + Whether this tag allows NONE/null to be selected (default: true). + false + java.lang.Boolean + + + required + Whether this tag is required (default: false) + false + java.lang.Boolean + + + requiredMessage + Localizable message to be displayed when this field is required but not selected. + false + java.lang.String + + + id + Id of the JSF component. + true + java.lang.String + + + styleClass + CSS style class for this component, default: select. + false + java.lang.String + + + value + A target property to set the selected country in. + true + org.mxchange.jcountry.model.data.Country + + diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index cac23e37..26d03a54 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -16,7 +16,7 @@ - + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index 1062279f..a45e6972 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -16,59 +16,66 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index be6bf16e..9ebed061 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -105,7 +105,7 @@ -
+
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index dc069457..a181a29a 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -26,7 +26,7 @@
-
+
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index faf4f2b7..08dfc7e5 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -24,18 +24,18 @@
-
+
- +
- +
@@ -43,7 +43,7 @@
- + diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css index a3e22a51..b5c6eb7a 100644 --- a/web/resources/css/layout.css +++ b/web/resources/css/layout.css @@ -338,3 +338,7 @@ ul.navbar-horizontal li.footer-copyright { #footer::after { clear: both; } + +.column-selector { + float: right; +} diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 8f0a3bbb..672c8218 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -24,7 +24,7 @@ -
+
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index caa79212..cbac07e5 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -31,7 +31,7 @@ -
+
-- 2.39.5