ed7543287b
Having to write [% KOHA_VERSION %] for each url is bad because: - It's easily forgettable when adding new <script> or <link> - It prevents grep'ing for the full filename - It violates the DRY principle - If at some point we want to change the "force js and css reload" mechanism, it will be tedious This patch: - adds a Template::Toolkit plugin that generates <script> and <link> tags for JS and CSS files, and inserts automatically the Koha version in the filename - use the new plugin to remove all occurences of [% KOHA_VERSION %] - remove the code that was adding KOHA_VERSION as a template variable Test plan: 1. Apply patch 2. Go to several different pages in Koha (opac and intranet) while checking your browser's dev tools (there should be no 404 for JS and CSS files, and the Koha version should appear in filenames) and the server logs (there should be no "File not found") 3. `git grep KOHA_VERSION` should return nothing 4. prove t/db_dependent/Koha/Template/Plugin/Asset.t Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
170 lines
6.4 KiB
Text
170 lines
6.4 KiB
Text
[% USE Asset %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Administration ›
|
|
[% IF ( add_form ) %][% IF ( searchfield ) %] Printers › Modify printer '[% searchfield %]'[% ELSE %] Printers › New printer[% END %][% END %]
|
|
[% IF ( add_validate ) %] Printers › Printer added[% END %]
|
|
[% IF ( delete_confirm ) %] Printers › Confirm deletion of printer '[% searchfield %]'[% END %]
|
|
[% IF ( delete_confirmed ) %] Printers › Printer deleted[% END %]
|
|
[% IF ( else ) %]Printers[% END %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% IF ( loop ) %]
|
|
[% Asset.css("css/datatables.css") %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
$("#printerst").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
|
|
],
|
|
"aaSorting": [[ 0, "asc" ]],
|
|
"sPaginationType": "four_button"
|
|
}));
|
|
});
|
|
//]]>
|
|
</script>
|
|
[% END %]
|
|
</head>
|
|
<body id="admin_printers" class="admin">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'cat-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › [% IF ( add_form ) %][% IF ( searchfield ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> › Modify printer '[% searchfield %]'[% ELSE %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> › New printer[% END %][% END %]
|
|
[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> › Printer added[% END %]
|
|
[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> › Confirm deletion of printer '[% searchfield %]'[% END %]
|
|
[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> › Printer deleted[% END %]
|
|
[% IF ( else ) %]Printers[% END %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% IF ( add_form ) %]
|
|
|
|
[% IF ( searchfield ) %]
|
|
<h1>Modify printer</h1>
|
|
[% ELSE %]
|
|
<h1>New printer</h1>
|
|
[% END %]
|
|
<form action="[% script_name %]" name="Aform" method="post" class="validated">
|
|
<input type="hidden" name="op" value="add_validate" />
|
|
[% IF ( searchfield ) %]
|
|
<input type="hidden" name="add" value="0" />
|
|
[% ELSE %]
|
|
<input type="hidden" name="add" value="1" />
|
|
[% END %]
|
|
<fieldset class="rows">
|
|
<ol> [% IF ( searchfield ) %]
|
|
<li>
|
|
<span class="label">Printer name: </span>
|
|
<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
|
|
</li>
|
|
[% ELSE %]
|
|
<li>
|
|
<label for="printername" class="required">Printer name: </label>
|
|
<input type="text" name="printername" id="printername" size="40" maxlength="40" class="required" required="required" />
|
|
<span class="required">Required</span>
|
|
</li>
|
|
[% END %]
|
|
<li>
|
|
<label for="printqueue" class="required">Queue: </label>
|
|
<input type="text" name="printqueue" id="printqueue" size="20" maxlength="20" value="[% printqueue %]" class="required" required="required" />
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="printtype">Type: </label>
|
|
<input type="text" name="printtype" id="printtype" size="20" maxlength="20" value="[% printtype %]" />
|
|
</li></ol>
|
|
</fieldset>
|
|
<fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/printers.pl">Cancel</a></fieldset>
|
|
</form>
|
|
|
|
[% END %]
|
|
|
|
[% IF ( add_validate ) %]
|
|
<h3>Printer added</h3>
|
|
<form action="[% script_name %]" method="post">
|
|
<fieldset class="action"> <input type="submit" value="OK" /></fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF ( delete_confirm ) %]
|
|
<div class="dialog alert">
|
|
<h3>Confirm deletion of printer <em>[% searchfield %]</em></h3>
|
|
|
|
<table>
|
|
<tr>
|
|
<th scope="row">Printer: </th><td>[% searchfield %]</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">Queue: </th><td>[% printqueue %]</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">Type: </th><td>[% printtype %]</td>
|
|
</tr>
|
|
</table>
|
|
|
|
<form action="[% script_name %]" method="post">
|
|
<input type="hidden" name="op" value="delete_confirmed" />
|
|
<input type="hidden" name="searchfield" value="[% searchfield %]" />
|
|
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
|
|
</form>
|
|
<form action="/cgi-bin/koha/admin/printers.pl" method="get">
|
|
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
|
|
</form>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( delete_confirmed ) %]
|
|
<div class="dialog message">
|
|
<h3>Printer deleted</h3>
|
|
<form action="[% script_name %]" method="post">
|
|
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
|
|
</form>
|
|
</div>
|
|
|
|
[% END %]
|
|
|
|
[% IF ( else ) %]
|
|
|
|
<div id="toolbar" class="btn-toolbar">
|
|
<a class="btn btn-default btn-sm" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="fa fa-plus"></i> New printer</a>
|
|
</div>
|
|
|
|
<h2>Printers</h2>
|
|
[% IF ( searchfield ) %]
|
|
You searched for [% searchfield %]</span>
|
|
[% END %]
|
|
|
|
[% IF ( loop ) %]
|
|
<table id="printerst">
|
|
<thead>
|
|
<tr>
|
|
<th>Name</th>
|
|
<th>Queue</th>
|
|
<th>Type</th>
|
|
<th> </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH loo IN loop %]
|
|
<tr>
|
|
<td>[% loo.printername %]</td>
|
|
<td>[% loo.printqueue %]</td>
|
|
<td>[% loo.printtype %]</td>
|
|
<td class="actions"><a class="btn btn-default btn-xs" href="[% loo.script_name %]?op=add_form&searchfield=[% loo.printername |uri %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.script_name %]?op=delete_confirm&searchfield=[% loo.printername |uri %]"><i class="fa fa-trash"></i> Delete</a></td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>[% ELSE %]<div class="dialog message">No printers defined.</div>[% END %]
|
|
[% END %]
|
|
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'admin-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|