From: Roland Haeder Date: Sat, 5 Mar 2016 21:21:32 +0000 (+0100) Subject: removed CSS class from ui:include (not needed) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f1b4eb71af37db7da34fa134d79011936ce36407;p=addressbook-war.git removed CSS class from ui:include (not needed) --- diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java index 3d03dad9..9480a5bf 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java @@ -102,6 +102,16 @@ public class UserWebSessionBean implements UserWebSessionController { */ private String emailAddress; + /** + * Email address 1 (changing) + */ + private String emailAddress1; + + /** + * Email address 2 (repeat in changing) + */ + private String emailAddress2; + /** * Email address list */ @@ -493,6 +503,26 @@ public class UserWebSessionBean implements UserWebSessionController { this.emailAddress = emailAddress; } + @Override + public String getEmailAddress1 () { + return this.emailAddress1; + } + + @Override + public void setEmailAddress1 (final String emailAddress1) { + this.emailAddress1 = emailAddress1; + } + + @Override + public String getEmailAddress2 () { + return this.emailAddress2; + } + + @Override + public void setEmailAddress2 (final String emailAddress2) { + this.emailAddress2 = emailAddress2; + } + @Override public String getEmailAddressRepeat () { return this.emailAddressRepeat; diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java index bc7213b9..890f3f32 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java @@ -173,6 +173,34 @@ public interface UserWebSessionController extends Serializable { */ void setEmailAddress (final String emailAddress); + /** + * Getter for email address 1 (changing) + *

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

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

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

+ * @param emailAddress2 Email address 2 + */ + void setEmailAddress2 (final String emailAddress2); + /** * Getter for email address, repeated *

diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index b021f0a5..54832f1b 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -19,7 +19,7 @@ - diff --git a/web/login/login_add_addressbook.xhtml b/web/login/login_add_addressbook.xhtml index d186b4ad..cbe38409 100644 --- a/web/login/login_add_addressbook.xhtml +++ b/web/login/login_add_addressbook.xhtml @@ -42,7 +42,7 @@ - diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml index 7550822b..84bba0df 100644 --- a/web/login/login_change_email_address.xhtml +++ b/web/login/login_change_email_address.xhtml @@ -29,13 +29,25 @@

#{msg.LOGIN_CHANGE_EMAIL_LEGEND} +
+
+ #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS} +
+ +
+ #{userController.emailAddress} +
+ +
+
+
- +
@@ -47,7 +59,7 @@
- +
@@ -59,14 +71,14 @@ - diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml index 5b7ff4a7..cd98d12c 100644 --- a/web/login/login_change_password.xhtml +++ b/web/login/login_change_password.xhtml @@ -66,7 +66,7 @@ - diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml index b441a304..f931f4d4 100644 --- a/web/login/login_change_personal_data.xhtml +++ b/web/login/login_change_personal_data.xhtml @@ -36,7 +36,7 @@ - diff --git a/web/login/login_data_saved.xhtml b/web/login/login_data_saved.xhtml index d4fa96b4..191f6277 100644 --- a/web/login/login_data_saved.xhtml +++ b/web/login/login_data_saved.xhtml @@ -21,7 +21,7 @@ - diff --git a/web/login/login_edit_user_data.xhtml b/web/login/login_edit_user_data.xhtml index 5208fa7e..0b53a907 100644 --- a/web/login/login_edit_user_data.xhtml +++ b/web/login/login_edit_user_data.xhtml @@ -41,7 +41,7 @@ - diff --git a/web/login/login_index.xhtml b/web/login/login_index.xhtml index baa04c5a..48b24029 100644 --- a/web/login/login_index.xhtml +++ b/web/login/login_index.xhtml @@ -19,7 +19,7 @@ - diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/login/login_list_sharing_addressbooks.xhtml index 12ffad67..3b09c2e9 100644 --- a/web/login/login_list_sharing_addressbooks.xhtml +++ b/web/login/login_list_sharing_addressbooks.xhtml @@ -32,7 +32,7 @@ - diff --git a/web/login/login_other_addressbooks.xhtml b/web/login/login_other_addressbooks.xhtml index 07e0538f..7e6397f2 100644 --- a/web/login/login_other_addressbooks.xhtml +++ b/web/login/login_other_addressbooks.xhtml @@ -19,7 +19,7 @@ - diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml index 2990b538..b0520a52 100644 --- a/web/login/login_own_addressbooks.xhtml +++ b/web/login/login_own_addressbooks.xhtml @@ -58,7 +58,7 @@ - diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml index 7d7190d3..3b107ac5 100644 --- a/web/login/login_shared_addressbooks.xhtml +++ b/web/login/login_shared_addressbooks.xhtml @@ -57,7 +57,7 @@ - diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/login/login_start_sharing_addressbook.xhtml index 6e1ac3ac..a06415aa 100644 --- a/web/login/login_start_sharing_addressbook.xhtml +++ b/web/login/login_start_sharing_addressbook.xhtml @@ -61,7 +61,7 @@ -