From: Roland Häder Date: Wed, 4 May 2016 10:58:03 +0000 (+0200) Subject: class was wrong, needs to be styleClass X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4447f01ca2a02bcd3e42e117c4e4efcf51e1f3dd;p=pizzaservice-war.git class was wrong, needs to be styleClass Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java new file mode 100644 index 00000000..cca85c6c --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionBean.java @@ -0,0 +1,215 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * 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.pizzaapplication.beans.email_address; + +import java.text.MessageFormat; +import java.util.List; +import java.util.Objects; +import javax.enterprise.context.SessionScoped; +import javax.faces.view.facelets.FaceletException; +import javax.inject.Inject; +import javax.inject.Named; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; +import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; +import org.mxchange.jusercore.model.email_address.EmailAddressChange; +import org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote; +import org.mxchange.jusercore.model.user.User; +import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController; + +/** + * A web session bean for changing email addresses + *

+ * @author Roland Haeder + */ +@Named ("emailChangeController") +@SessionScoped +public class PizzaEmailChangeWebSessionBean implements PizzaEmailChangeWebSessionController { + + /** + * Serial number + */ + private static final long serialVersionUID = 186_078_724_659_153L; + + /** + * Email address 1 (changing) + */ + private String emailAddress; + + /** + * Email address 2 (repeat in changing) + */ + private String emailAddressRepeat; + + /** + * Local list of already queued email addresses + */ + private List emailAddresses; + + /** + * Remote email change bean + */ + private final EmailChangeSessionBeanRemote emailBean; + + /** + * Login bean (controller) + */ + @Inject + private PizzaUserLoginWebSessionController loginController; + + /** + * Default constructor + */ + public PizzaEmailChangeWebSessionBean () { + // Try it + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup + this.emailBean = (EmailChangeSessionBeanRemote) context.lookup("java:global/addressbook-ejb/email-change!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N + + // Init list + this.emailAddresses = this.emailBean.allQueuedAddressesAsList(); + } catch (final NamingException e) { + // Throw again + throw new FaceletException(e); + } + } + + @Override + public String doChangeEmailAddress () { + // This method shall only be called if the user is logged-in + if (!this.loginController.isUserLoggedIn()) { + // Not logged-in + throw new IllegalStateException("User is not logged-in"); //NOI18N + } else if (!this.isRequiredChangeEmailAddressSet()) { + // Not all required fields are set + throw new FaceletException("Not all required fields are set."); //NOI18N + } else if (!Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())) { + // Email address 1+2 mismatch + throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N + } else if (!this.loginController.ifCurrentPasswordMatches()) { + // Password not matching + throw new FaceletException(new UserPasswordMismatchException(this.loginController.getLoggedInUser())); + } + + // Get user instance + User user = this.loginController.getLoggedInUser(); + + // It should be there, so run some tests on it + assert (user instanceof User) : "Instance loginController.loggedInUser is null"; //NOI18N + assert (user.getUserId() instanceof Long) : "Instance loginController.loggedInUser.userId is null"; //NOI18N + assert (user.getUserId() > 0) : MessageFormat.format("loginController.loggedInUser.userId={0} is invalid", user.getUserId()); //NOI18N + assert (user.getUserContact() instanceof Contact) : "Instance loginController.loggedInUser.userContact is null"; //NOI18N + assert (user.getUserContact().getContactId() instanceof Long) : "Instance loginController.userContact.contactId is null"; //NOI18N + assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N + + // Get dummy email address + String dummyEmail = this.getEmailAddress(); + + // Unset all so the user is forced to re-enter it + this.clear(); + + // Check if the email address is already enqueued + if (this.isEmailAddressQueued(dummyEmail)) { + // Yes, then abort here + return "login_email_already_added"; //NOI18N + } + + // Create change object, to save EJB calls, the hash is not generated here + ChangeableEmailAddress address = new EmailAddressChange(user, dummyEmail); + + // Call EJB + this.emailBean.enqueueEmailAddressForChange(address); + + // All fine + return "login_email_change_queued"; //NOI18N + } + + @Override + public String getEmailAddress () { + return this.emailAddress; + } + + @Override + public void setEmailAddress (final String emailAddress) { + this.emailAddress = emailAddress; + } + + @Override + public String getEmailAddressRepeat () { + return this.emailAddressRepeat; + } + + @Override + public void setEmailAddressRepeat (final String emailAddressRepeat) { + this.emailAddressRepeat = emailAddressRepeat; + } + + @Override + public boolean isRequiredChangeEmailAddressSet () { + return ((this.getEmailAddress() != null) && + (this.getEmailAddressRepeat() != null)); + } + + /** + * Clears email address fields so the user has to re-enter them + */ + private void clear () { + // Clear fields + this.setEmailAddress(null); + this.setEmailAddressRepeat(null); + } + + /** + * Checks if given email address has already been queued. First a local list + * is being checked, if not found, the EJB is called. Only if found, the + * result is "cached" in the list. + *

+ * @param emailAddress Email address to verify + *

+ * @return Whether the email address in field emailAddress is already queued + */ + private boolean isEmailAddressQueued (final String emailAddress) { + // It should be there + assert (emailAddress != null) : "emailAddress should not be null"; //NOI18N + assert (!emailAddress.trim().isEmpty()) : "emailAddress should not be empty"; //NOI18N + + // Check list + if (this.emailAddresses.contains(emailAddress)) { + // Okay, found it + return true; + } + + // Check EJB + boolean isQueued = this.emailBean.isEmailAddressEnqueued(emailAddress); + + // Is it there? + if (isQueued) { + // Add to list + this.emailAddresses.add(emailAddress); + } + + // Return status + return isQueued; + } + +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java new file mode 100644 index 00000000..1d7d3a10 --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/email_address/PizzaEmailChangeWebSessionController.java @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * 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.pizzaapplication.beans.email_address; + +import java.io.Serializable; + +/** + * An interface for an email change controller + *

+ * @author Roland Haeder + */ +public interface PizzaEmailChangeWebSessionController extends Serializable { + + /** + * Getter for email address 1 (changing) + *

+ * @return Email address + */ + String getEmailAddress (); + + /** + * Setter for email address 1 (changing) + *

+ * @param emailAddress Email address 1 + */ + void setEmailAddress (final String emailAddress); + + /** + * Getter for email address 2 (repeat changing) + *

+ * @return Email address 2 + */ + String getEmailAddressRepeat (); + + /** + * Setter for email address 2 (repeat changing) + *

+ * @param emailAddressRepeat Email address 2 + */ + void setEmailAddressRepeat (final String emailAddressRepeat); + + /** + * Checks whether all required are set for changing email address + *

+ * @return Whether the required personal data is set + */ + boolean isRequiredChangeEmailAddressSet (); + + /** + * Changes logged-in user's email address if the current password matches. + *

+ * @return New target page + */ + String doChangeEmailAddress (); + +} diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index cccd59ba..8c9415be 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -1,11 +1,11 @@ + lang="#{localizationController.language}" xml:lang="#{localizationController.language}" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > #{msg.PAGE_TITLE_LOGIN_FOO} diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index bd06406a..029bfc66 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -3,17 +3,17 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - Administration - + Administration - Default admin title - + - + 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 b1c484b1..04aeab14 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 @@ -29,9 +29,7 @@

- - - +
@@ -43,9 +41,7 @@
- - - +
@@ -57,7 +53,7 @@
- +
@@ -69,7 +65,7 @@
- +
@@ -83,7 +79,7 @@
- +
@@ -97,7 +93,7 @@
- +
@@ -109,7 +105,7 @@
- + @@ -124,16 +120,16 @@
- + - + - +
@@ -147,16 +143,16 @@
- + - + - +
@@ -177,6 +173,18 @@
+ +
+
+ +
+ +
+ +
+ +
+
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 c77f8b6e..4700255e 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 @@ -19,7 +19,7 @@
- +
@@ -33,11 +33,11 @@
- + - +
@@ -49,7 +49,7 @@
- +
@@ -63,7 +63,7 @@
- + @@ -78,7 +78,7 @@
- +
@@ -92,11 +92,11 @@
- + - +
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 bef9b00a..9bbaf3d1 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 @@ -19,7 +19,7 @@
- +
@@ -33,9 +33,9 @@
- + - +
@@ -47,7 +47,7 @@
- +
@@ -59,7 +59,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 fc3de964..8ff1740d 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 @@ -18,7 +18,7 @@
- +
@@ -33,7 +33,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -60,7 +60,7 @@
- +
diff --git a/web/WEB-INF/templates/basket/full_basket.tpl b/web/WEB-INF/templates/basket/full_basket.tpl index d7633df3..bb8ab3b8 100644 --- a/web/WEB-INF/templates/basket/full_basket.tpl +++ b/web/WEB-INF/templates/basket/full_basket.tpl @@ -19,7 +19,7 @@
- + @@ -39,7 +39,7 @@ #{msg.TOTAL_ITEM_PRICE}
- +
diff --git a/web/WEB-INF/templates/basket/total_sum.tpl b/web/WEB-INF/templates/basket/total_sum.tpl index 4cee8b90..3b6d11f7 100644 --- a/web/WEB-INF/templates/basket/total_sum.tpl +++ b/web/WEB-INF/templates/basket/total_sum.tpl @@ -10,11 +10,11 @@
#{msg.TOTAL_ORDER_PRICE} - +
- + diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl new file mode 100644 index 00000000..30065fd4 --- /dev/null +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -0,0 +1,218 @@ + + + +
+ #{msg.PERSONAL_DATA_MINIMUM_NOTICE} +
+ +
+
+ #{msg.PERSONAL_DATA_LEGEND} + +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + + +
+ +
+
+ +
+
+ +
+ +
+ + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+ +
+ + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+
+
+ +
+
+ #{msg.USER_PROFILE_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+
    +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}
    • +
+
+
+
+
+ diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl index c9124f7d..30065fd4 100644 --- a/web/WEB-INF/templates/generic/form_personal_data.tpl +++ b/web/WEB-INF/templates/generic/form_personal_data.tpl @@ -33,7 +33,7 @@
- +
@@ -47,7 +47,7 @@
- +
@@ -61,7 +61,7 @@
- +
@@ -75,7 +75,7 @@
- +
@@ -89,7 +89,7 @@
- +
@@ -103,7 +103,7 @@
- +
@@ -117,7 +117,7 @@
- + @@ -132,16 +132,16 @@
- + - + - +
@@ -155,16 +155,16 @@
- + - + - +
@@ -207,9 +207,9 @@
    -
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}
    • -
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}
    • -
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl index 3d9ef32f..4a5919f1 100644 --- a/web/WEB-INF/templates/generic/gender_selection_box.tpl +++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl @@ -6,7 +6,8 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + + diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl index 55ea9e3f..14515170 100644 --- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl +++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl @@ -6,12 +6,12 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - + diff --git a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl new file mode 100644 index 00000000..30799916 --- /dev/null +++ b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl @@ -0,0 +1,11 @@ + + + + + + + diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/generic/user_profile_link.tpl index 26fe3516..6188f9c1 100644 --- a/web/WEB-INF/templates/generic/user_profile_link.tpl +++ b/web/WEB-INF/templates/generic/user_profile_link.tpl @@ -7,7 +7,7 @@ - + diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 2864ca40..426b3b81 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -5,11 +5,11 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + Default guest title - + diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl new file mode 100644 index 00000000..d4a9658c --- /dev/null +++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl @@ -0,0 +1,17 @@ + + + +
+
+ #{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN} +
+ +
+ +
+
+ diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl new file mode 100644 index 00000000..6188f9c1 --- /dev/null +++ b/web/WEB-INF/templates/user/user_profile_link.tpl @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl new file mode 100644 index 00000000..b013deae --- /dev/null +++ b/web/WEB-INF/templates/user/userid_error.tpl @@ -0,0 +1,17 @@ + + + +
+
+ #{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID} +
+ +
+ +
+
+ diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 5ca8b083..badc92e3 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -38,8 +38,8 @@
- - + +
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 11928a3e..0ac502ad 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -40,8 +40,8 @@
- - + +
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index dca2708a..1c2b214f 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -71,8 +71,8 @@
- - + +
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index 61a6c937..63cda07c 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -53,8 +53,8 @@
- - + +
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index 5bb205a0..9d03373c 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -61,8 +61,8 @@
- - + +
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index 6d8302c3..e20902b9 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -37,8 +37,8 @@
- - + +
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index ed3caab9..d3e1adff 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -86,7 +86,7 @@
- + @@ -104,8 +104,8 @@
- - + +
diff --git a/web/basket.xhtml b/web/basket.xhtml index 53536f6e..f90436fa 100644 --- a/web/basket.xhtml +++ b/web/basket.xhtml @@ -30,7 +30,7 @@
- + @@ -56,7 +56,7 @@ #{msg.TOTAL_ITEM_PRICE}
- +
diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml index bf1599d2..831c723f 100644 --- a/web/customer/login.xhtml +++ b/web/customer/login.xhtml @@ -22,7 +22,7 @@
-
diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml index 9b4ade6b..0d088f3e 100644 --- a/web/customer/lost_passwd.xhtml +++ b/web/customer/lost_passwd.xhtml @@ -32,7 +32,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -57,8 +57,8 @@
- - + +
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml new file mode 100644 index 00000000..ddffa7e7 --- /dev/null +++ b/web/guest/user/register_done.xhtml @@ -0,0 +1,30 @@ + + + + + + #{msg.PAGE_TITLE_USER_REGISTER_DONE} + + + #{msg.CONTENT_TITLE_USER_REGISTER_DONE} + + + +
+ #{msg.GUEST_USER_REGISTRATION_COMPLETED} +
+ +
+ + + +
+ + + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index 64b21a7c..7a93e036 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -23,7 +23,7 @@ #{msg.USER_NAME} - + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index fe0a4efa..1109a02a 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -26,7 +26,7 @@ - + diff --git a/web/index.xhtml b/web/index.xhtml index 778cdbd8..993dec3b 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -68,15 +68,15 @@
#{msg.SINGLE_PRODUCT_PRICE} - +
#{msg.TOTAL_ITEM_PRICE} - - + +
@@ -90,7 +90,7 @@
#{msg.TOTAL_ORDER_PRICE} - +
diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml index 0cb769ae..69043c87 100644 --- a/web/user/login_add_addressbook.xhtml +++ b/web/user/login_add_addressbook.xhtml @@ -29,22 +29,22 @@
- +
- - + +
- + diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index 86f2b0e9..f86d426e 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -33,7 +33,7 @@
- #{userController.emailAddress} + #{contactController.emailAddress}
@@ -45,7 +45,7 @@
- +
@@ -57,7 +57,7 @@
- +
@@ -68,15 +68,15 @@
- - + +
- + diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml index e4c623c1..ae575a3b 100644 --- a/web/user/login_change_password.xhtml +++ b/web/user/login_change_password.xhtml @@ -33,7 +33,7 @@
- +
@@ -45,7 +45,7 @@
- +
@@ -56,15 +56,15 @@
- - + +
- + diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index 8e525094..b8aa7c0d 100644 --- a/web/user/login_change_personal_data.xhtml +++ b/web/user/login_change_personal_data.xhtml @@ -30,15 +30,15 @@
- - + +
- + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index 252ce7ec..c915c167 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -17,13 +17,13 @@ - + - + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index a339da4f..342127c6 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -17,13 +17,13 @@ - + - + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index cd5cbebb..79cea46e 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -43,7 +43,7 @@ - + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 4e243a58..7d8bc623 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -21,7 +21,7 @@ - + diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml index 18d256dd..8d0b0381 100644 --- a/web/user/login_own_addressbooks.xhtml +++ b/web/user/login_own_addressbooks.xhtml @@ -60,7 +60,7 @@ - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index ed0384fd..f89a0866 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -17,13 +17,13 @@ - + - +