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
8933149b
Commit
8933149b
authored
Jan 27, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'add_titles_to_links' into 'master'
Add titles to all nav links See merge request !313
parents
79ca8146
7ac64891
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
44 additions
and
46 deletions
+44
-46
app/views/groups/_settings_nav.html.haml
app/views/groups/_settings_nav.html.haml
+2
-2
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+9
-9
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+4
-4
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+5
-5
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+9
-10
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+9
-10
app/views/projects/_settings_nav.html.haml
app/views/projects/_settings_nav.html.haml
+6
-6
No files found.
app/views/groups/_settings_nav.html.haml
View file @
8933149b
%ul
.sidebar-subnav
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
)
do
=
link_to
edit_group_path
(
@group
)
,
title:
'Group'
do
%i
.fa.fa-pencil-square-o
%span
Group
=
nav_link
(
path:
'groups#projects'
)
do
=
link_to
projects_group_path
(
@group
)
do
=
link_to
projects_group_path
(
@group
)
,
title:
'Projects'
do
%i
.fa.fa-folder
%span
Projects
app/views/layouts/nav/_admin.html.haml
View file @
8933149b
...
...
@@ -5,49 +5,49 @@
%span
Overview
=
nav_link
(
controller: :projects
)
do
=
link_to
admin_projects_path
do
=
link_to
admin_projects_path
,
title:
'Projects'
do
%i
.fa.fa-cube
%span
Projects
=
nav_link
(
controller: :users
)
do
=
link_to
admin_users_path
do
=
link_to
admin_users_path
,
title:
'Users'
do
%i
.fa.fa-user
%span
Users
=
nav_link
(
controller: :groups
)
do
=
link_to
admin_groups_path
do
=
link_to
admin_groups_path
,
title:
'Groups'
do
%i
.fa.fa-group
%span
Groups
=
nav_link
(
controller: :logs
)
do
=
link_to
admin_logs_path
do
=
link_to
admin_logs_path
,
title:
'Logs'
do
%i
.fa.fa-file-text
%span
Logs
=
nav_link
(
controller: :broadcast_messages
)
do
=
link_to
admin_broadcast_messages_path
do
=
link_to
admin_broadcast_messages_path
,
title:
'Broadcast Messages'
do
%i
.fa.fa-bullhorn
%span
Messages
=
nav_link
(
controller: :hooks
)
do
=
link_to
admin_hooks_path
do
=
link_to
admin_hooks_path
,
title:
'Hooks'
do
%i
.fa.fa-external-link
%span
Hooks
=
nav_link
(
controller: :background_jobs
)
do
=
link_to
admin_background_jobs_path
do
=
link_to
admin_background_jobs_path
,
title:
'Background Jobs'
do
%i
.fa.fa-cog
%span
Background Jobs
=
nav_link
(
controller: :application_settings
)
do
=
link_to
admin_application_settings_path
do
=
link_to
admin_application_settings_path
,
title:
'Settings'
do
%i
.fa.fa-cogs
%span
Settings
=
nav_link
(
controller: :applications
)
do
=
link_to
admin_applications_path
do
=
link_to
admin_applications_path
,
title:
'Applications'
do
%i
.fa.fa-cloud
%span
Applications
app/views/layouts/nav/_dashboard.html.haml
View file @
8933149b
...
...
@@ -5,24 +5,24 @@
%span
Activity
=
nav_link
(
path:
'dashboard#projects'
)
do
=
link_to
projects_dashboard_path
,
class:
'shortcuts-projects'
do
=
link_to
projects_dashboard_path
,
title:
'Projects'
,
class:
'shortcuts-projects'
do
%i
.fa.fa-cube
%span
Projects
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
assigned_issues_dashboard_path
,
class:
'shortcuts-issues'
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'shortcuts-issues'
do
%i
.fa.fa-exclamation-circle
%span
Issues
%span
.count
=
current_user
.
assigned_issues
.
opened
.
count
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
assigned_mrs_dashboard_path
,
class:
'shortcuts-merge_requests'
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
%i
.fa.fa-tasks
%span
Merge Requests
%span
.count
=
current_user
.
assigned_merge_requests
.
opened
.
count
=
nav_link
(
controller: :help
)
do
=
link_to
help_path
do
=
link_to
help_path
,
title:
'Help'
do
%i
.fa.fa-question-circle
%span
Help
...
...
app/views/layouts/nav/_group.html.haml
View file @
8933149b
...
...
@@ -6,33 +6,33 @@
Activity
-
if
current_user
=
nav_link
(
controller:
[
:group
,
:milestones
])
do
=
link_to
group_milestones_path
(
@group
)
do
=
link_to
group_milestones_path
(
@group
)
,
title:
'Milestones'
do
%i
.fa.fa-clock-o
%span
Milestones
=
nav_link
(
path:
'groups#issues'
)
do
=
link_to
issues_group_path
(
@group
)
do
=
link_to
issues_group_path
(
@group
)
,
title:
'Issues'
do
%i
.fa.fa-exclamation-circle
%span
Issues
-
if
current_user
%span
.count
=
Issue
.
opened
.
of_group
(
@group
).
count
=
nav_link
(
path:
'groups#merge_requests'
)
do
=
link_to
merge_requests_group_path
(
@group
)
do
=
link_to
merge_requests_group_path
(
@group
)
,
title:
'Merge Requests'
do
%i
.fa.fa-tasks
%span
Merge Requests
-
if
current_user
%span
.count
=
MergeRequest
.
opened
.
of_group
(
@group
).
count
=
nav_link
(
path:
'groups#members'
)
do
=
link_to
members_group_path
(
@group
)
do
=
link_to
members_group_path
(
@group
)
,
title:
'Members'
do
%i
.fa.fa-users
%span
Members
-
if
can?
(
current_user
,
:manage_group
,
@group
)
=
nav_link
(
html_options:
{
class:
"
#{
"active"
if
group_settings_page?
}
separate-item"
})
do
=
link_to
edit_group_path
(
@group
),
class:
"tab no-highlight"
do
=
link_to
edit_group_path
(
@group
),
title:
'Settings'
,
class:
"tab no-highlight"
do
%i
.fa.fa-cogs
%span
Settings
...
...
app/views/layouts/nav/_profile.html.haml
View file @
8933149b
...
...
@@ -5,52 +5,51 @@
%span
Profile
=
nav_link
(
controller: :accounts
)
do
=
link_to
profile_account_path
do
=
link_to
profile_account_path
,
title:
'Account'
do
%i
.fa.fa-gear
%span
Account
=
nav_link
(
path:
[
'profiles#applications'
,
'applications#edit'
,
'applications#show'
,
'applications#new'
])
do
=
link_to
applications_profile_path
do
=
link_to
applications_profile_path
,
title:
'Applications'
do
%i
.fa.fa-cloud
%span
Applications
=
nav_link
(
controller: :emails
)
do
=
link_to
profile_emails_path
do
=
link_to
profile_emails_path
,
title:
'Emails'
do
%i
.fa.fa-envelope-o
%span
Emails
%span
.count
=
current_user
.
emails
.
count
+
1
-
unless
current_user
.
ldap_user?
=
nav_link
(
controller: :passwords
)
do
=
link_to
edit_profile_password_path
do
=
link_to
edit_profile_password_path
,
title:
'Password'
do
%i
.fa.fa-lock
%span
Password
=
nav_link
(
controller: :notifications
)
do
=
link_to
profile_notifications_path
do
=
link_to
profile_notifications_path
,
title:
'Notifications'
do
%i
.fa.fa-inbox
%span
Notifications
=
nav_link
(
controller: :keys
)
do
=
link_to
profile_keys_path
do
=
link_to
profile_keys_path
,
title:
'SSH Keys'
do
%i
.fa.fa-key
%span
SSH Keys
%span
.count
=
current_user
.
keys
.
count
=
nav_link
(
path:
'profiles#design'
)
do
=
link_to
design_profile_path
do
=
link_to
design_profile_path
,
title:
'Design'
do
%i
.fa.fa-image
%span
Design
=
nav_link
(
controller: :groups
)
do
=
link_to
profile_groups_path
do
=
link_to
profile_groups_path
,
title:
'Groups'
do
%i
.fa.fa-group
%span
Groups
=
nav_link
(
path:
'profiles#history'
)
do
=
link_to
history_profile_path
do
=
link_to
history_profile_path
,
title:
'History'
do
%i
.fa.fa-history
%span
History
app/views/layouts/nav/_project.html.haml
View file @
8933149b
...
...
@@ -6,36 +6,35 @@
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
),
class:
'shortcuts-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?
:commits
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches)
)
do
=
link_to
project_commits_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-commits'
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?
:network
=
nav_link
(
controller:
%w(network)
)
do
=
link_to
project_network_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-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?
:graphs
=
nav_link
(
controller:
%w(graphs)
)
do
=
link_to
project_graph_path
(
@project
,
@ref
||
@repository
.
root_ref
),
class:
'shortcuts-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?
:issues
=
nav_link
(
controller:
%w(issues milestones labels)
)
do
=
link_to
url_for_project_issues
,
class:
'shortcuts-issues'
do
=
link_to
url_for_project_issues
,
title:
'Issues'
,
class:
'shortcuts-issues'
do
%i
.fa.fa-exclamation-circle
%span
Issues
...
...
@@ -44,7 +43,7 @@
-
if
project_nav_tab?
:merge_requests
=
nav_link
(
controller: :merge_requests
)
do
=
link_to
project_merge_requests_path
(
@project
),
class:
'shortcuts-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
...
...
@@ -52,21 +51,21 @@
-
if
project_nav_tab?
:wiki
=
nav_link
(
controller: :wikis
)
do
=
link_to
project_wiki_path
(
@project
,
:home
),
class:
'shortcuts-wiki'
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
),
class:
'shortcuts-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
),
class:
"stat-tab tab no-highlight"
do
=
link_to
edit_project_path
(
@project
),
title:
'Settings'
,
class:
"stat-tab tab no-highlight"
do
%i
.fa.fa-cogs
%span
Settings
...
...
app/views/projects/_settings_nav.html.haml
View file @
8933149b
%ul
.project-settings-nav.sidebar-subnav
=
nav_link
(
path:
'projects#edit'
)
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
title:
'Project'
,
class:
"stat-tab tab "
do
%i
.fa.fa-pencil-square-o
%span
Project
=
nav_link
(
controller:
[
:team_members
,
:teams
])
do
=
link_to
project_team_index_path
(
@project
),
class:
"team-tab tab"
do
=
link_to
project_team_index_path
(
@project
),
title:
'Members'
,
class:
"team-tab tab"
do
%i
.fa.fa-users
%span
Members
=
nav_link
(
controller: :deploy_keys
)
do
=
link_to
project_deploy_keys_path
(
@project
)
do
=
link_to
project_deploy_keys_path
(
@project
)
,
title:
'Deploy Keys'
do
%i
.fa.fa-key
%span
Deploy Keys
=
nav_link
(
controller: :hooks
)
do
=
link_to
project_hooks_path
(
@project
)
do
=
link_to
project_hooks_path
(
@project
)
,
title:
'Web Hooks'
do
%i
.fa.fa-link
%span
Web Hooks
=
nav_link
(
controller: :services
)
do
=
link_to
project_services_path
(
@project
)
do
=
link_to
project_services_path
(
@project
)
,
title:
'Services'
do
%i
.fa.fa-cogs
%span
Services
=
nav_link
(
controller: :protected_branches
)
do
=
link_to
project_protected_branches_path
(
@project
)
do
=
link_to
project_protected_branches_path
(
@project
)
,
title:
'Protected Branches'
do
%i
.fa.fa-lock
%span
Protected branches
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