Bugzilla – Attachment 44035 Details for
Bug 11559
Professional cataloger's interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 11559: (QA followup) replace font choices, fix macro editor
PASSED-QA-Bug-11559-QA-followup-replace-font-choic.patch (text/plain), 3.02 KB, created by
Katrin Fischer
on 2015-10-26 21:31:02 UTC
(
hide
)
Description:
[PASSED QA] Bug 11559: (QA followup) replace font choices, fix macro editor
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-10-26 21:31:02 UTC
Size:
3.02 KB
patch
obsolete
>From e4ded23127672167bfa1e7d90a0a5ffc5c3bb6fa Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Mon, 26 Oct 2015 14:29:54 -0600 >Subject: [PATCH] [PASSED QA] 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 > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > 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 @@ > <li><a class="set-fontSize" style="font-size: 1.18em" href="#">Huge text</a></li> > <li class="divider"></li> > <li><a class="set-font" style="font-family: monospace" href="#">Default font</a></li> >+ <li><a class="set-font" style="font-family: Consolas" href="#">Consolas</a></li> > <li><a class="set-font" style="font-family: 'Courier New'" href="#">Courier New</a></li> >- <li><a class="set-font" style="font-family: peep" href="#">peep</a></li> >+ <li><a class="set-font" style="font-family: 'DejaVu Sans Mono'" href="#">DejaVu Sans Mono</a></li> >+ <li><a class="set-font" style="font-family: 'Lucida Console'" href="#">Lucida Console</a></li> >+ <li><a class="set-font" style="font-family: Monaco" href="#">Monaco</a></li> > </ul> > </div> > <button class="btn btn-small" id="show-alerts" title="Previous alerts"><i class="icon-bell"></i> Alerts <span class="caret"></span></button> >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11559
:
26069
|
26070
|
26071
|
26104
|
26653
|
26654
|
27140
|
27141
|
27142
|
27757
|
27758
|
27759
|
27760
|
27761
|
27900
|
27901
|
27902
|
27993
|
27995
|
34458
|
34459
|
34460
|
34461
|
34462
|
34463
|
36243
|
36244
|
36245
|
36246
|
36247
|
36248
|
36455
|
38533
|
38534
|
38535
|
38536
|
38537
|
38538
|
38539
|
40153
|
40154
|
40155
|
40543
|
40555
|
40556
|
40557
|
40558
|
40811
|
40812
|
40813
|
40814
|
40815
|
41425
|
41453
|
41476
|
42373
|
43261
|
43547
|
43614
|
43615
|
43616
|
43617
|
43618
|
43619
|
43620
|
43621
|
43622
|
43623
|
43703
|
43704
|
43705
|
43706
|
43707
|
43708
|
43709
|
43710
|
43711
|
43712
|
43713
|
43772
|
43790
|
43883
|
43969
|
44016
|
44018
|
44022
|
44023
|
44024
|
44025
|
44026
|
44027
|
44028
|
44029
|
44030
|
44031
|
44032
|
44033
|
44034
| 44035 |
44036