Harmonised urls.

This commit is contained in:
Martin Edenhofer 2014-12-31 10:35:38 +01:00
parent 761fd162bf
commit 22d4da61dd
4 changed files with 8 additions and 8 deletions

View file

@ -21,7 +21,7 @@ class Index extends App.ControllerContent
# set title
@title 'Reset Password'
@navupdate '#reset_password'
@navupdate '#password_reset'
@render()
@ -75,7 +75,7 @@ class Index extends App.ControllerContent
)
@formEnable( @el.find('.form-password') )
App.Config.set( 'reset_password', Index, 'Routes' )
App.Config.set( 'password_reset', Index, 'Routes' )
class Verify extends App.ControllerContent
events:
@ -94,7 +94,7 @@ class Verify extends App.ControllerContent
# set title
@title 'Reset Password'
@navupdate '#reset_password_verify'
@navupdate '#password_reset_verify'
# get data
params =

View file

@ -28,7 +28,7 @@
<button class="btn btn--primary" type="submit"><%- @T( 'Sign in' ) %></button>
<% if @C('user_lost_password'): %>
<a href="#reset_password" class="subtle-link standalone pull-right"><%- @T( 'Forgot password?' ) %></a>
<a href="#password_reset" class="subtle-link standalone pull-right"><%- @T( 'Forgot password?' ) %></a>
<% end %>
</div>
@ -52,7 +52,7 @@
<p>
<%- @T( "You're already registered with your email adress if you've been in touch with our support team.") %><br>
<% if @C('user_lost_password'): %>
<%- @T( "You can request your password") %> <a href="#reset_password"><%- @T( "here") %></a>.
<%- @T( "You can request your password") %> <a href="#password_reset"><%- @T( "here") %></a>.
<% end %>
</p>

View file

@ -3,7 +3,7 @@
<div class="hero-unit fullscreen-body">
<h2><%- @T( @head ) %><small></small></h2>
<p><%- @message %></p>
<a href="#reset_password" class="subtle retry">&raquo; <%- @T('try again') %> &laquo;</a>
<a href="#password_reset" class="subtle retry">&raquo; <%- @T('try again') %> &laquo;</a>
</div>
</div>
</div>

View file

@ -228,7 +228,7 @@ class SignupPasswordChangeAndResetTest < TestCase
},
{
:execute => 'navigate',
:to => browser_url + '/#reset_password',
:to => browser_url + '/#password_reset',
},
{
:execute => 'wait',
@ -250,7 +250,7 @@ class SignupPasswordChangeAndResetTest < TestCase
:action => [
{
:execute => 'click',
:css => 'a[href="#reset_password"]',
:css => 'a[href="#password_reset"]',
},
{
:execute => 'set',