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
eef461d4
Commit
eef461d4
authored
Feb 06, 2015
by
Carlos Ribeiro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix showing overflow when have several items at sidebar
parent
89f8020f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
63 deletions
+77
-63
CHANGELOG
CHANGELOG
+1
-1
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+76
-62
No files found.
CHANGELOG
View file @
eef461d4
...
...
@@ -12,7 +12,7 @@ v 7.8.0
- View note image attachments in new tab when clicked instead of downloading them
- Improve sorting logic in UI and API. Explicitly define what sorting method is used by default
- Allow more variations for commit messages closing issues (Julien Bianchi and Hannes Rosenögger)
-
-
Fix overflow at sidebar when have several itens
-
- Show tags in commit view (Hannes Rosenögger)
- Only count a user's vote once on a merge request or issue (Michael Clarke)
...
...
app/views/layouts/nav/_project.html.haml
View file @
eef461d4
%ul
.project-navigation.nav.nav-sidebar
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
})
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
%i
.fa.fa-dashboard
%span
Project
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree)
)
do
=
link_to
project_tree_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Files'
,
class:
'shortcuts-tree'
do
%i
.fa.fa-files-o
-
if
@project_settings_nav
=
nav_link
do
=
link_to
project_path
(
@project
),
title:
'Back to project'
,
class:
""
do
%i
.fa.fa-angle-left
%span
Files
Back to project
-
if
project_nav_tab?
:commits
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches)
)
do
=
link_to
project_commits_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
%i
.fa.fa-history
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
separate-item"
})
do
=
link_to
edit_project_path
(
@project
),
title:
'Settings'
,
class:
"stat-tab tab no-highlight"
do
%i
.fa.fa-cogs
%span
Commits
Settings
%i
.fa.fa-angle-down
-
if
project_nav_tab?
:network
=
nav_link
(
controller:
%w(network)
)
do
=
link_to
project_network_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Network'
,
class:
'shortcuts-network'
do
%i
.fa.fa-code-fork
%span
Network
=
render
'projects/settings_nav'
-
if
project_nav_tab?
:graphs
=
nav_link
(
controller:
%w(graphs)
)
do
=
link_to
project_
graph_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Graphs'
,
class:
'shortcuts-graphs
'
do
%i
.fa.fa-
area-chart
-
else
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
}
)
do
=
link_to
project_
path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project
'
do
%i
.fa.fa-
dashboard
%span
Graphs
Project
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree)
)
do
=
link_to
project_tree_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Files'
,
class:
'shortcuts-tree'
do
%i
.fa.fa-files-o
%span
Files
-
if
project_nav_tab?
:issues
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
link_to
url_for_project_issues
,
title:
'Issues'
,
class:
'shortcuts-issues'
do
%i
.fa.fa-exclamation-circle
%span
Issues
-
if
@project
.
default_issues_tracker?
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
-
if
project_nav_tab?
:commits
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches)
)
do
=
link_to
project_commits_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
%i
.fa.fa-history
%span
Commits
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
%i
.fa.fa-tasks
%span
Merge Requests
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
-
if
project_nav_tab?
:network
=
nav_link
(
controller:
%w(network)
)
do
=
link_to
project_network_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Network'
,
class:
'shortcuts-network'
do
%i
.fa.fa-code-fork
%span
Network
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :wikis
)
do
=
link_to
project_wiki_path
(
@project
,
:home
),
title:
'Wiki'
,
class:
'shortcuts-wiki
'
do
%i
.fa.fa-book
%span
Wiki
-
if
project_nav_tab?
:graphs
=
nav_link
(
controller:
%w(graphs)
)
do
=
link_to
project_graph_path
(
@project
,
@ref
||
@repository
.
root_ref
),
title:
'Graphs'
,
class:
'shortcuts-graphs
'
do
%i
.fa.fa-area-chart
%span
Graphs
-
if
project_nav_tab?
:snippets
=
nav_link
(
controller: :snippets
)
do
=
link_to
project_snippets_path
(
@project
),
title:
'Snippets'
,
class:
'shortcuts-snippets'
do
%i
.fa.fa-file-text-o
%span
Snippets
-
if
project_nav_tab?
:issues
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
link_to
url_for_project_issues
,
title:
'Issues'
,
class:
'shortcuts-issues'
do
%i
.fa.fa-exclamation-circle
%span
Issues
-
if
@project
.
default_issues_tracker?
%span
.count.issue_counter
=
@project
.
issues
.
opened
.
count
-
if
project_nav_tab?
:setting
s
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
separate-item"
}
)
do
=
link_to
edit_project_path
(
@project
),
title:
'Settings'
,
class:
"stat-tab tab no-highlight"
do
%i
.fa.fa-cog
s
%span
Setting
s
%i
.fa.fa-angle-down
-
if
project_nav_tab?
:merge_request
s
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
),
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
%i
.fa.fa-task
s
%span
Merge Request
s
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
-
if
@project_settings_nav
=
render
'projects/settings_nav'
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :wikis
)
do
=
link_to
project_wiki_path
(
@project
,
:home
),
title:
'Wiki'
,
class:
'shortcuts-wiki'
do
%i
.fa.fa-book
%span
Wiki
-
if
project_nav_tab?
:snippets
=
nav_link
(
controller: :snippets
)
do
=
link_to
project_snippets_path
(
@project
),
title:
'Snippets'
,
class:
'shortcuts-snippets'
do
%i
.fa.fa-file-text-o
%span
Snippets
-
if
project_nav_tab?
:settings
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
separate-item"
})
do
=
link_to
edit_project_path
(
@project
),
title:
'Settings'
,
class:
"stat-tab tab no-highlight"
do
%i
.fa.fa-cogs
%span
Settings
%i
.fa.fa-angle-down
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