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
Boxiang Sun
gitlab-ce
Commits
5ba52693
Commit
5ba52693
authored
May 17, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dashboard shortcuts
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
442083e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+1
-1
app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
...sets/javascripts/shortcuts_dashboard_navigation.js.coffee
+4
-4
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+4
-4
No files found.
app/assets/javascripts/dispatcher.js.coffee
View file @
5ba52693
...
@@ -119,7 +119,7 @@ class Dispatcher
...
@@ -119,7 +119,7 @@ class Dispatcher
new
UsersSelect
()
new
UsersSelect
()
when
'projects'
when
'projects'
new
NamespaceSelect
()
new
NamespaceSelect
()
when
'dashboard'
when
'dashboard'
,
'root'
shortcut_handler
=
new
ShortcutsDashboardNavigation
()
shortcut_handler
=
new
ShortcutsDashboardNavigation
()
when
'profiles'
when
'profiles'
new
Profile
()
new
Profile
()
...
...
app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee
View file @
5ba52693
...
@@ -3,10 +3,10 @@
...
@@ -3,10 +3,10 @@
class
@
ShortcutsDashboardNavigation
extends
Shortcuts
class
@
ShortcutsDashboardNavigation
extends
Shortcuts
constructor
:
->
constructor
:
->
super
()
super
()
Mousetrap
.
bind
(
'g a'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.shortcuts-activity'
))
Mousetrap
.
bind
(
'g a'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.
dashboard-
shortcuts-activity'
))
Mousetrap
.
bind
(
'g i'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.shortcuts-issues'
))
Mousetrap
.
bind
(
'g i'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.
dashboard-
shortcuts-issues'
))
Mousetrap
.
bind
(
'g m'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.shortcuts-merge_requests'
))
Mousetrap
.
bind
(
'g m'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.
dashboard-
shortcuts-merge_requests'
))
Mousetrap
.
bind
(
'g p'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.shortcuts-projects'
))
Mousetrap
.
bind
(
'g p'
,
->
ShortcutsDashboardNavigation
.
findAndFollowLink
(
'.
dashboard-
shortcuts-projects'
))
@
findAndFollowLink
:
(
selector
)
->
@
findAndFollowLink
:
(
selector
)
->
link
=
$
(
selector
).
attr
(
'href'
)
link
=
$
(
selector
).
attr
(
'href'
)
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
5ba52693
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
class:
"
#{
project_tab_class
}
home"
})
do
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
class:
"
#{
project_tab_class
}
home"
})
do
=
link_to
dashboard_projects_path
,
title:
'Projects'
do
=
link_to
dashboard_projects_path
,
title:
'Projects'
,
class:
'dashboard-shortcuts-projects'
do
=
icon
(
'bookmark fw'
)
=
icon
(
'bookmark fw'
)
%span
%span
Projects
Projects
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
Todos
Todos
%span
.count.todos-pending-count
=
number_with_delimiter
(
todos_pending_count
)
%span
.count.todos-pending-count
=
number_with_delimiter
(
todos_pending_count
)
=
nav_link
(
path:
'dashboard#activity'
)
do
=
nav_link
(
path:
'dashboard#activity'
)
do
=
link_to
activity_dashboard_path
,
class:
'shortcuts-activity'
,
title:
'Activity'
do
=
link_to
activity_dashboard_path
,
class:
'
dashboard-
shortcuts-activity'
,
title:
'Activity'
do
=
icon
(
'dashboard fw'
)
=
icon
(
'dashboard fw'
)
%span
%span
Activity
Activity
...
@@ -26,13 +26,13 @@
...
@@ -26,13 +26,13 @@
%span
%span
Milestones
Milestones
=
nav_link
(
path:
'dashboard#issues'
)
do
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'shortcuts-issues'
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'
dashboard-
shortcuts-issues'
do
=
icon
(
'exclamation-circle fw'
)
=
icon
(
'exclamation-circle fw'
)
%span
%span
Issues
Issues
%span
.count
=
number_with_delimiter
(
current_user
.
assigned_issues
.
opened
.
count
)
%span
.count
=
number_with_delimiter
(
current_user
.
assigned_issues
.
opened
.
count
)
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'shortcuts-merge_requests'
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'
dashboard-
shortcuts-merge_requests'
do
=
icon
(
'tasks fw'
)
=
icon
(
'tasks fw'
)
%span
%span
Merge Requests
Merge Requests
...
...
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