aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/responsive/_global_style.scss5
-rw-r--r--app/assets/stylesheets/responsive/_signin_layout.scss18
-rw-r--r--app/assets/stylesheets/responsive/_signin_style.scss11
-rw-r--r--app/views/user/_signin.html.erb10
-rw-r--r--app/views/user/_signup.html.erb31
-rw-r--r--app/views/user/sign.html.erb19
6 files changed, 45 insertions, 49 deletions
diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss
index af25fb0b0..0ffa875ab 100644
--- a/app/assets/stylesheets/responsive/_global_style.scss
+++ b/app/assets/stylesheets/responsive/_global_style.scss
@@ -225,6 +225,11 @@ div.pagination {
}
+.pretitle {
+ margin-bottom: -0.5em;
+ color: #666;
+}
+
/* Search result highlighting */
.highlight {
background:#FF0;
diff --git a/app/assets/stylesheets/responsive/_signin_layout.scss b/app/assets/stylesheets/responsive/_signin_layout.scss
index 44999d31b..5a0e0057f 100644
--- a/app/assets/stylesheets/responsive/_signin_layout.scss
+++ b/app/assets/stylesheets/responsive/_signin_layout.scss
@@ -6,7 +6,7 @@
#left_half {
@include grid-column(12);
@include respond-min( $main_menu-mobile_menu_cutoff ){
- @include grid-column($columns:5,$float:left);
+ @include grid-column($columns:7,$float:left);
@include ie8{
padding-right: 0.9375em;
}
@@ -19,7 +19,7 @@
#right_half {
@include grid-column(12);
@include respond-min( $main_menu-mobile_menu_cutoff ){
- @include grid-column($columns:5,$float:right);
+ @include grid-column($columns:4,$float:right);
@include ie8{
padding-left: 0.9375em;
}
@@ -29,20 +29,6 @@
}
}
-#middle_strip {
- @include grid-column(12);
- @include respond-min( $main_menu-mobile_menu_cutoff ){
- @include grid-column($columns:2,$float:left);
- @include ie8{
- padding-left: 0.9375em;
- padding-right: 0.9375em;
- }
- @include lte-ie7 {
- width: 7.438em;
- }
- }
-}
-
#sign_together{
@include grid-row($behavior: nest);
}
diff --git a/app/assets/stylesheets/responsive/_signin_style.scss b/app/assets/stylesheets/responsive/_signin_style.scss
index 2bd2802b4..918392365 100644
--- a/app/assets/stylesheets/responsive/_signin_style.scss
+++ b/app/assets/stylesheets/responsive/_signin_style.scss
@@ -15,14 +15,19 @@
font-size:1.2em;
}
-p#sign_in_reason, p#superuser_message {
+#sign_in_reason, #superuser_message {
font-size:2em;
font-weight:bold;
line-height:1em;
}
-p#superuser_message {
+#superuser_message {
font-size:1.2em;
}
-
+.sign-in-wrapper {
+ margin-top: 1.5em;
+ @include respond-min( $main_menu-mobile_menu_cutoff ){
+ margin-top: 0;
+ }
+}
diff --git a/app/views/user/_signin.html.erb b/app/views/user/_signin.html.erb
index e86791aaf..7428082d3 100644
--- a/app/views/user/_signin.html.erb
+++ b/app/views/user/_signin.html.erb
@@ -9,27 +9,27 @@
<p>
<label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label>
- <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 10 } %>
+ <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 60 } %>
</p>
<p>
<label class="form_label" for="user_signin_password"><%= _('Password:')%></label>
- <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 20, :autocomplete => 'off' } %>
+ <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 70, :autocomplete => 'off' } %>
</p>
<p class="form_note">
- <%= link_to _('Forgotten your password?'), signchangepassword_path(:pretoken => h(params[:token])), :tabindex => 30 %>
+ <%= link_to _('Forgotten your password?'), signchangepassword_path(:pretoken => h(params[:token])), :tabindex => 80 %>
</p>
<p class="form_checkbox">
- <%= check_box_tag 'remember_me', "1", false, :tabindex => 40 %>
+ <%= check_box_tag 'remember_me', "1", false, :tabindex => 90 %>
<label for="remember_me"><%= _('Remember me</label> (keeps you signed in longer;
do not use on a public computer) ')%></p>
<div class="form_button">
<%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %>
<%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %>
- <%= submit_tag _('Sign in'), :tabindex => 50 %>
+ <%= submit_tag _('Sign in'), :tabindex => 100 %>
</div>
<% end %>
diff --git a/app/views/user/_signup.html.erb b/app/views/user/_signup.html.erb
index ec6541881..801d2abe0 100644
--- a/app/views/user/_signup.html.erb
+++ b/app/views/user/_signup.html.erb
@@ -5,35 +5,36 @@
<!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>-->
+
+
<p>
- <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label>
- <%= text_field 'user_signup', 'email', { :size => 20, :tabindex => 60 } %>
+ <label class="form_label" for="user_signup_name"> <%= _('Your name:')%></label>
+ <%= text_field 'user_signup', 'name', { :size => 20, :tabindex => 10, :autocomplete => "off" } %>
</p>
<div class="form_item_note">
- <%= _('We will not reveal your email address to anybody unless you or
- the law tell us to (<a href="{{url}}">details</a>). ', :url => help_privacy_path) %>
+ <%= _('Your <strong>name will appear publicly</strong>
+ (<a href="{{why_url}}">why?</a>)
+ on this website and in search engines.
+ <a href="{{help_url}}">Thinking of using a pseudonym?</a>', :why_url => (help_privacy_path+"#public_request").html_safe, :help_url => (help_privacy_path+"#real_name").html_safe) %>
</div>
<p>
- <label class="form_label" for="user_signup_name"> <%= _('Your name:')%></label>
- <%= text_field 'user_signup', 'name', { :size => 20, :tabindex => 70, :autocomplete => "off" } %>
+ <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label>
+ <%= text_field 'user_signup', 'email', { :size => 20, :tabindex => 20 } %>
</p>
<div class="form_item_note">
- <%= _('Your <strong>name will appear publicly</strong>
- (<a href="{{why_url}}">why?</a>)
- on this website and in search engines. If you
- are thinking of using a pseudonym, please
- <a href="{{help_url}}">read this first</a>.', :why_url => (help_privacy_path+"#public_request").html_safe, :help_url => (help_privacy_path+"#real_name").html_safe) %>
+ <%= _('We will not reveal your email address to anybody unless <a href="{{url}}">you or
+ the law tell us to</a>. ', :url => help_privacy_path) %>
</div>
<p>
<label class="form_label" for="user_signup_password"> <%= _('Password:')%></label>
- <%= password_field 'user_signup', 'password', { :size => 15, :tabindex => 80, :autocomplete => "off" } %>
+ <%= password_field 'user_signup', 'password', { :size => 15, :tabindex => 30, :autocomplete => "off" } %>
</p>
<p>
- <label class="form_label" for="user_signup_password_confirmation"> <%= _('Password: (again)')%></label>
- <%= password_field 'user_signup', 'password_confirmation', { :size => 15, :tabindex => 90, :autocomplete => "off" } %>
+ <label class="form_label" for="user_signup_password_confirmation"> <%= _('Confirm password:')%></label>
+ <%= password_field 'user_signup', 'password_confirmation', { :size => 15, :tabindex => 40, :autocomplete => "off" } %>
</p>
<% if @request_from_foreign_country %>
@@ -43,7 +44,7 @@
<div class="form_button">
<%= hidden_field_tag 'token', params[:token], {:id => 'signup_token' } %>
<%= hidden_field_tag :modal, params[:modal], {:id => 'signup_modal' } %>
- <%= submit_tag _('Sign up'), :tabindex => 100 %>
+ <%= submit_tag _('Sign up'), :tabindex => 50 %>
</div>
<% end %>
diff --git a/app/views/user/sign.html.erb b/app/views/user/sign.html.erb
index 5536e6c73..394c42a47 100644
--- a/app/views/user/sign.html.erb
+++ b/app/views/user/sign.html.erb
@@ -24,26 +24,25 @@
<div id="sign_together">
<% if !@post_redirect.nil? %>
- <p id="sign_in_reason">
+ <h1 id="sign_in_reason">
<% if @post_redirect.reason_params[:web].empty? %>
- <%= _('Please sign in or make a new account.') %>
+ <%= _('Please create an account or sign in') %>
<% else %>
- <%= _('{{reason}}, please sign in or make a new account.', :reason => @post_redirect.reason_params[:web]) %>
+ <%= _('{{reason}}, create an account or sign in', :reason => @post_redirect.reason_params[:web]) %>
<% end %>
- </p>
+ </h1>
<% end %>
<div id="left_half">
- <h1><%= _('Sign up') %></h1>
+ <h2><%= _('Create a new account') %></h2>
<%= render :partial => 'signup' %>
</div>
- <div id="middle_strip">
- <%= _('- or -') %>
- </div>
-
<div id="right_half">
- <h1><%= _('Sign in') %></h1>
+ <div class="sign-in-wrapper">
+ <p class="pretitle"><%= _('Got an account?') %></p>
+ <h2><%= _('Sign in') %></h2>
<%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %>
+ </div>
</div>
<div style="clear:both"></div>