aboutsummaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-10-04 15:39:07 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-10-04 15:39:07 +0200
commit099f5ab760602e9b08b804cecd1eb41442cd1b62 (patch)
treeaa1b7a53827407f2c079c83dcabc9243b6ba1041 /app/views
parent0a60a1a71e32fa29518705a4f194c8025d8164bf (diff)
parent38a6f0c4b29e5a53c21f345dd839a4fa0b2a6f47 (diff)
Merge pull request #654 from aledeg/new-shortcut
Add a shortcut to close drop-down lists
Diffstat (limited to 'app/views')
-rw-r--r--app/views/configure/shortcut.phtml7
-rw-r--r--app/views/helpers/javascript_vars.phtml3
2 files changed, 9 insertions, 1 deletions
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index a4029b676..44727e62b 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -112,6 +112,13 @@
</div>
<div class="form-group">
+ <label class="group-name" for="close_dropdown_shortcut"><?php echo Minz_Translate::t ('close_dropdown'); ?></label>
+ <div class="group-controls">
+ <input type="text" id="help_shortcut" name="shortcuts[close_dropdown]" list="keys" value="<?php echo $s['close_dropdown']; ?>" />
+ </div>
+ </div>
+
+ <div class="form-group">
<label class="group-name" for="help_shortcut"><?php echo Minz_Translate::t ('help'); ?></label>
<div class="group-controls">
<input type="text" id="help_shortcut" name="shortcuts[help]" list="keys" value="<?php echo $s['help']; ?>" />
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 71798369d..4f7e3db0c 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -28,7 +28,8 @@ echo ',shortcuts={',
'auto_share:"', $s['auto_share'], '",',
'focus_search:"', $s['focus_search'], '",',
'user_filter:"', $s['user_filter'], '",',
- 'help:"', $s['help'], '"',
+ 'help:"', $s['help'], '",',
+ 'close_dropdown:"', $s['close_dropdown'], '"',
"},\n";
if (Minz_Request::param ('output') === 'global') {