Attachment 136885 Details for Bug 30952 – Bug 30952: Circulation Module

[patch] Bug 30952: Circulation Module

Bug-30952-Circulation-Module.patch (text/plain), 82.34 KB, created by Solene D on 2022-07-01 12:45:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Solene D

Created: 2022-07-01 12:45:19 UTC

Size: 82.34 KB

patch

obsolete

>From 8faa3fd6035a3a786018038f2a1992d5ecce5a6e Mon Sep 17 00:00:00 2001
>From: Solene Desvaux <sdesvaux@biblibre.com>
>Date: Thu, 31 Mar 2022 11:27:38 +0200
>Subject: [PATCH] Bug 30952: Circulation Module
>
>---
> .../prog/en/modules/circ/article-requests.tt  |   1 -
> .../prog/en/modules/circ/bookcount.tt         |   1 -
> .../prog/en/modules/circ/branchoverdues.tt    |  16 +-
> .../prog/en/modules/circ/branchtransfers.tt   |  28 ++-
> .../prog/en/modules/circ/checkout-notes.tt    |   2 +-
> .../prog/en/modules/circ/circulation-home.tt  |  93 ++++----
> .../prog/en/modules/circ/circulation.tt       |  20 +-
> .../circ/circulation_batch_checkouts.tt       |   1 -
> .../prog/en/modules/circ/offline.tt           |   1 -
> .../prog/en/modules/circ/on-site_checkouts.tt |   1 -
> .../prog/en/modules/circ/overdue.tt           | 215 +++++++++---------
> .../prog/en/modules/circ/pendingreserves.tt   |  68 +++---
> .../prog/en/modules/circ/renew.tt             |  52 +++--
> .../prog/en/modules/circ/request-article.tt   |   1 -
> .../prog/en/modules/circ/reserveratios.tt     | 127 ++++++-----
> .../prog/en/modules/circ/returns.tt           | 124 +++++-----
> .../prog/en/modules/circ/set-library.tt       |  47 ++--
> .../prog/en/modules/circ/transfers_to_send.tt |  12 +-
> .../en/modules/circ/transferstoreceive.tt     |  14 +-
> .../prog/en/modules/circ/view_holdsqueue.tt   |  41 ++--
> .../prog/en/modules/circ/waitingreserves.tt   |  16 +-
> 21 files changed, 473 insertions(+), 408 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>index 562854249e..c4586446b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
>@@ -129,7 +129,6 @@
> 
> <body id="circ_article-requests" class="circ">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
> 
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>index 5f31c5b7c7..6df2a3e4c0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>@@ -9,7 +9,6 @@
> 
> <body id="circ_bookcount" class="circ">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>index 849dedf04f..92440d2f11 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
>@@ -1,12 +1,14 @@
> [% USE Branches %]
> [% USE Koha %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Overdues at [% Branches.GetLoggedInBranchname | html %] &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="circ_branchoverdues" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -22,6 +24,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -33,7 +41,7 @@
>         [% END %]
>             <main>
> 
>-<h1>Circulation: Overdues at [% Branches.GetLoggedInBranchname | html %]</h1>
>+<h2>Circulation: Overdues at [% Branches.GetLoggedInBranchname | html %]</h2>
> 
> <form name="selectlocation" action="branchoverdues.pl" method="post">
>     <label for="location">Shelving location selected: </label><select id="location" name="location">
>@@ -42,7 +50,7 @@
>             [% IF ( locationsloo.selected ) %]<option value="[% locationsloo.authorised_value | html %]" selected="selected">[% locationsloo.lib | html %]</option>[% ELSE %]<option value="[% locationsloo.authorised_value | html %]">[% locationsloo.lib | html %]</option>[% END %]
>         [% END %]
>     </select>
>-    <input type="submit" name="location" class="submit" value="OK" />
>+    <button type="submit" class="submit" id="principal">OK</button>
> </form>
> 
>     [% IF ( overduesloop ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>index 267cb064e2..5169c19086 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -2,13 +2,15 @@
> [% USE Branches %]
> [% USE ItemTypes %]
> [% USE AuthorisedValues %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Transfers &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="circ_branchtransfers" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -24,6 +26,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -171,19 +179,17 @@
> <div id="branchtransfers">
>     <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
>         <fieldset class="brief">
>-            <legend>Transfer</legend>
>-            <ol>
>-            <li>
>-                <label for="tobranchcd">Destination library: </label>
>+            <h3>Transfer</h3>
>+            <ol><li>
>+                <p>Destination library:
>                     <select name="tobranchcd" id="tobranchcd">
>                         [% PROCESS options_for_libraries libraries => Branches.all( selected => tobranchcd, unfiltered => 1) %]
>-                    </select>
>+                    </select></p>
>             </li>
>             <li>
>-                <label for="barcode">Enter barcode: </label>
>-                <input name="barcode" id="barcode" size="15" class="focus" type="text" /> <input type="submit" value="Submit" />
>-            </li>
>-			</ol>
>+                <input name="barcode" size="15" class="petit-barcode" type="text" placeholder="Enter barcode" /><button type="submit" class="submit" id="principal">Submit</button>
>+            </li></ol>
>+
>         </fieldset>
>         [% FOREACH trsfitemloo IN trsfitemloop %]
>             <input type="hidden" name="bc-[% trsfitemloo.counter | html %]" value="[% trsfitemloo.item.barcode | html %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>index dcfc6ac4df..498eff8133 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>@@ -12,7 +12,7 @@
> <body id="circ_checkout-notes" class="circ">
> 
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
>index 6821d18f4b..7f498333cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
>@@ -1,13 +1,16 @@
> [% USE raw %]
> [% USE Koha %]
> [% USE Branches %]
>+[% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="circ_circulation-home" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form = formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -20,6 +23,14 @@
>             </a>
>         </li>
>     </ol>
>+
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
>     <div class="main container-fluid">
>@@ -27,45 +38,32 @@
>         <h1>Circulation</h1>
> 
>         <div class="row">
>-
>             <div class="col-sm-5 col-md-4">
>                 <h3>Circulation</h3>
> 
>                 <ul class="buttons-list">
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i> Check out</a>
>-                    </li>
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i> Check in</a>
>-                    </li>
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a>
>-                    </li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i></a> Check out</li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i></a> Check in</li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i></a> Renew</li>
>                     [% UNLESS IndependentBranches %]
>                         <li>
>                             [% IF Koha.Preference('UseCirculationDesks') %]
>-                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>
>+                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i></a> Set library and desk
>                             [% ELSE %]
>-                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
>+                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i></a> Set library
>                             [% END %]
>                         </li>
>                     [% END %]
>                     [% IF ( fast_cataloging ) %]
>                         [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
>-                            <li>
>-                                <a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i> Fast cataloging</a>
>-                            </li>
>+                            <li><a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i></a> Fast cataloging</li>
>                         [% END %]
>                     [% END %]
>                     [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
>-                        <li>
>-                            <a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i> Checkout notes</a>
>-                        </li>
>+                        <li><a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i></a> Checkout notes</li>
>                     [% END %]
>                     [% IF Koha.Preference('OnSiteCheckouts') %]
>-                        <li>
>-                            <a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker"></i> Pending on-site checkouts</a>
>-                        </li>
>+                        <li><a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa fa-map-marker"></i></a> Pending on-site checkouts</li>
>                     [% END %]
>                 </ul>
>             </div>
>@@ -74,18 +72,10 @@
>                 <h3>Holds</h3>
> 
>                 <ul class="buttons-list">
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i> Holds queue</a>
>-                    </li>
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i> Holds to pull</a>
>-                    </li>
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a>
>-                    </li>
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
>-                    </li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i></a> Holds queue</li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa fa-hand-grab-o"></i></a> Holds to pull</li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i></a> Holds awaiting pickup</li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i></a> Hold ratios</li>
>                 </ul>
> 
>                 [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
>@@ -108,9 +98,7 @@
>                 [% IF Koha.Preference('ArticleRequests') %]
>                     <h3>Patron request</h3>
>                     <ul class="buttons-list">
>-                        <li>
>-                            <a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i> Article requests</a>
>-                        </li>
>+                        <li><a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa fa-newspaper-o"></i</a>> Article requests</li>
>                     </ul>
>                 [% END %]
> 
>@@ -118,16 +106,10 @@
> 
>                 <ul class="buttons-list">
>                     [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
>-                        <li>
>-                            <a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i> Transfer</a>
>-                        </li>
>+                        <li><a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa fa-exchange"></i></a> Transfer</li>
>                     [% END %]
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out"></i> Transfers to send</a>
>-                    </li>
>-                    <li>
>-                        <a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i> Transfers to receive</a>
>-                    </li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa fa-sign-out"></i></a> Transfers to send</li>
>+                    <li><a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa fa-sign-in"></i></a> Transfers to receive</li>
>                 </ul>
> 
>                 <h3>Overdues</h3>
>@@ -138,38 +120,41 @@
>                             <a class="circ-button"
>                                 href="/cgi-bin/koha/circ/overdue.pl"
>                                 title="Warning: This report is very resource intensive on systems with large numbers of overdue items."
>-                            ><i class="fa fa-clock-o"></i> Overdues</a>
>+                            ><i class="fa fa-clock-o"></i></a> Overdues
>                         </li>
>                     [% END %]
>                     <li>
>                         <a class="circ-button"
>                             href="/cgi-bin/koha/circ/branchoverdues.pl"
>                             title="Limited to your library.  See report help for other details."
>-                        ><i class="fa fa-clock-o"></i> Overdues with fines</a>
>+                        ><i class="fa fa-clock-o"></i></a> Overdues with fines
>                     </li>
>                 </ul>
>             </div>
>         </div>
>+
>         <div class="row" id="intranet-circulation-home-html">
>             <div class="col-md-12">
>                 [% Koha.Preference('IntranetCirculationHomeHTML') | $raw  %]
>             </div>
>         </div>
>+
>         <div class="row" id="offline-circulation">
>             <div class="col-md-12">
>                 <h4>Offline circulation</h4>
>                     <div class="col-sm-5 col-md-3">
>                     [% IF (AllowOfflineCirculation) %]
>-                        <a href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a>
>+                        <a class="noir" href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a>
>                     [% END %]
>-                       <p><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p>
>-                       <p><a href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p>
>+                        <p><a class="noir" href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p>
>+                        <p><a class="noir" href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p>
>                     </div>
>                     <div class="col-sm-5 col-md-3">
>-                    <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p>
>-                    <p><a href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p>
>+                    <p><a class="noir" href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p>
>+                    <p><a class="noir" href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p>
>                     </div>
>             </div>
>         </div>
>+    </div>
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index a000d35d52..3314172917 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -9,7 +9,9 @@
> [% USE ItemTypes %]
> [% USE Price %]
> [% USE AuthorisedValues %]
>-[% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
> [% SET destination = "circ" %]
>@@ -24,8 +26,7 @@
> 
> <body id="circ_circulation" class="circ">
> 
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'circ-search.inc' %]
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>@@ -640,10 +641,10 @@
>                                             <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" />
>                                         [% END %]
> 
>-                                        <button type="submit" class="btn btn-default">Check out</button>
>+                                        <button class="submit" id="principal" type="submit">Check out</button>
> 
>                                         <div id="show-circ-settings">
>-                                            <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i> Checkout settings</a>
>+                                            <a href="#"><i class="fa fa-caret-right circ-settings-icon"></i></a>
>                                         </div>
> 
>                                         <div class="circ-settings">
>@@ -765,10 +766,10 @@
> 
>                             [% IF ( noissues ) %]
>                                 [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
>-                                    <div id="circmessages" class="circmessage attention">
>+                                    <fieldset>
>                                 [% ELSE %]
>                                     <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
>-                                    <div id="circmessages" class="circmessage warning">
>+                                    <fieldset>
>                                 [% END %]
>                                 <h3>
>                                     Cannot check out!
>@@ -777,12 +778,13 @@
>                                     [% END %]
>                                 </h3>
>                             [% ELSE %]
>-                                <div id="circmessages" class="circmessage attention">
>+                                <fieldset>
>                             [% END %]
> 
>                             [% INCLUDE 'patron_messages.inc' %]
> 
>-                        </div> 
>+
>+                        </fieldset> 
>                     </div> 
>                 </div> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>index ef837f5b2f..9a1bc2483e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>@@ -21,7 +21,6 @@
> <body id="circ_circulation_batch_checkouts" class="circ">
> 
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>index 3dd818a33d..1767ad1840 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>@@ -17,7 +17,6 @@
> 
> <body id="circ_offline" class="circ">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
> <div class="loading-overlay" style="display: none;">
>     <div>Downloading records, please wait...</div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>index 906b9d46d2..7e45bbd708 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>@@ -12,7 +12,6 @@
> 
> <body id="circ_stats" class="circ">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index 3271a6e028..9d9cd0295f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -8,6 +8,9 @@
> [%- USE Categories -%]
> [%- USE TablesSettings -%]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Items overdue as of [% todaysdate | html %] &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -29,8 +32,7 @@
> </head>
> 
> <body id="circ_overdue" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -46,6 +48,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -140,123 +148,110 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>+                <div id="filters">
>+                    <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
>+                        <fieldset class="brief">
>+                            <h4>Filter on</h4>
> 
>-<form method="post" action="/cgi-bin/koha/circ/overdue.pl">
>-  <fieldset class="brief">
>-<h4>Filter on:</h4>
>-    <fieldset><legend>Date due:</legend>
>-        <ol>
>-            <li class="radio">
>-                <label for="showall">Show any items currently checked out:</label>
>-                [% IF ( showall ) %]
>-                        <input type="checkbox" id="showall" name="showall" value="show" checked="checked" />
>-                [% ELSE %]
>-                    <input type="checkbox" id="showall" name="showall" value="show" />
>-                [% END %]
>-            </li>
>+                            <fieldset><legend>Date due:</legend>
>+                                    <li class="radio">
>+                                        <p for="showall">Show any items currently checked out:
>+                                        [% IF ( showall ) %]
>+                                            <input type="checkbox" id="showall" name="showall" value="show" checked="checked" />
>+                                        [% ELSE %]
>+                                            <input type="checkbox" id="showall" name="showall" value="show" />
>+                                        [% END %]
>+                                        </p>
> 
>-            <li class="date_due_filter">
>-                <label for="from">From:</label>
>-                <input type="text" id="from" name="dateduefrom" size="10" value="[% filters.dateduefrom | $KohaDates %]" class="flatpickr" data-date_to="to" />
>-            </li>
>-            <li class="date_due_filter">
>-                <label for="to">To:</label>
>-                <input type="text" id="to" name="datedueto" size="10" value="[% filters.datedueto | $KohaDates %]" class="flatpickr" />
>-            </li>
>-        </ol>
>-    </fieldset>
>-    <ol>
>-    <li><label>Name or cardnumber:</label><input type="text" name="borname" value="[% filters.borname | html %]" /></li>
>-    <li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option>
>-      [% FOREACH borcatloo IN borcatloop %]
>-        [% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value | html %]" selected="selected">[% borcatloo.catname | html %]</option>[% ELSE %]<option value="[% borcatloo.value | html %]">[% borcatloo.catname | html %]</option>[% END %]
>-      [% END %]
>-      </select>
>-    </li>
>+                                        <p>From: <input type="text" id="from" name="dateduefrom" size="10" value="[% filters.dateduefrom | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
>+                                        <p>To:<input type="text" id="to" name="datedueto" size="10" value="[% filters.datedueto | $KohaDates %]" class="flatpickr" /></p>
>+                                    </li>
> 
>-    <li><label>Patron flags:</label>
>-        <select name="borflag" id="borflag">
>-            <option value="">None</option>
>-            [% IF ( borflag_gonenoaddress ) %]<option value="gonenoaddress" selected="selected">Address in question</option>
>-            [% ELSE %]<option value="gonenoaddress">Address in question</option>[% END %]
>-            [% IF ( borflag_debarred ) %]<option value="debarred" selected="selected">Restricted</option>
>-            [% ELSE %]<option value="debarred">Restricted</option>[% END %]
>-            [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option>
>-            [% ELSE %]<option value="lost">Lost card</option>[% END %]
>-        </select>
>-    </li>
>-	[% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %]
>-		
>-		<li>
>-			<label>[% patron_attr_filter_loo.description | html %]:</label>
>-            [% IF ( patron_attr_filter_loo.authorised_value_category ) %]
>-                [% SET authvals = AuthorisedValues.GetAuthValueDropbox( patron_attr_filter_loo.authorised_value_category ) %]
>-                <select id="pattrodue-input-[% patron_attr_filter_loo.domid | html %]" name="patron_attr_filter_[% patron_attr_filter_loo.code | html %]" class="pattrodue-input">
>-                    <option></option>
>-                    [% FOREACH authval IN authvals %]
>-                        [% IF ( patron_attr_filter_loo.cgivalue == authval.authorised_value ) -%]
>-                            <option value="[% authval.authorised_value | html %]" selected="selected">[% authval.lib | html %]</option>
>-                        [% ELSE -%]
>-                            <option value="[% authval.authorised_value | html %]">[% authval.lib | html %]</option>
>-                        [% END %]
>-                    [% END %]
>-                </select>
>-			[% ELSE %]
>-                <input type="text" name="patron_attr_filter_[% patron_attr_filter_loo.code | html %]" value="[% patron_attr_filter_loo.cgivalue | html %]"/>
>-			[% END %]
>-			[% IF ( patron_attr_filter_loo.repeatable ) %]
>-                <a href="#" class="btn btn-link clone-attribute" data-original-id="pattrodue-input-[% patron_attr_filter_loo.domid | html %]"><i class="fa fa-plus"></i> Add</a>
>-                [% IF ( patron_attr_filter_loo.isclone ) %]
>-                    <a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
>-                [% ELSIF ( patron_attr_filter_loo.ismany ) %]
>-                    <a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
>-                [% ELSE %]
>-                    <a href="#" class="btn btn-link delete_clone" style="display:none"><i class="fa fa-remove"></i> Delete</a>
>-                [% END %]
>-			[% END %]
>-		</li>
>-	[% END %]
>+                                    <li><p>Name or cardnumber:<input type="text" name="borname" value="[% filters.borname | html %]" /></p>
>+                                        <p>Patron category:<select name="borcat" id="borcat"><option value="">Any</option>
>+                                        [% FOREACH borcatloo IN borcatloop %]
>+                                            [% IF ( borcatloo.selected ) %]<option value="[% borcatloo.value | html %]" selected="selected">[% borcatloo.catname | html %]</option>[% ELSE %]<option value="[% borcatloo.value | html %]">[% borcatloo.catname | html %]</option>[% END %]
>+                                        [% END %]
>+                                        </select></p>
>+                                        <p>Patron flags:
>+                                            <select name="borflag" id="borflag">
>+                                                <option value="">None</option>
>+                                                [% IF ( borflag_gonenoaddress ) %]<option value="gonenoaddress" selected="selected">Address in question</option>
>+                                                [% ELSE %]<option value="gonenoaddress">Address in question</option>[% END %]
>+                                                [% IF ( borflag_debarred ) %]<option value="debarred" selected="selected">Restricted</option>
>+                                                [% ELSE %]<option value="debarred">Restricted</option>[% END %]
>+                                                [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option>
>+                                                [% ELSE %]<option value="lost">Lost card</option>[% END %]
>+                                            </select>
>+                                        </p>
> 
>-    <li><label>Item type:</label><select name="itemtype" id="itemtype"><option value="">Any</option>
>-      [% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %]
>-        <option value="[% itemtypeloo.value | html %]" selected="selected">[% itemtypeloo.itemtypename | html %]</option>[% ELSE %]
>-        <option value="[% itemtypeloo.value | html %]">[% itemtypeloo.itemtypename | html %]</option>[% END %]
>-      [% END %]
>-      </select>
>-    </li>
>+                                    [% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %]
>+                                        
>+                                            <p>[% patron_attr_filter_loo.description | html %]:
>+                                            [% IF ( patron_attr_filter_loo.authorised_value_category ) %]
>+                                                [% SET authvals = AuthorisedValues.GetAuthValueDropbox( patron_attr_filter_loo.authorised_value_category ) %]
>+                                                <select id="pattrodue-input-[% patron_attr_filter_loo.domid | html %]" name="patron_attr_filter_[% patron_attr_filter_loo.code | html %]" class="pattrodue-input">
>+                                                    <option></option>
>+                                                    [% FOREACH authval IN authvals %]
>+                                                        [% IF ( patron_attr_filter_loo.cgivalue == authval.authorised_value ) -%]
>+                                                            <option value="[% authval.authorised_value | html %]" selected="selected">[% authval.lib | html %]</option>
>+                                                        [% ELSE -%]
>+                                                            <option value="[% authval.authorised_value | html %]">[% authval.lib | html %]</option>
>+                                                        [% END %]
>+                                                    [% END %]
>+                                                </select>
>+                                            [% ELSE %]
>+                                                <input type="text" name="patron_attr_filter_[% patron_attr_filter_loo.code | html %]" value="[% patron_attr_filter_loo.cgivalue | html %]"/>
>+                                            [% END %]
>+                                            [% IF ( patron_attr_filter_loo.repeatable ) %]
>+                                                <a href="#" class="btn btn-link clone-attribute" data-original-id="pattrodue-input-[% patron_attr_filter_loo.domid | html %]"><i class="fa fa-plus"></i> Add</a>
>+                                                [% IF ( patron_attr_filter_loo.isclone ) %]
>+                                                    <a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
>+                                                [% ELSIF ( patron_attr_filter_loo.ismany ) %]
>+                                                    <a href="#" class="btn btn-link delete_clone"><i class="fa fa-remove"></i> Delete</a>
>+                                                [% ELSE %]
>+                                                    <a href="#" class="btn btn-link delete_clone" style="display:none"><i class="fa fa-remove"></i> Delete</a>
>+                                                [% END %]
>+                                            [% END %]</p>
>+                                    [% END %]
> 
>-    <li>
>-        <label>Item home library:</label>
>-        <select name="homebranch" id="homebranch">
>-            <option value="">Any</option>
>-            [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.homebranch ) %]
>-        </select>
>-    </li>
>+                                    <p>
>+                                        Item type:<select name="itemtype" id="itemtype"><option value="">Any</option>
>+                                        [% FOREACH itemtypeloo IN itemtypeloop %][% IF ( itemtypeloo.selected ) %]
>+                                            <option value="[% itemtypeloo.value | html %]" selected="selected">[% itemtypeloo.itemtypename | html %]</option>[% ELSE %]
>+                                            <option value="[% itemtypeloo.value | html %]">[% itemtypeloo.itemtypename | html %]</option>[% END %]
>+                                        [% END %]
>+                                        </select>
>+                                    </p>
> 
>-    <li>
>-        <label>Item holding library:</label>
>-        <select name="holdingbranch" id="holdingbranch">
>-            <option value="">Any</option>
>-            [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.holdingbranch ) %]
>-        </select>
>-    </li>
>+                                        <p>Item home library:
>+                                        <select name="homebranch" id="homebranch">
>+                                            <option value="">Any</option>
>+                                            [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.homebranch ) %]
>+                                        </select></p>
> 
>-    <li>
>-        <label>Library of the patron:</label>
>-        <select name="branch" id="branch">
>-            <option value="">Any</option>
>-            [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.branch, only_from_group => 1 ) %]
>-        </select>
>-    </li>
>+                                        <p>Item holding library:
>+                                        <select name="holdingbranch" id="holdingbranch">
>+                                            <option value="">Any</option>
>+                                            [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.holdingbranch ) %]
>+                                        </select></p>
> 
>-</ol>
>-   <fieldset class="action">
>-      <input type="submit" value="Apply filter" class="submit" />
>-      <input type="hidden" name="op" value="apply filter" />
>-   </fieldset>
>-   </fieldset>
>-  </form>
>+                                        <p>Library of the patron:
>+                                        <select name="branch" id="branch">
>+                                            <option value="">Any</option>
>+                                            [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.branch, only_from_group => 1 ) %]
>+                                        </select></p>
>+                                    </li>
>+                                </ol>
>+                                <fieldset class="action">
>+                                    <button type="submit" class="submit" id="principal">Apply filter</button>
>+                                    <input type="hidden" name="op" value="apply filter" />
>+                                </fieldset>
> 
>+                            </fieldset>
>+                        </fieldset>
>+                    </form>
>+                </div>
>             </aside>
>         </div> 
>      </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index 61203de92e..52486c8693 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -7,14 +7,16 @@
> [%- USE Branches -%]
> [%- USE ItemTypes -%]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Holds to pull &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="circ_pendingreserves" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>@@ -31,6 +33,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -250,7 +258,7 @@
>     </tfoot>
>     </table>
>     [% ELSE %]
>-        <strong>No items found.</strong>
>+        <fieldset><strong>No items found.</strong></fieldset>
>     [% END %]
> </div>
> 
>@@ -260,37 +268,33 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>+                <div id="filters">
>+                    <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
>+                        <fieldset class="brief">
>+                            <h4>Refine results</h4>
>+                            <fieldset>
>+                                <ol>
>+                                    <li>
>+                                        <p>Start date:
>+                                        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
>+                                    </li>
>+                                    <li>
>+                                        <p>End date:
>+                                        <input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="flatpickr" /></p>
>+                                    </li>
>+                                </ol>
> 
>-<div id="filters">
>+                                [% IF ( HoldsToPullEndDate ) %]
>+                                    <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p>
>+                                [% ELSE %]
>+                                    <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
>+                                [% END %]
> 
>-<form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
>-<fieldset class="brief">
>-<h4>Refine results</h4>
>-<ol>
>-<li>
>-<label for="from">
>-    Start date:
>-</label>
>-<input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" />
>-</li>
>-<li><label for="to">
>-    End date:
>-</label>
>-<input type="text" size="10" id="to" name="to" value="[% to | $KohaDates %]" class="flatpickr" />
>-</li>
>-</ol>
>-
>-[% IF ( HoldsToPullEndDate ) %]
>-    <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p>
>-[% ELSE %]
>-    <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
>-[% END %]
>-
>-<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
>-</fieldset>
>-</form>
>-
>-</div>
>+                                <button type="submit" class="submit" id="principal">Submit</button>
>+                            </fieldset>
>+                        </fieldset>
>+                    </form>
>+                </div>
>             </aside>
>         </div> 
>      </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>index 913994d447..378f0ecaeb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>@@ -3,6 +3,9 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> 
> <title>Renew [% title | html %] &rsaquo; Circulation &rsaquo; Koha</title>
>@@ -11,8 +14,7 @@
> 
> <body id="circ_renew" class="circ">
> 
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -28,6 +30,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -196,51 +204,45 @@
>             [% UNLESS error %]
>                 <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
> 
>-                    <fieldset>
>-                        <h1>Renew</h1>
>+                    <fieldset class="brief">
>+                        <h3>Renew</h3>
>+                        <ol>
> 
>                         [% IF Koha.Preference('UnseenRenewals') %]
>                             <div class="renew_formfield">
>-                                <div>
>-                                    <label for="barcode" class="hint">Enter item barcode: </label>
>-                                </div>
>-                                <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" />
>+                                <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" />
>                             </div>
>                             <div class="renew_formfield">
>                                 <label for="unseen" class="hint">Record renewal as unseen if appropriate: </label>
>                                 <input value="1" name="unseen" id="unseen" type="checkbox" />
>                             </div>
>                         [% ELSE %]
>-                            <div>
>-                                <label for="barcode" class="hint">Enter item barcode: </label>
>-                            </div>
>-
>-                            <input name="barcode" id="barcode" size="14" class="barcode focus" type="text" />
>+                            <input name="barcode" size="14" class="barcode focus" type="text" placeholder="Enter item barcode" />
> 
>                         [% END %]
>-                        <button type="submit" class="btn btn-default">Submit</button>
>+                        <button type="submit" class="submit" id="principal">Submit</button>
> 
>                         <div class="circ-settings show">
>                             <div class="date-select" id="renew_date_override_fields">
>-                                <div><label for="hard_due_date" class="hint">Renewal due date [% INCLUDE 'date-format.inc' %]:</label></div>
>-                                <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" />
>+                                <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" placeholder="Renewal due date [% INCLUDE 'date-format.inc' %]" />
>                             </div> 
>                         </div>
>+                        </ol>
>                     </fieldset>
> 
> 
>                 </form>
>             [% END %]
> 
>-                    [% IF Koha.Preference('CircSidebar') %]
>-                            </div> 
>-                            <div class="col-sm-2 col-sm-pull-10">
>-                                <aside>
>-                                    [% INCLUDE 'circ-nav.inc' %]
>-                                </aside>
>-                            </div> 
>-                        </div> 
>-                    [% END %]
>+                [% IF Koha.Preference('CircSidebar') %]
>+                        </div> 
>+                        <div class="col-sm-2 col-sm-pull-10">
>+                            <aside>
>+                                [% INCLUDE 'circ-nav.inc' %]
>+                            </aside>
>+                        </div> 
>+                    </div> 
>+                [% END %]
> 
>             </main>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>index 243f6e068b..fbcd5873ef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
>@@ -60,7 +60,6 @@
> 
> <body id="circ_request-article" class="circ">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'circ-search.inc' %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>index 4f68aae453..36fac404de 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
>@@ -6,6 +6,9 @@
> [% USE ItemTypes %]
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Hold ratios &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -17,8 +20,7 @@
> </head>
> 
> <body id="circ_reserveratios" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc'form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -34,6 +36,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -119,69 +127,70 @@
>                     [% ELSE %]
>                         <span>0 to order</span>
>                     [% END %]
>-                </p>
>-            </td>
>-        </tr>
>-      [% END %]
>-      </tbody>
>-    </table>
>-    [% ELSE %]
>-        <strong>No items found.</strong>
>-    [% END %]
>+                    </tbody>
>+                </table>
>+                [% ELSE %]
>+                    <strong>No items found.</strong>
>+                [% END %]
> 
>             </main>
>         </div> 
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-
>-<form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
>-<fieldset class="brief">
>-<h4>Refine results:</h4>
>-<ol>
>-    <li>
>-        <label for="ratio">Hold ratio (greater than or equal to):</label>
>-        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" />
>-    </li>
>-
>-    <li class="checkbox">
>-        [% IF include_ordered %]
>-            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
>-        [% ELSE %]
>-            <input id="include_ordered" name="include_ordered" type="checkbox"/>
>-        [% END %]
>-        <label for="include_ordered">Include ordered</label>
>-    </li>
>-
>-    <li class="checkbox">
>-        [% IF include_suspended %]
>-            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
>-        [% ELSE %]
>-            <input id="include_suspended" name="include_suspended" type="checkbox"/>
>-        [% END %]
>-        <label for="include_suspended">Include suspended</label>
>-    </li>
>-
>-    <li>
>-        <label for="from">Start date:</label>
>-        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" />
>-    </li>
>-
>-    <li>
>-        <label for="to">End date:</label>
>-        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" />
>-    </li>
>-</ol>
>-(inclusive)
>-
>-<fieldset class="action"><input type="submit" value="Go" class="submit"/></fieldset>
>-</fieldset>
>-[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
>-<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-<input type="hidden" name="basketno" value="[% basketno | html %]" />
>-[% END %]
>-</form>
>-
>+                <div id="filters">
>+                    <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
>+                        <fieldset class="brief">
>+                            <h4>Refine results</h4>
>+
>+                            <fieldset>
>+                                <ol>
>+                                    <li>
>+                                        <p>Hold ratio (greater than or equal to):
>+                                        <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" /></p>
>+                                    </li>
>+
>+                                    <li class="checkbox">
>+                                        <p>
>+                                        [% IF include_ordered %]
>+                                            <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked"/>
>+                                        [% ELSE %]
>+                                            <input id="include_ordered" name="include_ordered" type="checkbox"/>
>+                                        [% END %]
>+                                        Include ordered</p>
>+                                    </li>
>+
>+                                    <li class="checkbox">
>+                                        <p>
>+                                        [% IF include_suspended %]
>+                                            <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked"/>
>+                                        [% ELSE %]
>+                                            <input id="include_suspended" name="include_suspended" type="checkbox"/>
>+                                        [% END %]
>+                                        Include suspended</p>
>+                                    </li>
>+
>+                                    <li>
>+                                        <p>Start date:
>+                                        <input type="text" size="10" id="from" name="from" value="[% from | $KohaDates %]" class="flatpickr" data-date_to="to" /></p>
>+                                    </li>
>+
>+                                    <li>
>+                                        <p>End date:
>+                                        <input size="10" id="to" name="to" value="[% to | $KohaDates %]" type="text" class="flatpickr" /></p>
>+                                    </li>
>+                                </ol>
>+                                <p>(inclusive)</p>
>+                                <button type="submit" class="submit" id="principal">Go</button>
>+                            </fieldset>
>+                        </fieldset>
>+
>+                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
>+                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                        [% END %]
>+                    </form>
>+                </div>
>             </aside>
>         </div> 
>      </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index ab184328ea..bdd37b0536 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -6,6 +6,9 @@
> [% USE ItemTypes %]
> [% USE AuthorisedValues %]
> [% USE TablesSettings %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'checkin-search.inc' %]
>+[% END %]
> [% PROCESS 'member-display-address-style.inc' %]
> [% SET footerjs = 1 %]
> [% BLOCK display_bormessagepref %]
>@@ -35,8 +38,7 @@
> <body id="circ_returns" class="circ">
>     <span class="audio-alert-success"></span>
> 
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'checkin-search.inc' %]
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>@@ -52,6 +54,12 @@
>                 </a>
>             </li>
>         </ol>
>+        <ol>
>+            [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+        </ol>
>+        <ol>
>+            <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+        </ol>
>     </nav>
> 
>     <div class="main container-fluid">
>@@ -67,58 +75,60 @@
>                         [% END %]
> 
>                         [% BLOCK all_checkin_messages %]
>-                            [% IF hold_auto_filled %]
>-                                <div class="dialog message hold-auto-filled">
>-                                    [% IF ( reservenotes ) %]
>-                                        <h4>Notes: [% reservenotes | html %]</h4>
>-                                    [% END %]
>-                                    <h3>Hold filled for:</h3>
>-                                    <ul>
>-                                        <li>
>-                                            [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 %]
>-                                            <span class="patron-category"> - [% patron.category.description | html %]</span>
>-                                        </li>
> 
>-                                        [% INCLUDE display_holdpatron_address %]
> 
>-                                        [% IF ( patron.phone ) %]
>-                                            <li>[% patron.phone | html %]</li>
>-                                        [% END %]
>+                            <div class="dialog message hold-auto-filled">
>+                            [% IF hold_auto_filled %]
>+                                [% IF ( reservenotes ) %]
>+                                    <h4>Notes: [% reservenotes | html %]</h4>
>+                                [% END %]
>+                                <h3>Hold filled for:</h3>
>+                                <ul>
>+                                    <li>
>+                                        [% INCLUDE 'patron-title.inc' patron=patron hide_patron_infos_if_needed=1 invert_name=1 %]
>+                                        <span class="patron-category"> - [% patron.category.description | html %]</span>
>+                                    </li>
> 
>-                                        [% IF ( patron.email ) %]
>-                                            <li>
>-                                                [% IF ( transfertodo ) %]
>-                                                    [% patron.email | html %]
>-                                                [% ELSE %]
>-                                                    <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
>-                                                [% END %]
>-                                            </li>
>-                                        [% END %]
>+                                    [% INCLUDE display_holdpatron_address %]
> 
>-                                        [% UNLESS ( transfertodo) %]
>-                                            [% INCLUDE display_bormessagepref %]
>-                                        [% END %]
>+                                    [% IF ( patron.phone ) %]
>+                                        <li>[% patron.phone | html %]</li>
>+                                    [% END %]
> 
>-                                        [% IF ( patron.is_debarred ) %]
>-                                            <li class="error">Patron is RESTRICTED</li>
>-                                        [% END %]
>+                                    [% IF ( patron.email ) %]
>+                                        <li>
>+                                            [% IF ( transfertodo ) %]
>+                                                [% patron.email | html %]
>+                                            [% ELSE %]
>+                                                <a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>
>+                                            [% END %]
>+                                        </li>
>+                                    [% END %]
> 
>-                                        [% IF ( patron.gonenoaddress ) %]
>-                                            <li class="error">Patron's address is in doubt</li>
>-                                        [% END %]
>-                                    </ul>
>+                                    [% UNLESS ( transfertodo) %]
>+                                        [% INCLUDE display_bormessagepref %]
>+                                    [% END %]
>+
>+                                    [% IF ( patron.is_debarred ) %]
>+                                        <li class="error">Patron is RESTRICTED</li>
>+                                    [% END %]
> 
>-                                    [% IF ( transfertodo ) %]
>-                                        <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
>-                                    [% ELSE %]
>-                                        <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
>+                                    [% IF ( patron.gonenoaddress ) %]
>+                                        <li class="error">Patron's address is in doubt</li>
>                                     [% END %]
>+                                </ul>
>+
>+                                [% IF ( transfertodo ) %]
>+                                    <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) | html %]</h4>
>+                                [% ELSE %]
>+                                    <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) | html %]</h4>
>+                                [% END %]
> 
>-                                    <a href="#" class="btn btn-default print print-slip">
>-                                        <i class="fa fa-print"></i> Print
>-                                    </a>
>-                                </div> 
>+                                <a href="#" class="btn btn-default print print-slip">
>+                                    <i class="fa fa-print"></i> Print
>+                                </a>
>                             [% END # /IF hold_auto_filled %]
>+                            </div> 
> 
>                             [% IF ( trigger ) %]
>                                  <div id="transfer-trigger" class="dialog message">
>@@ -937,30 +947,30 @@
>                         </div>
> 
>                         <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
>-                            <fieldset id="circ_returns_checkin">
>+                            <fieldset  class="brief">
>                                 <div class="show_checkin_dialog" style="float:right;display:none"><button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" title="Show the last checkin message"><i class="fa fa-info"></i></button></div>
>-                                <h1>Check in</h1>
>+                                <h3>Check in</h3>
>+                                <ol>
>                                 <div class="row">
>                                     <div class="col-sm-6">
>-                                        <div class="hint">Enter item barcode:</div>
>                                             <div class="form-control-group">
>                                                 [% IF ( exemptfine ) %]
>-                                                    <input name="barcode" id="barcode" size="14" class="focus input-warning" type="text" />
>+                                                    <input name="barcode" size="14" class="barcode class="focus input-warning" type="text" placeholder="Enter item barcode" />
>                                                 [% ELSIF ( dropboxmode ) %]
>-                                                    <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" />
>+                                                    <input name="barcode" size="14" class="barcode focus input-warning" placeholder="Enter item barcode" />
>                                                 [% ELSE %]
>-                                                    <input name="barcode" id="barcode" size="14" class="barcode focus" />
>+                                                    <input name="barcode" size="14" class="barcode focus" placeholder="Enter item barcode" />
>                                                 [% END %]
>-                                                <button type="submit" class="btn btn-default">Check in</button>
>+                                                <div id="show-circ-settings">
>+                                                    <a href="#"><i class="fa-sign-out"></i></a>
>+                                                </div>
>+                                                <button class="submit" id="principal" type="submit" >Check in</button>
>                                                 [% FOREACH inputloo IN inputloop %]
>                                                     <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
>                                                     <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
>                                                     <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
>                                                 [% END %]
>                                             </div>
>-                                        <div id="show-circ-settings">
>-                                            <a href="#"><i class="fa circ-settings-icon fa-caret-down"></i> Checkin settings</a>
>-                                        </div>
>                                     </div>
>                                     <div class="col-sm-6">
>                                         [% IF ( exemptfine ) %]
>@@ -999,9 +1009,8 @@
>                                 <div class="circ-settings">
>                                     [% IF Koha.Preference('SpecifyReturnDate') %]
>                                         <div class="date-select" id="return_date_override_fields">
>-                                            <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
> 
>-                                            <input type="text" size="20" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" class="flatpickr" data-flatpickr-pastinclusive="true" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />
>+                                            <input type="text" size="30" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" class="flatpickr" data-flatpickr-pastinclusive="true" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" placeholder="Specify return date [% INCLUDE 'date-format.inc' %]" />
> 
>                                             <div class="circ-setting">
>                                                 [% IF ( return_date_override_remember ) %]
>@@ -1046,6 +1055,7 @@
>                                     [% END %] 
> 
>                                 </div> 
>+                                </ol>
>                             </fieldset> 
>                         </form> 
> 
>@@ -1158,7 +1168,6 @@
>                                 [% END # /FOREACH riloo %]
>                             </table> 
>                         [% END # /IF riloop %]
>-
>                     [% IF Koha.Preference('CircSidebar') %]
>                             </div> 
>                             <div class="col-sm-2 col-sm-pull-10">
>@@ -1171,7 +1180,6 @@
>                             </div> 
>                         </div> 
>                     [% END %]
>-
>                 </main>
>             </div> 
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
>index d89de8b7a3..887c7ade80 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
>@@ -5,6 +5,9 @@
> [% USE Registers %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% IF Koha.Preference('UseCirculationDesks') %]
> <title>Set library and desk &rsaquo; Circulation &rsaquo; Koha</title>
>@@ -17,8 +20,7 @@
> </style>
> </head>
> <body id="circ_set-library" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -32,6 +34,13 @@
>             <a href="#" aria-current="page">Set library</a>
>         </li>
>     </ol>
>+
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -82,13 +91,18 @@ Updated:<ul>
> 
> <form method="post" action="set-library.pl">
> [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
>-<fieldset class="rows">
>-    <legend>Set library</legend>
>+<fieldset  class="brief">
>+    <h3>Set library</h3>
>     <ol>
>-        <li><label for="branch">Choose library:</label>
>+        <li><p>Choose library:
>         <select name="branch" id="branch">
>             [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
>-        </select></li>
>+        </select></p></li>
>+
>+        <li>
>+            <button class="submit" id="principal" type="submit" >Submit</button>
>+            <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
>+        </li>
>     </ol>
> </fieldset>
> [% ELSE %]
>@@ -98,20 +112,25 @@ Updated:<ul>
> [% END %]
> 
> [% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
>-<fieldset class="rows">
>-    <legend>Set desk</legend>
>+<fieldset  class="brief">
>+    <h3>Set desk</h3>
>     <ol>
>         <li><label for="desk">Choose desk:</label>
>         <select name="desk_id" id="desk_id">
>             [% PROCESS options_for_desks desks => Desks.all(), selected => desk_id  %]
>         </select></li>
>+
>+        <li>
>+            <button class="submit" id="principal" type="submit" >Submit</button>
>+            <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
>+        </li>
>     </ol>
> </fieldset>
> [% END %]
> 
> [% IF Koha.Preference('UseCashRegisters') %]
>-<fieldset class="rows">
>-    <legend>Set cash register</legend>
>+<fieldset class="brief">
>+    <h3>Set cash register</h3>
>     <ol>
>         <li>
>             <label for="register_id">Choose cash register:</label>
>@@ -120,14 +139,14 @@ Updated:<ul>
>                 [% PROCESS options_for_registers registers => Registers.all() %]
>             </select>
>         </li>
>+        <li>
>+            <button class="submit" id="principal" type="submit" >Submit</button>
>+            <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
>+        </li>
>     </ol>
> </fieldset>
> [% END %]
> 
>-<fieldset class="action">
>-    <input type="submit" value="Submit" />
>-    <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
>-</fieldset>
> <div class="noshow">
>     [% FOREACH recycle_loo IN recycle_loop %]
>     <input type="text" name="[% recycle_loo.param | html %]" value="[% recycle_loo.value | html %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>index bd578be835..6ae6cb48e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
>@@ -5,6 +5,9 @@
> [% USE Branches %]
> [% USE ItemTypes %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% PROCESS 'transfer_reasons.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Transfers to send &rsaquo; Circulation &rsaquo; Koha</title>
>@@ -12,8 +15,7 @@
> </head>
> 
> <body id="circ_transferstosend" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-labal="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -27,6 +29,12 @@
>             <a href="#" aria-current="page">Transfers to send</a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>index 26cee8e466..339bc582ce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>@@ -4,14 +4,16 @@
> [% USE KohaDates %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Transfers to receive &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="circ_transferstoreceive" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -27,6 +29,12 @@
>             </a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -41,7 +49,7 @@
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                 [% END %]
> 
>-        <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
>+        <h2>Transfers made to your library as of [% show_date | $KohaDates %]</h2>
> 	[% IF ( branchesloop ) %]
>         <p>Your library is the destination for the following transfer(s)</p>
> 		[% IF ( latetransfers ) %]<p>Transfers are <span class="error">considered late</span> after [% TransfersMaxDaysWarning | html %] days.</p>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>index b0c0933df3..c266c0f16a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>@@ -8,6 +8,9 @@
> [% USE TablesSettings %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Holds queue &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -15,8 +18,7 @@
> </head>
> 
> <body id="circ_view_holdsqueue" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -45,6 +47,12 @@
>             </li>
>         [% END %]
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -59,7 +67,8 @@
>                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>                 [% END %]
> 
>-<h1>Holds queue</h1>
>+<fieldset class="brief">
>+<h3>Holds queue</h3>
> 
> [% IF ( run_report ) %]
>     [% IF ( total ) %]
>@@ -236,45 +245,43 @@
> [% BLOCK filter_form %]
>     <form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
>         [% IF ( total ) %]
>-            <fieldset class="brief">
>+            <fieldset>
>         [% ELSE -%]
>-            <fieldset class="rows">
>+            <fieldset>
>         [% END %]
>             <ol>
>                 <li>
>-                    <label for="branchlimit">Library: </label>
>+                    <p>Library:
>                     <select name="branchlimit" id="branchlimit">
>                         <option value="">All</option>
>                         [% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]
>-                    </select>
>+                    </select></p>
>                 </li>
>                 <li>
>-                    <label for="itemtypeslimit">Item type: </label>
>+                    <p>Item type:
>                     <select name="itemtypeslimit" id="itemtypeslimit">
>                         <option value="">All</option>
>                         [% PROCESS options_for_item_types itemtypes => ItemTypes.Get(), selected_itemtype => itemtypeslimit %]
>-                    </select>
>+                    </select></p>
>                 </li>
>                 <li>
>-                    <label for="ccodeslimit">Collection: </label>
>+                    <p>Collection:
>                     <select name="ccodeslimit" id="ccodeslimit">
>                         <option value="">All</option>
>                         [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ), selected_av => ccodeslimit %]
>-                    </select>
>+                    </select></p>
>                 </li>
>                 <li>
>-                    <label for="locationsslimit">Shelving location: </label>
>+                    <p>Shelving location:
>                     <select name="locationslimit" id="locationslimit">
>                         <option value="">All</option>
>                         [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %]
>-                    </select>
>+                    </select></p>
>                 </li>
>+            <button type="submit" class="submit" id="principal">Submit</button>
>+                <input type="hidden" name="run_report" value="1" />
>             </ol>
>         </fieldset>
>-        <fieldset class="action">
>-            <input type="submit" value="Submit" />
>-            <input type="hidden" name="run_report" value="1" />
>-        </fieldset>
>     </form>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index b6e06f7bc9..b01ad9ec77 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -6,14 +6,16 @@
> [% USE TablesSettings %]
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'circ-search.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Holds awaiting pickup &rsaquo; Circulation &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="circ_waitingreserves" class="circ">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'circ-search.inc' %]
>+[% INCLUDE 'header.inc'form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -27,6 +29,12 @@
>             <a href="#" aria-current="page">Holds awaiting pickup</a>
>         </li>
>     </ol>
>+    <ol>
>+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
>+    </ol>
>+    <ol>
>+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -44,7 +52,7 @@
>             <h1>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]</h1>
>             <h2>
>             [% IF ( all_branches_link ) %]
>-            <span><a href="[% all_branches_link | url %]">
>+            <span><a href="[% all_branches_link | url %]" id="lientype" >
>             View all libraries</a></span>
>             [% END %]
>         </h2>
>@@ -81,6 +89,7 @@
>             </div>
>         [% END %]
>         <div id="resultlist" class="toptabs">
>+            <fieldset id="searchresults">
>             <ul class="nav nav-tabs" role="tablist">
>                 <li role="presentation" class="active"><a href="#holdswaiting" aria-controls="holdswaiting" role="tab" data-toggle="tab">Holds waiting: [% reservecount | html %]</a></li>
>                 <li role="presentation">
>@@ -125,6 +134,7 @@
>                 <div class="dialog message">No holds found.</div>
>             [% END %]
>         </div>
>+        </fieldset>
>         </div>
>     [% END %]
> 
>-- 
>2.17.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