Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev

app/assets/javascripts/main.js.coffee

@@ -67,6 +67,9 @@ $ ->
     $('.appear-data').fadeIn()
     e.preventDefault()
 
+  $('body').keydown (e) ->
+    if e.which is 191
+      new Shortcuts()
 
   # Initialize chosen selects
   $('select.chosen').chosen()

app/assets/javascripts/shortcuts.js.coffee

@@ -0,0 +1,11 @@
+class Shortcuts
+  constructor: ->
+    if $('#modal-shortcuts').length > 0
+      $('#modal-shortcuts').modal('show')
+    else
+      $.ajax(
+        url: '/help/shortcuts',
+        dataType: "script"
+      )
+
+@Shortcuts = Shortcuts

app/controllers/help_controller.rb

@@ -12,4 +12,7 @@ class HelpController < ApplicationController
       not_found!
     end
   end
+
+  def shortcuts
+  end
 end

app/views/help/_shortcuts.html.haml

@@ -0,0 +1,14 @@
+#modal-shortcuts.modal.hide
+  .modal-header
+    %a.close{href: "#"} ×
+    %h3 Keyboard Shortcuts
+  .modal-body
+    %h5 Global Shortcuts
+    %p
+      %span.label.label-inverse s
+      –
+      Focus Search
+    %p
+      %span.label.label-inverse ?
+      –
+      Show this dialog

app/views/help/shortcuts.js.haml

@@ -0,0 +1,3 @@
+:plain
+  $("body").append("#{escape_javascript(render('shortcuts'))}");
+  $("#modal-shortcuts").modal();

app/views/layouts/_head_panel.html.haml

@@ -38,4 +38,3 @@
         %li
           = link_to current_user, class: "profile-pic", id: 'profile-pic' do
             = image_tag gravatar_icon(current_user.email, 26)
-

config/routes.rb

@@ -38,6 +38,7 @@ Gitlab::Application.routes.draw do
   get 'help/system_hooks'   => 'help#system_hooks'
   get 'help/web_hooks'      => 'help#web_hooks'
   get 'help/workflow'       => 'help#workflow'
+  get 'help/shortcuts'
 
   #
   # Global snippets