This is an automated email from the git hooks/post-receive script. New commit to branch feature/6844-forgotenPassword in repository wao. See http://git.codelutin.com/wao.git commit c2565950475e8bb627b0b8cc45754a3fd98ebf7b Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Mar 31 12:10:46 2015 +0200 Pas la peine d'afficher deux boutons pour « Mot de passe oublié », pas la peine de l'afficher si la personne a réussi à s'authentifiée (étape de choix du profil ou acceptation CGU) --- .../WEB-INF/content/authentication/login.jsp | 31 +++++++++------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp b/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp index 41382b4..3aeb73b 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp @@ -65,14 +65,6 @@ </s:else> - <s:if test="credentialsAsked"> - <s:url namespace="/authentication" action="forgotten-password" id="recoverPasswordURL"> - </s:url> - <s:a href="%{recoverPasswordURL}"> - <s:text name="wao.ui.forgotPassword"/> - </s:a> - </s:if> - <s:if test="userProfileAsked"> <s:radio name="userProfileId" list="userProfiles" label="%{getText('wao.ui.form.authentication.chooseUserProfile')}" /> @@ -88,21 +80,22 @@ </fieldset> <div class="form-actions"> - <s:if test="credentialsAsked"> - <s:submit type="button" cssClass="btn btn-primary"> - <s:param name="userPassordReminderAsked">true</s:param> - <s:text name="wao.ui.forgotPassword"/> - </s:submit> - </s:if> - <s:submit type="button" cssClass="btn btn-primary"> <s:text name="wao.ui.form.authentication.action.submit"/> </s:submit> - <s:url namespace="/authentication" action="login!input" id="cancelUrl"/> - <s:a href="%{cancelUrl}" cssClass="btn"> - <s:text name="wao.ui.action.cancel"/> - </s:a> + <s:if test="userProfileAsked || acceptCguAsked"> + <s:url namespace="/authentication" action="login!input" id="cancelUrl"/> + <s:a href="%{cancelUrl}" cssClass="btn"> + <s:text name="wao.ui.action.cancel"/> + </s:a> + </s:if> + <s:else> + <s:url namespace="/authentication" action="forgotten-password!input" id="recoverPasswordUrl" /> + <s:a href="%{recoverPasswordUrl}" cssClass="btn btn-link"> + <s:text name="wao.ui.forgotPassword"/> + </s:a> + </s:else> </div> </s:form> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.