From: Roland Häder Date: Sun, 25 Jun 2017 11:10:34 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ff37f1fa4262e87620d722aca17e9e203fcaa57c;p=pizzaservice-war.git Please cherry-pick: - converted another div (class=table_row) to h:panelGroup - well, I wanted here a "h:tableRow" or something, maybe one day I rewrite this Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java index 9b0e8829..f42d8484 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/phone/PizzaAdminContactPhoneWebRequestBean.java @@ -238,10 +238,10 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N } else if ((this.adminPhoneController.getFaxNumber() == null) && (this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) { // All fields are empty - throw new NullPointerException("choosenFaxNumber, mobileProvider and phoneNumer are null"); //NOI18N + throw new NullPointerException("faxNumber, mobileProvider and phoneNumer are null"); //NOI18N } else if ((this.adminPhoneController.getFaxNumber() instanceof DialableFaxNumber) && (this.adminPhoneController.getPhoneCountry() instanceof Country) && (this.adminPhoneController.getPhoneAreaCode() instanceof Integer) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) { // All fields are set - throw new IllegalStateException("choosenFaxNumber, mobileProvider and phoneNumer are all set"); //NOI18N + throw new IllegalStateException("faxNumber, mobileProvider and phoneNumer are all set"); //NOI18N } else if ((this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() instanceof Integer) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) { // No country selected this.showFacesMessage("form_add_contact_fax:phoneCountry", "ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED"); //NOI18N @@ -300,10 +300,10 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N } else if ((this.adminPhoneController.getLandLineNumber() == null) && (this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() == null) || (this.adminPhoneController.getPhoneAreaCode() < 1)) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) { // All fields are empty - throw new NullPointerException("choosenLandLineNumber, mobileProvider and phoneNumer are null"); //NOI18N + throw new NullPointerException("landLineNumber, mobileProvider and phoneNumer are null"); //NOI18N } else if ((this.adminPhoneController.getLandLineNumber() instanceof DialableLandLineNumber) && (this.adminPhoneController.getPhoneCountry() instanceof Country) && (this.adminPhoneController.getPhoneAreaCode() instanceof Integer) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) { // All fields are set - throw new IllegalStateException("choosenLandLineNumber, mobileProvider and phoneNumer are all set"); //NOI18N + throw new IllegalStateException("landLineNumber, mobileProvider and phoneNumer are all set"); //NOI18N } else if ((this.adminPhoneController.getPhoneCountry() == null) && ((this.adminPhoneController.getPhoneAreaCode() instanceof Integer) || (this.adminPhoneController.getPhoneNumber() instanceof Long))) { // No country selected this.showFacesMessage("form_add_contact_landLine:phoneCountry", "ERROR_ADMIN_NO_PHONE_COUNTRY_SELECTED"); //NOI18N @@ -362,10 +362,10 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N } else if ((this.adminPhoneController.getMobileNumber() == null) && (this.adminPhoneController.getMobileProvider() == null) && ((this.adminPhoneController.getPhoneNumber() == null) || (this.adminPhoneController.getPhoneNumber() < 1))) { // All fields are empty - throw new NullPointerException("choosenMobileNumber, mobileProvider and phoneNumer are null"); //NOI18N + throw new NullPointerException("mobileNumber, mobileProvider and phoneNumer are null"); //NOI18N } else if ((this.adminPhoneController.getMobileNumber() instanceof DialableMobileNumber) && (this.adminPhoneController.getMobileProvider() instanceof MobileProvider) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) { // All fields are set - throw new IllegalStateException("choosenMobileNumber, mobileProvider and phoneNumer are all set"); //NOI18N + throw new IllegalStateException("mobileNumber, mobileProvider and phoneNumer are all set"); //NOI18N } else if ((this.adminPhoneController.getMobileProvider() == null) && (this.adminPhoneController.getPhoneNumber() instanceof Long)) { // No mobile provider selected this.showFacesMessage("form_add_contact_mobile:phoneCountry", "ERROR_ADMIN_NO_PHONE_MOBILE_PROVIDER_SELECTED"); //NOI18N diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java index b4df84c7..d73884a5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java @@ -89,17 +89,17 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement /** * fax number */ - private DialableFaxNumber choosenFaxNumber; + private DialableFaxNumber faxNumber; /** * land-line number */ - private DialableLandLineNumber choosenLandLineNumber; + private DialableLandLineNumber landLineNumber; /** * mobile number */ - private DialableMobileNumber choosenMobileNumber; + private DialableMobileNumber mobileNumber; /** * Event being fired when an administrator has deleted fax number @@ -555,35 +555,35 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement @Override public DialableFaxNumber getFaxNumber () { // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); - // System.out.println(MessageFormat.format("{0}: Returning this.choosenFaxNumber={1}, caller: {2}", this.getClass().getSimpleName(), this.choosenFaxNumber, caller)); - return this.choosenFaxNumber; + // System.out.println(MessageFormat.format("{0}: Returning this.faxNumber={1}, caller: {2}", this.getClass().getSimpleName(), this.faxNumber, caller)); + return this.faxNumber; } @Override - public void setFaxNumber (final DialableFaxNumber choosenFaxNumber) { + public void setFaxNumber (final DialableFaxNumber faxNumber) { // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName()); - // System.out.println(MessageFormat.format("{0}: Settin choosenFaxNumber={1}, previous: this.choosenFaxNumber={2}, caller: {3}", this.getClass().getSimpleName(), choosenFaxNumber, this.choosenFaxNumber, caller)); - this.choosenFaxNumber = choosenFaxNumber; + // System.out.println(MessageFormat.format("{0}: Settin faxNumber={1}, previous: this.faxNumber={2}, caller: {3}", this.getClass().getSimpleName(), faxNumber, this.faxNumber, caller)); + this.faxNumber = faxNumber; } @Override public DialableLandLineNumber getLandLineNumber () { - return this.choosenLandLineNumber; + return this.landLineNumber; } @Override - public void setLandLineNumber (final DialableLandLineNumber choosenLandLineNumber) { - this.choosenLandLineNumber = choosenLandLineNumber; + public void setLandLineNumber (final DialableLandLineNumber landLineNumber) { + this.landLineNumber = landLineNumber; } @Override public DialableMobileNumber getMobileNumber () { - return this.choosenMobileNumber; + return this.mobileNumber; } @Override - public void setMobileNumber (final DialableMobileNumber choosenMobileNumber) { - this.choosenMobileNumber = choosenMobileNumber; + public void setMobileNumber (final DialableMobileNumber mobileNumber) { + this.mobileNumber = mobileNumber; } @Override diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java index f8df058d..bfc4b3d4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java @@ -133,9 +133,9 @@ public interface PizzaAdminPhoneWebRequestController extends Serializable { /** * Setter for choosen fax number *

- * @param choosenFaxNumber fax number + * @param faxNumber fax number */ - void setFaxNumber (final DialableFaxNumber choosenFaxNumber); + void setFaxNumber (final DialableFaxNumber faxNumber); /** * Getter for choosen land-line number @@ -147,9 +147,9 @@ public interface PizzaAdminPhoneWebRequestController extends Serializable { /** * Setter for choosen land-line number *

- * @param choosenLandLineNumber land-line number + * @param landLineNumber land-line number */ - void setLandLineNumber (final DialableLandLineNumber choosenLandLineNumber); + void setLandLineNumber (final DialableLandLineNumber landLineNumber); /** * Getter for choosen mobile number @@ -161,9 +161,9 @@ public interface PizzaAdminPhoneWebRequestController extends Serializable { /** * Setter for choosen mobile number *

- * @param choosenMobileNumber mobile number + * @param mobileNumber mobile number */ - void setMobileNumber (final DialableMobileNumber choosenMobileNumber); + void setMobileNumber (final DialableMobileNumber mobileNumber); /** * Getter for phone area code diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl index a5d91955..dc8195a6 100644 --- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl @@ -17,7 +17,7 @@ -

+
  • @@ -32,6 +32,6 @@
-
+ diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl index b8d0765a..5b015a0d 100644 --- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl @@ -11,7 +11,7 @@ -
+
@@ -23,13 +23,13 @@
- + -
+
@@ -39,13 +39,13 @@
- + -
+
@@ -55,13 +55,13 @@
- + -
+
@@ -71,13 +71,13 @@
- + -
+
@@ -87,13 +87,13 @@
- + -
+
@@ -105,13 +105,13 @@
- + -
+
@@ -121,13 +121,13 @@
- + -
+
@@ -139,13 +139,13 @@
- + -
+
@@ -155,13 +155,13 @@
- + -
+
@@ -174,13 +174,13 @@
- + -
+
@@ -202,9 +202,9 @@
- + -
+
@@ -226,9 +226,9 @@
- + -
+
@@ -246,9 +246,9 @@
- + -
+
@@ -258,13 +258,13 @@
- + -
+
@@ -276,13 +276,13 @@
- + -
+
@@ -292,7 +292,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 521946fe..b87d9c18 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 @@ -15,7 +15,7 @@ -
+
@@ -27,13 +27,13 @@
- + -
+
@@ -47,13 +47,13 @@
- + -
+
@@ -65,13 +65,13 @@
- + -
+
@@ -84,13 +84,13 @@
- + -
+
@@ -102,13 +102,13 @@
- + -
+
@@ -122,7 +122,7 @@
- + 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 2cfa486a..65ec7dbc 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 @@ -22,13 +22,13 @@ -
+
- +
- + @@ -36,13 +36,13 @@
-
+
-
+
@@ -54,7 +54,7 @@
- + diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl index adb9bac9..2665a383 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl @@ -18,7 +18,7 @@ -
+
@@ -28,9 +28,9 @@
- +
-
+
@@ -42,7 +42,7 @@
- + 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 1aec8d21..22134c7d 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 @@ -22,13 +22,13 @@ -
+
- +
- + @@ -36,13 +36,13 @@
-
+
-
+
@@ -54,7 +54,7 @@
- + diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl index 98f95d66..0e721a16 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl @@ -18,7 +18,7 @@ -
+
@@ -28,9 +28,9 @@
- +
-
+
@@ -42,7 +42,7 @@
- + 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 b6c73ff0..0371fcd6 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 @@ -22,25 +22,25 @@ -
+
- +
- +
-
+
-
+
@@ -50,7 +50,7 @@
- + + -
+
@@ -48,9 +48,9 @@ -
+ -
+
@@ -66,7 +66,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 4faff759..d0a226f5 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 @@ -15,7 +15,7 @@ -
+
@@ -31,9 +31,9 @@ -
+ -
+
@@ -45,9 +45,9 @@
- + -
+
@@ -57,9 +57,9 @@
- + -
+
@@ -72,7 +72,7 @@
- + diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl index f7acb1ce..cc7ce2da 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl @@ -19,7 +19,7 @@ -
+
@@ -29,11 +29,11 @@
- +
-
+
@@ -43,9 +43,9 @@
- + -
+
@@ -55,10 +55,10 @@
- + -
+
@@ -73,7 +73,7 @@
    -
  • #{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}
  • +
  • diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl index 3e14d0c8..f5855475 100644 --- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl +++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl @@ -17,7 +17,7 @@
-
+
  • @@ -64,6 +64,6 @@
-
+
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index e49330f5..2191eb14 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -7,7 +7,7 @@ xmlns:p="http://primefaces.org/ui">
- #{msg.PERSONAL_DATA_MINIMUM_NOTICE} +
@@ -16,7 +16,7 @@ -
+
@@ -32,9 +32,9 @@ -
+ -
+
@@ -50,9 +50,9 @@ -
+ -
+
@@ -68,9 +68,9 @@ -
+ -
+
@@ -86,9 +86,9 @@ -
+ -
+
@@ -104,9 +104,9 @@ -
+ -
+
@@ -120,9 +120,9 @@ -
+ -
+
@@ -138,9 +138,9 @@ -
+ -
+
@@ -156,9 +156,9 @@ -
+ -
+
@@ -174,9 +174,9 @@ -
+ -
+
@@ -194,9 +194,9 @@ -
+ -
+
@@ -218,7 +218,7 @@
-
+ @@ -228,7 +228,7 @@ -
+
@@ -250,7 +250,7 @@
-
+ @@ -260,7 +260,7 @@ -
+
@@ -278,7 +278,7 @@
- + @@ -289,7 +289,7 @@ -
+
@@ -299,17 +299,17 @@
- + -
+
    -
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}
  • -
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}
  • -
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}
  • +
  • +
  • +
-
+
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 fab6239f..0a47f71b 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 @@ -6,7 +6,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > -
+
@@ -22,9 +22,9 @@ -
+ -
+
@@ -38,5 +38,5 @@ -
+ diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl index a3807770..7567f4b5 100644 --- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -11,7 +11,7 @@ -
+
@@ -23,7 +23,7 @@ - #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2} +
@@ -31,9 +31,9 @@ -
+ -
+
@@ -45,7 +45,7 @@ - #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2} +
@@ -53,7 +53,7 @@ -
+ 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 ea92ab2e..cc8edcf3 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -16,7 +16,7 @@ -
+
@@ -30,9 +30,9 @@ -
+ -
+
@@ -46,7 +46,7 @@ -
+ + @@ -40,7 +40,7 @@
-
+
@@ -50,13 +50,13 @@
- +
-
+
@@ -66,7 +66,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 6745979e..7fb7d9c8 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 @@ -20,7 +20,7 @@ -
+
@@ -34,7 +34,7 @@ -
+
@@ -42,7 +42,7 @@
-
+
@@ -52,13 +52,13 @@
- + -
+
@@ -68,7 +68,7 @@
- + 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 3787315c..a54a8306 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 @@ -6,7 +6,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > -
+
@@ -22,9 +22,9 @@ -
+
-
+
@@ -38,5 +38,5 @@ -
+ 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 881e30c1..ded265ba 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 @@ -11,7 +11,7 @@ -
+
@@ -27,7 +27,7 @@ -
+ diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index 5d36aee8..2e927990 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -47,7 +47,7 @@ -
+
@@ -57,7 +57,7 @@
- + + diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index 40adbfdf..aeb797b4 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -30,13 +30,13 @@ -
+ -
+ diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index 2532da19..a60a3f63 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -31,7 +31,7 @@ -
+
@@ -41,13 +41,13 @@
- +
-
+
@@ -57,7 +57,7 @@
- + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index dd71f528..af96c6a9 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -29,7 +29,7 @@ -
+
@@ -39,16 +39,16 @@
- + -
+ -
+ -
-
- - - +
+ + + -
-
- -
- -
- -
+ +
+ +
-
+
+
- -
-
+
+ + + + + +
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index d55eb2be..780d0119 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -31,45 +31,46 @@ -
-
- - - - -
-
- -
- -
- -
- -
+ +
+ + + + + +
+
- - - +
+ +
-
-
- -
+
+ -
- -
+ + + -
+ +
+
- - - -
-
+
+ +
+ +
+ + + + + +
+ +