From: Ævar Arnfjörð Bjarmason Date: Tue, 27 Apr 2010 20:32:43 +0000 (+0000) Subject: Tweak the OpenID login page X-Git-Tag: live~6331 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/79e140641c1b73a2776f28d4a3bfc9cfc5ef0401 Tweak the OpenID login page * Replace 'foo' alt text with a real alt text and add title="" text too * Don't display an "Or" between the two, it's obvious from context that it's either-or * Display a small OpenID logo next to the login form (from http://openid.net/foundation/news/logos/) * Fix some indenting / HTML errors in the login table * Don't add border: 1px style to the OpenID provider logos. Prettier this way and doesn't include inline CSS --- diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 6cac5cecb..c8cbdbaf2 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -38,23 +38,48 @@ function openid_signin(provider) (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>) -
-

<%= t 'user.login.or' %>

+

<%= t 'user.login.openid_heading' %>

- + + + + + + + +
<%= t 'user.login.openid' %><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3}) %>
(<%= t 'user.account.openid.link text' %>)
+ <%= image_tag "openid-16x16.gif", :alt => t('user.login.openid_logo_alt') %> + <%= t 'user.login.openid' %> + <%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3}) %>
+ + (<%= t 'user.account.openid.link text' %>) + +
- <%= image_tag "openid_logo.png", :alt => 'foo', :style => "border: solid; border-width: 1px" %> - <%= image_tag "yahoo.gif", :alt => 'foo', :style => "border: solid; border-width: 1px"%> - <%= image_tag "google.gif", :alt => 'foo', :style => "border: solid; border-width: 1px" %> - <%= image_tag "myopenid.png", :alt => 'foo', :style => "border: solid; border-width: 1px" %> - <%= image_tag "wordpress.png", :alt => 'foo', :style => "border: solid; border-width: 1px"%> - <%= image_tag "myspace.png", :alt => 'foo', :style => "border: solid; border-width: 1px" %> - + + <%= image_tag "openid_logo.png", :alt => t('user.login.openid_providers.openid.title') %> + + + <%= image_tag "yahoo.gif", :alt => t('user.login.openid_providers.yahoo.alt') %> + + + <%= image_tag "google.gif", :alt => t('user.login.openid_providers.google.alt') %> + + + <%= image_tag "myopenid.png", :alt => t('user.login.openid_providers.myopenid.alt') %> + + + <%= image_tag "wordpress.png", :alt => t('user.login.openid_providers.wordpress.alt') %> + + + <%= image_tag "myspace.png", :alt => t('user.login.openid_providers.myspace.alt') %> +
+
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8053e710e..8a8d3cdaa 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1512,7 +1512,6 @@ en: openid description: "Use your OpenID to login" username_heading: "Login with username and password:" openid_heading: "Login with an OpenID:" - or: "Or" remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" @@ -1520,6 +1519,26 @@ en: auth failure: "Sorry, could not log in with those details." openid missing provider: "Sorry, could not contact your OpenID provider" openid invalid: "Sorry, your OpenID seems misformed" + openid_logo_alt: "Log in with an OpenID" + openid_providers: + openid: + title: Login with an OpenID URL + alt: Login with an OpenID URL + yahoo: + title: Login with a Yahoo! OpenID + alt: Login with a Yahoo! OpenID + google: + title: Login with a Google OpenID + alt: Login with a Google OpenID + myopenid: + title: Login with a myOpenID OpenID + alt: Login with a myOpenID OpenID + wordpress: + title: Login with a Wordpress.com OpenID + alt: Login with a Wordpress.com OpenID + myspace: + title: Login with a MySpace OpenID + alt: Login with a MySpace OpenID logout: title: "Logout" heading: "Logout from OpenStreetMap" diff --git a/public/images/openid-16x16.gif b/public/images/openid-16x16.gif new file mode 100644 index 000000000..e2d8377db Binary files /dev/null and b/public/images/openid-16x16.gif differ
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %><%= submit_tag t('user.login.login_button'), :tabindex => 3 %>