Merge pull request #18 from danstowell/jsrouting-durationcalc

[rails.git] / app / views / user / login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index d1efa8b2b0e0dae9818a51cb76f66c2a85580818..cb70281e6f6bb1fa383eb751ccb7f736b5413d61 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,4 +1,3 @@
-

 <div id="login_login">
 <% content_for :heading do %>
   <h1><%= t 'user.login.heading' %></h1>
 <div id="login_login">
 <% content_for :heading do %>
   <h1><%= t 'user.login.heading' %></h1>


@@ -24,9 +23,9 @@
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
         </div>
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
         </div>

-        <p class="form-help deemphasize">
+        <span class="form-help deemphasize">

           <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>
           <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>

-        </p>
+        </span>

       </fieldset>
 
       <fieldset>
       </fieldset>
 
       <fieldset>


@@ -37,7 +36,7 @@
         <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
       </fieldset>
 
         <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
       </fieldset>
 

-      <fieldset class='form-section'>
+      <fieldset class='form-divider'>

 
         <p class='standard-label'><%= t 'user.login.with openid' %></p>
 
 
         <p class='standard-label'><%= t 'user.login.with openid' %></p>
 


@@ -58,7 +57,7 @@
 
           <div id="remember_me_openid" class='form-row'>
             <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
 
           <div id="remember_me_openid" class='form-row'>
             <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>

-            <label class="standard-label" for="remember_me"><%= t 'user.login.remember' %></label>
+            <label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label>

           </div>
 
         <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
           </div>
 
         <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>


@@ -73,6 +72,11 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
 
 <script type="text/javascript">
 $(document).ready(function() {

+  // Preserve location hash in referer
+  if (window.location.hash) {
+    $('#referer').val($('#referer').val() + window.location.hash);
+  }
+

   $("#openid_open_url").click(function() {
     $("#openid_url").val("http://");
     $("#login_openid_buttons").hide();
   $("#openid_open_url").click(function() {
     $("#openid_url").val("http://");
     $("#login_openid_buttons").hide();