Bugzilla – Attachment 43969 Details for
Bug 11559
Professional cataloger's interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11559: (QA followup) fix QA issues
Bug-11559-QA-followup-fix-QA-issues.patch (text/plain), 12.18 KB, created by
Jesse Weaver
on 2015-10-26 01:37:09 UTC
(
hide
)
Description:
Bug 11559: (QA followup) fix QA issues
Filename:
MIME Type:
Creator:
Jesse Weaver
Created:
2015-10-26 01:37:09 UTC
Size:
12.18 KB
patch
obsolete
>From e45b148f1358b40b944779c33c77656173167912 Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Sun, 25 Oct 2015 19:34:53 -0600 >Subject: [PATCH] Bug 11559: (QA followup) fix QA issues > >This fixes the following: > * License of editor.pl > * Remove tabs > * Use [% interface %] > * Re-order search fields like the old interface > * Add license information for new libraries >--- > cataloguing/editor.pl | 20 +++++------ > koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css | 4 +-- > .../intranet-tmpl/prog/en/css/staff-global.css | 2 +- > .../prog/en/includes/cateditor-ui.inc | 30 ++++++++-------- > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 9 +++++ > .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- > .../prog/en/modules/cataloguing/editor.tt | 42 +++++++++++----------- > 7 files changed, 59 insertions(+), 50 deletions(-) > >diff --git a/cataloguing/editor.pl b/cataloguing/editor.pl >index 6d0fd0d..8bf9a78 100755 >--- a/cataloguing/editor.pl >+++ b/cataloguing/editor.pl >@@ -4,18 +4,18 @@ > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 2 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > # > > use Modern::Perl '2009'; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css b/koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css >index f9b0071..cb6fa8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/humanmsg.css >@@ -25,11 +25,11 @@ html, body { > } > > .humanError { >- background-color: #400; >+ background-color: #400; > } > > .humanSuccess { >- background-color: #040; >+ background-color: #040; > } > > .humanMsg h3 { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index ff87531..f43256e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -427,7 +427,7 @@ dd { > > .btn-toolbar .yui-menu-button button, > .btn-toolbar .yui-button-button button { >- line-height : 1.7em; >+ line-height : 1.7em; > } > > ul.toolbar { >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 fe792c0..b5c2c23 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -1,10 +1,10 @@ >-<script src="/intranet-tmpl/lib/codemirror/codemirror-compressed.js"></script> >-<script src="/intranet-tmpl/lib/filesaver.js"></script> >-<script src="/intranet-tmpl/lib/koha/cateditor/marc-mode.js"></script> >-<script src="/intranet-tmpl/lib/require.js"></script> >+<script src="[% interface %]/lib/codemirror/codemirror-compressed.js"></script> >+<script src="[% interface %]/lib/filesaver.js"></script> >+<script src="[% interface %]/lib/koha/cateditor/marc-mode.js"></script> >+<script src="[% interface %]/lib/require.js"></script> > <script> > require.config( { >- baseUrl: '/intranet-tmpl/lib/koha/cateditor/', >+ baseUrl: '[% interface %]/lib/koha/cateditor/', > config: { > resources: { > marcflavour: '[% marcflavour %]', >@@ -40,16 +40,16 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > > // The columns that should show up in a search, in order, and keyed by the corresponding <metadata> tag in the XSL and Pazpar2 config > var z3950Labels = [ >- [ "local_number", _("Local number") ], >- [ "title", _("Title") ], >- [ "series", _("Series title") ], >- [ "author", _("Author") ], >- [ "lccn", _("LCCN") ], >- [ "isbn", _("ISBN") ], >- [ "issn", _("ISSN") ], >- [ "medium", _("Medium") ], >- [ "edition", _("Edition") ], >- [ "notes", _("Notes") ], >+ [ "local_number", _("Local number") ], >+ [ "title", _("Title") ], >+ [ "series", _("Series title") ], >+ [ "author", _("Author") ], >+ [ "lccn", _("LCCN") ], >+ [ "isbn", _("ISBN") ], >+ [ "issn", _("ISSN") ], >+ [ "medium", _("Medium") ], >+ [ "edition", _("Edition") ], >+ [ "notes", _("Notes") ], > ]; > > var state = { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index b7cbfbd..f5b64ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -735,6 +735,15 @@ > > <h2>TinyMCE WYSIWYG editor</h2> > <p>The <a href="http://www.tinymce.com/">TinyMCE WYSIWYG editor v3.5.8 </a> by Moxiecode (Ephox) is licensed under the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt">LGPL v2.1</a>.</p> >+ >+ <h2>CodeMirror editing library</h2> >+ <p>The <a href="http://codemirror.net/">CodeMirror editing library</a> by Marijn Haverbeke is licensed under an <a href="http://codemirror.net/LICENSE">MIT license</a>.</p> >+ >+ <h2>FileSaver library</h2> >+ <p>The <a href="https://github.com/eligrey/FileSaver.js/">FileSaver library</a> by Eli Grey is licensed under an <a href="https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md">MIT license</a>.</p> >+ >+ <h2>Require.js JS module system</h2> >+ <p>The <a href="http://requirejs.org/">Require.js JS module system</a> by The Dojo Foundation is licensed under an <a href="https://github.com/jrburke/requirejs/blob/master/LICENSE">MIT license</a>.</p> > </div> > > <div id="translations"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index a4c6945..103e1b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -124,7 +124,7 @@ > return false; > } ); > >- }); >+ }); > > function redirect(dest){ > $("#redirect").attr("value",dest); >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 e4e0cda..f791a20 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" href="[% themelang %]/css/cateditor.css" /> > <link rel="stylesheet" href="[% themelang %]/css/datatables.css" /> >-<link rel="stylesheet" href="/intranet-tmpl/lib/codemirror/codemirror.css" /> >+<link rel="stylesheet" href="[% interface %]/lib/codemirror/codemirror.css" /> > <link rel="stylesheet" href="[% themelang %]/css/humanmsg.css" /> > <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> > [% IF ( bidi ) %] >@@ -116,53 +116,53 @@ > </div> > <ul id="advanced-search-fields"> > <li> >- <label for="advanced-search-by-author">Author:</label> >- <input class="search-box" data-qualifier="author" id="advanced-search-by-author" /> >+ <label for="advanced-search-by-isbn">ISBN:</label> >+ <input class="search-box" data-qualifier="isbn" id="advanced-search-by-isbn" /> > </li> > <li> >- <label for="advanced-search-by-control-number">Control number:</label> >- <input class="search-box" data-qualifier="local_number" id="advanced-search-by-control-number" /> >+ <label for="advanced-search-by-issn">ISSN:</label> >+ <input class="search-box" data-qualifier="issn" id="advanced-search-by-issn" /> > </li> > <li> >- <label for="advanced-search-by-dewey">Dewey number:</label> >- <input class="search-box" data-qualifier="cn_dewey" id="advanced-search-by-dewey" /> >+ <label for="advanced-search-by-title">Title:</label> >+ <input class="search-box" data-qualifier="title" id="advanced-search-by-title" /> > </li> > <li> >- <label for="advanced-search-by-isbn">ISBN:</label> >- <input class="search-box" data-qualifier="isbn" id="advanced-search-by-isbn" /> >+ <label for="advanced-search-by-author">Author:</label> >+ <input class="search-box" data-qualifier="author" id="advanced-search-by-author" /> > </li> > <li> >- <label for="advanced-search-by-issn">ISSN:</label> >- <input class="search-box" data-qualifier="issn" id="advanced-search-by-issn" /> >+ <label for="advanced-search-by-subject">Subject:</label> >+ <input class="search-box" data-qualifier="subject" id="advanced-search-by-subject" /> >+ </li> >+ <li> >+ <label for="advanced-search-by-lc-number">LC call number:</label> >+ <input class="search-box" data-qualifier="cn_lc" id="advanced-search-by-lc-number" /> > </li> > <li> > <label for="advanced-search-by-lccn">LCCN:</label> > <input class="search-box" data-qualifier="lccn" id="advanced-search-by-lccn" /> > </li> > <li> >- <label for="advanced-search-by-lc-number">LC call number:</label> >- <input class="search-box" data-qualifier="cn_lc" id="advanced-search-by-lc-number" /> >+ <label for="advanced-search-by-control-number">Control number:</label> >+ <input class="search-box" data-qualifier="local_number" id="advanced-search-by-control-number" /> > </li> > <li> >- <label for="advanced-search-by-publisher-number">Publisher number:</label> >- <input class="search-box" data-qualifier="music_identifier" id="advanced-search-by-publisher-number" /> >+ <label for="advanced-search-by-dewey">Dewey number:</label> >+ <input class="search-box" data-qualifier="cn_dewey" id="advanced-search-by-dewey" /> > </li> > <li> > <label for="advanced-search-by-standard-number">Standard number:</label> > <input class="search-box" data-qualifier="standard_identifier" id="advanced-search-by-standard-number" /> > </li> > <li> >- <label for="advanced-search-by-subject">Subject:</label> >- <input class="search-box" data-qualifier="subject" id="advanced-search-by-subject" /> >+ <label for="advanced-search-by-publisher-number">Publisher number:</label> >+ <input class="search-box" data-qualifier="music_identifier" id="advanced-search-by-publisher-number" /> > </li> > <li> > <label for="advanced-search-by-publication-date">Publication date:</label> > <input class="search-box" data-qualifier="date" id="advanced-search-by-publication-date" /> > </li> >- <li> >- <label for="advanced-search-by-title">Title:</label> >- <input class="search-box" data-qualifier="title" id="advanced-search-by-title" /> >- </li> > </ul> > </div> > </form> >-- >2.6.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