Merge branch 'improve/devise_ui' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents dea02363 42003f53
Showing 8 changed files with 59 additions and 25 deletions Show diff stats
app/assets/stylesheets/sections/login.scss
app/views/devise/confirmations/new.html.haml
app/views/devise/mailer/confirmation_instructions.html.erb
app/views/devise/passwords/edit.html.haml
app/views/devise/passwords/new.html.haml
app/views/devise/registrations/new.html.haml
app/views/devise/sessions/new.html.haml
app/views/layouts/devise.html.haml
@@ -46,3 +46,10 @@ body.login-page{
     margin: 2px;
   }
 }
+
+.devise-errors {
+  h2 {
+   font-size: 14px;
+   color: #a00;
+  }
+}
 .login-box
   %h3.page-title Resend confirmation instructions
   = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
-    = devise_error_messages!
-    = f.email_field :email, placeholder: 'Email'
-    %div= f.submit "Resend confirmation instructions", class: 'btn btn-success'
+    .devise-errors
+      = devise_error_messages!
+    = f.email_field :email, placeholder: 'Email', class: "text", required: true
+    .clearfix.append-bottom-10
+      = f.submit "Resend confirmation instructions", class: 'btn btn-success'
   %hr
-  = link_to "Sign in", new_session_path(resource_name)
+  %p
+    %span.light
+      Already have login and password?
+    %strong
+      = link_to "Sign in", new_session_path(resource_name)
-<p>Welcome <%= @resource.email %>!</p>
+<p>Welcome <%= @resource.name %>!</p>
-<p>You can confirm your account through the link below:</p>
+<% if @resource.unconfirmed_email.present? %>
+  <p>You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:</p>
+<% else %>
+  <p>You can confirm your account through the link below:</p>
+<% end %>
 <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @resource.confirmation_token) %></p>
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f|
   %h3 Change your password
-  = devise_error_messages!
+  .devise-errors
+    = devise_error_messages!
   = f.hidden_field :reset_password_token
   %div
-    = f.password_field :password, class: "text top", placeholder: "New password"
+    = f.password_field :password, class: "text top", placeholder: "New password", required: true
   %div
-    = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
+    = f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password", required: true
   %div
   .clearfix.append-bottom-10
     = f.submit "Change my password", class: "btn btn-primary"
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
   %h3.page-title Reset password
-  = devise_error_messages!
-  = f.email_field :email, placeholder: "Email",  class: "text"
-  %br/
-  %br/
-  = f.submit "Reset password", class: "btn-primary btn"
-  .pull-right
-    = link_to "Sign in", new_session_path(resource_name), class: "btn"
-    %br/
+  .devise-errors
+    = devise_error_messages!
+  = f.email_field :email, placeholder: "Email",  class: "text", required: true
+  .clearfix.append-bottom-10
+    = f.submit "Reset password", class: "btn-primary btn"
+  %hr
+  %p
+    %span.light
+      Already have login and password?
+    %strong
+      = link_to "Sign in", new_session_path(resource_name)
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
   %h3.page-title Sign Up
-  %br
-  = devise_error_messages!
+  .devise-errors
+    = devise_error_messages!
   %div
     = f.text_field :name, class: "text top", placeholder: "Name", required: true
   %div
@@ -15,5 +15,10 @@
   %div
     = f.submit "Sign up", class: "btn-create btn"
   %hr
-  = link_to "Sign in", new_session_path(resource_name)
-  = link_to "Forgot your password?", new_password_path(resource_name), class: "pull-right"
+  %p
+    %span.light
+      Have an account?
+    %strong
+      = link_to "Sign in", new_session_path(resource_name)
+  %p
+    = link_to "Forgot your password?", new_password_path(resource_name)
@@ -17,14 +17,20 @@
   = render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable?
+  %hr
   - if gitlab_config.signup_enabled
-    %hr
-    %div
-      Don't have an account?
+    %p
+      %span.light
+        Don't have an account?
       %strong
         = link_to "Sign up", new_registration_path(resource_name)
+  %p
+    %span.light Did not receive confirmation email?
+    = link_to "Send again", new_confirmation_path(resource_name)
+
+
   - if extra_config.has_key?('sign_in_text')
     %hr
     = markdown(extra_config.sign_in_text)
@@ -11,5 +11,7 @@
             GitLab is open source software to collaborate on code.
             %br
             #{link_to "Sign in", new_user_session_path} or browse for #{link_to "public projects", public_projects_path}.
-        %hr
+    %hr
+    .container
+      .content
         = yield
	@@ -46,3 +46,10 @@ body.login-page{		@@ -46,3 +46,10 @@ body.login-page{
46	margin: 2px;	46	margin: 2px;
47	}	47	}
48	}	48	}
		49	+
		50	+.devise-errors {
		51	+ h2 {
		52	+ font-size: 14px;
		53	+ color: #a00;
		54	+ }
		55	+}
1	-<p>Welcome <%= @resource.email %>!</p>	1	+<p>Welcome <%= @resource.name %>!</p>
2		2
3	-<p>You can confirm your account through the link below:</p>	3	+<% if @resource.unconfirmed_email.present? %>
		4	+ <p>You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:</p>
		5	+<% else %>
		6	+ <p>You can confirm your account through the link below:</p>
		7	+<% end %>
4		8
5	<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @resource.confirmation_token) %></p>	9	<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @resource.confirmation_token) %></p>