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 Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
This commit is contained in:
Jesse Weaver
parent
ca99bfd7e8
commit
5aef3526e4
7 changed files with 65 additions and 56 deletions
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ html, body {
|
|||
}
|
||||
|
||||
.humanError {
|
||||
background-color: #400;
|
||||
background-color: #400;
|
||||
}
|
||||
|
||||
.humanSuccess {
|
||||
background-color: #040;
|
||||
background-color: #040;
|
||||
}
|
||||
|
||||
.humanMsg h3 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -738,6 +738,15 @@
|
|||
|
||||
<h2>Font Awesome</h2>
|
||||
<p><a href="http://fontawesome.io">Font Awesome</a> by Dave Gandy is licensed under the <a href="http://scripts.sil.org/OFL">SIL OFL 1.1</a> and the <a href="http://opensource.org/licenses/mit-license.html">MIT License</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">
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@
|
|||
return false;
|
||||
} );
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
function redirect(dest){
|
||||
$("#redirect").attr("value",dest);
|
||||
|
|
|
|||
|
|
@ -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 ) %]
|
||||
|
|
@ -115,10 +115,34 @@
|
|||
<button class="btn btn-small" type="reset"><i class="icon-remove"></i> <span>Clear</span></button>
|
||||
</div>
|
||||
<ul id="advanced-search-fields">
|
||||
<li>
|
||||
<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-issn">ISSN:</label>
|
||||
<input class="search-box" data-qualifier="issn" id="advanced-search-by-issn" />
|
||||
</li>
|
||||
<li>
|
||||
<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-author">Author:</label>
|
||||
<input class="search-box" data-qualifier="author" id="advanced-search-by-author" />
|
||||
</li>
|
||||
<li>
|
||||
<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-control-number">Control number:</label>
|
||||
<input class="search-box" data-qualifier="local_number" id="advanced-search-by-control-number" />
|
||||
|
|
@ -128,41 +152,17 @@
|
|||
<input class="search-box" data-qualifier="cn_dewey" id="advanced-search-by-dewey" />
|
||||
</li>
|
||||
<li>
|
||||
<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-issn">ISSN:</label>
|
||||
<input class="search-box" data-qualifier="issn" id="advanced-search-by-issn" />
|
||||
</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-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-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-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" />
|
||||
</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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue