[Rt-commit] rt branch, 4.4/shortcut-help-selfservice, created. rt-4.4.0-54-g35ee180

Dustin Graves dustin at bestpractical.com
Tue Mar 1 15:23:27 EST 2016


The branch, 4.4/shortcut-help-selfservice has been created
        at  35ee180f0a2eca27da204d433ba647f6509e82b5 (commit)

- Log -----------------------------------------------------------------
commit c4aec64bf3ec67911687d0d0db281905c8fecf32
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Tue Mar 1 20:21:35 2016 +0000

    move ShortcutHelp markup to Elements and add additional helper in SelfService
    
    Fixes: I#31535

diff --git a/share/html/Helpers/ShortcutHelp b/share/html/Elements/ShortcutHelp
similarity index 99%
copy from share/html/Helpers/ShortcutHelp
copy to share/html/Elements/ShortcutHelp
index b57ebfa..3a273ae 100644
--- a/share/html/Helpers/ShortcutHelp
+++ b/share/html/Elements/ShortcutHelp
@@ -116,5 +116,3 @@ $show_bulk_update => 0
 % }
 
 </div>
-
-% $m->abort;
diff --git a/share/html/Helpers/ShortcutHelp b/share/html/Helpers/ShortcutHelp
index b57ebfa..372ea65 100644
--- a/share/html/Helpers/ShortcutHelp
+++ b/share/html/Helpers/ShortcutHelp
@@ -49,72 +49,5 @@
 $show_search      => 0
 $show_bulk_update => 0
 </%args>
-
-<div class="keyboard-shortcuts">
-    <h2><&|/l&>Keyboard Shortcuts</&></h2>
-
-    <div class="titlebox">
-        <div class="titlebox-title">
-            <span class="left"><&|/l&>Global</&></span>
-            <span class="right-empty"></span>
-        </div>
-        <div class="titlebox-content">
-            <hr class="clear">
-            <table>
-                <tr>
-                    <td class="key-column"><span class="keyboard-shortcuts-key">/</span></td>
-                    <td><&|/l&>Quick search</&></td>
-                </tr>
-                <tr>
-                    <td><span class="keyboard-shortcuts-key">gh</span></td>
-                    <td><&|/l&>Return home</&></td>
-                </tr>
-                <tr>
-                    <td><span class="keyboard-shortcuts-key">gb</span> <span class="keyboard-shortcuts-separator">/</span> <span class="keyboard-shortcuts-key">gf</span></td>
-                    <td><&|/l&>Go back / forward</&></td>
-                </tr>
-            </table>
-        </div>
-    </div>
-
-% if($show_search) {
-
-    <div class="titlebox">
-        <div class="titlebox-title">
-            <span class="left"><&|/l&>Search</&></span>
-            <span class="right-empty"></span>
-        </div>
-        <div class="titlebox-content">
-            <hr class="clear">
-            <table>
-                <tr>
-                    <td class="key-column"><span class="keyboard-shortcuts-key">k</span><span class="keyboard-shortcuts-separator"> / </span><span class="keyboard-shortcuts-key">j</span></td>
-                    <td><&|/l&>Move up / down the list of results</&></td>
-                </tr>
-                <tr>
-                    <td><span class="keyboard-shortcuts-key">o</span> <span class="keyboard-shortcuts-separator">or</span> <span class="keyboard-shortcuts-key"><<&|/l&>Enter</&>></span></td>
-                    <td><&|/l&>View highlighted ticket</&></td>
-                </tr>
-                <tr>
-                    <td class="key-column"><span class="keyboard-shortcuts-key">r</span></td>
-                    <td><&|/l&>Reply to ticket</&></td>
-                </tr>
-                <tr>
-                    <td><span class="keyboard-shortcuts-key">c</span></td>
-                    <td><&|/l&>Comment on ticket</&></td>
-                </tr>
-% if($show_bulk_update) {
-                <tr>
-                    <td><span class="keyboard-shortcuts-key">x</span></td>
-                    <td><&|/l&>Toggle highlighted ticket's checkbox</&></td>
-                </tr>
-% }
-            </table>
-        </div>
-    </div>
-
-% }
-
-</div>
-
+<& /Elements/ShortcutHelp, %ARGS &>
 % $m->abort;
diff --git a/share/html/SelfService/Helpers/ShortcutHelp b/share/html/SelfService/Helpers/ShortcutHelp
new file mode 100644
index 0000000..372ea65
--- /dev/null
+++ b/share/html/SelfService/Helpers/ShortcutHelp
@@ -0,0 +1,53 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
+%#                                          <sales at bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+<%args>
+$show_search      => 0
+$show_bulk_update => 0
+</%args>
+<& /Elements/ShortcutHelp, %ARGS &>
+% $m->abort;

commit 35ee180f0a2eca27da204d433ba647f6509e82b5
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Tue Mar 1 20:22:29 2016 +0000

    add global '/' shortcut support for SelfService

diff --git a/share/static/js/keyboard-shortcuts.js b/share/static/js/keyboard-shortcuts.js
index bb380fe..a7b4cf5 100644
--- a/share/static/js/keyboard-shortcuts.js
+++ b/share/static/js/keyboard-shortcuts.js
@@ -14,6 +14,9 @@ jQuery(function() {
 
     var simpleSearch = function() {
         var searchInput = jQuery('#simple-search').find('input');
+        if (!searchInput.length) { // try SelfService simple search
+            searchInput = jQuery('#GotoTicket').find('input');
+        }
         if (!searchInput.length) return;
 
         searchInput.focus();

-----------------------------------------------------------------------


More information about the rt-commit mailing list