Bugzilla – Attachment 44032 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) fix pagination bar, add Ctrl-D to macro editor
PASSED-QA-Bug-11559-QA-followup-fix-pagination-bar.patch (text/plain), 3.43 KB, created by
Katrin Fischer
on 2015-10-26 21:30:42 UTC
(
hide
)
Description:
[PASSED QA] Bug 11559: (QA followup) fix pagination bar, add Ctrl-D to macro editor
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-10-26 21:30:42 UTC
Size:
3.43 KB
patch
obsolete
>From 7672363189f7d2827aa667ace3722f43bc85e440 Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Thu, 22 Oct 2015 16:53:11 -0600 >Subject: [PATCH] [PASSED QA] Bug 11559: (QA followup) fix pagination bar, add > Ctrl-D to macro editor > >Also, fix incredibly silly mistake with keyboard shortcuts popup. > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js | 2 -- > koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 9 ++++++++- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 6 +++--- > 3 files changed, 11 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js >index 91a286d..1fe5e37 100644 >--- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js >+++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js >@@ -204,8 +204,6 @@ define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], > > 'Ctrl-D': function( cm ) { > // Insert subfield delimiter >- // This will be extended later to allow either a configurable subfield delimiter or just >- // make it be the double cross. > var cur = cm.getCursor(); > > cm.replaceRange( "â¡", cur, null ); >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 310ca45..4cc594f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -531,7 +531,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' »</a></li>' ); > } > >- if ( pages.length > 1 ) $( '#search-top-pages, #search-bottom-pages' ).find( '.pagination' ).html( '<ul>' + pages.join( '' ) + '</ul>'); >+ $( '#search-top-pages, #search-bottom-pages' ).find( '.pagination' ).html( pages.length > 1 ? ( '<ul>' + pages.join( '' ) + '</ul>' ) : '' ); > > var $overlay = $('#search-overlay'); > $overlay.find('span').text(_("Loading")); >@@ -778,6 +778,13 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > macroEditor = CodeMirror( > $('#macro-editor')[0], > { >+ extraKeys: { >+ 'Ctrl-D': function( cm ) { >+ var cur = cm.getCursor(); >+ >+ cm.replaceRange( "â¡", cur, null ); >+ }, >+ }, > mode: 'null', > lineNumbers: true, > } >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 aa69ca0..e4e0cda 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -229,7 +229,9 @@ > </div> > </div> > >-<div id="shortcuts-contents"> >+</div> >+ >+<div id="shortcuts-contents" style="display: none"> > <table class="table table-condensed"> > <thead> > <tr> >@@ -278,8 +280,6 @@ > </table> > </div> > >-</div> >- > [% PROCESS 'cateditor-ui.inc' %] > > [% INCLUDE 'intranet-bottom.inc' %] >-- >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