Fix escaping of unicode character in edit menu name

[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 e5f87e180bddb2235d85da30729391cbea0d5c4b..8c079d0f1374e8e140e02b22506623f943eb87b4 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -1,66 +1,80 @@
-<%= javascript_include_tag 'openID.js' %>
+<div id="login_wrapper">
 
-<h1><%= t 'user.login.heading' %></h1>
+  <div id="login_login">
+    <h1><%= t 'user.login.heading' %></h1>
 
-<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %></p>
+    <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
+      <%= hidden_field_tag('referer', h(params[:referer])) %>
 
-<% form_tag :action => 'login' do %>
-    <%= 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>
-        </div>
-        <div style="float:left; width: 20px; padding: 10px;">
-        </div>
+      <p><%= t 'user.login.with username' %></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>
-            <a href="javascript: openid_signin('openid');" title="<%= h(t 'user.login.openid_providers.openid.title') %>">
-                <%= image_tag "openid_logo.png", :alt => t('user.login.openid_providers.openid.title') %>
-            </a>
-            <a href="javascript: openid_signin('yahoo');" title="<%= h(t 'user.login.openid_providers.yahoo.title') %>">
-                <%= image_tag "yahoo.png", :alt => t('user.login.openid_providers.yahoo.alt') %>
-            </a>
-            <a href="javascript: openid_signin('google');" title="<%= h(t 'user.login.openid_providers.google.title') %>">
-                <%= image_tag "google.png", :alt => t('user.login.openid_providers.google.alt') %>
-            </a>
-            <a href="javascript: openid_signin('myopenid');" title="<%= h(t 'user.login.openid_providers.myopenid.title') %>">
-                <%= image_tag "myopenid.png", :alt => t('user.login.openid_providers.myopenid.alt') %>
-            </a>
-            <a href="javascript: openid_signin('wordpress');" title="<%= h(t 'user.login.openid_providers.wordpress.title') %>">
-                <%= image_tag "wordpress.png", :alt => t('user.login.openid_providers.wordpress.alt') %>
-            </a>
-            <a href="javascript: openid_signin('myspace');" title="<%= h(t 'user.login.openid_providers.myspace.title') %>">
-                <%= image_tag "myspace.png", :alt => t('user.login.openid_providers.myspace.alt') %>
-            </a>
-        </div>
+      <table id="loginForm">
+        <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %></td></tr>
+        <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field_tag "password", "", :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 %>
 
-        <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>
-    </div>
-<% end %>
+      <br clear="all" />
+
+      <p><%= t 'user.login.with openid' %></p>
+
+      <table id="login_openid_buttons">
+        <tr>
+          <td>
+            <%=
+              link_to_function(image_tag("openid.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].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>
+          <td><%= openid_button "myopenid", "myopenid.com" %></td>
+          <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>
+
+</div>
+
+<%=
+  update_page_tag do |page|
+    page[:login_openid_url].hide
+    page[:login_openid_submit].hide
+  end
+%>