Browse Source

Bug 21411: (follow-up) Clean up for QA

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
19.05.x
Nick Clemens 4 years ago
parent
commit
b60230dccb
  1. 1
      installer/data/mysql/en/mandatory/keyboard_shortcuts.txt
  2. 3
      installer/data/mysql/mandatory/keyboard_shortcuts.sql
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
  4. 66
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
  5. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt

1
installer/data/mysql/en/mandatory/keyboard_shortcuts.txt

@ -1 +0,0 @@
Default keyboard shorcuts

3
installer/data/mysql/mandatory/keyboard_shortcuts.sql

@ -2,8 +2,7 @@
-- Default keyboard shortcuts
-- for Koha.
--
-- Copyright (C) 2007 LiblimeA
-- Copyright 2018 Koha Development Team
-- Copyright 2019 Koha Development Team
--
-- This file is part of Koha.
--

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt

@ -211,7 +211,7 @@
<dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt>
<dd>Add additional fields to certain tables</dd>
[% END %]
[% IF ( CAN_user_parameters_manage_keyboard_shortcuts ) %]
[% IF Koha.Preference('EnableAdvancedCatalogingEditor') && ( CAN_user_parameters_manage_keyboard_shortcuts ) %]
<dt><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></dt>
<dd>Define which keys trigger actions in the advanced cataloging editor</dd>
[% END %]

66
koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt

@ -1,5 +1,6 @@
[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; Advanced editor shortcuts</title>
@ -21,39 +22,42 @@
<div class="col-sm-10 col-sm-push-2">
<main>
<h1>Advanced editor keyboard shortcuts</h1>
<ul>
<li>Separate keys using a hyphen "-"</li>
<li>Control key is "Ctrl"</li>
<li>Alt key is "Alt"</li>
<li>Shift is "Shift"</li>
<li>If combining multiple keys they must be in specified order: Shift-Cmd-Ctrl-Alt</li>
<li><a href="https://codemirror.net/doc/manual.html#keymaps">More documentation on defining key maps</a></li>
</ul>
[% IF Koha.Preference('EnableAdvancedCatalogingEditor') %]
<ul>
<li>Separate keys using a hyphen "-"</li>
<li>Control key is "Ctrl"</li>
<li>Alt key is "Alt"</li>
<li>Shift is "Shift"</li>
<li>If combining multiple keys they must be in specified order: Shift-Cmd-Ctrl-Alt</li>
<li><a href="https://codemirror.net/doc/manual.html#keymaps">More documentation on defining key maps</a></li>
</ul>
<form id="adveditor_shortcuts" method="post" action="/cgi-bin/koha/admin/adveditorshortcuts.pl">
<fieldset>
<input type=hidden name="op" value="save" />
<table id="adv_editor_keyboard_shortcuts">
<thead>
<th>Description</th>
<th>Shortcut keys</th>
</thead>
<tbody>
[% FOREACH shortcut IN shortcuts %]
<tr>
<td><label for="shortcut_keys">[% PROCESS keyboard_shortcut_descriptions shortcut_name=shortcut.shortcut_name %]</label></td>
<td>
<input type="hidden" name="shortcut_name" value="[% shortcut.shortcut_name | html %]">
<input type="text" name="shortcut_keys" value="[% shortcut.shortcut_keys | html %]">
</td>
</tr>
[% END %]
</table>
</fieldset>
</fieldset class="action"><input type="submit" value="Save shortcuts"></fieldset>
</form>
<form id="adveditor_shortcuts" method="post" action="/cgi-bin/koha/admin/adveditorshortcuts.pl">
<fieldset>
<input type=hidden name="op" value="save" />
<table id="adv_editor_keyboard_shortcuts">
<thead>
<th>Description</th>
<th>Shortcut keys</th>
</thead>
<tbody>
[% FOREACH shortcut IN shortcuts %]
<tr>
<td><label for="shortcut_keys">[% PROCESS keyboard_shortcut_descriptions shortcut_name=shortcut.shortcut_name %]</label></td>
<td>
<input type="hidden" name="shortcut_name" value="[% shortcut.shortcut_name | html %]">
<input type="text" name="shortcut_keys" value="[% shortcut.shortcut_keys | html %]">
</td>
</tr>
[% END %]
</table>
</fieldset>
</fieldset class="action"><input type="submit" value="Save shortcuts"></fieldset>
</form>
[% ELSE %]
<p>Enable the advanced cataloging editor ( EnableAdvancedCatalogingEditor system preference) to define keyboard shortcuts</p>
[% END %]
</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->

4
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt

@ -269,7 +269,9 @@
</div>
<div id="shortcuts-contents" style="display: none">
<a id="redefine_shortcuts" href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Redefine shortcuts</a>
[% IF ( CAN_user_parameters_manage_keyboard_shortcuts ) %]
<a id="redefine_shortcuts" href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Redefine shortcuts</a>
[% END %]
<table class="table table-condensed">
<thead>
<tr>

Loading…
Cancel
Save