diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index e394a8c27..6cac5cecb 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,16 +1,64 @@ + +

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

<%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new', :referer => params[:referer]) %>

<% form_tag :action => 'login' do %> -<%= hidden_field_tag('referer', h(params[:referer])) %> - - - - - - - - -
<%= t 'user.login.email or username' %><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.password' %><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)

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

<%= t 'user.login.openid' %><%= text_field('user', 'openid_url',{:size => 28, :maxlength => 255, :tabindex => 3}) %> (<%= t 'user.account.openid.link text' %>)
 
 
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %><%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
+ <%= hidden_field_tag('referer', h(params[:referer])) %> +
+
+

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

+ + + + +
<%= t 'user.login.email or username' %><%= text_field('user', 'email',{:value => "", :size => 28, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.password' %><%= password_field('user', 'password',{:value => "", :size => 28, :maxlength => 255, :tabindex => 2}) %>
(<%= 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_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" %> + +
+
+ + +
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %><%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
+
+
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 02eff8f56..e6e0c6c0e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1375,7 +1375,9 @@ en: password: "Password:" openid: "OpenID:" openid description: "Use your OpenID to login" - alternatively: "Alternatively" + 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" diff --git a/public/images/google.gif b/public/images/google.gif new file mode 100644 index 000000000..ed6ba1093 Binary files /dev/null and b/public/images/google.gif differ diff --git a/public/images/myopenid.png b/public/images/myopenid.png new file mode 100644 index 000000000..78e4562e4 Binary files /dev/null and b/public/images/myopenid.png differ diff --git a/public/images/myspace.png b/public/images/myspace.png new file mode 100644 index 000000000..2fefe48af Binary files /dev/null and b/public/images/myspace.png differ diff --git a/public/images/openid-inputicon.gif b/public/images/openid-inputicon.gif new file mode 100644 index 000000000..cde836c89 Binary files /dev/null and b/public/images/openid-inputicon.gif differ diff --git a/public/images/openid_logo.png b/public/images/openid_logo.png new file mode 100644 index 000000000..8a8a92453 Binary files /dev/null and b/public/images/openid_logo.png differ diff --git a/public/images/wordpress.png b/public/images/wordpress.png new file mode 100644 index 000000000..901549859 Binary files /dev/null and b/public/images/wordpress.png differ diff --git a/public/images/yahoo.gif b/public/images/yahoo.gif new file mode 100644 index 000000000..078f30971 Binary files /dev/null and b/public/images/yahoo.gif differ diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index b6ee99712..11a0d20ea 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -739,3 +739,15 @@ abbr.geo { .table1 { background: #fff; } + +/* Rules for Login page */ +.loginBox { + float: left; + width: 400px; + height: 200px; + margin-bottom: 40px; + border-style: solid; + border-width: 1px; + padding-left: 10px; + padding-right: 10px; +} diff --git a/public/stylesheets/small.css b/public/stylesheets/small.css index b11aebf69..82a93544b 100644 --- a/public/stylesheets/small.css +++ b/public/stylesheets/small.css @@ -109,3 +109,18 @@ h1 { width: 100%; max-width: 18em; } + +#loginForm input#user_openid_url { + width: 100%; + max-width: 18em; +} + +/* Rules for Login page */ +.loginBox { + float: left; + width: 90%; + border-style: solid; + border-width: 1px; + padding-left: 10px; + padding-right: 10px; +} \ No newline at end of file