Show More
@@ -62,7 +62,12 b'' | |||||
62 | </p> |
|
62 | </p> | |
63 | %elif h.HasPermissionAny('hg.password_reset.hidden')(): |
|
63 | %elif h.HasPermissionAny('hg.password_reset.hidden')(): | |
64 | <p class="help-block"> |
|
64 | <p class="help-block"> | |
65 | ${_('Contact an administrator if you have forgotten your password.')} |
|
65 | ${_('Password reset is disabled. Please contact ')} | |
|
66 | % if c.visual.rhodecode_support_url: | |||
|
67 | <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a> | |||
|
68 | ${_('or')} | |||
|
69 | % endif | |||
|
70 | ${_('an administrator if you need help.')} | |||
66 | </p> |
|
71 | </p> | |
67 | %endif |
|
72 | %endif | |
68 |
|
73 |
@@ -2,7 +2,7 b'' | |||||
2 | <%inherit file="base/root.html"/> |
|
2 | <%inherit file="base/root.html"/> | |
3 |
|
3 | |||
4 | <%def name="title()"> |
|
4 | <%def name="title()"> | |
5 | ${_('Create an Account')} |
|
5 | ${_('Reset Password')} | |
6 | %if c.rhodecode_name: |
|
6 | %if c.rhodecode_name: | |
7 | · ${h.branding(c.rhodecode_name)} |
|
7 | · ${h.branding(c.rhodecode_name)} | |
8 | %endif |
|
8 | %endif | |
@@ -30,7 +30,14 b'' | |||||
30 |
|
30 | |||
31 | %if h.HasPermissionAny('hg.password_reset.disabled')(): |
|
31 | %if h.HasPermissionAny('hg.password_reset.disabled')(): | |
32 | <div class="right-column"> |
|
32 | <div class="right-column"> | |
33 | <p>${_('Password reset has been disabled.')}</p> |
|
33 | <p> | |
|
34 | ${_('Password reset is disabled. Please contact ')} | |||
|
35 | % if c.visual.rhodecode_support_url: | |||
|
36 | <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a> | |||
|
37 | ${_('or')} | |||
|
38 | % endif | |||
|
39 | ${_('an administrator if you need help.')} | |||
|
40 | </p> | |||
34 | </div> |
|
41 | </div> | |
35 | %else: |
|
42 | %else: | |
36 | <div id="register" class="right-column"> |
|
43 | <div id="register" class="right-column"> |
@@ -564,7 +564,7 b' class TestPasswordReset(TestController):' | |||||
564 | asr_reset.one_element_exists('#email') |
|
564 | asr_reset.one_element_exists('#email') | |
565 | asr_reset.one_element_exists('#send') |
|
565 | asr_reset.one_element_exists('#send') | |
566 | else: |
|
566 | else: | |
567 |
assert 'Password reset |
|
567 | assert 'Password reset is disabled.' in pwdreset_page | |
568 | asr_reset.no_element_exists('#email') |
|
568 | asr_reset.no_element_exists('#email') | |
569 | asr_reset.no_element_exists('#send') |
|
569 | asr_reset.no_element_exists('#send') | |
570 |
|
570 | |||
@@ -585,4 +585,4 b' class TestPasswordReset(TestController):' | |||||
585 | pwd_reset_url, |
|
585 | pwd_reset_url, | |
586 | {'email': 'lisa@rhodecode.com',} |
|
586 | {'email': 'lisa@rhodecode.com',} | |
587 | ) |
|
587 | ) | |
588 |
assert 'Password reset |
|
588 | assert 'Password reset is disabled.' in pwdreset_page |
General Comments 0
You need to be logged in to leave comments.
Login now