<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
<div class="table">
<div class="table_header">
- #{msg.LOGIN_EDIT_USER_DATA_TITLE}
+ #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
</div>
<h:form id="login_form">
- <div class="table_header2">
- #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
- </div>
-
<div class="para">
- <fieldset id="login_data">
+ <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">
- <h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
+ #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
</div>
<div class="table_right">
- <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
+ #{userController.emailAddress}
</div>
<div class="clear"></div>
<div class="table_row">
<div class="table_left">
- <h:outputLabel for="emailAddress2" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL2}" />
+ <h:outputLabel for="emailAddress1" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL1}" />
</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="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress1}" required="true" />
</div>
<div class="clear"></div>
</div>
- <div class="para"></div>
-
<div class="table_row">
<div class="table_left">
- <h:outputLabel for="password" value="#{msg.LOGIN_ENTER_PASSWORD_CONFIRM}" />
+ <h:outputLabel for="emailAddress2" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL2}" />
</div>
<div class="table_right">
- <h:inputSecret class="input" id="password" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" />
+ <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddress2}" required="true" />
</div>
<div class="clear"></div>
</fieldset>
</div>
+ <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
<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="#{loginController.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>