From b60230dccba64f7b6d5519bf735899953fbe2255 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 1 May 2019 11:27:05 +0000 Subject: [PATCH] Bug 21411: (follow-up) Clean up for QA Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../mysql/en/mandatory/keyboard_shortcuts.txt | 1 - .../mysql/mandatory/keyboard_shortcuts.sql | 3 +- .../prog/en/modules/admin/admin-home.tt | 2 +- .../en/modules/admin/adveditorshortcuts.tt | 66 ++++++++++--------- .../prog/en/modules/cataloguing/editor.tt | 4 +- 5 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 installer/data/mysql/en/mandatory/keyboard_shortcuts.txt diff --git a/installer/data/mysql/en/mandatory/keyboard_shortcuts.txt b/installer/data/mysql/en/mandatory/keyboard_shortcuts.txt deleted file mode 100644 index 64e5e94989..0000000000 --- a/installer/data/mysql/en/mandatory/keyboard_shortcuts.txt +++ /dev/null @@ -1 +0,0 @@ -Default keyboard shorcuts diff --git a/installer/data/mysql/mandatory/keyboard_shortcuts.sql b/installer/data/mysql/mandatory/keyboard_shortcuts.sql index b7fb58a3f4..ef4a95553d 100644 --- a/installer/data/mysql/mandatory/keyboard_shortcuts.sql +++ b/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. -- diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 2352bc87f4..957af5c9c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -211,7 +211,7 @@
Additional fields
Add additional fields to certain tables
[% END %] - [% IF ( CAN_user_parameters_manage_keyboard_shortcuts ) %] + [% IF Koha.Preference('EnableAdvancedCatalogingEditor') && ( CAN_user_parameters_manage_keyboard_shortcuts ) %]
Keyboard shortcuts
Define which keys trigger actions in the advanced cataloging editor
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt index 730ed50b3e..4589653c18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ b/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' %] Koha › Administration › Advanced editor shortcuts @@ -21,39 +22,42 @@

Advanced editor keyboard shortcuts

-
    -
  • Separate keys using a hyphen "-"
  • -
  • Control key is "Ctrl"
  • -
  • Alt key is "Alt"
  • -
  • Shift is "Shift"
  • -
  • If combining multiple keys they must be in specified order: Shift-Cmd-Ctrl-Alt
  • -
  • More documentation on defining key maps
  • -
+ [% IF Koha.Preference('EnableAdvancedCatalogingEditor') %] +
    +
  • Separate keys using a hyphen "-"
  • +
  • Control key is "Ctrl"
  • +
  • Alt key is "Alt"
  • +
  • Shift is "Shift"
  • +
  • If combining multiple keys they must be in specified order: Shift-Cmd-Ctrl-Alt
  • +
  • More documentation on defining key maps
  • +
-
-
- - - - - - - - - [% FOREACH shortcut IN shortcuts %] - - - - - [% END %] -
DescriptionShortcut keys
- - -
-
- -
+
+
+ + + + + + + + [% FOREACH shortcut IN shortcuts %] + + + + + [% END %] +
DescriptionShortcut keys
+ + +
+
+ +
+ [% ELSE %] +

Enable the advanced cataloging editor ( EnableAdvancedCatalogingEditor system preference) to define keyboard shortcuts

+ [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index fb0011994f..d313fd982a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -269,7 +269,9 @@