tidier code

[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 9fdeb3ab3bc1892502445675de456997f9933950..ded03318f6e25842993f0df350ac270c82233492 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -12,13 +12,13 @@
 
       <fieldset>
         <div class="form-row">
 
       <fieldset>
         <div class="form-row">

-          <label class="standard-label">
+          <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">
             <%= t 'user.login.email or username' %>
           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
         <div class="form-row">

-          <label class="standard-label">
+          <label for="password" class="standard-label">

             <%= t 'user.login.password' %>
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
             <%= t 'user.login.password' %>
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>


@@ -38,26 +38,34 @@
 
       <fieldset class='form-divider'>
 
 
       <fieldset class='form-divider'>
 

-        <p class='standard-label'><%= t 'user.login.with openid' %></p>
-
-        <ul class='clearfix' 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", "https://www.google.com/accounts/o8/id" %></li>
-          <li><%= openid_button "yahoo", "yahoo.com" %></li>
-          <li><%= openid_button "wordpress", "wordpress.com" %></li>
-          <li><%= openid_button "aol", "aol.com" %></li>
+        <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>
 
         </ul>
 

-          <div id='login_openid_url' class='form-row'>
-            <label 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 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>
+        <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" %>
 
 
         <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
 


@@ -78,7 +86,7 @@ $(document).ready(function() {
 
   $("#openid_open_url").click(function() {
     $("#openid_url").val("http://");
 
   $("#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();
   });
     $("#login_openid_url").show();
     $("#login_openid_submit").show();
   });