From 1c710097619f6c70d3892cc9edabe119b93a4630 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 5 Mar 2016 22:21:29 +0100
Subject: [PATCH] removed CSS class from ui:include (not needed)

---
 .../jjobs/beans/user/UserWebSessionBean.java  | 30 +++++++++++++++++++
 .../beans/user/UserWebSessionController.java  | 28 +++++++++++++++++
 web/WEB-INF/templates.dist/login_page.xhtml   |  2 +-
 web/login/login_add_addressbook.xhtml         |  2 +-
 web/login/login_change_email_address.xhtml    | 20 ++++++++++---
 web/login/login_change_password.xhtml         |  2 +-
 web/login/login_change_personal_data.xhtml    |  2 +-
 web/login/login_data_saved.xhtml              |  2 +-
 web/login/login_edit_user_data.xhtml          |  2 +-
 web/login/login_index.xhtml                   |  2 +-
 web/login/login_own_addressbooks.xhtml        |  2 +-
 11 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java
index e2919895..c0f50417 100644
--- a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/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
 	 */
@@ -559,6 +569,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/jjobs/beans/user/UserWebSessionController.java b/src/java/org/mxchange/jjobs/beans/user/UserWebSessionController.java
index 9d8c2866..9b68c9c2 100644
--- a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/user/UserWebSessionController.java
@@ -174,6 +174,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 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 @@
 			</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 d186b4ad..cbe38409 100644
--- 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 7550822b..84bba0df 100644
--- 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 5b7ff4a7..cd98d12c 100644
--- 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 b441a304..f931f4d4 100644
--- 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 d4fa96b4..191f6277 100644
--- 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 5208fa7e..0b53a907 100644
--- 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 baa04c5a..48b24029 100644
--- 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_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml
index 1dca7e35..6d926582 100644
--- a/web/login/login_own_addressbooks.xhtml
+++ b/web/login/login_own_addressbooks.xhtml
@@ -58,7 +58,7 @@
 			</h:outputText>
 
 			<h:outputText 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" />
 			</h:outputText>
 		</ui:define>
 	</ui:composition>
-- 
2.39.5