Attachment 137768 Details for Bug 30952 – Bug 30952: (follow-up) Correct whitespace errors

[patch] Bug 30952: (follow-up) Correct whitespace errors

Bug-30952-follow-up-Correct-whitespace-errors.patch (text/plain), 127.92 KB, created by Owen Leonard on 2022-07-15 14:57:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2022-07-15 14:57:22 UTC

Size: 127.92 KB

patch

obsolete

>From 68903338f023fab74aaf3dd7d5d3020541a820db Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 15 Jul 2022 14:47:02 +0000
>Subject: [PATCH] Bug 30952: (follow-up) Correct whitespace errors
>
>Tab characters are forbidden, as is space at the end of lines.
>---
> .../prog/en/includes/acquisitions-search.inc  |   4 +-
> .../en/includes/contracts-admin-search.inc    |  14 +-
> .../prog/en/includes/letters-search.inc       |   4 +-
> .../prog/en/includes/patrons-admin-search.inc |  10 +-
> .../prog/en/includes/z3950-admin-search.inc   |   4 +-
> .../prog/en/modules/acqui/parcels.tt          |  12 +-
> .../prog/en/modules/catalogue/ISBDdetail.tt   |   6 +-
> .../en/modules/catalogue/labeledMARCdetail.tt |  26 +-
> .../en/modules/labels/label-bib-search.tt     |  44 +--
> .../en/modules/labels/label-edit-profile.tt   |  14 +-
> .../prog/en/modules/labels/spinelabel-home.tt |  16 +-
> .../en/modules/reports/acquisitions_stats.tt  | 236 +++++++--------
> .../prog/en/modules/reports/bor_issues_top.tt | 178 ++++++------
> .../prog/en/modules/reports/borrowers_out.tt  |  40 +--
> .../en/modules/reports/borrowers_stats.tt     | 270 +++++++++---------
> .../prog/en/modules/reports/cat_issues_top.tt | 152 +++++-----
> .../prog/en/modules/reports/catalogue_out.tt  | 160 +++++------
> .../en/modules/reports/catalogue_stats.tt     | 226 +++++++--------
> .../en/modules/reports/issues_avg_stats.tt    | 258 ++++++++---------
> .../prog/en/modules/reports/issues_stats.tt   |  54 ++--
> .../prog/en/modules/reports/reserves_stats.tt |  96 +++----
> .../prog/en/modules/reports/serials_stats.tt  |  98 +++----
> .../prog/en/modules/tags/review.tt            |  36 +--
> .../prog/en/modules/tools/viewlog.tt          |  92 +++---
> 24 files changed, 1025 insertions(+), 1025 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>index 9a1b0d71d5..bb7d65090d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>@@ -9,7 +9,7 @@
>     </div>
> 
>     <div id="orders_search" class="residentsearch">
>-		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
>+        <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
>             <input type="text" id="title" style="display:inline;left: 125px;" class="multi-input" placeholder="Title" name="title" size="13" value="[% title | html %]" />
>             <input type="text" id="searchsupplier" style="display:inline" class="multi-input" placeholder="Vendor" name="name" size="13" value="[% name | html %]" />
>             <input type="hidden" id="do_search" name="do_search" value="do" />
>@@ -21,7 +21,7 @@
>                 <input type="text" style="right: 260px" placeholder="Basket" name="basket" id="basket" />
>                 <input type="text" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
>             </p>
>-	    </form>
>+        </form>
>     </div>
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>index bcd79bc01b..231ab3a474 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>@@ -1,18 +1,18 @@
> [% USE Koha %]
> 
> <div id="header_search">
>-	<div id="contract_description_search" class="residentsearch">
>-	<form action="[% script_name | html %]" method="post">
>+    <div id="contract_description_search" class="residentsearch">
>+    <form action="[% script_name | html %]" method="post">
>         <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Search by contract name or/and description:"/>
>-		<input type="submit" class="submit" id="submit" name="search" value="" />
>-	</form>	
>-	</div>
>+        <input type="submit" class="submit" id="submit" name="search" value="" />
>+    </form>
>+    </div>
> 
>     [% INCLUDE 'patron-search-box.inc' %]
> 
>     [% INCLUDE 'catalogue-search-box.inc' %]
> 
>-	<ul id="btn-space">
>+    <ul id="btn-space">
>         <li><a title="Search contracts" class="iconsearch" href="#contract_description_search"><i class="fa fa-pencil-square-o"></i></a></li>
>         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
>         [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
>@@ -20,6 +20,6 @@
>         <span class="name-icon active">Search contracts</span>
>         <span class="name-icon">Check out</span>
>         <span class="name-icon">Search the catalog</span>
>-	</ul>
>+    </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>index d94f383445..863dbe9987 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>@@ -12,7 +12,7 @@
> 
>         [% INCLUDE 'catalogue-search-box.inc' %]
> 
>-	<ul id="btn-space">
>+    <ul id="btn-space">
>                 <li><a title="Search notices" class="iconsearch" href="#notices_search"><i class="fa fa-commenting-o"></i></a></li>
>                 [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
>                 [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
>@@ -20,6 +20,6 @@
>                 <span class="name-icon active" >Search notices</span>
>                 <span class="name-icon">Check out</span>
>                 <span class="name-icon">Search the catalog</span>
>-	</ul>
>+    </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>index cd0796b315..0942b9b2cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>@@ -1,18 +1,18 @@
> [% USE Koha %]
> <div id="header_search">
> 
>-	<div id="patron_category_search" class="residentsearch">
>+    <div id="patron_category_search" class="residentsearch">
>         <form action="[% script_name | html %]" method="post">
>             <input class="head-searchbox" type="text" name="description" value="[% searchfield | html %]" placeholder="Search by patron category name" />
>             <input type="submit" class="submit" id="submit" name="search" value="" />
>         </form>
>-	</div>
>+    </div>
> 
>     [% INCLUDE 'patron-search-box.inc' %]
> 
>-	[% INCLUDE 'catalogue-search-box.inc' %]
>+    [% INCLUDE 'catalogue-search-box.inc' %]
> 
>-	<ul id="btn-space">
>+    <ul id="btn-space">
>         <li><a title="Search patron categories" class="iconsearch" href="#patron_category_search"><i class="fa fa-fw fa-id-card-o"></i></a></li>
>         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" class="iconsearch" href="#circ_search"><i class="fa fa-upload"></i></a></li>[% END %]
>         [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" class="iconsearch" href="#catalog_search"><i class="fa fa-fw fa-search"></i></a></li>[% END %]
>@@ -20,6 +20,6 @@
>         <span class="name-icon active">Search patron categories</span>
>         <span class="name-icon">Check out</span>
>         <span class="name-icon">Search the catalog</span>
>-	</ul>
>+    </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>index 28ab2bc930..ab0a8cf884 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>@@ -2,11 +2,11 @@
> <div id="header_search">
> 
>     <div id="z3950_search" class="residentsearch">
>-	    <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
>+        <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
>                 <input class="head-searchbox" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search" />
>                 <input type="submit" class="submit" id="submit" name="search" value="" />
>         </form>
>-	</div>
>+    </div>
> 
>     [% INCLUDE 'patron-search-box.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>index bd7b4b79c7..5b9552d561 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>@@ -153,14 +153,14 @@
>             <input type="hidden" name="op" value="new" />
>             <input type="text" size="20" id="invoice" name="invoice" class="focus required" required="required" />
>         </li>
>-		[% IF ( gst ) %]
>+        [% IF ( gst ) %]
>         <li>
>             <label for="gst">GST:</label>
>             <input type="text" size="20" id="gst" name="gst" />
>         </li>
>-		[% END %]
>+        [% END %]
>       
>@@ -189,7 +189,7 @@
>             <input type="checkbox" id="showallfunds" />
> 
>         </li>
>-		</ol>
>+        </ol>
> <input type="submit" class="button principal" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
>         </form>
>     </div>
>@@ -201,7 +201,7 @@
>     <aside>
>     <form method="get" action="parcels.pl">
>     <fieldset class="sidebar">
>-	<h3>Filter</h3>
>+    <h3>Filter</h3>
>         <ol>
>             <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li>
>             <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li>
>@@ -229,7 +229,7 @@
>                 </select></li>
>         </ol>
>     <fieldset class="action"><input type="submit" class="button principal" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
>-	</fieldset>
>+    </fieldset>
> </form>
> </aside>
> </div>  
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>index eebeab70b2..c857c61ac5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>@@ -53,7 +53,7 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-	[% INCLUDE 'cat-toolbar.inc' %]
>+    [% INCLUDE 'cat-toolbar.inc' %]
>                 <h2>
>                     [% IF ( unknownbiblionumber ) %]
>                         Unknown record
>@@ -70,9 +70,9 @@
>     
>     <span class="Z3988" title="[% ocoins | html %]"></span>
>     [% END %]
>-	  <div id="catalogue_ISBDdetail">
>+      <div id="catalogue_ISBDdetail">
>           [% ISBD | $raw %]
>-	  </div>
>+      </div>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>index f5dc6f94ff..6f87b9b2be 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>@@ -15,11 +15,11 @@
>   [% END %] &rsaquo; Catalog &rsaquo; Koha
> </title>
> 
>-	[% INCLUDE 'doc-head-close.inc' %]
>+    [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="catlaog_labeledMARCdetail" class="catalog">
>-	[% INCLUDE 'header.inc' form=formulaire %]
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>@@ -73,17 +73,17 @@
>                         [% END %]
>                     </select>
>                     </strong></p>
>-					
>-					<div>
>-						<table class="labeledmarc-table">
>-							[% FOREACH marc_dat IN marc_data %]
>-								<tr>
>-									<td class="labeledmarc-label">[% marc_dat.label | html %]</td>
>-									<td class="labeledmarc-value">[% marc_dat.value | html %]</td>
>-								</tr>
>-							[% END %]
>-						</table>
>-					</div>
>+                    
>+                    <div>
>+                        <table class="labeledmarc-table">
>+                            [% FOREACH marc_dat IN marc_data %]
>+                                <tr>
>+                                    <td class="labeledmarc-label">[% marc_dat.label | html %]</td>
>+                                    <td class="labeledmarc-value">[% marc_dat.value | html %]</td>
>+                                </tr>
>+                            [% END %]
>+                        </table>
>+                    </div>
>             </main>
>         </div> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
>index 55d15c5232..a38403f9e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt
>@@ -6,28 +6,28 @@
> <h2>Search</h2>
> 
> <form name="f" method="post">
>-	<input type="hidden" name="op" value="do_search" />
>-	<input type="hidden" name="type" value="intranet" />
>-	<div class="details">
>-		<h3>Search on</h3>
>-		<p>
>-			<label for="category">Name or ISSN: </label>
>-			[% category | html %]
>-		</p>
>-		<p>
>-			<label for="index">Search value: </label>
>-			<input type="text" name="value" value="[% value | html %]" />
>-			<input type="hidden" name="authtypecode" value="[% category | html %]" />
>-			<input type="hidden" name="marclist" value="" />
>-			<input type="hidden" name="and_or" value="and" />
>-			<input type="hidden" name="excluding" value="" />
>-			<input type="hidden" name="operator" value="contains" />
>-			<input type="hidden" id="index" name="index" value="[% index | html %]" />
>-		</p>
>-		<p>
>-			<input type="submit" value="Start search" class="submit principal" />
>-		</p>
>-	</div>
>+    <input type="hidden" name="op" value="do_search" />
>+    <input type="hidden" name="type" value="intranet" />
>+    <div class="details">
>+        <h3>Search on</h3>
>+        <p>
>+            <label for="category">Name or ISSN: </label>
>+            [% category | html %]
>+        </p>
>+        <p>
>+            <label for="index">Search value: </label>
>+            <input type="text" name="value" value="[% value | html %]" />
>+            <input type="hidden" name="authtypecode" value="[% category | html %]" />
>+            <input type="hidden" name="marclist" value="" />
>+            <input type="hidden" name="and_or" value="and" />
>+            <input type="hidden" name="excluding" value="" />
>+            <input type="hidden" name="operator" value="contains" />
>+            <input type="hidden" id="index" name="index" value="[% index | html %]" />
>+        </p>
>+        <p>
>+            <input type="submit" value="Start search" class="submit principal" />
>+        </p>
>+    </div>
> </form>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>index 6ced0b5bea..e74df2750e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>@@ -65,7 +65,7 @@
>                                             </li>
>                                             <li>
>                                                 [% IF ( profile_id ) %]
>-												<span class="label">Paper bin:</span> [% paper_bin | html %]
>+                                                <span class="label">Paper bin:</span> [% paper_bin | html %]
>                                                 <input type="hidden" name="paper_bin" value="[% paper_bin | html %]" />
>                                                 [% ELSE %]
>                                                 <label for="paper_bin">Paper bin:</label><input type="text"  size="20" name="paper_bin" id="paper_bin" />
>@@ -104,10 +104,10 @@
>                                                 </select>
>                                             </li>
>                                          </ol>
>-										</fieldset>
>+                                        </fieldset>
> 
>-										<fieldset class="rows"><h3>Offset:</h3>
>-										<ol>
>+                                        <fieldset class="rows"><h3>Offset:</h3>
>+                                        <ol>
>                                             <li>
>                                                 <label for="offset_horz">Horizontal: </label><input type="text"  size="4" name="offset_horz" id="offset_horz" value="[% offset_horz | html %]" />
>                                             </li>
>@@ -115,10 +115,10 @@
>                                                 <label for="offset_vert">Vertical: </label><input type="text" size="4" name="offset_vert" id="offset_vert" value="[% offset_vert | html %]" />
>                                             </li>
>                                          </ol>
>-										</fieldset>
>+                                        </fieldset>
> 
>-										<fieldset class="rows"><h3>Creep:</h3>
>-										<ol>
>+                                        <fieldset class="rows"><h3>Creep:</h3>
>+                                        <ol>
>                                             <li>
>                                                 <label for="creep_horz">Horizontal: </label><input type="text"  size="4" name="creep_horz" id="creep_horz" value="[% creep_horz | html %]" />
>                                             </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>index 65d4d7a790..72c29d3a95 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>@@ -34,16 +34,16 @@
>             <main>
> 
>                 <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint">
>-				<fieldset class="brief">
>+                <fieldset class="brief">
> <h3>Quick spine label creator</h3>
>-				<ol>
>-					<li><label for="barcode">Barcode: </label>
>+                <ol>
>+                    <li><label for="barcode">Barcode: </label>
>                         <input type="text" name="barcode" id="barcode" class="focus" required="required" />
>-					</li>
>-				</ol>
>-				<fieldset class="action"><input class="principal" type="submit" value="View spine label" /></fieldset>
>-				</fieldset>
>-				</form>
>+                    </li>
>+                </ol>
>+                <fieldset class="action"><input class="principal" type="submit" value="View spine label" /></fieldset>
>+                </fieldset>
>+                </form>
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>index ec2fc6ce12..7fbf547dcb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>@@ -45,7 +45,7 @@
> 
> <h2>Acquisitions statistics </h2>
> [% IF ( do_it ) %]
>-	[% FOREACH mainloo IN mainloop %]
>+    [% FOREACH mainloo IN mainloop %]
>         [% IF ( mainloo.loopfilter.size ) %]
>             <p><strong>Filtered on:</strong></p>
>             [% FOREACH loopfilte IN mainloo.loopfilter %]
>@@ -66,108 +66,108 @@
>                     [% END %]
>                     : [% loopfilte.filter | html %]
>                 </p>
>-			[% END %]
>-		[% END %]
>+            [% END %]
>+        [% END %]
> 
>-		<table>
>-			<tr >
>-				<th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th>[% loopco.coltitle | html %]</th>
>-				[% END %]
>-				<th>TOTAL</th>
>-			</tr>
>-				[% FOREACH loopro IN mainloo.looprow %]
>-					<tr>
>-						[% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>-						[% loopro.rowtitle | html %]</td>
>-						[% FOREACH loopcel IN loopro.loopcell %]
>-							[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-								[% IF ( loopcel.value ) %][% loopcel.value | html %]
>-								[% ELSE %] &nbsp;
>-								[% END %]
>-							</td>
>-						[% END %]
>-						[% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-							[% loopro.totalrow | html %]
>-						</td>
>-					</tr>
>-				[% END %]
>-				<tr >
>-					<th>TOTAL</th>
>-					[% FOREACH loopfoote IN mainloo.loopfooter %]
>-						<th>
>-							[% loopfoote.totalcol | html %]
>-						</th>
>-					[% END %]
>-					<th>[% mainloo.total | html %]</th>
>-				</tr>
>-		</table>
>-	[% END %]
>+        <table>
>+            <tr >
>+                <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th>[% loopco.coltitle | html %]</th>
>+                [% END %]
>+                <th>TOTAL</th>
>+            </tr>
>+                [% FOREACH loopro IN mainloo.looprow %]
>+                    <tr>
>+                        [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>+                        [% loopro.rowtitle | html %]</td>
>+                        [% FOREACH loopcel IN loopro.loopcell %]
>+                            [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                                [% IF ( loopcel.value ) %][% loopcel.value | html %]
>+                                [% ELSE %] &nbsp;
>+                                [% END %]
>+                            </td>
>+                        [% END %]
>+                        [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                            [% loopro.totalrow | html %]
>+                        </td>
>+                    </tr>
>+                [% END %]
>+                <tr >
>+                    <th>TOTAL</th>
>+                    [% FOREACH loopfoote IN mainloo.loopfooter %]
>+                        <th>
>+                            [% loopfoote.totalcol | html %]
>+                        </th>
>+                    [% END %]
>+                    <th>[% mainloo.total | html %]</th>
>+                </tr>
>+        </table>
>+    [% END %]
> [% ELSE %]
>-	<form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">
>-	<fieldset class="rows">
>-	<h3>Acquisitions statistics</h3>
>-	<table>
>-		<thead>
>-			<tr>
>-			<th>Title</th>
>-			<th>Row</th>
>-			<th>Column</th>
>-			<th>Filter</th>
>-			</tr>
>-		</thead>
>-		<tbody>
>-			<tr class="hilighted">
>+    <form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">
>+    <fieldset class="rows">
>+    <h3>Acquisitions statistics</h3>
>+    <table>
>+        <thead>
>+            <tr>
>+            <th>Title</th>
>+            <th>Row</th>
>+            <th>Column</th>
>+            <th>Filter</th>
>+            </tr>
>+        </thead>
>+        <tbody>
>+            <tr class="hilighted">
>                 <td>Placed on</td>
>-				<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
>-				<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>
>+                <td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
>+                <td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>
>                 <td>
>                     From <input type="text" size="10" id="placedonfrom" name="Filter" value="" class="flatpickr" data-date_to="placedonto" />
>                     <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>                     To <input size="10" id="placedonto" name="Filter" type="text" value="" class="flatpickr" />
>                     <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>                 </td>
>-			</tr>
>-			<tr class="hilighted">
>-				<td>&nbsp;</td>
>-				<td colspan="2">group by <select name="PlacedOnDisplay">
>-					<option value="">None</option>
>-					<option value ="1">Day of week</option>
>-					<option value ="2">Month</option>
>-					<option value ="3">Year</option>
>-					</select>
>+            </tr>
>+            <tr class="hilighted">
>+                <td>&nbsp;</td>
>+                <td colspan="2">group by <select name="PlacedOnDisplay">
>+                    <option value="">None</option>
>+                    <option value ="1">Day of week</option>
>+                    <option value ="2">Month</option>
>+                    <option value ="3">Year</option>
>+                    </select>
> 
>-				</td>
>-				<td>&nbsp;</td>
>-			</tr>
>-			<tr>
>+                </td>
>+                <td>&nbsp;</td>
>+            </tr>
>+            <tr>
>                 <td>Received on</td>
>-				<td><input type="radio" name="Line" value="aqorders.datereceived" /></td>
>-				<td><input type="radio" name="Column" value="aqorders.datereceived" /></td>
>+                <td><input type="radio" name="Line" value="aqorders.datereceived" /></td>
>+                <td><input type="radio" name="Column" value="aqorders.datereceived" /></td>
>                 <td>
>                     From <input type="text" size="10" id="receivedonfrom" name="Filter" value="" class="flatpickr" data-date_to="receivedonto" />
>                     <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>                     To <input type="text" size="10" id="receivedonto" name="Filter" value="" class="flatpickr" />
>                     <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>                 </td>
>-			</tr>
>-			<tr>
>-				<td>&nbsp;</td>
>-				<td colspan="2">group by <select name="ReceivedOnDisplay">
>-					<option value="">None</option>
>-					<option value ="1">Day of week</option>
>-					<option value ="2">Month</option>
>-					<option value ="3">Year</option>
>-					</select>
>+            </tr>
>+            <tr>
>+                <td>&nbsp;</td>
>+                <td colspan="2">group by <select name="ReceivedOnDisplay">
>+                    <option value="">None</option>
>+                    <option value ="1">Day of week</option>
>+                    <option value ="2">Month</option>
>+                    <option value ="3">Year</option>
>+                    </select>
> 
>-				</td>
>-				<td>&nbsp;</td>
>-			</tr>
>-			<tr class="hilighted">
>-				<td>Vendor</td>
>-				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
>-				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
>+                </td>
>+                <td>&nbsp;</td>
>+            </tr>
>+            <tr class="hilighted">
>+                <td>Vendor</td>
>+                <td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
>+                <td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
>                 <td>
>                     <select name="Filter">
>                         <option value="">All vendors</option>
>@@ -213,10 +213,10 @@
>                     [% END %]
>                 </td>
>             </tr>
>-			<tr>
>+            <tr>
>                 <td>Item type</td>
>-				<td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
>-				<td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
>+                <td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
>+                <td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
>                 <td>
>                     <select name="Filter" id="itemtypes">
>                         <option value="">All item types</option>
>@@ -225,12 +225,12 @@
>                         [% END %]
>                     </select>
>                 </td>
>-			</tr>
>+            </tr>
> 
>-			<tr>
>-				<td>Fund</td>
>-				<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
>-				<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
>+            <tr>
>+                <td>Fund</td>
>+                <td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
>+                <td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
>                 <td>
>                     <select name="Filter" id="budget">
>                         <option value="">All funds</option>
>@@ -239,13 +239,13 @@
>                         [% END %]
>                     </select>
>                 </td>
>-			</tr>
>+            </tr>
> 
>-			[% IF ( hassort1 ) %]
>-				<tr class="hilighted">
>-					<td>Sort1</td>
>-					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
>-					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
>+            [% IF ( hassort1 ) %]
>+                <tr class="hilighted">
>+                    <td>Sort1</td>
>+                    <td><input type="radio" name="Line" value="aqorders.sort1" /></td>
>+                    <td><input type="radio" name="Column" value="aqorders.sort1" /></td>
>                     <td>
>                         <select name="Filter" id="sort1">
>                             <option value="">All</option>
>@@ -254,13 +254,13 @@
>                             [% END %]
>                         </select>
>                     </td>
>-				</tr>
>-			[% END %]
>-			[% IF ( hassort2 ) %]
>-				[% IF ( HglghtSort2 ) %]<tr class="hilighted"> [% ELSE %]<tr>[% END %]
>-					<td>Sort2</td>
>-					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
>-					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
>+                </tr>
>+            [% END %]
>+            [% IF ( hassort2 ) %]
>+                [% IF ( HglghtSort2 ) %]<tr class="hilighted"> [% ELSE %]<tr>[% END %]
>+                    <td>Sort2</td>
>+                    <td><input type="radio" name="Line" value="aqorders.sort2" /></td>
>+                    <td><input type="radio" name="Column" value="aqorders.sort2" /></td>
>                     <td>
>                         <select name="Filter" id="sort2">
>                             <option value="">All</option>
>@@ -269,11 +269,11 @@
>                             [% END %]
>                         </select>
>                     </td>
>-				</tr>
>-			[% END %]
>-		</tbody>
>-	</table><br />
>-	</fieldset>
>+                </tr>
>+            [% END %]
>+        </tbody>
>+    </table><br />
>+    </fieldset>
> 
> <fieldset class="rows">
>     <h3> Cell value </h3>
>@@ -296,8 +296,8 @@
>     </ol>
> </fieldset>
> 
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -321,11 +321,11 @@
>         </li>
>     </ol>
> 
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>index 2a3515cce6..a0749cc57d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>@@ -48,8 +48,8 @@
> 
> [% IF ( do_it ) %]
>     <h2>Patrons with the most checkouts</h2>
>-	[% FOREACH mainloo IN mainloop %]
>-		[% IF ( mainloo.loopfilter ) %]
>+    [% FOREACH mainloo IN mainloop %]
>+        [% IF ( mainloo.loopfilter ) %]
>             [% IF mainloo.loopfilter.size %]
>                 <p>Filtered on:</p>
>                 <ul>
>@@ -83,43 +83,43 @@
>                     [% END %]
>                 </ul>
>             [% END %]
>-		[% END %]
>-		
>-		<table>
>-			<tr>
>-				<th rowspan="2">Rank</th>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th colspan="2">[% loopco.coltitle | html %]</th>
>-				[% END %]
>-			</tr>
>-			<tr>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th>Patron</th>
>-					<th>Checkout count</th>
>-				[% END %]
>-			</tr>
>-				[% FOREACH loopro IN mainloo.looprow %]
>-				<tr>
>-					[% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-					[% loopro.rowtitle | html %]</td>
>-					[% FOREACH loopcel IN loopro.loopcell %]
>-						[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+        [% END %]
>+
>+        <table>
>+            <tr>
>+                <th rowspan="2">Rank</th>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th colspan="2">[% loopco.coltitle | html %]</th>
>+                [% END %]
>+            </tr>
>+            <tr>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th>Patron</th>
>+                    <th>Checkout count</th>
>+                [% END %]
>+            </tr>
>+                [% FOREACH loopro IN mainloo.looprow %]
>+                <tr>
>+                    [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                    [% loopro.rowtitle | html %]</td>
>+                    [% FOREACH loopcel IN loopro.loopcell %]
>+                        [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>                             [% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference | uri %]">[% END %]
>-							[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
>-							[% IF ( loopcel.reference ) %]</a>[% END %]
>-						</td>
>-						[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-						[% IF ( loopcel.count ) %][% loopcel.count | html %][% END %]
>-						</td>
>-					[% END %]
>-				</tr>
>-				[% END %]
>-		</table>
>-	[% END %]
>+                            [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
>+                            [% IF ( loopcel.reference ) %]</a>[% END %]
>+                        </td>
>+                        [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                        [% IF ( loopcel.count ) %][% loopcel.count | html %][% END %]
>+                        </td>
>+                    [% END %]
>+                </tr>
>+                [% END %]
>+        </table>
>+    [% END %]
> [% ELSE %]
>     <h2>Patrons with the most checkouts</h2>
>-	<form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl">
>-	<fieldset class="rows">
>+    <form method="post" action="/cgi-bin/koha/reports/bor_issues_top.pl">
>+    <fieldset class="rows">
>         <ol>
>             <li>
>                 <label for="checkoutfrom">Checkout date from:</label>
>@@ -137,68 +137,68 @@
>                 <input type="text" size="10" id="checkinto" name="Filter" value="" class="flatpickr" />
>                 <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>             </li>
>-			<li> 
>-				<label for="branch">Library: </label>
>+            <li>
>+                <label for="branch">Library: </label>
> <select name="Filter" id="branch"><option value="" > Any library</option>
>     [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
>         <option value="[% l.branchcode | html %]" >[% l.branchname | html %] </option>
>-     [% END %] 
>+     [% END %]
>     </select>			</li>
>-			<li> 
>+            <li>
>                 <label for="documenttype">Item type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option>
>     [% FOREACH itemtype IN itemtypes %]
>         <option value="[% itemtype.itemtype | html %]" >[% itemtype.translated_description | html %] </option>
>-     [% END %] 
>+     [% END %]
>     </select>
>-			</li>
>-			<li> 
>+            </li>
>+            <li>
>                 <label for="patroncategory">Patron category: </label><select name="Filter" id="patroncategory"><option value="" > Any category code</option>
>     [% FOREACH patron_category IN patron_categories%]
>         <option value="[% patron_category.categorycode | html %]" >[% patron_category.description | html %] </option>
>      [% END %]
>     </select>
>-			</li>
>-		</ol>
>-	</fieldset>
>-	
>-	<fieldset class="rows">
>-	<ol>
>-		<li><label for="numlimit">Limit to: </label> <select name="Limit" id="numlimit">
>-						<option value ="5" selected="selected"> 5</option>
>-						<option value ="10">10</option>
>-						<option value ="15">15</option>
>-						<option value ="20">20</option>
>+            </li>
>+        </ol>
>+    </fieldset>
>+
>+    <fieldset class="rows">
>+    <ol>
>+        <li><label for="numlimit">Limit to: </label> <select name="Limit" id="numlimit">
>+                        <option value ="5" selected="selected"> 5</option>
>+                        <option value ="10">10</option>
>+                        <option value ="15">15</option>
>+                        <option value ="20">20</option>
>                         <option value ="">No limit</option>
>-	
>-					</select></li>
>-		<li><label for="criteria">By: </label> <select name="Criteria" id="criteria">
>-						<option value ="" selected="selected">None</option>
>-						<option value ="branchcode">Library</option>
>+    
>+                    </select></li>
>+        <li><label for="criteria">By: </label> <select name="Criteria" id="criteria">
>+                        <option value ="" selected="selected">None</option>
>+                        <option value ="branchcode">Library</option>
>                         <option value ="categorycode">Category code</option>
>                         <option value ="itemtype">Item type</option>
>-						<option value ="Day">Day</option>
>-						<option value ="Week">Week</option>
>-						<option value ="Month">Month</option>
>-						<option value ="Year">Year</option>
>-					</select></li>
>-	</ol>
>-	</fieldset>
>+                        <option value ="Day">Day</option>
>+                        <option value ="Week">Week</option>
>+                        <option value ="Month">Month</option>
>+                        <option value ="Year">Year</option>
>+                    </select></li>
>+    </ol>
>+    </fieldset>
> 
> <fieldset class="rows">
>-	<h3>Output</h3>
>-	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
>-		<li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
>-			<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
>-			<label class="inline" for="MIME">Into an application: </label>
>-			<select name="MIME" id="MIME">
>-			[% FOREACH mimeloo IN mimeloop %]
>-				<option value="[% mimeloo.type | html %]">[% mimeloo.type | html %]</option>
>-			[% END %]
>-			</select>
>-			<label class="inline" for="sep">Delimiter: </label>
>+    <h3>Output</h3>
>+    <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
>+        <li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
>+            <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
>+            <label class="inline" for="MIME">Into an application: </label>
>+            <select name="MIME" id="MIME">
>+            [% FOREACH mimeloo IN mimeloop %]
>+                <option value="[% mimeloo.type | html %]">[% mimeloo.type | html %]</option>
>+            [% END %]
>+            </select>
>+            <label class="inline" for="sep">Delimiter: </label>
>             <select name="sep" id="sep">
>             [% FOREACH value IN CGIseplist.values.sort() %]
>               [% IF ( value == CGIseplist.default ) %]
>@@ -208,16 +208,16 @@
>               [% END %]
>             [% END %]
>             </select>
>-		</li>
>-	</ol>
>-	</fieldset>
>+        </li>
>+    </ol>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>index 15845f9881..ffc103d1cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>@@ -41,7 +41,7 @@
>                     <p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit | html %] =[% loopfilte.filter | html %][% IF ( loopfilte.err ) %]  [% END %]</p>
>             [% END %]
>         [% END %]
>-        
>+
>         <table>
>             <tr>
>                 <th>Num/Patrons</th>
>@@ -64,7 +64,7 @@
>     <h2>Patrons with no checkouts</h2>
>     <form method="post" action="/cgi-bin/koha/reports/borrowers_out.pl">
>     <fieldset class="rows">
>-		<ol>
>+        <ol>
>             <li><label for="patroncategory">Patron category: </label> <select name="Filter" id="patroncategory"><option value="" > Any category code</option>
>     [% FOREACH patron_category IN patron_categories %]
>         <option value="[% patron_category.categorycode | html %]" >[% patron_category.description | html %] </option>
>@@ -73,13 +73,13 @@
> </li>
>     <li><label for="to">Not checked out since: </label> <input size="10" id="to" class="flatpickr" data-flatpickr-pastdate="true" name="Filter" value="" type="text" />
> </li>
>-		</ol>
>-	</fieldset>
>-	
>+        </ol>
>+    </fieldset>
>+
>     <fieldset class="rows">
>-	<h3>Limits</h3>
>-		<ol>
>-			<li><label for="numberlimit">Limit to: </label><select name="Limit" id="numberlimit">
>+    <h3>Limits</h3>
>+        <ol>
>+            <li><label for="numberlimit">Limit to: </label><select name="Limit" id="numberlimit">
>                         <option value ="" selected="selected">None</option>
>                         <option value ="5"> 5</option>
>                         <option value ="10">10</option>
>@@ -90,16 +90,16 @@
>                         <option value ="50">50</option>
>                         <option value ="100">100</option>
>                     </select></li>
>-			<li><label for="criteria">By: </label><select name="Criteria" id="criteria">
>+            <li><label for="criteria">By: </label><select name="Criteria" id="criteria">
>                         <option value ="" selected="selected">None</option>
>                         <option value ="categorycode">Patron category</option>
>                         <option value ="branchcode">Library</option>
>                     </select></li>
>-		</ol>
>-	</fieldset>
>-	
>+        </ol>
>+    </fieldset>
>+
> <fieldset class="rows">
>-	<h3>Output</h3>
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -124,14 +124,14 @@
>             </select>
>         </li>
>     </ol>
>-	</fieldset>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>index 25ff5ac89e..c06613a6b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>@@ -10,8 +10,8 @@
> 
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>-	.sql {display:none;}
>-	.debug {display:none;}
>+    .sql {display:none;}
>+    .debug {display:none;}
> </style>
> </head>
> 
>@@ -53,61 +53,61 @@
> 
> <h2>Patrons statistics</h2>
> [% IF ( do_it ) %]
>-	[% FOREACH mainloo IN mainloop %]
>+    [% FOREACH mainloo IN mainloop %]
>         [% IF ( mainloo.loopfilter.size>0 ) %]
>             <p>Filtered on:</p>
>-			[% FOREACH loopfilte IN mainloo.loopfilter %]
>-				<p>
>-					[% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>-				</p>
>-			[% END %]
>-		[% END %]
>-		<table>
>-			<tr>
>-				<th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th>[% IF ( loopco.coltitle_display ) %][% loopco.coltitle_display | html %][% ELSE %][% loopco.coltitle | html %][% END %]
>-					</th>
>-				[% END %]
>-				<th>TOTAL</th>
>-			</tr>
>-				[% FOREACH loopro IN mainloo.looprow %]
>+            [% FOREACH loopfilte IN mainloo.loopfilter %]
>+                <p>
>+                    [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>+                </p>
>+            [% END %]
>+        [% END %]
>+        <table>
>+            <tr>
>+                <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th>[% IF ( loopco.coltitle_display ) %][% loopco.coltitle_display | html %][% ELSE %][% loopco.coltitle | html %][% END %]
>+                    </th>
>+                [% END %]
>+                <th>TOTAL</th>
>+            </tr>
>+                [% FOREACH loopro IN mainloo.looprow %]
>                     <tr>
>-						<td>[% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display | html %][% ELSE %][% loopro.rowtitle | html %][% END %]
>-						</td>
>-						[% FOREACH loopcel IN loopro.loopcell %]
>-						<td>[% IF ( loopcel.value ) %][% loopcel.value | html %][% ELSE %]&nbsp;[% END %]
>-						</td>
>-						[% END %]
>-						<td>[% loopro.totalrow | html %]</td>
>-					</tr>
>-				[% END %]
>-				<tr>
>-					<th>TOTAL</th>
>-					[% FOREACH loopfoote IN mainloo.loopfooter %]
>-						<th>[% loopfoote.totalcol | html %]</th>
>-					[% END %]
>-					<th>[% mainloo.total | html %]</th>
>-				</tr>
>-		</table>
>-	[% END %]
>+                        <td>[% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display | html %][% ELSE %][% loopro.rowtitle | html %][% END %]
>+                        </td>
>+                        [% FOREACH loopcel IN loopro.loopcell %]
>+                        <td>[% IF ( loopcel.value ) %][% loopcel.value | html %][% ELSE %]&nbsp;[% END %]
>+                        </td>
>+                        [% END %]
>+                        <td>[% loopro.totalrow | html %]</td>
>+                    </tr>
>+                [% END %]
>+                <tr>
>+                    <th>TOTAL</th>
>+                    [% FOREACH loopfoote IN mainloo.loopfooter %]
>+                        <th>[% loopfoote.totalcol | html %]</th>
>+                    [% END %]
>+                    <th>[% mainloo.total | html %]</th>
>+                </tr>
>+        </table>
>+    [% END %]
> [% ELSE %]
> 
>-	<form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl">
>-	<fieldset class="rows"><h3>Patrons statistics</h3>
>-	<table>
>-		<thead>
>-			<tr>
>-			<th>Title</th>
>-			<th>Row</th>
>-			<th>Column</th>
>-			<th>Filter</th>
>-			</tr>
>-		</thead>
>-		<tbody>
>+    <form method="post" action="/cgi-bin/koha/reports/borrowers_stats.pl">
>+    <fieldset class="rows"><h3>Patrons statistics</h3>
>+    <table>
>+        <thead>
>             <tr>
>-			<td>Patron category</td>
>-			<td><input type="radio" name="Line" value="categorycode" /></td>
>+            <th>Title</th>
>+            <th>Row</th>
>+            <th>Column</th>
>+            <th>Filter</th>
>+            </tr>
>+        </thead>
>+        <tbody>
>+            <tr>
>+            <td>Patron category</td>
>+            <td><input type="radio" name="Line" value="categorycode" /></td>
>             <td><input type="radio" checked="checked" name="Column" value="categorycode" /></td>
>             <td>
>                 <select name="Filter" id="catcode">
>@@ -117,69 +117,69 @@
>                     [% END %]
>                 </select>
>             </td>
>-			</tr>
>-			<tr>
>-			<td>Patron status</td>
>-			<td colspan="2"></td>
>-			<td ><select name="status"><option value=""> </option><option value="debarred">restricted</option><option value="gonenoadress">gone no address</option><option value="lost">lost</option></select></td>
>-			</tr>
>+            </tr>
>+            <tr>
>+            <td>Patron status</td>
>+            <td colspan="2"></td>
>+            <td ><select name="status"><option value=""> </option><option value="debarred">restricted</option><option value="gonenoadress">gone no address</option><option value="lost">lost</option></select></td>
>+            </tr>
>             <tr>
>-			<td>Patron activity</td>
>-			<td colspan="2"><select name="period" id="period">
>-			<option value="1">1</option>
>-			<option value="2">2</option>
>-			<option value="3">3</option>
>-			</select>
>-			<label for="period">years of activity</label> 
>-			</td>
>-			<td><select name="activity"><option value=""> </option><option value="active">active</option><option value="nonactive">no active</option></select></td>
>-			</tr>
>+            <td>Patron activity</td>
>+            <td colspan="2"><select name="period" id="period">
>+            <option value="1">1</option>
>+            <option value="2">2</option>
>+            <option value="3">3</option>
>+            </select>
>+            <label for="period">years of activity</label>
>+            </td>
>+            <td><select name="activity"><option value=""> </option><option value="active">active</option><option value="nonactive">no active</option></select></td>
>+            </tr>
> 
>-			<tr>
>+            <tr>
>             <td rowspan="2">ZIP/Postal code</td>
>-			<td><input type="radio" name="Line" value="zipcode" /></td>
>-			<td><input type="radio" name="Column" value="zipcode" /></td>
>+            <td><input type="radio" name="Line" value="zipcode" /></td>
>+            <td><input type="radio" name="Column" value="zipcode" /></td>
>             <td><select name="Filter" id="zipcode">
>-				<option value=""> </option>
>-				[% FOREACH ZIP_LOO IN ZIP_LOOP %]
>-				<option value="[% ZIP_LOO.zipcode | html %]">[% ZIP_LOO.zipcode | html %]</option>
>-				[% END %]
>-				</select>
>-			</td>
>-			</tr>
>-			<tr>
>-			<td colspan="2"><select name="digits" id="digits">
>-			<option value=""> </option>
>-			<option value ="1">1</option>
>-			<option value ="2">2</option>
>-			<option value ="3">3</option>
>-			<option value ="4">4</option>
>-			<option value ="5">5</option>
>-			<option value ="6">6</option>
>-			<option value ="7">7</option>
>-			<option value ="8">8</option>
>-			<option value ="9">9</option>
>-			<option value ="10">10</option>
>-			</select>
>-			<label for="digits">digits</label> 
>-			</td>
>-			<td>&nbsp;</td>
>-			</tr>
>+                <option value=""> </option>
>+                [% FOREACH ZIP_LOO IN ZIP_LOOP %]
>+                <option value="[% ZIP_LOO.zipcode | html %]">[% ZIP_LOO.zipcode | html %]</option>
>+                [% END %]
>+                </select>
>+            </td>
>+            </tr>
>+            <tr>
>+            <td colspan="2"><select name="digits" id="digits">
>+            <option value=""> </option>
>+            <option value ="1">1</option>
>+            <option value ="2">2</option>
>+            <option value ="3">3</option>
>+            <option value ="4">4</option>
>+            <option value ="5">5</option>
>+            <option value ="6">6</option>
>+            <option value ="7">7</option>
>+            <option value ="8">8</option>
>+            <option value ="9">9</option>
>+            <option value ="10">10</option>
>+            </select>
>+            <label for="digits">digits</label>
>+            </td>
>+            <td>&nbsp;</td>
>+            </tr>
> 
>             <tr>
>-			<td>Library</td>
>+            <td>Library</td>
>             <td><input type="radio" checked="checked" name="Line"   value="branchcode" /></td>
>-			<td><input type="radio" name="Column" value="branchcode" /></td>
>-			<td>
>+            <td><input type="radio" name="Column" value="branchcode" /></td>
>+            <td>
>                 <select name="Filter" id="branch">
>                 <option value=""></option>
>                 [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
>                     <option value="[% l.branchcode | html %]">[% l.branchcode | html %] - [% l.branchname || 'UNKNOWN' | html %]</option>
>                 [% END %]
>                 </select>
>-			</td>
>-			</tr>
>-		    <tr>
>+            </td>
>+            </tr>
>+            <tr>
>                 <td>Date of birth</td>
>                 <td colspan="2"></td>
>                 <td>
>@@ -202,40 +202,40 @@
>                     </select>
>                 </td>
>             </tr>
>-			[% IF ( SORT1_LOOP ) %]
>+            [% IF ( SORT1_LOOP ) %]
>                 <tr>
>-				<td>Sort1</td>
>-				<td><input type="radio" name="Line" value="sort1" /></td>
>-				<td><input type="radio" name="Column" value="sort1" /></td>
>-				<td>
>+                <td>Sort1</td>
>+                <td><input type="radio" name="Line" value="sort1" /></td>
>+                <td><input type="radio" name="Column" value="sort1" /></td>
>+                <td>
>                     <select id="sort1" name="Filter">
>-					<option value=""/>
>-					[% FOREACH SORT1_LOO IN SORT1_LOOP %]
>-						<option value="[% SORT1_LOO.authorized_value | html %]">[% SORT1_LOO.lib | html %]</option>
>-					[% END %]
>-					</select>
>-				</td>
>-				</tr>
>+                    <option value=""/>
>+                    [% FOREACH SORT1_LOO IN SORT1_LOOP %]
>+                        <option value="[% SORT1_LOO.authorized_value | html %]">[% SORT1_LOO.lib | html %]</option>
>+                    [% END %]
>+                    </select>
>+                </td>
>+                </tr>
>             [% ELSE %]
>                 <input type="hidden" name="Filter" />
>-			[% END %]
>-			[% IF ( SORT2_LOOP ) %]
>+            [% END %]
>+            [% IF ( SORT2_LOOP ) %]
>                 <tr>
>-				<td>Sort2</td>
>-				<td><input type="radio" name="Line" value="sort2" /></td>
>-				<td><input type="radio" name="Column" value="sort2" /></td>
>-				<td>
>+                <td>Sort2</td>
>+                <td><input type="radio" name="Line" value="sort2" /></td>
>+                <td><input type="radio" name="Column" value="sort2" /></td>
>+                <td>
>                     <select id="sort2" name="Filter">
>-					<option value=""/>
>-					[% FOREACH SORT2_LOO IN SORT2_LOOP %]
>-						<option value="[% SORT2_LOO.value | html %]">[% SORT2_LOO.value | html %]</option>
>-					[% END %]
>-					</select>
>-				</td>
>-				</tr>
>+                    <option value=""/>
>+                    [% FOREACH SORT2_LOO IN SORT2_LOOP %]
>+                        <option value="[% SORT2_LOO.value | html %]">[% SORT2_LOO.value | html %]</option>
>+                    [% END %]
>+                    </select>
>+                </td>
>+                </tr>
>             [% ELSE %]
>                 <input type="hidden" name="Filter" />
>-			[% END %]
>+            [% END %]
>             [% IF Koha.Preference('ExtendedPatronAttributes') %]
>                 <tr>
>                     <th colspan="4">Patron attributes</th>
>@@ -284,9 +284,9 @@
>     </table>
>     </fieldset>
> 
>-	
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -312,11 +312,11 @@
>         </li>
>     </ol>
> 
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>index b005424349..8062290f23 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>@@ -47,51 +47,51 @@
> [% IF ( do_it ) %]
> 
>     <h2>Top [% mainloo.limit | html %] Most-circulated items</h2>
>-	[% FOREACH mainloo IN mainloop %]
>-		[% IF ( mainloo.loopfilter ) %]
>+    [% FOREACH mainloo IN mainloop %]
>+        [% IF ( mainloo.loopfilter ) %]
>             <p>Filtered on:</p>
>-			[% FOREACH loopfilte IN mainloo.loopfilter %]
>+            [% FOREACH loopfilte IN mainloo.loopfilter %]
>                     <p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit | html %] =[% loopfilte.filter | html %][% IF ( loopfilte.err ) %]  [% END %]</p>
>-			[% END %]
>-		[% END %]
>-		
>-		<table>
>+            [% END %]
>+        [% END %]
>+
>+        <table>
> <tr>				<th>Rank/Biblioitemnumbers</th>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th colspan="2">[% loopco.coltitle | html %]</th>
>-				[% END %]</tr>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th colspan="2">[% loopco.coltitle | html %]</th>
>+                [% END %]</tr>
>         <tr>
>-				<th>&nbsp;</th>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th>Item</th>
>+                <th>&nbsp;</th>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th>Item</th>
>                     <th>Count of checkouts</th>
>-				[% END %]
>-			  </tr>
>-				[% FOREACH loopro IN mainloo.looprow %]
>+                [% END %]
>+              </tr>
>+                [% FOREACH loopro IN mainloo.looprow %]
>                     <tr>
>-						<td>[% loopro.rowtitle | html %]</td>
>-						[% FOREACH loopcel IN loopro.loopcell %]
>-							<td>
>+                        <td>[% loopro.rowtitle | html %]</td>
>+                        [% FOREACH loopcel IN loopro.loopcell %]
>+                            <td>
> 
> [% IF ( loopcel.reference ) %]
>     <a href="[% PROCESS biblio_a_href biblionumber => loopcel.reference %]">
>- [% END %]                                        
>-								[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
>-								[% IF ( loopcel.reference ) %]</a>[% END %]
>-							</td>
>-							<td>
>-								[% IF ( loopcel.count ) %][% loopcel.count | html %][% END %]
>-							</td>
>-						[% END %]
>-					</tr>
>-				[% END %]
>-		</table>
>-	[% END %]
>+ [% END %]
>+                                [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
>+                                [% IF ( loopcel.reference ) %]</a>[% END %]
>+                            </td>
>+                            <td>
>+                                [% IF ( loopcel.count ) %][% loopcel.count | html %][% END %]
>+                            </td>
>+                        [% END %]
>+                    </tr>
>+                [% END %]
>+        </table>
>+    [% END %]
> [% ELSE %]
>     <h2>Most-circulated items</h2>
>-	<form method="post" action="/cgi-bin/koha/reports/cat_issues_top.pl">
>-	<fieldset class="rows">
>-	<ol>
>+    <form method="post" action="/cgi-bin/koha/reports/cat_issues_top.pl">
>+    <fieldset class="rows">
>+    <ol>
>         <li>
>             <label for="checkoutfrom">Checkout date from: </label>
>             <input type="text" size="10" id="checkoutfrom" name="Filter" data-date_to="checkoutto" class="flatpickr" />
>@@ -114,14 +114,14 @@
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>             </select>
>         </li>
>-      <li> 
>+      <li>
>         <label for="documenttype">Item type: </label><select name="Filter" id="documenttype"><option value="" > Any item type</option>
>     [% FOREACH itemtype IN itemtypes %]
>         <option value="[% itemtype.itemtype | html %]" >[% itemtype.translated_description | html %] </option>
>-     [% END %] 
>+     [% END %]
>     </select>
>       </li>
>-      <li> 
>+      <li>
>         <label for="itemcallnumber">Call number: </label><input type="text" name="Filter" id="itemcallnumber" value="" />
>       </li>
>       <li>
>@@ -145,39 +145,39 @@
>      [% END %]
>     </select>
>         </li>
>-				<li><label for="day">Day: </label> <input type="text" name="Filter" id="day" value="" /></li>
>-				<li><label for="month">Month: </label> <input type="text" name="Filter" id="month" value="" /></li>
>-				<li><label for="year">Year: </label> <input type="text" name="Filter" id="year" value="" /></li>
>-	</ol>
>-	</fieldset>
>-	
>-	<fieldset class="rows">
>-	<h3>Limits</h3>
>-	<ol><li><label for="numberlimit">Limit to:</label><select name="Limit" id="numberlimit">
>+                <li><label for="day">Day: </label> <input type="text" name="Filter" id="day" value="" /></li>
>+                <li><label for="month">Month: </label> <input type="text" name="Filter" id="month" value="" /></li>
>+                <li><label for="year">Year: </label> <input type="text" name="Filter" id="year" value="" /></li>
>+    </ol>
>+    </fieldset>
>+
>+    <fieldset class="rows">
>+    <h3>Limits</h3>
>+    <ol><li><label for="numberlimit">Limit to:</label><select name="Limit" id="numberlimit">
>+                        <option value ="" selected="selected">None</option>
>+                        <option value="5" selected="selected"> 5</option>
>+                        <option value ="10">10</option>
>+                        <option value ="15">15</option>
>+                        <option value ="20">20</option>
>+                        <option value ="25">25</option>
>+                        <option value ="40">40</option>
>+                        <option value ="50">50</option>
>+                        <option value ="100">100</option>
>+                    </select></li>
>+    <li><label for="criteria">By: </label><select name="Criteria" id="criteria">
>                         <option value ="" selected="selected">None</option>
>-						<option value="5" selected="selected"> 5</option>
>-						<option value ="10">10</option>
>-						<option value ="15">15</option>
>-						<option value ="20">20</option>
>-						<option value ="25">25</option>
>-						<option value ="40">40</option>
>-						<option value ="50">50</option>
>-						<option value ="100">100</option>
>-					</select></li>
>-	<li><label for="criteria">By: </label><select name="Criteria" id="criteria">
>-						<option value ="" selected="selected">None</option>
>                         <option value ="branch">Library</option>
>-						<option value ="categorycode">Categorycode</option>
>-						<option value ="itemtype">Itemtype</option>
>-						<option value ="Day">Day</option>
>-						<option value ="Week">Week</option>
>-						<option value ="Month">Month</option>
>-						<option value ="Year">Year</option>
>-					</select></li></ol>
>-	</fieldset>
>-	
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+                        <option value ="categorycode">Categorycode</option>
>+                        <option value ="itemtype">Itemtype</option>
>+                        <option value ="Day">Day</option>
>+                        <option value ="Week">Week</option>
>+                        <option value ="Month">Month</option>
>+                        <option value ="Year">Year</option>
>+                    </select></li></ol>
>+    </fieldset>
>+
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -202,14 +202,14 @@
>             </select>
>         </li>
>     </ol>
>-	</fieldset>
>-
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    </fieldset>
>+
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>index d4c99f2a2e..71544197ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>@@ -7,7 +7,7 @@
> <title>Items with no checkouts &rsaquo; Reports &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>-	.sql {display: none;}
>+    .sql {display: none;}
> </style>
> </head>
> <body id="rep_catalogue_out" class="rep">
>@@ -36,96 +36,96 @@
>             <main>
> 
> [% IF ( do_it ) %]
>-	<h2>Items with no checkouts</h2>
>-	[% FOREACH mainloo IN mainloop %]
>-		[% IF ( mainloo.loopfilter ) %]
>+    <h2>Items with no checkouts</h2>
>+    [% FOREACH mainloo IN mainloop %]
>+        [% IF ( mainloo.loopfilter ) %]
>             <p>Filtered on:</p>
>-			[% FOREACH loopfilte IN mainloo.loopfilter %]
>-				[% IF ( loopfilte.err ) %]<p class="error">Error: 
>-				[% ELSE %]<p>
>-				[% END %]
>-					[% IF ( loopfilte.sql ) %]<span class="sql">[% END %]
>-					[% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>-					[% IF ( loopfilte.sql ) %]</span>[% END %]
>-				</p>
>-			[% END %]
>-		[% END %]
>-		
>-		[% IF ( mainloo.looptables ) %]
>-			<h3><a name="summary" id="summary"></a>Summary</h3>
>-			<table id="summary_table">
>+            [% FOREACH loopfilte IN mainloo.loopfilter %]
>+                [% IF ( loopfilte.err ) %]<p class="error">Error:
>+                [% ELSE %]<p>
>+                [% END %]
>+                    [% IF ( loopfilte.sql ) %]<span class="sql">[% END %]
>+                    [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
>+                    [% IF ( loopfilte.sql ) %]</span>[% END %]
>+                </p>
>+            [% END %]
>+        [% END %]
>+
>+        [% IF ( mainloo.looptables ) %]
>+            <h3><a name="summary" id="summary"></a>Summary</h3>
>+            <table id="summary_table">
>                 <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th>
>-				</tr>
>-			[% FOREACH looptable IN mainloo.looptables %]
>+                </tr>
>+            [% FOREACH looptable IN mainloo.looptables %]
>                 <tr><td><a href="#table[% looptable.coltitle | uri %]">[% looptable.coltitle | html %]</a></td>
>-					<td>[% IF ( looptable.looptable_count ) %]
>-						[% looptable.looptable_first | html %] to [% looptable.looptable_last | html %]
>-						[% END %]
>-					</td>
>-					<td>[% looptable.looptable_count | html %]</td>
>-					<td>[% looptable.coltitle_count | html %]</td>
>-				</tr>
>-			[% END %]
>-				<tr><th>TOTAL</th><th></th><th>[% mainloo.total_looptable_count | html %]</th><th>[% mainloo.total_coltitle_count | html %]</th>
>-				</tr>
>-			</table>
>+                    <td>[% IF ( looptable.looptable_count ) %]
>+                        [% looptable.looptable_first | html %] to [% looptable.looptable_last | html %]
>+                        [% END %]
>+                    </td>
>+                    <td>[% looptable.looptable_count | html %]</td>
>+                    <td>[% looptable.coltitle_count | html %]</td>
>+                </tr>
>+            [% END %]
>+                <tr><th>TOTAL</th><th></th><th>[% mainloo.total_looptable_count | html %]</th><th>[% mainloo.total_coltitle_count | html %]</th>
>+                </tr>
>+            </table>
> 
>-		[% END %]
>-		[% FOREACH looptable IN mainloo.looptables %]
>-		<h3><a id="table[% looptable.coltitle | html %]"></a>
>-			[% looptable.coltitle | html %]
>-		</h3>
>-		<table>
>-			<tr>
>-				<th>#</th>
>+        [% END %]
>+        [% FOREACH looptable IN mainloo.looptables %]
>+        <h3><a id="table[% looptable.coltitle | html %]"></a>
>+            [% looptable.coltitle | html %]
>+        </h3>
>+        <table>
>+            <tr>
>+                <th>#</th>
>                 <th>Call number</th>
>-				<th>Barcode</th>
>+                <th>Barcode</th>
>                 <th>Item details</th>
>-			</tr>
>-				[% IF ( looptable.looprow ) %]
>-				[% FOREACH loopro IN looptable.looprow %]
>+            </tr>
>+                [% IF ( looptable.looprow ) %]
>+                [% FOREACH loopro IN looptable.looprow %]
>                     <tr>
>-		    
>-						<td>[% loop.count | html %]</td>
>+
>+                        <td>[% loop.count | html %]</td>
>                         <td>[% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber | html %][% ELSE %]No call number[% END %]</td>
>                         <td>[% IF ( loopro.barcode ) %][% loopro.barcode | html %][% ELSE %]No barcode[% END %]</td>
>                         <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | uri %]">[% IF ( loopro.title ) %][% loopro.title | html %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author | html %][% END %]</p>
>                             [% IF ( loopro.branch ) %]at [% Branches.GetName( loopro.branch ) | html %][% END %]
>-						</td>
>-					</tr>
>-				[% END %]
>-				[% ELSE %]
>-					<tr><td colspan="4">No items for [% looptable.coltitle | html %]</td>
>-					</tr>
>-				[% END %]
>-		</table>
>-		[% END %]
>-	[% END %]
>+                        </td>
>+                    </tr>
>+                [% END %]
>+                [% ELSE %]
>+                    <tr><td colspan="4">No items for [% looptable.coltitle | html %]</td>
>+                    </tr>
>+                [% END %]
>+        </table>
>+        [% END %]
>+    [% END %]
> [% ELSE %]
>     <h2>Items with no checkouts</h2>
>-	<form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl">
>-	
>-	<fieldset class="rows">
>-		<ol>
>-			<li><label for="branch">Library: </label>
>-	<select name="Filter" id="branch">
>+    <form method="post" action="/cgi-bin/koha/reports/catalogue_out.pl">
>+
>+    <fieldset class="rows">
>+        <ol>
>+            <li><label for="branch">Library: </label>
>+    <select name="Filter" id="branch">
>         <option value="">Any library</option>
>         [% PROCESS options_for_libraries libraries => Branches.all() %]
>     </select></li>
>-      <li> 
>+      <li>
>         <label for="documenttype">Item type: </label><select name="Filter" id="documenttype">
>         <option value="">Any item type</option>
>     [% FOREACH itemtype IN itemtypes %]
>         <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option>
>-     [% END %] 
>+     [% END %]
>     </select>
>     </li>
>-		</ol>	
>-	</fieldset>
>-	
>-	<fieldset class="rows">
>-	<h3>Limits</h3>
>-		<ol>
>+        </ol>
>+    </fieldset>
>+
>+    <fieldset class="rows">
>+    <h3>Limits</h3>
>+        <ol>
>         <li>
>             <label for="numberlimit">Limit to: </label>
>             <select name="Limit" id="numberlimit">
>@@ -140,21 +140,21 @@
>                 <option value ="1000">1000</option>
>             </select>
>         </li>
>-		<li><label for="criteria">By: </label><select name="Criteria" id="criteria">
>-						<option value ="" selected="selected">None</option>
>-						<option value ="homebranch">Library</option>
>+        <li><label for="criteria">By: </label><select name="Criteria" id="criteria">
>+                        <option value ="" selected="selected">None</option>
>+                        <option value ="homebranch">Library</option>
>                         <option value ="itype">Item type</option>
>-					</select></li>
>-		</ol>
>-	</fieldset>
>+                    </select></li>
>+        </ol>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>     <input type="hidden" name="do_it" value="1" />
>     <input type="hidden" name="output" value="screen" />
>-	</fieldset>
>-	</form>
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>index dde16ccf9e..66760922ad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>@@ -46,14 +46,14 @@
> 
> <h2>Catalog statistics</h2>
> [% IF ( do_it ) %]
>-	[% FOREACH mainloo IN mainloop %]
>-		[% IF ( mainloo.loopfilter ) %]
>+    [% FOREACH mainloo IN mainloop %]
>+        [% IF ( mainloo.loopfilter ) %]
>             <p>Filtered on:</p>
>-			[% FOREACH loopfilte IN mainloo.loopfilter %]
>-					<p>[% loopfilte.crit | html %] =[% loopfilte.filter | html %]</p>
>-			[% END %]
>-		[% END %]
>-		
>+            [% FOREACH loopfilte IN mainloo.loopfilter %]
>+                    <p>[% loopfilte.crit | html %] =[% loopfilte.filter | html %]</p>
>+            [% END %]
>+        [% END %]
>+
>         <table id="catalogue_stats">
>             <thead>
>                 <tr>
>@@ -65,51 +65,51 @@
>                 </tr>
>             </thead>
>             <tbody>
>-				[% FOREACH loopro IN mainloo.looprow %]
>-					<tr>
>-						[% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>-						[% loopro.rowtitle | html %]</td>
>-						[% FOREACH loopcel IN loopro.loopcell %]
>-							[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-								[% IF ( loopcel.value ) %][% loopcel.value | html %]
>-								[% ELSE %]&nbsp;
>-								[% END %]
>-							</td>
>-						[% END %]
>-						[% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-							[% loopro.totalrow | html %]
>-						</td>
>-					</tr>
>-				[% END %]
>+                [% FOREACH loopro IN mainloo.looprow %]
>+                    <tr>
>+                        [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>+                        [% loopro.rowtitle | html %]</td>
>+                        [% FOREACH loopcel IN loopro.loopcell %]
>+                            [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                                [% IF ( loopcel.value ) %][% loopcel.value | html %]
>+                                [% ELSE %]&nbsp;
>+                                [% END %]
>+                            </td>
>+                        [% END %]
>+                        [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                            [% loopro.totalrow | html %]
>+                        </td>
>+                    </tr>
>+                [% END %]
>             </tbody>
>             <tfoot>
>-				<tr>
>+                <tr>
>                     <th>TOTAL (all results)</th>
>-					[% FOREACH loopfoote IN mainloo.loopfooter %]
>-						<th>
>-							[% loopfoote.totalcol | html %]
>-						</th>
>-					[% END %]
>-					<th>[% mainloo.total | html %]</th>
>-				</tr>
>+                    [% FOREACH loopfoote IN mainloo.loopfooter %]
>+                        <th>
>+                            [% loopfoote.totalcol | html %]
>+                        </th>
>+                    [% END %]
>+                    <th>[% mainloo.total | html %]</th>
>+                </tr>
>             </tfoot>
>-		</table>
>-	[% END %]
>+        </table>
>+    [% END %]
> [% ELSE %]
> 
>-	<form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">
>-	<fieldset class="rows">
>-	<h3>Catalog statistics</h3>
>-	<table>
>-		<thead>
>-			<tr>
>-			<th>Title</th>
>-			<th>Row</th>
>-			<th>Column</th>
>-			<th>Filter</th>
>-			</tr>
>-		</thead>
>-		<tbody>
>+    <form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl">
>+    <fieldset class="rows">
>+    <h3>Catalog statistics</h3>
>+    <table>
>+        <thead>
>+            <tr>
>+            <th>Title</th>
>+            <th>Row</th>
>+            <th>Column</th>
>+            <th>Filter</th>
>+            </tr>
>+        </thead>
>+        <tbody>
>       <tr>
>         <td>Koha full call number</td>
>         <td><input type="radio" name="Line" value="items.itemcallnumber" /></td>
>@@ -130,64 +130,64 @@
>         </td>
>         <td>&nbsp;</td>
>       </tr>
>-			 <tr>
>+             <tr>
>                 <td>Item type</td>
>-				<td><input type="radio" name="Line" value="[% item_itype | html %]" /></td>
>+                <td><input type="radio" name="Line" value="[% item_itype | html %]" /></td>
>                 <td><input type="radio" checked="checked" name="Column" value="[% item_itype | html %]" /></td>
>-				<td><select name="Filter" id="[% item_itype | html %]">
>-					<option value=""> </option>
>+                <td><select name="Filter" id="[% item_itype | html %]">
>+                    <option value=""> </option>
>                     [% FOREACH itemtype IN itemtypes %]
>                         <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option>
>                     [% END %]
>-					</select>
>-				</td>
>-			</tr>
>-			 <tr>
>-				<td>Publisher</td>
>-				<td><input type="radio" name="Line" value="publishercode" /></td>
>-				<td><input type="radio" name="Column" value="publishercode" /></td>
>-				<td><input type="text" name="Filter" /></td>
>-			</tr>
>-			<tr>
>+                    </select>
>+                </td>
>+            </tr>
>+             <tr>
>+                <td>Publisher</td>
>+                <td><input type="radio" name="Line" value="publishercode" /></td>
>+                <td><input type="radio" name="Column" value="publishercode" /></td>
>+                <td><input type="text" name="Filter" /></td>
>+            </tr>
>+            <tr>
>                 <td>Publication year</td>
>-				<td><input type="radio" name="Line" value="publicationyear" /></td>
>-				<td><input type="radio" name="Column" value="publicationyear" /></td>
>+                <td><input type="radio" name="Line" value="publicationyear" /></td>
>+                <td><input type="radio" name="Column" value="publicationyear" /></td>
>                 <td><label for="pubyearFrom">From</label> <input type="text" name="Filter" id="pubYearFrom" /> <label for="pubyearTo">To</label> <input type="text" name="Filter" id="pubyearTo" /></td>
>-			</tr>
>-			<tr>
>+            </tr>
>+            <tr>
>                 <td>Home library</td>
>                 <td><input type="radio" checked="checked" name="Line" value="items.homebranch" /></td>
>-				<td><input type="radio" name="Column" value="items.homebranch" /></td>
>-				<td><select name="Filter" id="branch">
>+                <td><input type="radio" name="Column" value="items.homebranch" /></td>
>+                <td><select name="Filter" id="branch">
>                     <option value=""> </option>
>                     [% PROCESS options_for_libraries libraries => Branches.all() %]
>                     </select>
>-				</td>
>-			</tr>
>-			<tr>
>+                </td>
>+            </tr>
>+            <tr>
>                 <td>Shelving location</td>
>-				<td><input type="radio" name="Line" value="items.location" /></td>
>-				<td><input type="radio" name="Column" value="items.location" /></td>
>-				<td><select name="Filter" id="location">
>-					<option value=""> </option>
>-					[% FOREACH locationloo IN locationloop %]
>-					[% IF ( locationloo.selected ) %]<option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>[% ELSE %]<option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>[% END %]
>-					[% END %]
>-					</select>
>-				</td>
>-			</tr>
>-			<tr>
>-				<td>Collection</td>
>-				<td><input type="radio" name="Line"   value="items.ccode" /></td>
>-				<td><input type="radio" name="Column" value="items.ccode" /></td>
>-				<td><select name="Filter" id="ccode">
>-					<option value=""> </option>
>-					[% FOREACH authval IN authvals %]
>-					[% IF ( authval.selected ) %]<option value="[% authval.code | html %]" selected="selected">[% authval.description | html %]</option>[% ELSE %]<option value="[% authval.code | html %]">[% authval.description | html %]</option>[% END %]
>-					[% END %]
>-					</select>
>-				</td>
>-			</tr>
>+                <td><input type="radio" name="Line" value="items.location" /></td>
>+                <td><input type="radio" name="Column" value="items.location" /></td>
>+                <td><select name="Filter" id="location">
>+                    <option value=""> </option>
>+                    [% FOREACH locationloo IN locationloop %]
>+                    [% IF ( locationloo.selected ) %]<option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>[% ELSE %]<option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>[% END %]
>+                    [% END %]
>+                    </select>
>+                </td>
>+            </tr>
>+            <tr>
>+                <td>Collection</td>
>+                <td><input type="radio" name="Line"   value="items.ccode" /></td>
>+                <td><input type="radio" name="Column" value="items.ccode" /></td>
>+                <td><select name="Filter" id="ccode">
>+                    <option value=""> </option>
>+                    [% FOREACH authval IN authvals %]
>+                    [% IF ( authval.selected ) %]<option value="[% authval.code | html %]" selected="selected">[% authval.description | html %]</option>[% ELSE %]<option value="[% authval.code | html %]">[% authval.description | html %]</option>[% END %]
>+                    [% END %]
>+                    </select>
>+                </td>
>+            </tr>
>             [% IF (notforloan) %]
>                 <tr>
>                     <td>[% notforloan_label | html %]</td>
>@@ -273,8 +273,8 @@
>                     <input type="text" name="Filter" id="deldateTo" class="flatpickr" />
>                 </td>
>             </tr>
>-		</tbody>
>-	</table><br /></fieldset>
>+        </tbody>
>+    </table><br /></fieldset>
> 
>     <fieldset class="rows">
>         <h3>Cell value</h3>
>@@ -293,19 +293,19 @@
>             </li>
>         </ol>
>     </fieldset>
>-	
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>-	<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
>-		<li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
>-			<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
>-			<label class="inline" for="MIME">Into an application: </label>
>-			<select name="MIME" id="MIME">
>-			[% FOREACH CGIextChoic IN CGIextChoice %]
>-			<option value="[% CGIextChoic.type | html %]">[% CGIextChoic.type | html %]</option>
>-			[% END %]
>-			</select>
>-			
>+
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>+    <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li>
>+        <li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" />
>+            <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
>+            <label class="inline" for="MIME">Into an application: </label>
>+            <select name="MIME" id="MIME">
>+            [% FOREACH CGIextChoic IN CGIextChoice %]
>+            <option value="[% CGIextChoic.type | html %]">[% CGIextChoic.type | html %]</option>
>+            [% END %]
>+            </select>
>+            
>             <select name="sep" id="sep">
>             [% FOREACH value IN CGIsepChoice.values.sort() %]
>               [% IF ( value == CGIsepChoice.default ) %]
>@@ -315,13 +315,13 @@
>               [% END %]
>             [% END %]
>             </select>
>-		</li>
>-	</ol>
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+        </li>
>+    </ol>
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>index 6bbd840fc2..c4a2cc1ab4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>@@ -46,65 +46,65 @@
> 
> <h2>Average checkout period</h2>
> [% IF ( do_it ) %]
>-	[% FOREACH mainloo IN mainloop %]
>-		[% IF ( mainloo.loopfilter ) %]
>+    [% FOREACH mainloo IN mainloop %]
>+        [% IF ( mainloo.loopfilter ) %]
>             <p>Filtered on:</p>
>-			[% FOREACH loopfilte IN mainloo.loopfilter %]
>-					<p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit | html %] =[% loopfilte.filter | html %][% IF ( loopfilte.err ) %]  [% END %]</p>
>-			[% END %]
>-		[% END %]
>-		
>-		<table>
>-			<tr>
>-				<th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>-				[% FOREACH loopco IN mainloo.loopcol %]
>-					<th>[% loopco.coltitle | html %]</th>
>-				[% END %]
>-				<th>TOTAL</th>
>-			</tr>
>-				[% FOREACH loopro IN mainloo.looprow %]
>-					<tr>
>-						[% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>-						[% loopro.rowtitle | html %]</td>
>-						[% FOREACH loopcel IN loopro.loopcell %]
>-							[% IF ( loopcel.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>-								[% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
>-							</td>
>-						[% END %]
>-						[% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>-							[% loopro.totalrow | html %]
>-						</td>
>-					</tr>
>-				[% END %]
>-				<tr>
>-					<th>TOTAL</th>
>-					[% FOREACH loopfoote IN mainloo.loopfooter %]
>-						<th>
>-							[% loopfoote.totalcol | html %]
>-						</th>
>-					[% END %]
>-					<th>[% mainloo.total | html %]</th>
>-				</tr>
>-		</table>
>-	[% END %]
>+            [% FOREACH loopfilte IN mainloo.loopfilter %]
>+                    <p>[% IF ( loopfilte.err ) %]  [% END %] [% loopfilte.crit | html %] =[% loopfilte.filter | html %][% IF ( loopfilte.err ) %]  [% END %]</p>
>+            [% END %]
>+        [% END %]
>+
>+        <table>
>+            <tr>
>+                <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>+                [% FOREACH loopco IN mainloo.loopcol %]
>+                    <th>[% loopco.coltitle | html %]</th>
>+                [% END %]
>+                <th>TOTAL</th>
>+            </tr>
>+                [% FOREACH loopro IN mainloo.looprow %]
>+                    <tr>
>+                        [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>+                        [% loopro.rowtitle | html %]</td>
>+                        [% FOREACH loopcel IN loopro.loopcell %]
>+                            [% IF ( loopcel.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
>+                                [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %]
>+                            </td>
>+                        [% END %]
>+                        [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
>+                            [% loopro.totalrow | html %]
>+                        </td>
>+                    </tr>
>+                [% END %]
>+                <tr>
>+                    <th>TOTAL</th>
>+                    [% FOREACH loopfoote IN mainloo.loopfooter %]
>+                        <th>
>+                            [% loopfoote.totalcol | html %]
>+                        </th>
>+                    [% END %]
>+                    <th>[% mainloo.total | html %]</th>
>+                </tr>
>+        </table>
>+    [% END %]
> [% ELSE %]
> 
>-	<form method="post" action="/cgi-bin/koha/reports/issues_avg_stats.pl">
>-	<fieldset class="rows">
>-	<h3>Average checkout period statistics</h3>
>-	<table>
>-		<thead>
>-			<tr>
>-			<th>Title</th>
>-			<th>Row</th>
>-			<th>Column</th>
>-			<th>Filter</th>
>-			</tr>
>-		</thead>
>-		<tbody>
>-			<tr class="hilighted">
>-				<td>Checkout date</td>
>-				<td><input type="radio" name="Line" value="timestamp" /></td>
>+    <form method="post" action="/cgi-bin/koha/reports/issues_avg_stats.pl">
>+    <fieldset class="rows">
>+    <h3>Average checkout period statistics</h3>
>+    <table>
>+        <thead>
>+            <tr>
>+            <th>Title</th>
>+            <th>Row</th>
>+            <th>Column</th>
>+            <th>Filter</th>
>+            </tr>
>+        </thead>
>+        <tbody>
>+            <tr class="hilighted">
>+                <td>Checkout date</td>
>+                <td><input type="radio" name="Line" value="timestamp" /></td>
>                 <td><input type="radio" checked="checked" name="Column" value="timestamp" /></td>
>                 <td>
>                     <label for="checkoutfrom">From</label>
>@@ -113,24 +113,24 @@
>                     <label for="checkouto">To</label>
>                     <input size="10" id="checkouto" name="Filter" value="" type="text" class="flatpickr" />
>                     <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>-				</td>
>-			</tr>
>-			<tr class="hilighted"> 
>-				<td>&nbsp;</td>
>-				<td colspan="2">by <select name="IssueDisplay">
>-					<option value=""> </option>
>-					<option value ="1">Day</option>
>-					<option value ="2">Month</option>
>-					<option value ="3">Year</option>
>-					</select>
>+                </td>
>+            </tr>
>+            <tr class="hilighted">
>+                <td>&nbsp;</td>
>+                <td colspan="2">by <select name="IssueDisplay">
>+                    <option value=""> </option>
>+                    <option value ="1">Day</option>
>+                    <option value ="2">Month</option>
>+                    <option value ="3">Year</option>
>+                    </select>
> 
>-				</td>
>-				<td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
>-			</tr>
>-			<tr>
>-				<td>Returns</td>
>-				<td><input type="radio" name="Line" value="returndate" /></td>
>-				<td><input type="radio" name="Column" value="returndate" /></td>
>+                </td>
>+                <td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
>+            </tr>
>+            <tr>
>+                <td>Returns</td>
>+                <td><input type="radio" name="Line" value="returndate" /></td>
>+                <td><input type="radio" name="Column" value="returndate" /></td>
>                 <td>
>                     <label for="checkinfrom">From</label>
>                     <input type="text" size="10" id="checkinfrom" name="Filter" data-date_to="checkinto" class="flatpickr" />
>@@ -138,24 +138,24 @@
>                     <label for="checkinto">To</label>
>                     <input type="text" size="10" id="checkinto" name="Filter" value="" class="flatpickr" />
>                     <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>-				</td>
>-			</tr>
>-			<tr> 
>-				<td>&nbsp;</td>
>-				<td colspan="2">by <select name="ReturnDisplay">
>-					<option value=""> </option>
>-					<option value ="1">Day</option>
>-					<option value ="2">Month</option>
>-					<option value ="3">Year</option>
>-					</select>
>-					
>-				</td>
>-				<td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
>-			</tr>
>-			<tr class="hilighted">
>-				<td>Patron category</td>
>+                </td>
>+            </tr>
>+            <tr>
>+                <td>&nbsp;</td>
>+                <td colspan="2">by <select name="ReturnDisplay">
>+                    <option value=""> </option>
>+                    <option value ="1">Day</option>
>+                    <option value ="2">Month</option>
>+                    <option value ="3">Year</option>
>+                    </select>
>+
>+                </td>
>+                <td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
>+            </tr>
>+            <tr class="hilighted">
>+                <td>Patron category</td>
>                 <td><input type="radio" checked="checked" name="Line" value="borrowers.categorycode" /></td>
>-				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
>+                <td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
>                 <td>
>                     <select name="Filter" id="borcat">
>                         <option value=""></option>
>@@ -164,11 +164,11 @@
>                         [% END %]
>                     </select>
>                 </td>
>-			</tr>
>-			<tr>
>-				<td>Item type</td>
>-				<td><input type="radio" name="Line" value="itemtype" /></td>
>-				<td><input type="radio" name="Column" value="itemtype" /></td>
>+            </tr>
>+            <tr>
>+                <td>Item type</td>
>+                <td><input type="radio" name="Line" value="itemtype" /></td>
>+                <td><input type="radio" name="Column" value="itemtype" /></td>
>                 <td>
>                     <select name="Filter" id="itemtypes">
>                         <option value=""></option>
>@@ -177,23 +177,23 @@
>                         [% END %]
>                     </select>
>                 </td>
>-			</tr>
>-			<tr class="hilighted">
>-				<td>Library</td>
>-				<td><input type="radio" name="Line" value="branchcode" /></td>
>-				<td><input type="radio" name="Column" value="branchcode" /></td>
>+            </tr>
>+            <tr class="hilighted">
>+                <td>Library</td>
>+                <td><input type="radio" name="Line" value="branchcode" /></td>
>+                <td><input type="radio" name="Column" value="branchcode" /></td>
>                 <td>
>                     <select name="Filter" id="branch">
>                         <option value=""></option>
>                         [% PROCESS options_for_libraries libraries => Branches.all() %]
>                     </select>
>                 </td>
>-			</tr>
>-			[% IF ( hassort1 ) %]
>-				<tr class="hilighted"> 
>-					<td>Sort1</td>
>-					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
>-					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
>+            </tr>
>+            [% IF ( hassort1 ) %]
>+                <tr class="hilighted">
>+                    <td>Sort1</td>
>+                    <td><input type="radio" name="Line" value="borrowers.sort1" /></td>
>+                    <td><input type="radio" name="Column" value="borrowers.sort1" /></td>
>                     <td>
>                         <select name="Filter" id="sort1">
>                             <option value=""></option>
>@@ -202,13 +202,13 @@
>                             [%- END %]
>                         </select>
>                     </td>
>-				</tr>
>-			[% END %]
>-			[% IF ( hassort2 ) %]
>-				[% IF ( HglghtSort2 ) %]<tr class="hilighted"> [% ELSE %]<tr>[% END %] 
>-					<td>Sort2</td>
>-					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
>-					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
>+                </tr>
>+            [% END %]
>+            [% IF ( hassort2 ) %]
>+                [% IF ( HglghtSort2 ) %]<tr class="hilighted"> [% ELSE %]<tr>[% END %]
>+                    <td>Sort2</td>
>+                    <td><input type="radio" name="Line" value="borrowers.sort2" /></td>
>+                    <td><input type="radio" name="Column" value="borrowers.sort2" /></td>
>                     <td>
>                         <select name="Filter" id="sort2">
>                             <option value=""></option>
>@@ -217,14 +217,14 @@
>                             [%- END %]
>                         </select>
>                     </td>
>-				</tr>
>-			[% END %]
>-		</tbody>
>-	</table><br /></fieldset>
>-	
>-	
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+                </tr>
>+            [% END %]
>+        </tbody>
>+    </table><br /></fieldset>
>+
>+
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -247,15 +247,15 @@
>             </select>
>         </li>
>     </ol>
>-	</fieldset>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="hidden" name="Filter" value="" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	<input type="submit" class="principal" value="Submit" />
>-	</fieldset>
>-	</form>
>+    <fieldset class="action">
>+    <input type="hidden" name="Filter" value="" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    <input type="submit" class="principal" value="Submit" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>index ab02c1d396..77367e96e1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>@@ -7,7 +7,7 @@
> <title>Circulation statistics[% IF ( do_it ) %] &rsaquo; Results[% END %] &rsaquo; Reports &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>-	.sql {display:none;}
>+    .sql {display:none;}
> </style>
> </head>
> 
>@@ -79,12 +79,12 @@
>                     [% CASE 14 %]<span>Issuing library = [% loopfilte.filter | html %]</span>
>                     [% CASE %]<span>[% loopfilte.crit | html %] = [% loopfilte.filter | html %]</span>
>                 [% END %]
>-				</li>
>+                </li>
>             [% END %]
>             </ul>
>         [% END %]
>-        
>-        <table> 
>+
>+        <table>
>             <tr>
>                 <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>                 [% FOREACH loopco IN mainloo.loopcol %]
>@@ -96,9 +96,9 @@
>                     <tr>
>                         <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %]</td>
>                     [% FOREACH loopcel IN loopro.loopcell %]
>-						<td>[% loopcel.value || 0 | html %]</td>
>+                        <td>[% loopcel.value || 0 | html %]</td>
>                     [% END %]
>-						<td>[% loopro.totalrow | html %]</td>
>+                        <td>[% loopro.totalrow | html %]</td>
>                     </tr>
>                 [% END %]
>             <tr>
>@@ -114,7 +114,7 @@
> 
>     <form method="post" action="/cgi-bin/koha/reports/issues_stats.pl">
>     <fieldset class="rows">
>-	<h3>Circulation statistics</h3><table>
>+    <h3>Circulation statistics</h3><table>
>         <thead>
>             <tr>
>                 <th>Title</th>
>@@ -189,7 +189,7 @@
>                  <option value="[% categoryloo.categorycode | html %]">[% categoryloo.description | html %]</option>
>                [% END %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Item type</td>
>@@ -201,7 +201,7 @@
>                  <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option>
>                [% END %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Issuing library</td>
>@@ -211,7 +211,7 @@
>                 <option value=""> </option>
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Collection</td>
>@@ -235,7 +235,7 @@
>                     <option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>
>                 [% END %]
>                </select>
>-            </td> 
>+            </td>
>         </tr>
>         <tr>
>             <td>Item call number</td>
>@@ -245,28 +245,28 @@
>         </tr>
>         [% IF ( hassort1 ) %]
>         <tr><td>Patron sort 1</td>
>-			<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
>-			<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
>-			<td><select name="Filter" id="sort1">
>+            <td><input type="radio" name="Line" value="borrowers.sort1" /></td>
>+            <td><input type="radio" name="Column" value="borrowers.sort1" /></td>
>+            <td><select name="Filter" id="sort1">
>                <option value=""> </option>
>                [% FOREACH Bsort IN Bsort1 %]
>                 <option value="[% Bsort.authorised_value | html %]" >[% Bsort.lib | html %]</option>
>                [% END %]
>                </select>
>-            </td> 
>+            </td>
>         </tr>
>         [% END %]
>         [% IF ( hassort2 ) %]
>         <tr><td>Patron sort 2</td>
>             <td><input type="radio" name="Line" value="borrowers.sort2" /></td>
>             <td><input type="radio" name="Column" value="borrowers.sort2" /></td>
>-           	<td><select name="Filter" id="sort2">
>+               <td><select name="Filter" id="sort2">
>                <option value=""> </option>
>                [% FOREACH Bsort IN Bsort2 %]
>                    <option value="[% Bsort.authorised_value | html %]" >[% Bsort.lib | html %]</option>
>                [% END %]
>                </select>
>-            </td> 
>+            </td>
>         </tr>
>         [% END %]
>         <tr><td>Home library</td>
>@@ -358,9 +358,9 @@
>         </li>
>     </ol>
> </fieldset>
>-			
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -385,14 +385,14 @@
>             </select>
>         </li>
>     </ol>
>-	</fieldset>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>index 286e73edb2..d37f57653b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>@@ -7,7 +7,7 @@
> <title>Holds statistics[% IF ( do_it ) %] &rsaquo; Results[% END %] &rsaquo; Reports &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>-	.sql {display:none;}
>+    .sql {display:none;}
> </style>
> </head>
> 
>@@ -56,18 +56,18 @@
>             <ul>
>             [% FOREACH loopfilte IN loopfilter %]
>                 [% IF ( loopfilte.err ) %]<li class="error">Error:
>-				[% ELSIF ( loopfilte.sql ) %]<li class="sql">
>-				[% ELSE %]<li>
>-				[% END %]
>-					[% loopfilte.crit | html %] [% loopfilte.filter | html %]
>-				</li>
>+                [% ELSIF ( loopfilte.sql ) %]<li class="sql">
>+                [% ELSE %]<li>
>+                [% END %]
>+                    [% loopfilte.crit | html %] [% loopfilte.filter | html %]
>+                </li>
>             [% END %]
>             </ul>
>         [% END %]
>-		
>+
>     [% FOREACH mainloo IN mainloop %]
>-        
>-        <table> 
>+
>+        <table>
>             <tr>
>                 <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
>                 [% FOREACH loopco IN mainloo.loopcol %]
>@@ -79,11 +79,11 @@
>                     <tr>
>                         <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %]</td>
>                     [% FOREACH loopcel IN loopro.loopcell %]
>-						<td align="center">
>+                        <td align="center">
>                         [% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output | uri %]&amp;[% loopcel.url_complement | uri %]">[% loopcel.value | html %]</a>[% ELSE %][% loopcel.value | html %][% END %]
>-						</td>
>+                        </td>
>                     [% END %]
>-						<td align="center">[% loopro.totalrow | html %]</td>
>+                        <td align="center">[% loopro.totalrow | html %]</td>
>                     </tr>
>                 [% END %]
>             <tr>
>@@ -100,7 +100,7 @@
> 
>     <form method="post" action="/cgi-bin/koha/reports/reserves_stats.pl">
>     <fieldset class="rows">
>-	<h3>Holds statistics</h3><table>
>+    <h3>Holds statistics</h3><table>
>         <thead>
>             <tr>
>                 <th>Title</th>
>@@ -110,17 +110,17 @@
>             </tr>
>         </thead>
>         <tbody>
>-        	<tr >
>+            <tr >
>                 <td>Hold status </td>
>                 <td><input type="radio" name="Line" value="reservestatus" /></td>
>                 <td><input type="radio" name="Column" value="reservestatus" checked="checked" /></td>
>                 <td>
>-				<input type="checkbox" name="filter_reservestatus_or_1" value="1" /> Asked
>-				<input type="checkbox" name="filter_reservestatus_or_2" value="2" /> Processing
>-				<input type="checkbox" name="filter_reservestatus_or_3" value="3" /> Waiting
>-				<input type="checkbox" name="filter_reservestatus_or_4" value="4" /> Satisfied
>-				<input type="checkbox" name="filter_reservestatus_or_5" value="5" /> Cancelled
>-				</td>
>+                <input type="checkbox" name="filter_reservestatus_or_1" value="1" /> Asked
>+                <input type="checkbox" name="filter_reservestatus_or_2" value="2" /> Processing
>+                <input type="checkbox" name="filter_reservestatus_or_3" value="3" /> Waiting
>+                <input type="checkbox" name="filter_reservestatus_or_4" value="4" /> Satisfied
>+                <input type="checkbox" name="filter_reservestatus_or_5" value="5" /> Cancelled
>+                </td>
>              </tr>
>              <tr>
>                 <td>Hold date</td>
>@@ -170,7 +170,7 @@
>                     <input  size="10" id="filter_waitingdate_end" name="filter_waitingdate_end" value="" type="text" class="flatpickr" />
>                 </td>
>              </tr>
>-			 <tr>
>+             <tr>
>                 <td>Cancellation date</td>
>                 <td><input type="radio" name="Line" value="cancellationdate" /></td>
>                 <td><input type="radio" name="Column" value="cancellationdate" /></td>
>@@ -192,7 +192,7 @@
>                  <option value="[% categoryloo.categorycode | html %]">[% categoryloo.description | html %]</option>
>                [% END %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Item type</td>
>@@ -204,7 +204,7 @@
>                  <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option>
>                [% END %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Pickup library</td>
>@@ -214,7 +214,7 @@
>                <option value=""> </option>
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Holding library</td>
>@@ -224,7 +224,7 @@
>                <option value=""> </option>
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Home library</td>
>@@ -234,7 +234,7 @@
>                 <option value=""> </option>
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>                </select>
>-             </td> 
>+             </td>
>         </tr>
>         <tr>
>             <td>Collection</td>
>@@ -243,7 +243,7 @@
>             <td><select name="filter_items.ccode" id="ccode">
>                 <option value=""> </option>
>                 [% FOREACH ccodeloo IN ccodeloop %]
>-					[% IF ( ccodeloo.selected ) %] <option value="[% ccodeloo.code | html %]" selected="selected">[% ccodeloo.description | html %]</option>[% ELSE %]<option value="[% ccodeloo.code | html %]">[% ccodeloo.description | html %]</option>[% END %]
>+                    [% IF ( ccodeloo.selected ) %] <option value="[% ccodeloo.code | html %]" selected="selected">[% ccodeloo.description | html %]</option>[% ELSE %]<option value="[% ccodeloo.code | html %]">[% ccodeloo.description | html %]</option>[% END %]
>                 [% END %]
>                 </select>
>             </td>
>@@ -255,10 +255,10 @@
>             <td><select name="filter_items.location" id="location">
>                 <option value=""> </option>
>                 [% FOREACH locationloo IN locationloop %]
>-					[% IF ( locationloo.selected ) %]<option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>[% ELSE %]<option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>[% END %]
>-				[% END %]
>+                    [% IF ( locationloo.selected ) %]<option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>[% ELSE %]<option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>[% END %]
>+                [% END %]
>                </select>
>-            </td> 
>+            </td>
>         </tr>
>         <tr>
>             <td>Item call number</td>
>@@ -268,28 +268,28 @@
>         </tr>
>         [% IF ( hassort1 ) %]
>         <tr><td>Patron sort 1</td>
>-			<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
>-			<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
>-			<td><select name="filter_borrowers.sort1" id="sort1">
>+            <td><input type="radio" name="Line" value="borrowers.sort1" /></td>
>+            <td><input type="radio" name="Column" value="borrowers.sort1" /></td>
>+            <td><select name="filter_borrowers.sort1" id="sort1">
>                <option value=""> </option>
>                [% FOREACH Bsort IN Bsort1 %]
>-			   [% IF ( Bsort.selected ) %]<option value="[% Bsort.authorised_value | html %]" selected="selected">[% Bsort.lib | html %]</option>[% ELSE %]<option value="[% Bsort.authorised_value | html %]" >[% Bsort.lib | html %]</option>[% END %]
>+               [% IF ( Bsort.selected ) %]<option value="[% Bsort.authorised_value | html %]" selected="selected">[% Bsort.lib | html %]</option>[% ELSE %]<option value="[% Bsort.authorised_value | html %]" >[% Bsort.lib | html %]</option>[% END %]
>                [% END %]
>                </select>
>-            </td> 
>+            </td>
>         </tr>
>         [% END %]
>         [% IF ( hassort2 ) %]
>         <tr><td>Patron sort 2</td>
>             <td><input type="radio" name="Line" value="borrowers.sort2" /></td>
>             <td><input type="radio" name="Column" value="borrowers.sort2" /></td>
>-           	<td><select name="filter_borrowers.sort2" id="sort2">
>+               <td><select name="filter_borrowers.sort2" id="sort2">
>                <option value=""> </option>
>                [% FOREACH Bsort IN Bsort2 %]
>-			   [% IF ( Bsort.selected ) %]<option value="[% Bsort.authorised_value | html %]" selected="selected">[% Bsort.lib | html %]</option>[% ELSE %]<option value="[% Bsort.authorised_value | html %]" >[% Bsort.lib | html %]</option>[% END %]
>+               [% IF ( Bsort.selected ) %]<option value="[% Bsort.authorised_value | html %]" selected="selected">[% Bsort.lib | html %]</option>[% ELSE %]<option value="[% Bsort.authorised_value | html %]" >[% Bsort.lib | html %]</option>[% END %]
>                [% END %]
>                </select>
>-            </td> 
>+            </td>
>         </tr>
>         [% END %]
>         </tbody>
>@@ -297,9 +297,9 @@
> 
> <fieldset class="rows"><h3>Cell value </h3><ol><li><label for="cellvalue1">Count holds:</label> <input type="radio" name="Cellvalue" value="1" id="cellvalue1" checked="checked" /> </li>
>             <li><label for="cellvalue2">Count unique borrowers:</label> <input type="radio" name="Cellvalue" value="2" id="cellvalue2" /> </li><li><label for="cellvalue3">Count unique items:</label> <input type="radio" name="Cellvalue" id="cellvalue3" value="3" /> </li><li><label for="cellvalue4">Count unique bibliographic records:</label> <input type="radio" name="Cellvalue" id="cellvalue4" value="4" /> </li></ol></fieldset>
>-			
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -324,14 +324,14 @@
>             </select>
>         </li>
>     </ol>
>-	</fieldset>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>index 7bbba7d45f..d8f43fcc64 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>@@ -10,7 +10,7 @@
> <title>Serials subscriptions stats &rsaquo; Reports &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>-	.sql {display: none;}
>+    .sql {display: none;}
> </style>
> </head>
> 
>@@ -39,12 +39,12 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-	<h2>Serials subscriptions</h2>
>+    <h2>Serials subscriptions</h2>
> [% IF ( do_it ) %]
>-	<table id="resulttable">
>-		<thead>
>-			<tr>
>-				<th>Vendor</th>
>+    <table id="resulttable">
>+        <thead>
>+            <tr>
>+                <th>Vendor</th>
>                 <th class="anti-the">Title</th>
>                 <th>Subscription ID</th>
>                 <th>Library</th>
>@@ -52,16 +52,16 @@
>                 <th>Subscription begin</th>
>                 <th>Subscription end</th>
>                 <th>Expired? / Closed?</th>
>-			</tr>
>-		</thead>
>-		<tbody>
>-				[% FOREACH data IN datas %]
>+            </tr>
>+        </thead>
>+        <tbody>
>+                [% FOREACH data IN datas %]
>                 <tr>
>                     <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td>
>                     <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td>
>-					<td>[% data.subscriptionid | html %]</td>
>+                    <td>[% data.subscriptionid | html %]</td>
>                     <td>[% Branches.GetName( data.branchcode ) | html %]</td>
>-					<td>[% data.callnumber | html %]</td>
>+                    <td>[% data.callnumber | html %]</td>
>                     <td data-order="[% data.startdate | html %]">[% data.startdate | $KohaDates %]</td>
>                     <td data-order="[% data.enddate | html %]">[% data.enddate | $KohaDates %]</td>
>                     <td>
>@@ -72,47 +72,47 @@
>                         [% END %]
>                     </td>
>                 </tr>
>-				[% END %]
>-			</tr>
>-		</tbody>
>-	</table>
>+                [% END %]
>+            </tr>
>+        </tbody>
>+    </table>
> 
> [% ELSE %]
>-	<form method="post" action="/cgi-bin/koha/reports/serials_stats.pl">
>+    <form method="post" action="/cgi-bin/koha/reports/serials_stats.pl">
> 
>-	<fieldset class="rows">
>-		<ol>
>-			<li>
>+    <fieldset class="rows">
>+        <ol>
>+            <li>
> 
>-				<label for="bookseller">
>-					Vendor:
>-			    </label>
>-				<select name="bookseller" id="bookseller">
>+                <label for="bookseller">
>+                    Vendor:
>+                </label>
>+                <select name="bookseller" id="bookseller">
>                     <option value="">Any vendor</option>
>-    				[% FOREACH bookseller IN booksellers %]
>-						<option value="[% bookseller.aqbooksellerid | html %]">[% bookseller.name | html %]</option>
>-					[% END %]
>-			    </select>
>-			</li><li>
>+                    [% FOREACH bookseller IN booksellers %]
>+                        <option value="[% bookseller.aqbooksellerid | html %]">[% bookseller.name | html %]</option>
>+                    [% END %]
>+                </select>
>+            </li><li>
>                 <label for="branchcode">
>-					Library:
>-		    	</label>
>-		    	<select name="branchcode"  id="branchcode">
>-				<option value="">Any library</option>
>+                    Library:
>+                </label>
>+                <select name="branchcode"  id="branchcode">
>+                <option value="">Any library</option>
>                 [% PROCESS options_for_libraries libraries => Branches.all() %]
>-		    	</select>
>+                </select>
> 
>-		    </li>
>-		    <li>
>-		    	<label for="expired">Include expired subscriptions: </label>
>+            </li>
>+            <li>
>+                <label for="expired">Include expired subscriptions: </label>
>                 <input type="checkbox" name="expired" id="expired" />
>-		    </li>
>-		</ol>
>-	</fieldset>
>+            </li>
>+        </ol>
>+    </fieldset>
> 
> 
>-	<fieldset class="rows">
>-	<h3>Output</h3>
>+    <fieldset class="rows">
>+    <h3>Output</h3>
>     <ol>
>         <li>
>             <label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
>@@ -137,14 +137,14 @@
>             </select>
>         </li>
>     </ol>
>-	</fieldset>
>+    </fieldset>
> 
>-	<fieldset class="action">
>-	<input type="submit" class="principal" value="Submit" />
>-	<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-	<input type="hidden" name="do_it" value="1" />
>-	</fieldset>
>-	</form>
>+    <fieldset class="action">
>+    <input type="submit" class="principal" value="Submit" />
>+    <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+    <input type="hidden" name="do_it" value="1" />
>+    </fieldset>
>+    </form>
> [% END %]
> 
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>index 936bb596a0..b0ad81e0b1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>@@ -100,13 +100,13 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
>     <thead>
>         <tr>
>             <th class="NoSort">&nbsp;</th>
>-		<th>Status</th>
>-		<th>Term</th>
>-		<th>Weight</th>
>+        <th>Status</th>
>+        <th>Term</th>
>+        <th>Weight</th>
>             <th class="NoSort noExport">Actions</th>
>             [% UNLESS ( filter_approved_pending ) %]<th>Reviewer</th>[% END %]
>         <th>Date</th>
>-	</tr>
>+    </tr>
>     </thead>
>     <tbody>
>     [% FOREACH tagloo IN tagloop %]
>@@ -221,10 +221,10 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
> <form method="post" action="/cgi-bin/koha/tags/review.pl">
> <fieldset class="sidebar">
>   <h4>Filters</h4>
>-	<ol>
>-	    <li><p for="tag">Term:<input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /></p>
>-	    </li>
>-	    <li><p for="approved">Status:
>+    <ol>
>+        <li><p for="tag">Term:<input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /></p>
>+        </li>
>+        <li><p for="approved">Status:
>             <select name="approved" id="approved">
>             [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option>
>             [% ELSE %]<option value="all">all</option>[% END %]
>@@ -234,19 +234,19 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
>             [% ELSE %]<option value="0">pending</option>[% END %]
>             [% IF ( filter_approved_rej ) %]<option selected="selected" value="-1">rejected</option>
>             [% ELSE %]<option value="-1">rejected</option>[% END %]
>-			</select></p>
>-	    </li>
>-	    <li><p for="approver">Reviewer: <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /></p>
>-	    </li>
>-	    <li>
>-			<p for="from">Date: from
>+            </select></p>
>+        </li>
>+        <li><p for="approver">Reviewer: <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /></p>
>+        </li>
>+        <li>
>+            <p for="from">Date: from
>             <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" />
>-			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
>+            <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
> 
>-			<p for="to">...to
>+            <p for="to">...to
>             <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" />
>-			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
>-	    </li>
>+            <div class="hint">[% INCLUDE 'date-format.inc' %]</div></p>
>+        </li>
>   </ol>
>  <fieldset class="action"><button type="submit" class="btn btn-default btn-sm principal"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset>
> </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index 6270d3a5cb..92d738231d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -204,18 +204,18 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-				<h2>Browse system logs</h2>
>-				<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
>-					[% IF ( do_it ) %]
>-						<input type="hidden" name="do_it" value="[% do_it | html %]" />
>-					[% END %]
>+                <h2>Browse system logs</h2>
>+                <form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
>+                    [% IF ( do_it ) %]
>+                        <input type="hidden" name="do_it" value="[% do_it | html %]" />
>+                    [% END %]
>                     <input type="hidden" name="src" value="[% src | html %]" />
>-					<fieldset class="rows">
>-						<ol>
>-							<li>
>-								<label for="user">Librarian:</label>
>+                    <fieldset class="rows">
>+                        <ol>
>+                            <li>
>+                                <label for="user">Librarian:</label>
>                                 <input type="text" name="user" id="user" value="[% user | html %]" />
>-							</li>
>+                            </li>
>                             [% UNLESS src == "circ" %]
>                                 <li>
>                                     <label>Modules:</label>
>@@ -265,10 +265,10 @@
>                                     <input type="text" id="object" name="object" value="[% object | html %]" />
>                                 [% END %]
>                             </li>
>-							<li>
>-								<label for="info">Info:</label>
>+                            <li>
>+                                <label for="info">Info:</label>
>                                 <input type="text" id="info" name="info" value="[% info | html %]" />
>-							</li>
>+                            </li>
>                             <li>
>                                 <label>Interface:</label>
>                                 [% IF interfaces.size == 0 %]
>@@ -285,41 +285,41 @@
>                                     [% END %]
>                                 [% END %]
>                             </li>
>-							<li>
>+                            <li>
>                                 <label for="from"> Display from: </label> <input type="text" size="10" id="from" name="from" value="[% datefrom | html %]" class="flatpickr" data-date_to="to" />
>-				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>-							</li>
>-							<li>
>+                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                            </li>
>+                            <li>
>                                 <label for="to">Display to: </label> <input size="10" id="to" name="to" type="text" value="[% dateto | html %]" class="flatpickr" />
>-				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>-							</li>
>-						</ol>
>-					</fieldset>
>-					<fieldset class="rows">
>-						<h3>Output</h3>
>-						<ol>
>-							<li>
>-								<label for="screen" >To screen in the browser:</label> <input id="screen" type="radio" checked="checked" name="output" value="screen" />
>-							</li>
>-							<li>
>-								<label for="file">To a file:</label>
>-								<input id="file" type="radio" name="output" value="file" />
>-								<label class="inline" for="basename">Named:</label>
>-								<input type="text" name="basename" id="basename" value="Export" />
>-								
>-								<input type="hidden" name="report_name" value="[% report_name | html %]" />
>-							</li>
>-						</ol>
>-					</fieldset>
>-					<fieldset class="action">
>-						<input type="submit" class="principal" value="Submit" />
>-						<input type="hidden" name="do_it" value="1" />
>-					</fieldset>
>-			</form>
>+                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                            </li>
>+                        </ol>
>+                    </fieldset>
>+                    <fieldset class="rows">
>+                        <h3>Output</h3>
>+                        <ol>
>+                            <li>
>+                                <label for="screen" >To screen in the browser:</label> <input id="screen" type="radio" checked="checked" name="output" value="screen" />
>+                            </li>
>+                            <li>
>+                                <label for="file">To a file:</label>
>+                                <input id="file" type="radio" name="output" value="file" />
>+                                <label class="inline" for="basename">Named:</label>
>+                                <input type="text" name="basename" id="basename" value="Export" />
>+                                
>+                                <input type="hidden" name="report_name" value="[% report_name | html %]" />
>+                            </li>
>+                        </ol>
>+                    </fieldset>
>+                    <fieldset class="action">
>+                        <input type="submit" class="principal" value="Submit" />
>+                        <input type="hidden" name="do_it" value="1" />
>+                    </fieldset>
>+            </form>
>                 [% IF ( do_it ) %]
>                     [% IF ( total ) %]
>                         <h3>Log entries</h3>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605