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 3d03dad953ef6dd6c1bda9ce6713f6ecc0185f5c..9480a5bf53fdb330861f226a0ae36228160bc860 100644 (file)
--- 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 bc7213b98cc618deb969f35ddf3ef03205acb110..890f3f323ab0f1231df34ba66a3c9101fd8d1ec8 100644 (file)
--- 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)
+        * <p>
+        * @return Email address
+        */
+       String getEmailAddress1 ();
+
+       /**
+        * Setter for email address 1 (changing)
+        * <p>
+        * @param emailAddress1 Email address 1
+        */
+       void setEmailAddress1 (final String emailAddress1);
+
+       /**
+        * Getter for email address 2 (repeat changing)
+        * <p>
+        * @return Email address 2
+        */
+       String getEmailAddress2 ();
+
+       /**
+        * Setter for email address 2 (repeat changing)
+        * <p>
+        * @param emailAddress2 Email address 2
+        */
+       void setEmailAddress2 (final String emailAddress2);
+
        /**
         * Getter for email address, repeated
         * <p>

diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index b021f0a5f6eaf4e6af81f7ecc7aaa98e11e6b0b5..54832f1b9d23fa94950661451af3b3438b24b903 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -19,7 +19,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_add_addressbook.xhtml b/web/login/login_add_addressbook.xhtml
index d186b4adcad5a8583c146311d74ccd16e934ad69..cbe38409675386932af8df0f6bada3b2b90b902c 100644 (file)
--- a/web/login/login_add_addressbook.xhtml
+++ b/web/login/login_add_addressbook.xhtml
@@ -42,7 +42,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
index 7550822b2d647723ef910ddef46aa346acfdc51c..84bba0df2891668d1578414e40a2d3bcc1dd5b4c 100644 (file)
--- a/web/login/login_change_email_address.xhtml
+++ b/web/login/login_change_email_address.xhtml
@@ -29,13 +29,25 @@
                                                        <fieldset id="change_email">
                                                                <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
 
+                                                               <div class="table_row">
+                                                                       <div class="table_left">
+                                                                               #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               #{userController.emailAddress}
+                                                                       </div>
+
+                                                                       <div class="clear"></div>
+                                                               </div>
+
                                                                <div class="table_row">
                                                                        <div class="table_left">
                                                                                <h:outputLabel for="emailAddress1" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL1}" />
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
+                                                                               <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress1}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -47,7 +59,7 @@
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddressRepeat}" required="true" />
+                                                                               <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddress2}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -59,14 +71,14 @@
 
                                                <div class="table_footer">
                                                        <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userController.changeEmailAddress()}" />
+                                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userController.doChangeEmailAddress()}" />
                                                </div>
                                        </h:form>
                                </div>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml
index 5b7ff4a7bf6624575eb53cef469aef7a70894dd6..cd98d12c94dd18502c90e9c752f6244248129b4d 100644 (file)
--- a/web/login/login_change_password.xhtml
+++ b/web/login/login_change_password.xhtml
@@ -66,7 +66,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml
index b441a30407cc969b4d63d7649322bd32a9a322b4..f931f4d4e16ae3cefa9251549139181d50d8e566 100644 (file)
--- a/web/login/login_change_personal_data.xhtml
+++ b/web/login/login_change_personal_data.xhtml
@@ -36,7 +36,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_data_saved.xhtml b/web/login/login_data_saved.xhtml
index d4fa96b4338ede7ca863d3a33fc7147cfc88a4b3..191f6277ae710dd6c5cc9eb2555b0e1d471e5c7c 100644 (file)
--- a/web/login/login_data_saved.xhtml
+++ b/web/login/login_data_saved.xhtml
@@ -21,7 +21,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_edit_user_data.xhtml b/web/login/login_edit_user_data.xhtml
index 5208fa7e7623c0e1dfe65269a04351a971254262..0b53a90765567278e87d32d5e7fb2f641c2629f2 100644 (file)
--- a/web/login/login_edit_user_data.xhtml
+++ b/web/login/login_edit_user_data.xhtml
@@ -41,7 +41,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_index.xhtml b/web/login/login_index.xhtml
index baa04c5a4b08f98e4480c32a8d3446528409ddcb..48b240291a03965a140872e3d9ce53001113b3c4 100644 (file)
--- a/web/login/login_index.xhtml
+++ b/web/login/login_index.xhtml
@@ -19,7 +19,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/login/login_list_sharing_addressbooks.xhtml
index 12ffad6740709f9d6f79f78924aa2d99b98c69cf..3b09c2e9f6c88073ae5d4147f0c5e884b04efdee 100644 (file)
--- a/web/login/login_list_sharing_addressbooks.xhtml
+++ b/web/login/login_list_sharing_addressbooks.xhtml
@@ -32,7 +32,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_other_addressbooks.xhtml b/web/login/login_other_addressbooks.xhtml
index 07e0538fa2d4ba3a9c4f2b5b8458990657cb41c6..7e6397f2fc5d57fdff6c2e78c3afa4209a95ee5b 100644 (file)
--- a/web/login/login_other_addressbooks.xhtml
+++ b/web/login/login_other_addressbooks.xhtml
@@ -19,7 +19,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml
index 2990b538e7993df0651e3a0030702a084bffa760..b0520a52e78907ebb77e22bf3ffd590e8711c261 100644 (file)
--- a/web/login/login_own_addressbooks.xhtml
+++ b/web/login/login_own_addressbooks.xhtml
@@ -58,7 +58,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml
index 7d7190d3dc8d4a7150949d5979503fdf52800f71..3b107ac5024a8cfb986be2d73e84604e9f830ab1 100644 (file)
--- a/web/login/login_shared_addressbooks.xhtml
+++ b/web/login/login_shared_addressbooks.xhtml
@@ -57,7 +57,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>

diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/login/login_start_sharing_addressbook.xhtml
index 6e1ac3ac62c6c944256fa3715f376aefada01743..a06415aad0d2750db1c959ca5b865343a4616fcc 100644 (file)
--- a/web/login/login_start_sharing_addressbook.xhtml
+++ b/web/login/login_start_sharing_addressbook.xhtml
@@ -61,7 +61,7 @@
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>