deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve devise views

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-07 13:20:33 +02:00
parent 210e9cd489
commit 66121d6caa
4 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/sections/login.scss
View file

@ -1,7 +1,7 @@
/* Login Page */
body.login-page{
padding-top: 10%;
background: #f1f1f1;
body.login-page{
padding-top: 7%;
background: #666;
}
.login-box{

10
app/views/devise/passwords/new.html.erb
View file

@ -1,9 +1,9 @@
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %>
<%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| %>
<%= image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo" %>
<%= devise_error_messages! %>
<%= f.email_field :email, :placeholder => "Email", :class => "text" %>
<%= f.email_field :email, placeholder: "Email", class: "text" %>
<br/>
<br/>
<%= f.submit "Reset password", :class => "btn-primary btn" %>
<div class="right"> <%= link_to "Sign in", new_session_path(resource_name), :class => "btn" %><br /></div>
<%= f.submit "Reset password", class: "btn-primary btn" %>
<div class="pull-right"> <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /></div>
<% end %>

19
app/views/devise/registrations/new.html.haml
View file

@ -1,19 +1,18 @@
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "login-box" }) do |f|
= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo"
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
= image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
= devise_error_messages!
%div
= f.text_field :name, :class => "text top", :placeholder => "Name", :required => true
= f.text_field :name, class: "text top", placeholder: "Name", required: true
%div
= f.text_field :username, :class => "text middle", :placeholder => "Username", :required => true
= f.text_field :username, class: "text middle", placeholder: "Username", required: true
%div
= f.email_field :email, :class => "text middle", :placeholder => "Email", :required => true
= f.email_field :email, class: "text middle", placeholder: "Email", required: true
%div
= f.password_field :password, :class => "text middle", :placeholder => "Password", :required => true
= f.password_field :password, class: "text middle", placeholder: "Password", required: true
%div
= f.password_field :password_confirmation, :class => "text bottom", :placeholder => "Confirm password", :required => true
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm password", required: true
%div
= f.submit "Sign up", :class => "btn-primary btn wide"
%br
= 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 => "right"
= link_to "Forgot your password?", new_password_path(resource_name), class: "pull-right"

6
app/views/devise/sessions/new.html.haml
View file

@ -11,18 +11,18 @@
= f.check_box :remember_me
%span Remember me
%br/
= f.submit "Sign in", :class => "btn-primary btn wide"
= f.submit "Sign in", :class => "btn-create btn"
.pull-right
= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
%br/
%br/
- if Gitlab.config.gitlab.signup_enabled
%hr/
Don't have an account?
= link_to "Sign up", new_registration_path(resource_name)
.clearfix
- if devise_mapping.omniauthable? && resource_class.omniauth_providers.present?
%hr
%div
%span Sign in with: &nbsp;
- resource_class.omniauth_providers.each do |provider|
%span
= link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider)