signin page
This commit is contained in:
parent
487ae906a9
commit
5d879a0643
|
@ -430,6 +430,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
|||
color:#444;
|
||||
font-size:22px;
|
||||
padding-top:5px;
|
||||
margin:2px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -8,8 +8,18 @@ class ApplicationController < ActionController::Base
|
|||
render :file => File.join(Rails.root, "public", "gitosis_error"), :layout => false
|
||||
end
|
||||
|
||||
layout :layout_by_resource
|
||||
|
||||
protected
|
||||
|
||||
def layout_by_resource
|
||||
if devise_controller?
|
||||
"devise"
|
||||
else
|
||||
"application"
|
||||
end
|
||||
end
|
||||
|
||||
def abilities
|
||||
@abilities ||= Six.new
|
||||
end
|
||||
|
|
|
@ -1,20 +1,12 @@
|
|||
<h2>Sign in</h2>
|
||||
|
||||
<div class="span-12 colborder">
|
||||
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
|
||||
<div><%= f.label :email %><br />
|
||||
<%= f.text_field :email %></div>
|
||||
|
||||
<div><%= f.label :password %><br />
|
||||
<%= f.password_field :password %></div>
|
||||
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %>
|
||||
<%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
|
||||
<%= f.text_field :email, :class => "text top" %>
|
||||
<%= f.password_field :password, :class => "text bottom" %>
|
||||
|
||||
<% if devise_mapping.rememberable? -%>
|
||||
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
|
||||
<% end -%>
|
||||
<br/>
|
||||
<div><%= f.submit "Sign in", :class => "lbutton vm" %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div>
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
</div>
|
||||
<%= f.submit "Sign in", :class => "grey-button" %>
|
||||
<div class="right"> <%= render :partial => "devise/shared/links" %></div>
|
||||
<% end %>
|
||||
|
|
16
app/views/layouts/devise.html.haml
Normal file
16
app/views/layouts/devise.html.haml
Normal file
|
@ -0,0 +1,16 @@
|
|||
!!!
|
||||
%html
|
||||
%head
|
||||
%title
|
||||
GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
|
||||
= stylesheet_link_tag "application"
|
||||
= javascript_include_tag "application"
|
||||
= csrf_meta_tags
|
||||
%link{:href => "/assets/favicon.png", :rel => "icon", :type => "image/png"}/
|
||||
= javascript_tag do
|
||||
REQ_URI = "#{request.env["REQUEST_URI"]}";
|
||||
REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
|
||||
%body.login-page
|
||||
#container
|
||||
= render :partial => "layouts/flash"
|
||||
= yield
|
Loading…
Reference in a new issue