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
Kazuhiko Shiozaki
gitlab-ce
Commits
1ffb4b98
Commit
1ffb4b98
authored
Oct 28, 2011
by
gitlabhq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new design/layout started. projects page
parent
3fa770dd
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
605 additions
and
43 deletions
+605
-43
app/assets/images/.directory
app/assets/images/.directory
+1
-1
app/assets/images/bg-header.png
app/assets/images/bg-header.png
+0
-0
app/assets/images/images.png
app/assets/images/images.png
+0
-0
app/assets/images/login-logo.png
app/assets/images/login-logo.png
+0
-0
app/assets/javascripts/modernizr-2.0.6.min.js
app/assets/javascripts/modernizr-2.0.6.min.js
+4
-0
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+3
-3
app/assets/stylesheets/style.scss
app/assets/stylesheets/style.scss
+521
-0
app/views/layouts/_head_panel.html.erb
app/views/layouts/_head_panel.html.erb
+29
-10
app/views/layouts/_page_title.html.haml
app/views/layouts/_page_title.html.haml
+6
-0
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+19
-15
app/views/projects/_tile.html.haml
app/views/projects/_tile.html.haml
+15
-14
app/views/projects/index.html.haml
app/views/projects/index.html.haml
+7
-0
No files found.
app/assets/images/.directory
View file @
1ffb4b98
[Dolphin]
ShowPreview=true
Timestamp=2011,
9,14,20,34,18
Timestamp=2011,
10,28,13,16,25
Version=2
app/assets/images/bg-header.png
0 → 100644
View file @
1ffb4b98
212 Bytes
app/assets/images/images.png
0 → 100644
View file @
1ffb4b98
6.32 KB
app/assets/images/login-logo.png
0 → 100644
View file @
1ffb4b98
1.4 KB
app/assets/javascripts/modernizr-2.0.6.min.js
0 → 100755
View file @
1ffb4b98
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/projects.css.scss
View file @
1ffb4b98
...
...
@@ -210,9 +210,9 @@ table.round-borders {
padding
:
20px
;
}
body
{
background
:
#eaeaea
;
}
//
body {
//
background: #eaeaea;
//
}
a
{
color
:
#111
;
...
...
app/assets/stylesheets/style.scss
0 → 100755
View file @
1ffb4b98
This diff is collapsed.
Click to expand it.
app/views/layouts/_head_panel.html.erb
View file @
1ffb4b98
<div
id=
"header-panel"
>
<!-- Page Header -->
<header>
<h1
class=
"logo"
>
<a
href=
"/"
>
GITLAB
</a></h1>
<div
class=
"login-top"
>
<%=
link_to
profile_path
,
:class
=>
"pic"
do
%>
<%=
image_tag
gravatar_icon
(
current_user
.
email
)
%>
<%
end
%>
<%=
link_to
profile_path
,
:class
=>
"username"
do
%>
<%=
current_user
.
name
%>
<%
end
%>
<%=
link_to
'Logout'
,
destroy_user_session_path
,
:class
=>
"logout"
,
:method
=>
:delete
%>
</div>
<!-- .login-top -->
<nav>
<%=
link_to
root_path
,
:class
=>
current_page?
(
root_path
)
?
"current dashboard"
:
"dashboard"
do
%>
<span></span>
Dashboard
<%
end
%>
<%=
link_to
projects_path
,
:class
=>
current_page?
(
projects_path
)
?
"current project"
:
"project"
do
%>
<span></span>
Projects
<%
end
%>
<%=
link_to
(
admin_root_path
,
:class
=>
admin_namespace?
?
"current admin"
:
"admin"
)
do
%>
<span></span>
Admin
<%
end
if
current_user
.
is_admin?
%>
</nav>
</header>
<!-- eo Page Header -->
<div
id=
"header-panel"
style=
"display:none"
>
<div
class=
"container"
>
<div
class=
"span-24"
>
<div
class=
"span-10"
>
<%#= image_tag "git.png", :height => 40, :class => "left" %>
<%#= link_to "gitlab", root_path, :id => "logo" %>
<span
class=
"search-holder"
>
<%=
text_field_tag
"search"
,
nil
,
:placeholder
=>
"Search"
%>
</span>
</div>
<div
class=
"right"
>
<%=
link_to
truncate
(
@project
.
name
,
:length
=>
20
),
project_path
(
@project
),
:class
=>
"current button"
if
@project
&&
!
@project
.
new_record?
%>
<%=
link_to
'Projects'
,
projects_path
,
:class
=>
current_page?
(
projects_path
)
?
"current button"
:
"button"
%>
<%=
link_to
(
'Admin'
,
admin_root_path
,
:class
=>
admin_namespace?
?
"current button"
:
"button"
)
if
current_user
.
is_admin?
%>
<%=
link_to
profile_path
,
:class
=>
((
controller
.
controller_name
==
"keys"
||
controller
.
controller_name
==
"profile"
)
?
"current button"
:
"button"
)
do
%>
<%=
image_tag
gravatar_icon
(
current_user
.
email
)
%>
<%=
current_user
.
name
.
split
(
" "
).
first
%>
<%
end
%>
<%=
link_to
'Logout'
,
destroy_user_session_path
,
:style
=>
"border-left: 1px solid #666;"
,
:class
=>
"button"
,
:method
=>
:delete
%>
</div>
</div>
</div>
...
...
app/views/layouts/_page_title.html.haml
0 → 100644
View file @
1ffb4b98
-
if
content_for?
(
:page_title
)
=
yield
:page_title
-
else
.page-title
.container_3
%h1
=
controller
.
controller_name
.
capitalize
app/views/layouts/application.html.haml
View file @
1ffb4b98
...
...
@@ -3,10 +3,10 @@
%head
%title
GitLab
#{
" - #{@project.name}"
if
@project
&&
!
@project
.
new_record?
}
=
stylesheet_link_tag
'blueprint/screen'
,
:media
=>
"screen, projection"
=
stylesheet_link_tag
'blueprint/print'
,
:media
=>
"print"
=
stylesheet_link_tag
'blueprint/plugins/buttons/screen'
,
:media
=>
"screen, projection"
=
stylesheet_link_tag
'blueprint/plugins/link-icons/screen'
,
:media
=>
"screen, projection"
-#
= stylesheet_link_tag 'blueprint/screen', :media => "screen, projection"
-#
= stylesheet_link_tag 'blueprint/print', :media => "print"
-#
= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
-#
= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
=
stylesheet_link_tag
"application"
=
javascript_include_tag
"application"
=
csrf_meta_tags
...
...
@@ -15,14 +15,18 @@
REQ_URI = "
#{
request
.
env
[
"REQUEST_URI"
]
}
";
REQ_REFFER = "
#{
request
.
env
[
"HTTP_REFERER"
]
}
";
%body
#thebody
=
render
:partial
=>
"layouts/flash"
-
if
user_signed_in?
=
render
:partial
=>
"layouts/head_panel"
.top_bar.container
=
render
:partial
=>
"projects/top_menu"
if
@project
&&
!
@project
.
new_record?
=
render
:partial
=>
"projects/projects_top_menu"
if
(
controller
.
controller_name
==
"projects"
&&
[
"index"
,
"new"
,
"create"
].
include?
(
controller
.
action_name
))
&&
!
admin_namespace?
=
render
:partial
=>
"profile/top_menu"
if
[
"keys"
,
"profile"
].
include?
(
controller
.
controller_name
)
=
render
:partial
=>
"admin/top_menu"
if
admin_namespace?
#content-container
.container
.span-24
=
yield
#container
=
render
:partial
=>
"layouts/flash"
-
if
user_signed_in?
=
render
:partial
=>
"layouts/head_panel"
=
render
:partial
=>
"layouts/page_title"
-
if
@project
&&
!
@project
.
new_record?
.top_bar.container
=
render
:partial
=>
"projects/top_menu"
-
if
[
"keys"
,
"profile"
].
include?
(
controller
.
controller_name
)
.top_bar.container
=
render
:partial
=>
"profile/top_menu"
-
if
admin_namespace?
.top_bar.container
=
render
:partial
=>
"admin/top_menu"
%div
{
:id
=>
"main"
,
:role
=>
"main"
,
:class
=>
"container_3"
}
#content-container
=
yield
app/views/projects/_tile.html.haml
View file @
1ffb4b98
-
@projects
.
in_groups_of
(
3
,
false
)
do
|
projects
|
-
projects
.
each_with_index
do
|
project
,
i
|
%div
{
:class
=>
"project_thumb round-borders"
,
:style
=>
i
==
2
?
""
:
"margin-right:30px;"
}
%div
{
:class
=>
"project"
,
:url
=>
project_path
(
project
)
}
%h2
=
image_tag
gravatar_icon
(
project
.
name
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
=
link_to
(
"/"
+
project
.
code
),
project_path
(
project
),
:style
=>
"text-decoration:none"
%p
=
project
.
name
%p
=
project
.
url_to_repo
-#%p
Commit –
= last_commit(project)
%hr
=
link_to
"Browse Code"
,
tree_project_path
(
project
),
:class
=>
"lbutton"
=
link_to
"Commits"
,
project_commits_path
(
project
),
:class
=>
"lbutton"
,
:style
=>
"float:right;width:80px;"
.clear
%div
.grid_1
%div
{
:class
=>
"project-box ui-box ui-box-big"
,
:style
=>
i
==
2
?
""
:
"margin-right:30px;"
}
=
link_to
project_path
(
project
)
do
%h3
=
project
.
name
.data
%p
.title.repository
%span
Repository:
=
project
.
url_to_repo
%p
.title.activity
%span
Last Activity:
-
last_note
=
project
.
notes
.
last
=
last_note
?
last_note
.
created_at
.
stamp
(
"24 Aug, 2011"
)
:
"Never"
.buttons
%a
.browse-code.button.yellow
{
:href
=>
tree_project_path
(
project
)}
Browse code
%a
.commits.button.green
{
:href
=>
project_commits_path
(
project
)}
Commits
app/views/projects/index.html.haml
View file @
1ffb4b98
-
content_for
(
:page_title
)
do
.page-title
.container_3
-
if
current_user
.
can_create_project?
%a
.grey-button
{
:href
=>
new_project_path
}
Create new project
%h1
Projects
-
unless
@projects
.
empty?
%div
{
:class
=>
"tile"
,
:style
=>
view_mode_style
(
"tile"
)}
=
render
"tile"
...
...
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