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
d8f7748d
Commit
d8f7748d
authored
Sep 26, 2012
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove app_menu and project_menu partials
Now it's consistent across layouts where their main menus are.
parent
8432c9c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
58 deletions
+50
-58
app/views/layouts/_app_menu.html.haml
app/views/layouts/_app_menu.html.haml
+0
-19
app/views/layouts/_project_menu.html.haml
app/views/layouts/_project_menu.html.haml
+0
-33
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+17
-3
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+33
-3
No files found.
app/views/layouts/_app_menu.html.haml
deleted
100644 → 0
View file @
8432c9c1
%ul
.main_menu
=
nav_link
(
path:
'dashboard#index'
,
html_options:
{
class:
'home'
})
do
=
link_to
"Home"
,
root_path
,
title:
"Home"
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
dashboard_issues_path
do
Issues
%span
.count
=
current_user
.
assigned_issues
.
opened
.
count
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
dashboard_merge_requests_path
do
Merge Requests
%span
.count
=
current_user
.
cared_merge_requests
.
count
=
nav_link
(
path:
'search#show'
)
do
=
link_to
"Search"
,
search_path
=
nav_link
(
path:
'help#index'
)
do
=
link_to
"Help"
,
help_path
app/views/layouts/_project_menu.html.haml
deleted
100644 → 0
View file @
8432c9c1
%ul
.main_menu
=
nav_link
(
html_options:
{
class:
"home
#{
project_tab_class
}
"
})
do
=
link_to
@project
.
code
,
project_path
(
@project
),
title:
"Project"
-
if
@project
.
repo_exists?
-
if
can?
current_user
,
:download_code
,
@project
=
nav_link
(
controller:
%w(tree blob blame)
)
do
=
link_to
'Files'
,
project_tree_path
(
@project
,
@ref
||
@project
.
root_ref
)
=
nav_link
(
controller:
%w(commit commits compare repositories protected_branches)
)
do
=
link_to
"Commits"
,
project_commits_path
(
@project
,
@ref
||
@project
.
root_ref
)
=
nav_link
(
path:
'projects#graph'
)
do
=
link_to
"Network"
,
graph_project_path
(
@project
)
-
if
@project
.
issues_enabled
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
link_to
project_issues_filter_path
(
@project
)
do
Issues
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
-
if
@project
.
repo_exists?
-
if
@project
.
merge_requests_enabled
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
)
do
Merge Requests
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
-
if
@project
.
wall_enabled
=
nav_link
(
path:
'projects#wall'
)
do
=
link_to
'Wall'
,
wall_project_path
(
@project
)
-
if
@project
.
wiki_enabled
=
nav_link
(
controller: :wikis
)
do
=
link_to
'Wiki'
,
project_wiki_path
(
@project
,
:index
)
app/views/layouts/application.html.haml
View file @
d8f7748d
...
...
@@ -5,6 +5,20 @@
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
.container
=
render
partial:
"layouts/app_menu"
.content
=
yield
%ul
.main_menu
=
nav_link
(
path:
'dashboard#index'
,
html_options:
{
class:
'home'
})
do
=
link_to
"Home"
,
root_path
,
title:
"Home"
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
dashboard_issues_path
do
Issues
%span
.count
=
current_user
.
assigned_issues
.
opened
.
count
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
dashboard_merge_requests_path
do
Merge Requests
%span
.count
=
current_user
.
cared_merge_requests
.
count
=
nav_link
(
path:
'search#show'
)
do
=
link_to
"Search"
,
search_path
=
nav_link
(
path:
'help#index'
)
do
=
link_to
"Help"
,
help_path
.content
=
yield
app/views/layouts/project.html.haml
View file @
d8f7748d
...
...
@@ -5,7 +5,37 @@
=
render
"layouts/flash"
=
render
"layouts/head_panel"
,
title:
@project
.
name
.container
=
render
partial:
"layouts/project_menu"
.content
=
yield
%ul
.main_menu
=
nav_link
(
html_options:
{
class:
"home
#{
project_tab_class
}
"
})
do
=
link_to
@project
.
code
,
project_path
(
@project
),
title:
"Project"
-
if
@project
.
repo_exists?
-
if
can?
current_user
,
:download_code
,
@project
=
nav_link
(
controller:
%w(tree blob blame)
)
do
=
link_to
'Files'
,
project_tree_path
(
@project
,
@ref
||
@project
.
root_ref
)
=
nav_link
(
controller:
%w(commit commits compare repositories protected_branches)
)
do
=
link_to
"Commits"
,
project_commits_path
(
@project
,
@ref
||
@project
.
root_ref
)
=
nav_link
(
path:
'projects#graph'
)
do
=
link_to
"Network"
,
graph_project_path
(
@project
)
-
if
@project
.
issues_enabled
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
link_to
project_issues_filter_path
(
@project
)
do
Issues
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
-
if
@project
.
repo_exists?
&&
@project
.
merge_requests_enabled
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
)
do
Merge Requests
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
-
if
@project
.
wall_enabled
=
nav_link
(
path:
'projects#wall'
)
do
=
link_to
'Wall'
,
wall_project_path
(
@project
)
-
if
@project
.
wiki_enabled
=
nav_link
(
controller: :wikis
)
do
=
link_to
'Wiki'
,
project_wiki_path
(
@project
,
:index
)
.content
=
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