diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-08 10:47:26 +0400 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-09-08 22:49:15 +0400 |
| commit | 7f7bf86bbffee21e577ab559c10f9f3b7ab79e49 (patch) | |
| tree | 541b65a4d95f95b9f7f4ba13ecbd75c438d7469a /app | |
| parent | f42a1ded99920998a9b63b309adc227485428d2c (diff) | |
Change shortcut for activity to project, because navbar changed
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/shortcuts_navigation.coffee | 2 | ||||
| -rw-r--r-- | app/views/help/_shortcuts.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/shortcuts_navigation.coffee b/app/assets/javascripts/shortcuts_navigation.coffee index e24a74ea9b6..e592b700e7c 100644 --- a/app/assets/javascripts/shortcuts_navigation.coffee +++ b/app/assets/javascripts/shortcuts_navigation.coffee @@ -3,7 +3,7 @@ class @ShortcutsNavigation extends Shortcuts constructor: -> super() - Mousetrap.bind('g a', -> ShortcutsNavigation.findAndollowLink('.shortcuts-activity')) + Mousetrap.bind('g p', -> ShortcutsNavigation.findAndollowLink('.shortcuts-project')) Mousetrap.bind('g f', -> ShortcutsNavigation.findAndollowLink('.shortcuts-tree')) Mousetrap.bind('g c', -> ShortcutsNavigation.findAndollowLink('.shortcuts-commits')) Mousetrap.bind('g n', -> ShortcutsNavigation.findAndollowLink('.shortcuts-network')) diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 4301a6eafc1..467f003b333 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -78,9 +78,9 @@ %tr %td.shortcut .key g - .key a + .key p %td - Go to the activity feed + Go to the project's activity feed %tr %td.shortcut .key g diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index aadbb31dc96..6cb2a82bac8 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -1,6 +1,6 @@ %ul.project-navigation = nav_link(path: 'projects#show', html_options: {class: "home"}) do - = link_to project_path(@project), title: 'Project', class: 'shortcuts-activity' do + = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do Project - if project_nav_tab? :files = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do |