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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d6b051c5
Commit
d6b051c5
authored
Mar 03, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get rid of sidebar
parent
62707bb7
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
28 additions
and
121 deletions
+28
-121
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-1
app/views/layouts/_project_side_right.html.haml
app/views/layouts/_project_side_right.html.haml
+0
-8
app/views/layouts/_projects_side.html.haml
app/views/layouts/_projects_side.html.haml
+0
-21
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+1
-3
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+1
-6
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+1
-1
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+9
-10
app/views/projects/_team.html.haml
app/views/projects/_team.html.haml
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+9
-2
app/views/team_members/_show.html.haml
app/views/team_members/_show.html.haml
+5
-3
app/views/widgets/_project_member.html.haml
app/views/widgets/_project_member.html.haml
+0
-54
app/views/widgets/_recent_projects.html.haml
app/views/widgets/_recent_projects.html.haml
+0
-11
No files found.
app/views/issues/_show.html.haml
View file @
d6b051c5
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
=
link_to
project_issue_path
(
issue
.
project
,
issue
)
do
=
link_to
project_issue_path
(
issue
.
project
,
issue
)
do
%p
.row_title
=
truncate
(
issue
.
title
,
:length
=>
6
0
)
%p
.row_title
=
truncate
(
issue
.
title
,
:length
=>
10
0
)
...
...
app/views/layouts/_project_side_right.html.haml
deleted
100644 → 0
View file @
62707bb7
%aside
.project-right
-
if
content_for?
:sidebar_all
=
render
:sidebar_all
-
else
-
if
content_for?
:sidebar_top_block
=
yield
:sidebar_top_block
=
render
"widgets/project_member"
=
render
"widgets/recent_projects"
app/views/layouts/_projects_side.html.haml
deleted
100644 → 0
View file @
62707bb7
%aside
.projects
-
if
current_user
.
can_create_project?
.widget
You can create up to
=
current_user
.
projects_limit
projects. Click on link below to add a new one
.link_holder
=
link_to
new_project_path
,
:class
=>
""
do
New Project »
-
if
current_user
.
is_admin?
.widget
You have administrator privilegies. You can configure application following this button:
.link_holder
=
link_to
admin_root_path
,
:class
=>
""
,
:title
=>
"Admin"
do
Visit Admin Area »
-
if
current_user
.
projects
.
count
>
0
=
render
"widgets/recent_projects"
app/views/layouts/profile.html.haml
View file @
d6b051c5
...
@@ -13,6 +13,4 @@
...
@@ -13,6 +13,4 @@
=
link_to
keys_path
,
:class
=>
controller
.
controller_name
==
"keys"
?
"current"
:
nil
do
=
link_to
keys_path
,
:class
=>
controller
.
controller_name
==
"keys"
?
"current"
:
nil
do
SSH Keys
SSH Keys
.content
.content
.row
=
yield
.span12
=
yield
.sidebar
=
render
"layouts/projects_side"
app/views/layouts/project.html.haml
View file @
d6b051c5
...
@@ -7,10 +7,5 @@
...
@@ -7,10 +7,5 @@
.container
.container
=
render
:partial
=>
"layouts/project_menu"
=
render
:partial
=>
"layouts/project_menu"
.content
.content
-
if
@full_content
=
yield
=
yield
-
else
.row
.span12
=
yield
.sidebar
=
render
"layouts/project_side_right"
app/views/merge_requests/_merge_request.html.haml
View file @
d6b051c5
...
@@ -10,4 +10,4 @@
...
@@ -10,4 +10,4 @@
→
→
%span
.label
=
merge_request
.
target_branch
%span
.label
=
merge_request
.
target_branch
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
=
link_to
project_merge_request_path
(
merge_request
.
project
,
merge_request
)
do
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
6
0
)
%p
.row_title
=
truncate
(
merge_request
.
title
,
:length
=>
10
0
)
app/views/projects/_project_head.html.haml
View file @
d6b051c5
...
@@ -2,11 +2,6 @@
...
@@ -2,11 +2,6 @@
%li
{
:class
=>
"#{'active' if current_page?(project_path(@project)) }"
}
%li
{
:class
=>
"#{'active' if current_page?(project_path(@project)) }"
}
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab"
do
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab"
do
Show
Show
-
if
can?
current_user
,
:admin_project
,
@project
%li
{
:class
=>
"#{'active' if current_page?(edit_project_path(@project)) }"
}
=
link_to
edit_project_path
(
@project
),
:class
=>
"stat-tab tab "
do
Edit
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
team_members
") || current_page?(team_project_path(@project)) }"
}
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
team_members
") || current_page?(team_project_path(@project)) }"
}
=
link_to
team_project_path
(
@project
),
:class
=>
"team-tab tab"
do
=
link_to
team_project_path
(
@project
),
:class
=>
"team-tab tab"
do
Team
Team
...
@@ -18,11 +13,15 @@
...
@@ -18,11 +13,15 @@
Snippets
Snippets
-
if
can?
current_user
,
:admin_project
,
@project
-
if
can?
current_user
,
:admin_project
,
@project
%li
{
:class
=>
"#{'active' if controller.controller_name == "
hooks
" }"
}
%li
.right
{
:class
=>
"#{'active' if controller.controller_name == "
deploy_keys
"}"
}
=
link_to
project_hooks_path
(
@project
)
do
%span
Hooks
%li
{
:class
=>
"#{'active' if controller.controller_name == "
deploy_keys
"}"
}
=
link_to
project_deploy_keys_path
(
@project
)
do
=
link_to
project_deploy_keys_path
(
@project
)
do
%span
%span
Deploy Keys
Deploy Keys
%li
.right
{
:class
=>
"#{'active' if controller.controller_name == "
hooks
" }"
}
=
link_to
project_hooks_path
(
@project
)
do
%span
Hooks
%li
.right
{
:class
=>
"#{'active' if current_page?(edit_project_path(@project)) }"
}
=
link_to
edit_project_path
(
@project
),
:class
=>
"stat-tab tab "
do
Edit
app/views/projects/_team.html.haml
View file @
d6b051c5
%ul
.
media-grid
%ul
.
unstyled.ui-box
-
@project
.
users_projects
.
each
do
|
up
|
-
@project
.
users_projects
.
each
do
|
up
|
=
render
(
:partial
=>
'team_members/show'
,
:locals
=>
{
:member
=>
up
})
=
render
(
:partial
=>
'team_members/show'
,
:locals
=>
{
:member
=>
up
})
...
...
app/views/projects/show.html.haml
View file @
d6b051c5
=
render
"project_head"
=
render
"project_head"
%h3
%h3
=
@project
.
name
=
@project
.
name
-
if
can?
current_user
,
:download_code
,
@project
%span
.right
=
link_to
"Download"
,
archive_project_repository_path
(
@project
),
:class
=>
"btn small right"
-
if
can?
current_user
,
:download_code
,
@project
=
link_to
"Download"
,
archive_project_repository_path
(
@project
),
:class
=>
"btn small padded"
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small padded"
do
Merge Request
-
if
@project
.
issues_enabled
&&
can?
(
current_user
,
:write_issue
,
@project
)
=
link_to
new_project_issue_path
(
@project
),
:title
=>
"New Issue"
,
:class
=>
"btn small"
do
Issue
.back_link
.back_link
=
link_to
projects_path
do
=
link_to
projects_path
do
←
To projects list
←
To projects list
...
...
app/views/team_members/_show.html.haml
View file @
d6b051c5
-
user
=
member
.
user
-
user
=
member
.
user
-
allow_admin
=
can?
current_user
,
:admin_project
,
@project
-
allow_admin
=
can?
current_user
,
:admin_project
,
@project
%li
{
:id
=>
dom_id
(
member
),
:class
=>
"team_member_row"
}
%li
{
:id
=>
dom_id
(
member
),
:class
=>
"team_member_row wll"
}
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
user
.
name
do
.left
=
image_tag
gravatar_icon
(
user
.
email
,
60
),
:class
=>
"thumbnail"
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
user
.
name
do
=
image_tag
gravatar_icon
(
user
.
email
,
60
),
:class
=>
"styled_image"
.row
.row
.span8
.span8
%h4
%h4
=
truncate
(
user
.
name
,
:lenght
=>
24
)
=
truncate
(
user
.
name
,
:lenght
=>
24
)
%br
%small
=
truncate
user
.
email
,
:lenght
=>
24
%small
=
truncate
user
.
email
,
:lenght
=>
24
.span3
.span3
...
...
app/views/widgets/_project_member.html.haml
deleted
100644 → 0
View file @
62707bb7
-
member
=
@project
.
team_member_by_id
(
current_user
.
id
)
.widget
.media-grid
%li
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
current_user
.
name
do
=
image_tag
gravatar_icon
(
current_user
.
email
,
60
),
:class
=>
"thumbnail"
,
:width
=>
60
%h4
Hey,
#{
truncate
current_user
.
first_name
,
:lenght
=>
24
}
!
%p
-
if
@project
.
issues_enabled
%span
Assigned Issues:
=
current_user
.
assigned_issues
.
opened
.
count
%br
-
if
@project
.
merge_requests_enabled
%span
Assigned Requests:
=
current_user
.
assigned_merge_requests
.
opened
.
count
%br
%br
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small padded"
do
Merge Request
-
if
@project
.
issues_enabled
&&
can?
(
current_user
,
:write_issue
,
@project
)
=
link_to
new_project_issue_path
(
@project
),
:title
=>
"New Issue"
,
:class
=>
"btn small"
do
Issue
%hr
%p
Your access level in this project is
%code
#{
member
.
project_access_human
}
%br
Visit member card for more information
.link_holder
=
link_to
project_team_member_path
(
@project
,
member
),
:title
=>
current_user
.
name
do
=
"Member Card »"
-#- if can? current_user, :write_project, @project
.widget
- if @project.issues_enabled && @project.merge_requests_enabled
.span3
%p You have access to create new issue or merge request.
%div
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "" do
New Issue »
%div
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "" do
New Merge Request »
app/views/widgets/_recent_projects.html.haml
deleted
100644 → 0
View file @
62707bb7
-
if
current_user
.
projects
.
count
>
0
%div
.widget
%h4
Recent Projects:
%ul
-
current_user
.
projects
.
order
(
"id DESC"
).
limit
(
5
).
each
do
|
project
|
%li
=
link_to
project_path
(
project
)
do
=
project
.
name
.link_holder
=
link_to
"Projects » "
,
projects_path
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