-<div id="login_wrapper">
-
- <div id="login_login">
- <h1><%= t 'user.login.heading' %></h1>
-
- <% form_tag({ :action => "login" }, { :id => "login_form" }) do %>
- <%= hidden_field_tag('referer', h(params[:referer])) %>
-
- <p><%= t 'user.login.with username' %></p>
-
- <table id="loginForm">
- <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}) %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
- <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></tr>
- </table>
- <%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
-
- <br clear="all" />
-
- <p><%= t 'user.login.with openid' %></p>
-
- <table id="login_openid_buttons_wide">
- <tr>
- <td>
- <%=
- link_to_function(image_tag("openid_large.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
- page[:login_form][:openid_url].value = "http://"
- page[:login_openid_buttons_wide].hide
- page[:login_openid_url].show
- page[:login_openid_submit].show
- end
- %>
- </td>
- <td><%= openid_button "google", "gmail.com" %></td>
- <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
- </tr>
- <tr>
- <td><%= openid_button "myopenid", "myopenid.com" %></td>
- <td><%= openid_button "wordpress", "wordpress.com" %></td>
- <td><%= openid_button "aol", "aol.com" %></td>
- </tr>
- </table>
-
- <table id="login_openid_buttons_narrow">
- <tr>
- <td>
- <%=
- link_to_function(image_tag("openid_large.png", :alt => t("user.login.openid_providers.openid.title")), nil, :title => t("user.login.openid_providers.openid.title")) do |page|
- page[:login_form][:openid_url].value = "http://"
- page[:login_openid_buttons_narrow].hide
- page[:login_openid_url].show
- page[:login_openid_submit].show
- end
- %>
- </td>
- <td><%= openid_button "google", "gmail.com" %></td>
- </tr>
- <tr>
- <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
- <td><%= openid_button "myopenid", "myopenid.com" %></td>
- </tr>
- <tr>
- <td><%= openid_button "wordpress", "wordpress.com" %></td>
- <td><%= openid_button "aol", "aol.com" %></td>
- </tr>
- </table>
-
- <table>
- <tr id="login_openid_url">
- <td class="fieldName nowrap">
- <%= t 'user.login.openid', :logo => openid_logo %>
- </td>
- <td>
- <%= text_field_tag("openid_url", "", { :size => 28, :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>
- </td>
- </tr>
- <tr>
- <td class="fieldName nowrap" id="remember_me_label"><label for="remember_me"><%= t 'user.login.remember' %></label></td>
- <td width="100%"><%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %></td>
- </tr>
- </table>
-
- <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
- <% end %>
-
- <br clear="all" />
- </div>
-
- <div id="login_signup">
- <h2><%= t 'user.login.new to osm' %></h2>
- <p><%= t 'user.login.to make changes' %></p>
- <p><%= t 'user.login.create account minute' %></p>
- <p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
-
- <br clear="both">
- </div>
+<% content_for :head do %>
+ <%= javascript_include_tag "login" %>
+<% end %>
-</div>
+<% content_for :heading do %>
+ <h1><%= t 'user.login.heading' %></h1>
+<% end %>
+
+<div id="login_login">
+ <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
+ <%= hidden_field_tag('referer', h(params[:referer])) %>
+
+ <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 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", 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>
-<%=
- update_page_tag do |page|
- page[:login_openid_url].hide
- page[:login_openid_submit].hide
- end
-%>
+ <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>
+
+ <% end %>
+
+</div>
projects / rails.git / blobdiff