Bug 26959: Reindent batch item modification template
This patch reindents the batch item modification template to make indentation consistent. Some lines have been split up. Some markup issues have been corrected: Removed script "type" attribute, removed obsolete "CDATA" markers, removed obsolete IE-specific conditional comment. To test, apply the patch and go to Tools -> Batch item modification. - Test the process of submitting a barcode file, and item number file, and a list of barcodes. - Confirm that everything works as expected. Use your preferred method for checking the differences between files while ignoring whitespace. I use diff with the "-w" flag, but I've been known to leave my car keys in the refrigerator from time to time. The only changes you see should be split lines. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
parent
17479dd3f9
commit
ff49528a04
1 changed files with 381 additions and 348 deletions
|
|
@ -10,16 +10,14 @@
|
|||
[% INCLUDE 'datatables.inc' %]
|
||||
[% Asset.js("js/pages/batchMod.js") | $raw %]
|
||||
<script>
|
||||
//<![CDATA[
|
||||
|
||||
// Prepare array of all column headers, incrementing each index by
|
||||
// two to accommodate control and title columns
|
||||
var allColumns = new Array([% FOREACH item_header_loo IN item_header_loop %]'[% loop.count | html %]'[% UNLESS ( loop.last ) %],[% END %][% END %]);
|
||||
for( x=0; x<allColumns.length; x++ ){
|
||||
allColumns[x] = Number(allColumns[x]) + 2;
|
||||
}
|
||||
$(document).ready(function(){
|
||||
|
||||
$(document).ready(function(){
|
||||
$("input[name='disable_input']").click(function() {
|
||||
var row = $(this).attr("id");
|
||||
row = row.replace("row","hint");
|
||||
|
|
@ -57,17 +55,13 @@ $(document).ready(function(){
|
|||
return false;
|
||||
});
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
<!--[if IE]>
|
||||
<style>#selections { display: none; }</style>
|
||||
<![endif]-->
|
||||
<style>input[type=checkbox]{ margin : 0 .5em; }</style>
|
||||
[% Asset.css("css/addbiblio.css") | $raw %]
|
||||
[% Asset.css("css/humanmsg.css") | $raw %]
|
||||
[% INCLUDE 'select2.inc' %]
|
||||
|
||||
</head>
|
||||
|
||||
<body id="tools_batchMod-edit" class="tools">
|
||||
[% INCLUDE 'header.inc' %]
|
||||
[% INCLUDE 'cat-search.inc' %]
|
||||
|
|
@ -105,11 +99,23 @@ $(document).ready(function(){
|
|||
</fieldset>
|
||||
</div>
|
||||
[% END %]
|
||||
[% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
|
||||
[% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
|
||||
|
||||
[% IF ( barcode_not_unique ) %]
|
||||
<div class="dialog alert">
|
||||
<strong>Error saving item</strong>: Barcode must be unique.
|
||||
</div>
|
||||
[% END %]
|
||||
[% IF ( no_next_barcode ) %]
|
||||
<div class="dialog alert">
|
||||
<strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.
|
||||
</div>
|
||||
[% END %]
|
||||
|
||||
[% IF ( notfoundbarcodes.size ) %]
|
||||
<div class="dialog alert"><p>Warning, the following barcodes were not found:</p></div>
|
||||
<div class="dialog alert">
|
||||
<p>Warning, the following barcodes were not found:</p>
|
||||
</div>
|
||||
|
||||
<table style="margin:auto;">
|
||||
<thead>
|
||||
<tr><th>Barcodes not found</th></tr>
|
||||
|
|
@ -120,14 +126,19 @@ $(document).ready(function(){
|
|||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
[% IF ( item_loop ) %]
|
||||
[% UNLESS ( too_many_items_display ) %]
|
||||
<h4>The following barcodes were found: </h4>
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END %] <!-- /notfoundbarcodes -->
|
||||
|
||||
[% IF ( notfounditemnumbers.size ) %]
|
||||
<div class="dialog alert"><p>Warning, the following itemnumbers were not found:</p></div>
|
||||
<div class="dialog alert">
|
||||
<p>Warning, the following itemnumbers were not found:</p>
|
||||
</div>
|
||||
|
||||
<table style="margin:auto;">
|
||||
<thead>
|
||||
<tr><th>Itemnumbers not found</th></tr>
|
||||
|
|
@ -163,13 +174,28 @@ $(document).ready(function(){
|
|||
<a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" href="#">Clear on loan</a>
|
||||
</div>
|
||||
[% END %]
|
||||
|
||||
<div id="cataloguing_additem_itemlist">
|
||||
|
||||
<p id="selections"><strong>Show/hide columns:</strong> <span class="selected"><input type="checkbox" checked="checked" id="showall"/><label for="showall">Show all columns</label></span> <span><input type="checkbox" id="hideall"/><label for="hideall">Hide all columns</label></span>
|
||||
<p id="selections">
|
||||
<strong>Show/hide columns:</strong>
|
||||
<span class="selected">
|
||||
<input type="checkbox" checked="checked" id="showall" />
|
||||
<label for="showall">Show all columns</label>
|
||||
</span>
|
||||
<span>
|
||||
<input type="checkbox" id="hideall" />
|
||||
<label for="hideall">Hide all columns</label>
|
||||
</span>
|
||||
|
||||
[% FOREACH item_header_loo IN item_header_loop %]
|
||||
<span class="selected"><input id="checkheader[% loop.count | html %]" type="checkbox" checked="checked" /> <label for="checkheader[% loop.count | html %]">[% item_header_loo.header_value | html %]</label> </span>
|
||||
<span class="selected">
|
||||
<input id="checkheader[% loop.count | html %]" type="checkbox" checked="checked" />
|
||||
<label for="checkheader[% loop.count | html %]">[% item_header_loo.header_value | html %]</label>
|
||||
</span>
|
||||
[% END %]
|
||||
</p>
|
||||
|
||||
<table id="itemst">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -188,7 +214,9 @@ $(document).ready(function(){
|
|||
[% IF item_loo.nomod %]
|
||||
<td class="error">Cannot edit</td>
|
||||
[% ELSE %]
|
||||
<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" data-is-onloan="[% item_loo.onloan | html %]" /></td>
|
||||
<td>
|
||||
<input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" data-is-onloan="[% item_loo.onloan | html %]" />
|
||||
</td>
|
||||
[% END %]
|
||||
[% ELSE %]
|
||||
<td> </td>
|
||||
|
|
@ -222,8 +250,12 @@ $(document).ready(function(){
|
|||
[% END %]
|
||||
</a>
|
||||
</td>
|
||||
[% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td>
|
||||
[% END %] </tr>
|
||||
[% FOREACH item_valu IN item_loo.item_value %]
|
||||
<td>
|
||||
[% item_valu.field | html %]
|
||||
</td>
|
||||
[% END %]
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -334,6 +366,7 @@ $(document).ready(function(){
|
|||
[% END %]
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="rows">
|
||||
<legend>Other attributes</legend>
|
||||
<ol>
|
||||
|
|
@ -349,6 +382,7 @@ $(document).ready(function(){
|
|||
</li>
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="action">
|
||||
<div id="jobpanel">
|
||||
<div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
|
||||
|
|
@ -375,7 +409,6 @@ $(document).ready(function(){
|
|||
<a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a>
|
||||
[% END %]
|
||||
</fieldset>
|
||||
|
||||
[% END %]
|
||||
|
||||
</form>
|
||||
[% INCLUDE 'intranet-bottom.inc' %]
|
||||
|
|
|
|||
Loading…
Reference in a new issue