Attachment 136960 Details for Bug 30952 – Bug 30952: Patrons Module

[patch] Bug 30952: Patrons Module

Bug-30952-Patrons-Module.patch (text/plain), 46.65 KB, created by Solene D on 2022-07-01 14:22:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Solene D

Created: 2022-07-01 14:22:31 UTC

Size: 46.65 KB

patch

obsolete

>From e09f6bbf503a3af03452a7dc6ee6d6f1c950b619 Mon Sep 17 00:00:00 2001
>From: Solene Desvaux <sdesvaux@biblibre.com>
>Date: Thu, 31 Mar 2022 11:29:02 +0200
>Subject: [PATCH] Bug 30952: Patrons Module
>
>---
> .../en/modules/members/accountline-details.tt |   6 +-
> .../prog/en/modules/members/apikeys.tt        |   6 +-
> .../prog/en/modules/members/boraccount.tt     |   6 +-
> .../prog/en/modules/members/deletemem.tt      |   6 +-
> .../prog/en/modules/members/discharge.tt      |   6 +-
> .../prog/en/modules/members/discharges.tt     |   3 +
> .../prog/en/modules/members/files.tt          |   6 +-
> .../prog/en/modules/members/holdshistory.tt   |   6 +-
> .../prog/en/modules/members/housebound.tt     |   6 +-
> .../prog/en/modules/members/ill-requests.tt   |   6 +-
> .../prog/en/modules/members/mancredit.tt      |   6 +-
> .../prog/en/modules/members/maninvoice.tt     |   6 +-
> .../prog/en/modules/members/member-flags.tt   |   6 +-
> .../en/modules/members/member-password.tt     |   6 +-
> .../prog/en/modules/members/member.tt         | 155 +++++++++++++-----
> .../prog/en/modules/members/memberentrygen.tt |  18 +-
> .../prog/en/modules/members/members-update.tt |   6 +-
> .../prog/en/modules/members/merge-patrons.tt  |   6 +-
> .../prog/en/modules/members/moremember.tt     |  14 +-
> .../prog/en/modules/members/notices.tt        |   6 +-
> .../prog/en/modules/members/pay.tt            |   6 +-
> .../prog/en/modules/members/paycollect.tt     |   6 +-
> .../modules/members/purchase-suggestions.tt   |   6 +-
> .../prog/en/modules/members/readingrec.tt     |   6 +-
> .../prog/en/modules/members/routing-lists.tt  |   6 +-
> .../prog/en/modules/members/statistics.tt     |   6 +-
> .../modules/members/tables/members_results.tt |  44 +++++
> .../en/modules/patron_lists/add-modify.tt     |   1 -
> .../prog/en/modules/patron_lists/list.tt      |   1 -
> .../prog/en/modules/patron_lists/lists.tt     |   1 -
> .../prog/en/modules/patroncards/edit-batch.tt |   1 -
> .../en/modules/patroncards/edit-layout.tt     |   1 -
> .../en/modules/patroncards/edit-profile.tt    |   1 -
> .../en/modules/patroncards/edit-template.tt   |   1 -
> .../prog/en/modules/patroncards/home.tt       |   1 -
> .../en/modules/patroncards/image-manage.tt    |   1 -
> .../prog/en/modules/patroncards/manage.tt     |   1 -
> 37 files changed, 271 insertions(+), 105 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>index 1a328dac49..0545bc924b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>@@ -5,6 +5,9 @@
> [%- USE AuthorisedValues -%]
> [%- USE Branches -%]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% PROCESS 'accounts.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] &rsaquo; [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
>@@ -12,8 +15,7 @@
> </head>
> 
> <body id="pat_accountline_details" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>index 71fcf5b6d6..a20e3660d5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>@@ -2,13 +2,15 @@
> [% USE Koha %]
> [% USE Asset %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>API Keys &rsaquo; Patrons &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="pat_apikeys" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index 5223997277..3aefaed7b5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -9,6 +9,9 @@
> [% USE Branches %]
> [% USE Registers %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
> 
> [% PROCESS 'accounts.inc' %]
>@@ -19,8 +22,7 @@
> </head>
> 
> <body id="pat_borraccount" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>index fb65d243cd..11e07b1b17 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
>@@ -3,13 +3,15 @@
> [% USE Price %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Delete patron [% patron.firstname | html %] [% patron.surname | html %] &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="pat_deletemem" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>index 728342d0f9..878070b794 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
>@@ -4,13 +4,15 @@
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% UNLESS blocking_error  %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] &rsaquo; Patrons &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="discharge" class="discharge">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>index 37f267c1e5..1fb5ebda8d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>@@ -9,7 +9,10 @@
> </head>
> <body id="pat_discharges" class="pat">
> [% INCLUDE 'header.inc' %]
>+<<<<<<< HEAD
> [% INCLUDE 'patron-search-header.inc' %]
>+=======
>+>>>>>>> Bug 30952: Patrons Module
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>index 541128e4ee..5e9c68ed4b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>@@ -4,14 +4,16 @@
> [% USE Branches %]
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="pat_files" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>index cb53a59913..fe2725a80d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>@@ -7,14 +7,16 @@
> [% USE TablesSettings %]
> [% USE ItemTypes %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="pat_holdshistory" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form= formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>index 20879d16ae..034cf29b60 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -5,14 +5,16 @@
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Housebound &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="housebound-home" class="housebound">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form= formulaire %]
> 
> [% BLOCK 'homebound-details' %]
>     <div class="rows">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>index fa95e58d57..ba724d494f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>@@ -4,6 +4,9 @@
> [% USE Koha %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc.inc' %]
>+[% END %]
> [% USE AuthorisedValues %]
> [% USE TablesSettings %]
> 
>@@ -13,8 +16,7 @@
> </head>
> 
> <body id="pat_illrequestshistory" class="pat">
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'patron-search-header.inc' %]
>+    [% INCLUDE 'header.inc' form= formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index ca3e93d84a..a75237dba4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -3,6 +3,9 @@
> [% USE Koha %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc.inc' %]
>+[% END %]
> 
> [% PROCESS 'accounts.inc' %]
> 
>@@ -12,8 +15,7 @@
> </head>
> 
> <body id="pat_mancredit" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form= formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>index d059c38f72..742b92d3a2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>@@ -4,6 +4,9 @@
> [% USE Price %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc.inc' %]
>+[% END %]
> 
> [% PROCESS 'accounts.inc' %]
> 
>@@ -13,8 +16,7 @@
> </head>
> 
> <body id="pat_maninvoice" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form= formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>index b64a0bd32a..0362b22852 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>@@ -2,6 +2,9 @@
> [% USE Asset %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% PROCESS 'permissions.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>@@ -11,8 +14,7 @@
> </head>
> 
> <body id="pat_member-flags" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>index f4990e4e3a..89286b5c09 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
>@@ -3,6 +3,9 @@
> [% USE Koha %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname | html %], [% patron.firstname | html %][% END %] &rsaquo; Patrons &rsaquo; Koha
>@@ -11,8 +14,7 @@
> </head>
> 
> <body id="pat_member-password" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>index 7c523061e3..e75e5187c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>@@ -5,6 +5,9 @@
> [% USE Branches %]
> [% USE Categories %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc.inc' %]
>+[% END %]
> [% PROCESS 'patronfields.inc' %]
> [% SET libraries = Branches.all %]
> [% SET categories = Categories.all.unblessed %]
>@@ -15,9 +18,8 @@
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>-<body id="pat_member" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+<body id="pat_member">
>+[% INCLUDE 'header.inc' form= formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>@@ -41,6 +43,14 @@
>             </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">
>@@ -65,35 +75,41 @@
>           [% END %]
> 
>           <div id="searchresults">
>+<<<<<<< HEAD
>+=======
>+            <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3>
>+
>+
>+>>>>>>> Bug 30952: Patrons Module
>             [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %]
>               <div class="searchheader fh-fixedHeader" id="searchheader" style="display:none;">
>                   <div>
>                       <a href="#" class="btn btn-link" id="select_all"><i class="fa fa-check"></i> Select all</a>
>-                      |
>                       <a href="#" class="btn btn-link" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
>                     [% IF CAN_user_tools_manage_patron_lists %]
> 
>                     [% END %]
> 
>                     [% IF CAN_user_tools_manage_patron_lists %]
>-                        <div id="patronlist-dropdown" class="btn-group">
>-                            <button id="patronlist-menu" type="button" class="btn btn-sm btn-default dropdown-toggle patron-edits disabled" disabled="disabled" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
>-                                Add to patron list <span class="caret"></span>
>-                            </button>
>-                            <ul class="dropdown-menu">
>-                                [% IF patron_lists %]
>-                                    [% FOREACH pl IN patron_lists %]
>-                                        <li><a href="#" class="patron-list-add" data-listid="[% pl.patron_list_id | html %]">[% pl.name | html %]</a></li>
>-                                    [% END %]
>+                        Add selected patrons to:
>+                        <select name="searchfieldstype" id="searchfieldstype_filter">
>+                            <option selected="selected" value=""> [New list] </option>
>+                            [% IF patron_lists %]
>+                                [% FOREACH pl IN patron_lists %]
>+                                    <option>[% pl.name | html %]</option>
>                                 [% END %]
>-                                <li role="separator" class="divider"></li>
>-                                <li><a href="#" class="patron-list-add" data-listid="new">New list</a></li>
>-                            </ul>
>-                        </div>
>+                            [% END %]
>+                        </select>
>+
>+                         <input type="text" name="new_list_name" id="mini_inp"/>
>+
>+                        <button type="submit" id="add_to_patron_list_submit" class="btn btn-link">Save</button>
>+
>+
>                     [% END %]
> 
>                     [% IF CAN_user_borrowers_edit_borrowers %]
>-                          <button id="merge-patrons" class="btn btn-sm btn-default disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button>
>+                          | <button id="merge-patrons" class="btn btn-sm btn-default disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button>
>                     [% END %]
>                   </div>
>                 </div>
>@@ -110,36 +126,89 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>+<<<<<<< HEAD
>                 [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %]
>+=======
>+                <div id="filters">
>+                    <form method="get" id="searchform">
>+                        <input type="hidden" id="firstletter_filter" value="" />
>+                        <fieldset class="brief">
>+                            <h4>Search patrons</h4>
>+
>+                            <fieldset>
>+                                <ol>
>+                                    <li>
>+                                        <p>Search:
>+                                        <input type="text" id="searchmember_filter" value="[% searchmember | html %]"/></p>
>+                                    </li>
>+                                    <li>
>+                                        <p>Search field:
>+                                        <select name="searchfieldstype" id="searchfieldstype_filter">
>+                                            [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
>+                                            [% default_fields = [ 'standard', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
>+                                            [% search_options = default_fields.merge(pref_fields).unique %]
>+                                            [% FOREACH s_o IN search_options %]
>+                                                [% display_name = PROCESS patron_fields name=s_o %]
>+                                                [% NEXT IF !display_name %]
>+                                                [% IF searchfieldstype == s_o %]
>+                                                    <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
>+                                                [% ELSE %]
>+                                                    <option value=[% s_o | html %]>[% display_name | $raw %]</option>
>+                                                [% END %]
>+                                            [% END %]
>+                                        </select></p>
>+                                    </li>
>+                                    <li>
>+                                        <p>Search type:
>+                                        <select name="searchtype" id="searchtype_filter">
>+                                        [% IF searchtype == "start_with" %]
>+                                            <option value='start_with' selected="selected">Starts with</option>
>+                                            <option value="contain">Contains</option>
>+                                        [% ELSE %]
>+                                            <option value='start_with'>Starts with</option>
>+                                            <option value="contain" selected="selected">Contains</option>
>+                                        [% END %]
>+                                        </select></p>
>+                                    </li>
>+                                    <li>
>+                                        <p>Patron category:
>+                                        [% SET categories = Categories.all() %]
>+                                        <select id="categorycode_filter">
>+                                        <option value="">Any</option>
>+                                        [% FOREACH cat IN categories %]
>+                                            [% IF cat.categorycode == categorycode_filter %]
>+                                    <option selected="selected" value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
>+                                            [% ELSE %]
>+                                    <option value="[% cat.categorycode | html %]">[% cat.description | html %]</option>
>+
>+                                            [% END %]
>+                                        [% END %]
>+                                        </select></p>
>+                                    </li>
>+                                    <li>
>+                                        <p>Library:
>+                                        [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
>+                                        <select id="branchcode_filter">
>+                                        [% IF branches.size != 1 %]
>+                                            <option value="">Any</option>
>+                                        [% END %]
>+                                        [% PROCESS options_for_libraries libraries => branches %]
>+                                        </select></p>
>+                                    </li>
>+                                </ol>
>+                                <ol>
>+                                    <button class="submit" id="principal" type="submit">Search</button>
>+                                    <a class="cancel" id="cancel_set_library" href="[% referer or '/cgi-bin/koha/circ/circulation.pl' %]">Cancel</a>
>+                                </ol>
>+                            </fieldset>
>+                        </fieldset>
>+                    </form>
>+                </div>
>+>>>>>>> Bug 30952: Patrons Module
>             </aside>
>         </div> 
>     </div> 
> 
>-    
>-    <div class="modal" id="new-patron-list" tabindex="-1" role="dialog" aria-labelledby="new-patron-listLabel">
>-        <div class="modal-dialog" role="document">
>-            <div class="modal-content">
>-                <div class="modal-header">
>-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>-                    <h4 class="modal-title" id="new-patron-listLabel">Add patrons to a new patron list</h4>
>-                </div>
>-                <form id="new-patron-list_form">
>-                    <div class="modal-body">
>-                        <div class="form-group">
>-                            <label for="new_patron_list" class="required">Patron list name: </label>
>-                            <input class="form-control required" type="text" name="new_patron_list" id="new_patron_list" required="required" />
>-                            <input type="hidden" name="add_to_patron_list" id="add_to_patron_list" />
>-                            <span class="required">Required</span>
>-                        </div>
>-                    </div> 
>-                    <div class="modal-footer">
>-                        <button type="submit" id="add_to_patron_list_submit" class="btn btn-default approve">Submit</button>
>-                        <button type="button" class="btn btn-default deny" data-dismiss="modal">Cancel</button>
>-                    </div> 
>-                </form> 
>-            </div> 
>-        </div> 
>-    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index c5f17cb6f0..f01490c5b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -9,6 +9,9 @@
> [% PROCESS 'member-alt-address-style.inc' %]
> [% PROCESS 'member-alt-contact-style.inc' %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
>     <title>
>         [% UNLESS blocking_error %]
>@@ -31,9 +34,8 @@ legend:hover {
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>-<body id="pat_memberentrygen" class="pat">
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'patron-search-header.inc' %]
>+<body id="pat_memberentrygen"s>
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>@@ -72,6 +74,12 @@ legend:hover {
>                 </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">
>@@ -223,9 +231,9 @@ legend:hover {
>                         [% UNLESS ( check_member ) %]
>                             <div id="toolbar" class="btn-toolbar">
>                                 [% IF quickadd && opadd %]
>-                                    <button class="btn btn-default toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
>+                                    <button class="btn btn-default toggler principal" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
>                                 [% END %]
>-                                <button class="btn btn-default toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
>+                                <button class="btn btn-default toggler principal" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
>                                 [% IF opadd %]
>                                     <a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
>                                 [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
>index 7d3ba0b643..0e57b4b325 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
>@@ -5,14 +5,16 @@
> [% USE Categories %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Update patron records &rsaquo; Patrons &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="pat_update" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> [% BLOCK display_names %]
> [% SWITCH field %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>index 0461c5a862..2f84c7782a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>@@ -4,6 +4,9 @@
> [% USE Categories %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Merge patron records &rsaquo; Patrons &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -46,8 +49,7 @@
> [% END %]
> </head>
> <body id="pat_merge" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> [% BLOCK display_names %]
>     [% SWITCH rs %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index bf90be1d45..2f2b0a2f9e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -11,6 +11,9 @@
> [% PROCESS 'member-display-address-style.inc' %]
> [% PROCESS 'member-display-alt-address-style.inc' %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
> <title>
>@@ -21,9 +24,8 @@
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>-<body id="pat_moremember" class="pat">
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'patron-search-header.inc' %]
>+<body id="pat_moremember">
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>@@ -48,6 +50,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">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>index 8922a7557c..c78aee6226 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>@@ -5,6 +5,9 @@
> [% USE Branches %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -14,8 +17,7 @@
> </head>
> 
> <body id="pat_notices" class="pat">
>-    [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'patron-search-header.inc' %]
>+    [% INCLUDE 'header.inc' form=formulaire %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>index 577e552843..9dbf426238 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -7,6 +7,9 @@
> [% USE TablesSettings %]
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% PROCESS 'accounts.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Make a payment for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
>@@ -14,8 +17,7 @@
> </head>
> 
> <body id="pat_pay" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 125ccc6e10..638f5881e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -5,6 +5,9 @@
> [% USE Registers %]
> [% USE Price %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% PROCESS 'accounts.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% BLOCK cash_register_required %]
>@@ -32,8 +35,7 @@
> </head>
> 
> <body id="pat_paycollect" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc'  form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>index 24da899b90..d26a29b133 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>@@ -5,14 +5,16 @@
> [% USE AuthorisedValues  %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="pat_purchase_suggestions" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index 5e5ffa79da..c0eb2ed14f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -6,14 +6,16 @@
> [% USE Branches %]
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="pat_readingrec" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>index ce35ab360a..96b436f636 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>@@ -4,14 +4,16 @@
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
> <body id="pat_routing_lists" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>index 14298e6f44..04f152af3a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>@@ -4,6 +4,9 @@
> [% USE AuthorisedValues %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+[% formulaire = BLOCK %]
>+    [% INCLUDE 'patron-search-header.inc' %]
>+[% END %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>     [% UNLESS blocking_error %]
>@@ -14,8 +17,7 @@
> </head>
> 
> <body id="pat_statistics" class="pat">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'patron-search-header.inc' %]
>+[% INCLUDE 'header.inc' form=formulaire %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
>new file mode 100644
>index 0000000000..dc0bc29160
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
>@@ -0,0 +1,44 @@
>+[% USE raw %]
>+[% USE I18N %]
>+[% USE To %]
>+[% USE AuthorisedValues %]
>+[% USE KohaDates %]
>+[% USE Price %]
>+[% PROCESS 'member-display-address-style.inc' %]
>+{
>+    "sEcho": [% sEcho | html %],
>+    "iTotalRecords": [% iTotalRecords | html %],
>+    "iTotalDisplayRecords": [% iTotalDisplayRecords | html %],
>+    "aaData": [
>+        [% FOREACH data IN aaData %]
>+            {
>+                [% IF CAN_user_borrowers_edit_borrowers || CAN_user_tools_manage_patron_lists %]
>+                "dt_borrowernumber":
>+                    "<label for='check[% data.borrowernumber | html %]' class='content_hidden'>Select patron</label><input type='checkbox' id='check[% data.borrowernumber | html %]' class='selection' name='borrowernumber' value='[% data.borrowernumber | html %]' />",
>+                [% END %]
>+                "dt_cardnumber":
>+                "[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<a href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]' title=\"[% I18N.t("Check out") | html %]\">[% data.cardnumber | html | $To %]</a>[% ELSE %][% data.cardnumber | html | $To %][% END %]",
>+                "dt_name":
>+                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap' title=\"[% I18N.t("View") | html %]\">[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ INCLUDE 'display-address-style' patron=data no_line_break=1 | $To ~%][% IF data.email %]<li>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a></li>[% END %]</ul></div>",
>+    "dt_dateofbirth":
>+        "[% INCLUDE 'patron-age.inc' patron = data %]",
>+                "dt_category":
>+                    "[% data.category_description | html | $To %] <span class=\"patron_category_type\">([% data.category_type | html | $To %])</span>",
>+                "dt_branch":
>+                    "[% data.branchname | html | $To %]",
>+                "dt_dateexpiry":
>+                    "[% data.dateexpiry | html | $To %]",
>+                "dt_od_checkouts":
>+                    "[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues | html %]</strong></span>[% ELSE %][% data.overdues | html %][% END %] / [% data.issues | html %]",
>+                "dt_fines":
>+                    "<span style='text-align: right; display: block;'><a href=\"/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% data.borrowernumber | html %]\">[% IF data.fines < 0 %]<span class='credit'>[% data.fines | $Price %]</span>[% ELSIF data.fines > 0 %]<span class='debit'><strong>[% data.fines | $Price %]</strong></span>[% ELSE %][% data.fines | $Price %][% END %]</a></span>",
>+                "dt_borrowernotes":
>+                    "[% data.borrowernotes | html_line_break | collapse | $To %]",
>+                "dt_action":
>+                "<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% data.borrowernumber | html %]' id='lientype'>Edit</a>[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] <a id='lientype' href='/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]'>Check out</a>[% END %]",
>+                "borrowernumber":
>+                    "[% data.borrowernumber | html %]"
>+            }[% UNLESS loop.last %],[% END %]
>+        [% END %]
>+    ]
>+}
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>index 0777c50afe..0659c688d5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>@@ -14,7 +14,6 @@
> 
> <body id="patlist_add_modify" class="pat patlist">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>index af946b4527..6a5cfd9be2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>@@ -26,7 +26,6 @@
> 
> <body id="patlist_list" class="pat patlist">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index 7dfa414206..69c0e5bbb0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>@@ -9,7 +9,6 @@
> 
> <body id="patlist_lists" class="pat patlist">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
> 
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>index 554342bed3..cee85a5bad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>@@ -8,7 +8,6 @@
> 
> <body id="pcard_edit-batch" class="tools pcard">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>index f8e1c2f536..8a862ca072 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>@@ -6,7 +6,6 @@
> 
> <body id="pcard_edit-layout" class="tools pcard">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>index 740cc3d1fa..081dd6f350 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>@@ -6,7 +6,6 @@
> 
> <body id="pcard_edit-profile" class="tools pcard">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>index c9bdbf73b5..7451768ab1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>@@ -8,7 +8,6 @@
> 
> <body id="pcard_edit-template" class="tools pcard">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>index c37ff366c3..58a4552565 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>@@ -4,7 +4,6 @@
> </head>
> <body id="pcard_home" class="tools pcard">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>             <li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>index 0616f0bca8..d023a37709 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>@@ -6,7 +6,6 @@
> 
> <body id="pcard_image-manage" class="tools pcard">
> [% INCLUDE 'header.inc' %]
>-[% INCLUDE 'cat-search.inc' %]
> <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>     <ol>
>         <li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>index 81bef9eef3..ecb148e364 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>@@ -30,7 +30,6 @@
> 
> <body id="pcard_manage" class="tools pcard">
>     [% INCLUDE 'header.inc' %]
>-    [% INCLUDE 'cat-search.inc' %]
> 
>     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>         <ol>
>-- 
>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