From 22d4da61dd0c48947e5893d53c4a52dd4708c54e Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 31 Dec 2014 10:35:38 +0100
Subject: [PATCH] Harmonised urls.

---
 .../{reset_password.js.coffee => password_reset.js.coffee}  | 6 +++---
 app/assets/javascripts/app/views/login.jst.eco              | 4 ++--
 .../javascripts/app/views/password/reset_failed.jst.eco     | 2 +-
 test/browser/signup_password_change_and_reset_test.rb       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename app/assets/javascripts/app/controllers/{reset_password.js.coffee => password_reset.js.coffee} (97%)

diff --git a/app/assets/javascripts/app/controllers/reset_password.js.coffee b/app/assets/javascripts/app/controllers/password_reset.js.coffee
similarity index 97%
rename from app/assets/javascripts/app/controllers/reset_password.js.coffee
rename to app/assets/javascripts/app/controllers/password_reset.js.coffee
index feb034074..856acb8ff 100644
--- a/app/assets/javascripts/app/controllers/reset_password.js.coffee
+++ b/app/assets/javascripts/app/controllers/password_reset.js.coffee
@@ -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 =
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index d75c53dca..3d62449c9 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -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>
 
diff --git a/app/assets/javascripts/app/views/password/reset_failed.jst.eco b/app/assets/javascripts/app/views/password/reset_failed.jst.eco
index eb3926b95..29662121b 100644
--- a/app/assets/javascripts/app/views/password/reset_failed.jst.eco
+++ b/app/assets/javascripts/app/views/password/reset_failed.jst.eco
@@ -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>
\ No newline at end of file
diff --git a/test/browser/signup_password_change_and_reset_test.rb b/test/browser/signup_password_change_and_reset_test.rb
index caaf30668..bbd67271f 100644
--- a/test/browser/signup_password_change_and_reset_test.rb
+++ b/test/browser/signup_password_change_and_reset_test.rb
@@ -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',