From a9db2bd634d09a924064ef6f614038224aa728a5 Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Mon, 26 Oct 2015 14:29:54 -0600 Subject: [PATCH] Bug 11559: (QA followup) replace font choices, fix macro editor More specifically: * Use monospace font options that are more widely installed * Don't allow entering macros until the user loads/creates a macro --- koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index b5c2c23..4e4d9b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -652,6 +652,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr $( '#macro-list li[data-name="' + name + '"]' ).addClass( 'active' ); var macro = Preferences.user.macros[name]; macroEditor.setValue( macro.contents ); + macroEditor.setOption( 'readOnly', false ); $( '#macro-format' ).val( macro.format || 'its' ); if ( macro.history ) macroEditor.setHistory( macro.history ); } @@ -787,6 +788,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr }, mode: 'null', lineNumbers: true, + readOnly: true, } ); var saveTimeout; 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 f791a20..0288ada 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -53,8 +53,11 @@
  • Huge text
  • Default font
  • +
  • Consolas
  • Courier New
  • -
  • peep
  • +
  • DejaVu Sans Mono
  • +
  • Lucida Console
  • +
  • Monaco
  • -- 2.6.1