# HG changeset patch # User lisaq # Date 2016-10-25 19:26:30 # Node ID 1703d7ca0809ffbd73b2946711518bf911746a02 # Parent 67438aefd55194d0ae457e1abd38d9eefdbe2d34 login: add support link to disabled password reset page diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -62,9 +62,14 @@

%elif h.HasPermissionAny('hg.password_reset.hidden')():

- ${_('Contact an administrator if you have forgotten your password.')} + ${_('Password reset is disabled. Please contact ')} + % if c.visual.rhodecode_support_url: + ${_('Support')} + ${_('or')} + % endif + ${_('an administrator if you need help.')}

- %endif + %endif ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")} diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -2,7 +2,7 @@ <%inherit file="base/root.html"/> <%def name="title()"> - ${_('Create an Account')} + ${_('Reset Password')} %if c.rhodecode_name: · ${h.branding(c.rhodecode_name)} %endif @@ -30,7 +30,14 @@ %if h.HasPermissionAny('hg.password_reset.disabled')():
-

${_('Password reset has been disabled.')}

+

+ ${_('Password reset is disabled. Please contact ')} + % if c.visual.rhodecode_support_url: + ${_('Support')} + ${_('or')} + % endif + ${_('an administrator if you need help.')} +

%else:
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py --- a/rhodecode/tests/functional/test_login.py +++ b/rhodecode/tests/functional/test_login.py @@ -564,7 +564,7 @@ class TestPasswordReset(TestController): asr_reset.one_element_exists('#email') asr_reset.one_element_exists('#send') else: - assert 'Password reset has been disabled.' in pwdreset_page + assert 'Password reset is disabled.' in pwdreset_page asr_reset.no_element_exists('#email') asr_reset.no_element_exists('#send') @@ -585,4 +585,4 @@ class TestPasswordReset(TestController): pwd_reset_url, {'email': 'lisa@rhodecode.com',} ) - assert 'Password reset has been disabled.' in pwdreset_page + assert 'Password reset is disabled.' in pwdreset_page