Harmonised urls.
This commit is contained in:
parent
761fd162bf
commit
22d4da61dd
4 changed files with 8 additions and 8 deletions
|
@ -21,7 +21,7 @@ class Index extends App.ControllerContent
|
||||||
|
|
||||||
# set title
|
# set title
|
||||||
@title 'Reset Password'
|
@title 'Reset Password'
|
||||||
@navupdate '#reset_password'
|
@navupdate '#password_reset'
|
||||||
|
|
||||||
@render()
|
@render()
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ class Index extends App.ControllerContent
|
||||||
)
|
)
|
||||||
@formEnable( @el.find('.form-password') )
|
@formEnable( @el.find('.form-password') )
|
||||||
|
|
||||||
App.Config.set( 'reset_password', Index, 'Routes' )
|
App.Config.set( 'password_reset', Index, 'Routes' )
|
||||||
|
|
||||||
class Verify extends App.ControllerContent
|
class Verify extends App.ControllerContent
|
||||||
events:
|
events:
|
||||||
|
@ -94,7 +94,7 @@ class Verify extends App.ControllerContent
|
||||||
|
|
||||||
# set title
|
# set title
|
||||||
@title 'Reset Password'
|
@title 'Reset Password'
|
||||||
@navupdate '#reset_password_verify'
|
@navupdate '#password_reset_verify'
|
||||||
|
|
||||||
# get data
|
# get data
|
||||||
params =
|
params =
|
|
@ -28,7 +28,7 @@
|
||||||
<button class="btn btn--primary" type="submit"><%- @T( 'Sign in' ) %></button>
|
<button class="btn btn--primary" type="submit"><%- @T( 'Sign in' ) %></button>
|
||||||
|
|
||||||
<% if @C('user_lost_password'): %>
|
<% 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 %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
<p>
|
<p>
|
||||||
<%- @T( "You're already registered with your email adress if you've been in touch with our support team.") %><br>
|
<%- @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'): %>
|
<% 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 %>
|
<% end %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="hero-unit fullscreen-body">
|
<div class="hero-unit fullscreen-body">
|
||||||
<h2><%- @T( @head ) %><small></small></h2>
|
<h2><%- @T( @head ) %><small></small></h2>
|
||||||
<p><%- @message %></p>
|
<p><%- @message %></p>
|
||||||
<a href="#reset_password" class="subtle retry">» <%- @T('try again') %> «</a>
|
<a href="#password_reset" class="subtle retry">» <%- @T('try again') %> «</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
|
@ -228,7 +228,7 @@ class SignupPasswordChangeAndResetTest < TestCase
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
:execute => 'navigate',
|
:execute => 'navigate',
|
||||||
:to => browser_url + '/#reset_password',
|
:to => browser_url + '/#password_reset',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
:execute => 'wait',
|
:execute => 'wait',
|
||||||
|
@ -250,7 +250,7 @@ class SignupPasswordChangeAndResetTest < TestCase
|
||||||
:action => [
|
:action => [
|
||||||
{
|
{
|
||||||
:execute => 'click',
|
:execute => 'click',
|
||||||
:css => 'a[href="#reset_password"]',
|
:css => 'a[href="#password_reset"]',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
:execute => 'set',
|
:execute => 'set',
|
||||||
|
|
Loading…
Reference in a new issue