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

Dmitriy Zaporozhets
2 parents 0f84833c 6e550af1
Showing 7 changed files with 35 additions and 1 deletions Show diff stats
app/assets/javascripts/main.js.coffee
app/assets/javascripts/shortcuts.js.coffee
app/controllers/help_controller.rb
app/views/help/_shortcuts.html.haml
app/views/help/shortcuts.js.haml
app/views/layouts/_head_panel.html.haml
config/routes.rb
@@ -67,6 +67,9 @@ $ -&gt;
     $('.appear-data').fadeIn()
     e.preventDefault()
  
+  $('body').keydown (e) ->
+    if e.which is 191
+      new Shortcuts()
  
   # Initialize chosen selects
   $('select.chosen').chosen()
@@ -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
@@ -12,4 +12,7 @@ class HelpController &lt; ApplicationController
       not_found!
     end
   end
+
+  def shortcuts
+  end
 end
@@ -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
+      &ndash;
+      Focus Search
+    %p
+      %span.label.label-inverse ?
+      &ndash;
+      Show this dialog
@@ -0,0 +1,3 @@
+:plain
+  $("body").append("#{escape_javascript(render('shortcuts'))}");
+  $("#modal-shortcuts").modal();
@@ -38,4 +38,3 @@
         %li
           = link_to current_user, class: "profile-pic", id: 'profile-pic' do
             = image_tag gravatar_icon(current_user.email, 26)
-
@@ -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
...	...	@@ -67,6 +67,9 @@ $ ->
67	67	$('.appear-data').fadeIn()
68	68	e.preventDefault()
69	69
	70	+ $('body').keydown (e) ->
	71	+ if e.which is 191
	72	+ new Shortcuts()
70	73
71	74	# Initialize chosen selects
72	75	$('select.chosen').chosen()
...	...
...	...	@@ -0,0 +1,11 @@
	1	+class Shortcuts
	2	+ constructor: ->
	3	+ if $('#modal-shortcuts').length > 0
	4	+ $('#modal-shortcuts').modal('show')
	5	+ else
	6	+ $.ajax(
	7	+ url: '/help/shortcuts',
	8	+ dataType: "script"
	9	+ )
	10	+
	11	+@Shortcuts = Shortcuts
...	...
...	...	@@ -12,4 +12,7 @@ class HelpController < ApplicationController
12	12	not_found!
13	13	end
14	14	end
	15	+
	16	+ def shortcuts
	17	+ end
15	18	end
...	...
...	...	@@ -0,0 +1,14 @@
	1	+#modal-shortcuts.modal.hide
	2	+ .modal-header
	3	+ %a.close{href: "#"} ×
	4	+ %h3 Keyboard Shortcuts
	5	+ .modal-body
	6	+ %h5 Global Shortcuts
	7	+ %p
	8	+ %span.label.label-inverse s
	9	+ –
	10	+ Focus Search
	11	+ %p
	12	+ %span.label.label-inverse ?
	13	+ –
	14	+ Show this dialog
...	...
...	...	@@ -0,0 +1,3 @@
	1	+:plain
	2	+ $("body").append("#{escape_javascript(render('shortcuts'))}");
	3	+ $("#modal-shortcuts").modal();
...	...
...	...	@@ -38,4 +38,3 @@
38	38	%li
39	39	= link_to current_user, class: "profile-pic", id: 'profile-pic' do
40	40	= image_tag gravatar_icon(current_user.email, 26)
41		-
...	...
...	...	@@ -38,6 +38,7 @@ Gitlab::Application.routes.draw do
38	38	get 'help/system_hooks' => 'help#system_hooks'
39	39	get 'help/web_hooks' => 'help#web_hooks'
40	40	get 'help/workflow' => 'help#workflow'
	41	+ get 'help/shortcuts'
41	42
42	43	#
43	44	# Global snippets
...	...