Merge branch 'master' into openid

Conflicts:
	app/views/user/login.html.erb

diff --cc app/views/user/login.html.erb
index 4515f412ddec810c95c296d0413573a173fb06a0,7cc4b6f24ad455c960ab175ec263de289789dcff..3d30d9d6915850d20fa6eb52fc30d4d0d7ea7a06
--- 1/app/views/user/login.html.erb
--- 2/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@@ -14,67 -12,14 +14,67 @@@
          <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 %>
 +
 +      <p><%= t 'user.login.with openid' %></p>
 +
 +      <table id="login_openid_buttons">
 +        <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].hide
 +                page[:login_openid_url].show
 +                page[:login_openid_submit].show
 +              end
 +            %>
 +          </td>
 +          <td><%= openid_button "yahoo", "me.yahoo.com" %></td>
 +          <td><%= openid_button "google", "gmail.com" %></td>
 +        </tr>
 +        <tr>
 +          <td><%= openid_button "myopenid", "myopenid.com" %></td>
 +          <td><%= openid_button "wordpress", "wordpress.com" %></td>
 +          <td><%= openid_button "myspace", "myspace.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="both">
 +
+     <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>
+     <p><%= t 'user.login.create account minute' %></p>
      <p><%= button_to t('user.login.register now'), :action => :new, :referer => params[:referer] %></p>
 -    <br clear="all" />
 +
 +    <br clear="both">
    </div>
 +
  </div>
 +
 +<%=
 +  update_page_tag do |page|
 +    page[:login_openid_url].hide
 +    page[:login_openid_submit].hide
 +  end
 +%>

diff --cc app/views/user/terms.html.erb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc public/stylesheets/common.css
Simple merge