Fixed flash refresh issue on login pg, reverted passwordrest pg chang…

…es to msg blocks [ref #5717]

src/main/java/propertyFiles/Bundle.properties

@@ -259,6 +259,23 @@ passwdVal.passwdValBean.warnDictionaryRead=Dictionary was set, but none was read
 passwdVal.passwdValBean.warnDictionaryObj=PwDictionaries not set and no default password file found:
 passwdVal.passwdValBean.warnSetStrength=The PwGoodStrength {0} value competes with the PwMinLength value of {1} and is added to {2}
 
+# passwordreset.xhtml
+pageTitle.passwdReset.pre=Account Password Reset
+passwdReset.token=token :
+passwdReset.userLookedUp=user looked up :
+passwdReset.emailSubmitted=email submitted :
+passwdReset.details={0} Password Reset{1} - To initiate the password reset process, please provide your email address.
+passwdReset.submitRequest=Submit Password Request
+passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}.
+passwdReset.debug=DEBUG
+passwdReset.resetUrl=The reset URL is
+passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address.
+passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again.
+passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below.
+passwdReset.newPasswd=New Password
+passwdReset.rePasswd=Retype Password
+passwdReset.resetBtn=Reset Password
+
 #loginpage.xhtml
 login.System=Login System
 login.forgot.text=Forgot your password?
@@ -648,23 +665,6 @@ notification.email.info.unavailable=Unavailable
 notification.email.apiTokenGenerated=Hello {0} {1},\n\nAPI Token has been generated. Please keep it secure as you would do with a password.
 notification.email.apiTokenGenerated.subject=API Token was generated
 
-# passwordreset.xhtml
-pageTitle.passwdReset.pre=Account Password Reset
-passwdReset.token=token :
-passwdReset.userLookedUp=user looked up :
-passwdReset.emailSubmitted=email submitted :
-passwdReset.details={0} Password Reset{1} - To initiate the password reset process, please provide your email address.
-passwdReset.submitRequest=Submit Password Request
-passwdReset.successSubmit.tip=If this email is associated with an account, then an email will be sent with further instructions to {0}.
-passwdReset.debug=DEBUG
-passwdReset.resetUrl=The reset URL is
-passwdReset.noEmail.tip=No email was actually sent because a user could not be found using the provided email address {0} but we don't mention this because we don't malicious users to use the form to determine if there is an account associated with an email address.
-passwdReset.illegalLink.tip=Your password reset link is not valid. If you need to reset your password, {0}click here{1} in order to request that your password to be reset again.
-passwdReset.newPasswd.details={0} Reset Password{1} \u2013 Our password requirements have changed. Please pick a strong password that matches the criteria below.
-passwdReset.newPasswd=New Password
-passwdReset.rePasswd=Retype Password
-passwdReset.resetBtn=Reset Password
-
 # dataverse.xhtml
 dataverse.title=The project, department, university, professor, or journal this dataverse will contain data for.
 dataverse.enterName=Enter name...

src/main/webapp/loginpage.xhtml

@@ -69,7 +69,7 @@
                                                 <h:inputText rendered="#{not fc.credential.secret}" value="#{fc.value}" id="credValue" styleClass="form-control"/>
                                                 <p:message rendered="#{not fc.credential.secret}" for="credValue" display="text"/>
 						<h:inputSecret rendered="#{fc.credential.secret}" value="#{fc.value}" id="sCredValue" styleClass="form-control" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
-                                                <p:message rendered="#{not fc.credential.secret}" for="sCredValue" display="text"/>
+                                                <p:message rendered="#{fc.credential.secret}" for="sCredValue" display="text"/>
                                             </div>
                                         </div>
                                     </ui:repeat>
@@ -92,7 +92,7 @@
 
                                     <div class="form-group">
                                         <div class="col-sm-offset-4 col-sm-9 button-block">
-                                            <p:commandButton id="login" styleClass="btn btn-default" value="#{bundle.login}" update="@all" action="#{LoginPage.login}"/>
+                                            <p:commandButton id="login" styleClass="btn btn-default" value="#{bundle.login}" update="@form,:messagePanel" action="#{LoginPage.login}"/>
                                         </div>
                                     </div>
                                     <div class="form-group">

src/main/webapp/passwordreset.xhtml

@@ -60,6 +60,9 @@
                         </h:form>
                     </div>
                     <ui:fragment rendered="#{not empty PasswordResetPage.emailAddress}">
+                        <h:outputFormat value="#{bundle['passwdReset.successSubmit.tip']}">
+                            <f:param value="#{PasswordResetPage.emailAddress}"/>
+                        </h:outputFormat>
                         <ui:fragment id="debugEmail" rendered="false">
                             <div style="background-color: lightgray">
                                 <tt>