X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26d7f66fbdcd95bdbfebc9c995e206b53dca3ef3..e5b5faad7228253147bc489402ef7640b071eaaf:/app/views/user/login.html.erb

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index d593672be..ded03318f 100644
--- 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>
@@ -7,67 +6,91 @@
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag('referer', h(params[:referer])) %>
 
-    <p><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
+    <p class='deemphasize'><%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
 
     <div id="loginForm" class="standard-form">
+
       <fieldset>
-        <label><%= t 'user.login.email or username' %></label>
-        <%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %>
-      </fieldset>
-      <fieldset>
-        <label><%= t 'user.login.password' %></label>
-        <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %>
-        <p class="form-help deemphasize"><%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %></p>
+        <div class="form-row">
+          <label for="username" class="standard-label">
+            <%= t 'user.login.email or username' %>
+          </label>
+          <%= text_field_tag "username", params[:username], :tabindex => 1 %>
+        </div>
+        <div class="form-row">
+          <label for="password" class="standard-label">
+            <%= t 'user.login.password' %>
+          </label>
+          <%= password_field_tag "password", "", :tabindex => 2 %>
+        </div>
+        <span class="form-help deemphasize">
+          <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>
+        </span>
       </fieldset>
+
       <fieldset>
         <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
-        <label for="remember_me"><%= t 'user.login.remember' %></label>
-      </fieldset>
-      <fieldset>
+        <label for="remember_me" class="standard-label">
+          <%= t 'user.login.remember' %>
+        </label>
         <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
       </fieldset>
-    </div>
-    <p><%= t 'user.login.with openid' %></p>
-
-    <ul id="login_openid_buttons">
-        <li><%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %></li>
-        <li><%= openid_button "google", "gmail.com" %></li>
-        <li><%= openid_button "yahoo", "me.yahoo.com" %></li>
-        <li><%= openid_button "myopenid", "myopenid.com" %></li>
-        <li><%= openid_button "wordpress", "wordpress.com" %></li>
-        <li><%= openid_button "aol", "aol.com" %></li>
-    </ul>
-
-    <div>
-      <fieldset id="login_openid_url">
-        <label><%= raw t 'user.login.openid', :logo => openid_logo %></label>
-        <%= url_field_tag("openid_url", "", { :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
-        <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
-      </fieldset>
-      <fieldset id="remember_me_openid">
-        <label for="remember_me"><%= t 'user.login.remember' %></label>
-        <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
+
+      <fieldset class='form-divider'>
+
+        <p class='standard-label'><%= t 'user.login.with external' %></p>
+
+        <ul class='clearfix' id="login_auth_buttons">
+          <li><%= link_to image_tag("openid.png", :alt => t("user.login.auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.auth_providers.openid.title") %></li>
+          <% if defined?(GOOGLE_AUTH_ID) -%>
+          <li><%= auth_button "google", "google" %></li>
+          <% end -%>
+          <% if defined?(FACEBOOK_AUTH_ID) -%>
+          <li><%= auth_button "facebook", "facebook" %></li>
+          <% end -%>
+          <% if defined?(WINDOWSLIVE_AUTH_ID) -%>
+          <li><%= auth_button "windowslive", "windowslive" %></li>
+          <% end -%>
+          <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
+          <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
+          <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
+        </ul>
+
+        <div id='login_openid_url' class='form-row'>
+          <label for='openid_url' class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
+          <%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %>
+          <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
+        </div>
+
+        <div class='form-row'>
+          <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
+          <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" %>
+
       </fieldset>
+
     </div>
-    <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+
   <% end %>
 
 </div>
 
 <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();
+    $("#login_auth_buttons").hide();
     $("#login_openid_url").show();
     $("#login_openid_submit").show();
   });
 
-  $(".openid_button").click(function() {
-    $("#openid_url").val($(this).attr("data-url"));
-    $("#login_form").submit();
-  });
-
   $("#login_openid_url").hide();
   $("#login_openid_submit").hide();
 });