Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
5d879a06
Commit
5d879a06
authored
Oct 28, 2011
by
gitlabhq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
signin page
parent
487ae906
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
19 deletions
+38
-19
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+1
-0
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+10
-0
app/views/devise/sessions/new.html.erb
app/views/devise/sessions/new.html.erb
+11
-19
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+16
-0
No files found.
app/assets/stylesheets/projects.css.scss
View file @
5d879a06
...
@@ -430,6 +430,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
...
@@ -430,6 +430,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
color
:
#444
;
color
:
#444
;
font-size
:
22px
;
font-size
:
22px
;
padding-top
:
5px
;
padding-top
:
5px
;
margin
:
2px
;
}
}
}
}
...
...
app/controllers/application_controller.rb
View file @
5d879a06
...
@@ -8,8 +8,18 @@ class ApplicationController < ActionController::Base
...
@@ -8,8 +8,18 @@ class ApplicationController < ActionController::Base
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"gitosis_error"
),
:layout
=>
false
render
:file
=>
File
.
join
(
Rails
.
root
,
"public"
,
"gitosis_error"
),
:layout
=>
false
end
end
layout
:layout_by_resource
protected
protected
def
layout_by_resource
if
devise_controller?
"devise"
else
"application"
end
end
def
abilities
def
abilities
@abilities
||=
Six
.
new
@abilities
||=
Six
.
new
end
end
...
...
app/views/devise/sessions/new.html.erb
View file @
5d879a06
<h2>
Sign in
</h2>
<%=
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"
%>
<div
class=
"span-12 colborder"
>
<%
if
devise_mapping
.
rememberable?
-%>
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
session_path
(
resource_name
))
do
|
f
|
%>
<div>
<%=
f
.
check_box
:remember_me
%>
<%=
f
.
label
:remember_me
%>
</div>
<div>
<%=
f
.
label
:email
%>
<br
/>
<%
end
-%>
<%=
f
.
text_field
:email
%>
</div>
<br/>
<%=
f
.
submit
"Sign in"
,
:class
=>
"grey-button"
%>
<div>
<%=
f
.
label
:password
%>
<br
/>
<div
class=
"right"
>
<%=
render
:partial
=>
"devise/shared/links"
%>
</div>
<%=
f
.
password_field
:password
%>
</div>
<%
end
%>
<%
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>
app/views/layouts/devise.html.haml
0 → 100644
View file @
5d879a06
!!!
%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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment