Add geoip_database key to example configuration

[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 31379e03e2f47f833947ece6db04b89a0e2991bb..26bb8089579130ab849c3511a2021cde6e5fd946 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,56 +1,88 @@
-<h1><%= t 'user.login.heading' %></h1>
+<% content_for :head do %>
+  <%= javascript_include_tag "login" %>
+<% end %>

 
 

-<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
+<% content_for :heading do %>
+  <h1><%= t 'user.login.heading' %></h1>
+<% end %>

 
 

-<% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
+<div id="login_login">
+  <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>

     <%= hidden_field_tag('referer', h(params[:referer])) %>
     <%= hidden_field_tag('referer', h(params[:referer])) %>

-    <div style="position: relative;">
-        <div class="loginBox">
-            <h3> <%= t 'user.login.username_heading' %></h3>
-            <table id="loginForm" width="100%">
-                <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
-                <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %></td></tr>
-                <tr><td></td><td> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
-            </table>
+
+    <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>
+        <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>

-        <div style="float:left; width: 20px; padding: 10px;">
+        <div class="form-row">
+          <label for="password" class="standard-label">
+            <%= t 'user.login.password' %>
+          </label>
+          <%= password_field_tag "password", "", :tabindex => 2 %>

         </div>
         </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", params[:remember_me] == "yes", :tabindex => 3 %>
+        <label for="remember_me" class="standard-label">
+          <%= t 'user.login.remember' %>
+        </label>
+        <%= submit_tag t('user.login.login_button'), :tabindex => 4 %>
+      </fieldset>
+
+      <fieldset class='form-divider'>
+
+        <p class='standard-label'><%= t 'user.login.with external' %></p>

 
 

-        <div class="loginBox">
-            <h3><%= t 'user.login.openid_heading' %></h3>
-            <table id="loginForm" width="100%">
-                <tr>
-                    <td class="fieldName">
-                        <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %>
-                        <%= t 'user.login.openid' %>
-                    </td>
-                    <td><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url"}) %></td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td>
-                        <span class="minorNote">
-                            (<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)
-                        </span>
-                    </td>
-                </tr>
-            </table>
-            <%=
-              link_to_function(image_tag("openid_logo.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
-                page[:login_form][:user_openid_url][:value] = "http://"
-              end
-            %>
-            <%= openid_button "yahoo", "yahoo.com" %>
-            <%= openid_button "google", "gmail.com" %>
-            <%= openid_button "myopenid", "myopenid.com" %>
-            <%= openid_button "wordpress", "wordpress.com" %>
-            <%= openid_button "myspace", "myspace.com" %>
+        <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 -%>
+          <% if defined?(GITHUB_AUTH_ID) -%>
+          <li><%= auth_button "github", "github" %></li>
+          <% end -%>
+          <% if defined?(WIKIPEDIA_AUTH_ID) -%>
+          <li><%= auth_button "wikipedia", "wikipedia" %></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>
 

-        <div style="clear: both">
-            <table id="loginForm">
-                <tr><td class="fieldName"><label for="remember_me"><%= t 'user.login.remember' %></label></td><td><%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %></td><td align=right><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>
-            </table>
+        <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>

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

     </div>
     </div>

-<% end %>
+
+  <% end %>
+
+</div>