From db116dec558cc1f8a2ad2e8469fefd60120ea911 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> Date: Mon, 11 Mar 2019 15:58:42 +0000 Subject: [PATCH] Bug 18589: (follow-up) Fix QA tool failures As per comment #17: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18589#c17 Sorry Josef, I honestly have no idea where those tabs came from :( Every once in a while my copy of Vim decides to embarass me and stick in tabs instead of spaces... <shakes fist at screen> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> --- .../prog/en/includes/ill-list-table-strings.inc | 26 +++---- .../prog/en/includes/ill-list-table.inc | 80 ++++++++++----------- .../prog/en/modules/members/ill-requests.tt | 82 +++++++++++----------- 3 files changed, 94 insertions(+), 94 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc index 3ef5e6e650..a02a26b3b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc @@ -1,19 +1,19 @@ <script> - var ill_borrower_details = _('View borrower details'); - var ill_biblio_details = _('View biblio details'); + var ill_borrower_details = _("View borrower details"); + var ill_biblio_details = _("View biblio details"); var ill_statuses = { - new: _('New request'), - req: _('Requested'), - genreq: _('Requested from partners'), - rev: _('Reverted'), - que: _('Queued request'), - canc: _('Cancellation requested'), - comp: _('Completed'), - del: _('Delete request') + new: _("New request"), + req: _("Requested"), + genreq: _("Requested from partners"), + rev: _("Reverted"), + que: _("Queued request"), + canc: _("Cancellation requested"), + comp: _("Completed"), + del: _("Delete request") }; - var ill_manage = _('Manage request'); + var ill_manage = _("Manage request"); var ill_columns = { - biblio_id: _('Bibliographic record ID'), - updated: _('Updated on') + biblio_id: _("Bibliographic record ID"), + updated: _("Updated on") }; </script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc index df26181f14..35a8538ec7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc @@ -1,42 +1,42 @@ <div> - [% IF prefilters.length > 0 %] - <table id="ill-requests" data-prefilters="[% prefilters | html %]"> - [% ELSE %] - <table id="ill-requests"> - [% END %] - <thead> - <tr id="illview-header"> - <th scope="col">Request ID</th> - <th scope="col">Author</th> - <th scope="col">Title</th> - <th scope="col">Article title</th> - <th scope="col">Issue</th> - <th scope="col">Volume</th> - <th scope="col">Year</th> - <th scope="col">Pages</th> - <th scope="col">Type</th> - <th scope="col">Order ID</th> - <th scope="col">Patron</th> - <th scope="col">Bibliographic record</th> - <th scope="col">Branch</th> - <th scope="col">Status</th> - <th scope="col" class="placed"> </th> - <th scope="col" class="placed_formatted">Placed on</th> - <th scope="col" class="updated"> </th> - <th scope="col" class="updated_formatted">Updated on</th> - <th scope="col">Replied</th> - <th scope="col" class="completed"> </th> - <th scope="col" class="completed_formatted">Completed on</th> - <th scope="col">Access URL</th> - <th scope="col">Cost</th> - <th scope="col">Comments</th> - <th scope="col">OPAC notes</th> - <th scope="col">Staff notes</th> - <th scope="col">Backend</th> - <th scope="col" class="actions"></th> - </tr> - </thead> - <tbody id="illview-body"> - </tbody> - </table> + [% IF prefilters.length > 0 %] + <table id="ill-requests" data-prefilters="[% prefilters | html %]"> + [% ELSE %] + <table id="ill-requests"> + [% END %] + <thead> + <tr id="illview-header"> + <th scope="col">Request ID</th> + <th scope="col">Author</th> + <th scope="col">Title</th> + <th scope="col">Article title</th> + <th scope="col">Issue</th> + <th scope="col">Volume</th> + <th scope="col">Year</th> + <th scope="col">Pages</th> + <th scope="col">Type</th> + <th scope="col">Order ID</th> + <th scope="col">Patron</th> + <th scope="col">Bibliographic record</th> + <th scope="col">Branch</th> + <th scope="col">Status</th> + <th scope="col" class="placed"> </th> + <th scope="col" class="placed_formatted">Placed on</th> + <th scope="col" class="updated"> </th> + <th scope="col" class="updated_formatted">Updated on</th> + <th scope="col">Replied</th> + <th scope="col" class="completed"> </th> + <th scope="col" class="completed_formatted">Completed on</th> + <th scope="col">Access URL</th> + <th scope="col">Cost</th> + <th scope="col">Comments</th> + <th scope="col">OPAC notes</th> + <th scope="col">Staff notes</th> + <th scope="col">Backend</th> + <th scope="col" class="actions"></th> + </tr> + </thead> + <tbody id="illview-body"> + </tbody> + </table> </div> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt index cab9a6c733..84dde1992c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt @@ -13,51 +13,51 @@ </head> <body> - [% INCLUDE 'header.inc' %] - [% INCLUDE 'patron-search.inc' %] + [% INCLUDE 'header.inc' %] + [% INCLUDE 'patron-search.inc' %] - <div id="breadcrumbs"> - <a href="/cgi-bin/koha/mainpage.pl">Home</a> - › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> - › ILL requests for [% INCLUDE 'patron-title.inc' %] - </div> + <div id="breadcrumbs"> + <a href="/cgi-bin/koha/mainpage.pl">Home</a> + › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> + › ILL requests for [% INCLUDE 'patron-title.inc' %] + </div> - <div id="doc3" class="yui-t1"> + <div id="doc3" class="yui-t1"> - <div id="bd"> - <div id="yui-main"> - <div class="yui-b"> - <div class="yui-g"> - <h2>ILL requests</h2> - [% INCLUDE 'ill-list-table.inc' %] - </div> - </div> - </div> - <div class="yui-b"> - [% INCLUDE 'circ-menu.inc' %] - </div> - </div> + <div id="bd"> + <div id="yui-main"> + <div class="yui-b"> + <div class="yui-g"> + <h2>ILL requests</h2> + [% INCLUDE 'ill-list-table.inc' %] + </div> + </div> + </div> + <div class="yui-b"> + [% INCLUDE 'circ-menu.inc' %] + </div> + </div> - [% MACRO jsinclude BLOCK %] - [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] - [% INCLUDE 'calendar.inc' %] - [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] - <script> - // Date format for datepickers - var dateMap = { - dmydot: 'dd.mm.yy', - iso: 'yy-mm-dd', - metric: 'dd/mm/yy', - us: 'mm/dd/yy' - }; - var dateFormat = dateMap['[% Koha.Preference('dateformat') | html %]']; - var prefilters = '[% prefilters | html %]'; - // Set column settings - var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %]; - </script> + [% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'calendar.inc' %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] + <script> + // Date format for datepickers + var dateMap = { + dmydot: 'dd.mm.yy', + iso: 'yy-mm-dd', + metric: 'dd/mm/yy', + us: 'mm/dd/yy' + }; + var dateFormat = dateMap['[% Koha.Preference('dateformat') | html %]']; + var prefilters = '[% prefilters | html %]'; + // Set column settings + var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %]; + </script> [% INCLUDE 'ill-list-table-strings.inc' %] - [% Asset.js("js/ill-list-table.js") | $raw %] - [% END %] + [% Asset.js("js/ill-list-table.js") | $raw %] + [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.11.0