Attachment 136901 Details for Bug 30952 – Bug 30952: update circulation

[patch] Bug 30952: update circulation

Bug-30952-update-circulation.patch (text/plain), 36.47 KB, created by Solene D on 2022-07-01 12:46:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Solene D

Created: 2022-07-01 12:46:30 UTC

Size: 36.47 KB

patch

obsolete

>From 122fd310d4e720ce8ffceea40313b5a845a3fa5c Mon Sep 17 00:00:00 2001
>From: Solene Desvaux <sdesvaux@biblibre.com>
>Date: Fri, 1 Jul 2022 10:07:08 +0200
>Subject: [PATCH] Bug 30952: update circulation
>
>---
> .../prog/en/includes/checkouts-table.inc      |   4 +-
> .../prog/en/modules/circ/circulation.tt       | 170 +++++++-----------
> .../prog/en/modules/circ/returns.tt           |   6 +-
> .../prog/en/modules/members/moremember.tt     |   3 +
> .../prog/en/modules/reserve/request.tt        |  22 +--
> 5 files changed, 79 insertions(+), 126 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>index e3b04aba1f..abb94cf21a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>@@ -53,8 +53,8 @@
>                             <label id="renew_as_unseen_label" for="override_limit">Renew as &quot;unseen&quot; if appropriate:</label>
>                             <input type="checkbox" name="renew_as_unseen" id="renew_as_unseen_checkbox" value="1" />
>                         [% END %]
>-                        <button class="btn btn-default" id="RenewCheckinChecked" id="lientype"><i class="fa fa-check"></i> Renew or check in selected items</button>
>-                        <button class="btn btn-default" id="RenewAll" id="lientype"><i class="fa fa-book"></i> Renew all</button>
>+                        <button class="btn btn-default principal" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button>
>+                        <button class="btn btn-default principal" id="RenewAll"><i class="fa fa-book"></i> Renew all</button>
>                     [% END %]
>                 </fieldset>
> 
>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 8001e5a389..fb7d35ceec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -66,8 +66,6 @@
>                         [% INCLUDE 'members-toolbar.inc' %]
>                     [% END %]
> 
>-                    <h1>Checkouts</h1>
>-
>                     
>                     [% IF ( was_renewed ) %]
>                         <div class="dialog message">Patron's account has been renewed until [% expiry | $KohaDates %]</div>
>@@ -237,15 +235,6 @@
>                                         Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS | html %]
>                                     </li>
>                                 [% END %]
>-
>-                                [% IF RECALLED %]
>-                                    [% IF RECALLED.waiting %]
>-                                        <li>Item <i>[% RECALLED.biblio.title | html %]</i> ([% RECALLED.item.barcode | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% RECALLED.patron_id | uri %]">[% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %]</a> ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.waiting_date | $KohaDates %]</li>
>-                                    [% ELSIF RECALLED.requested or RECALLED.overdue %]
>-                                        <li>Item <i>[% RECALLED.biblio.title | html %]</i> [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% RECALLED.patron_id | uri %]">[% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %]</a> ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.created_date | $KohaDates %]</li>
>-                                    [% END %]
>-                                [% END %]
>-
>                             </ul>
> 
>                             [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
>@@ -295,21 +284,6 @@
>                                         </p>
>                                     [% END %]
> 
>-                                    [% IF ( RECALLED ) %]
>-                                        <p>
>-                                            <label for="cancelrecall">Cancel recall</label>
>-                                            <input type="radio" value="cancel" name="cancel_recall" id="cancelrecall" />
>-                                            <input type="hidden" value="[% RECALLED.id | html %]" name="recall_id" />
>-                                        </p>
>-                                        [% IF RECALLED.waiting %]
>-                                            <p>
>-                                                <label for="revertrecall">Revert waiting status</label>
>-                                                <input type="radio" value="revert" name="cancel_recall" id="revertrecall" checked="checked"/>
>-                                                <input type="hidden" value="[% RECALLED.id | html %]" name="recall_id" />
>-                                            </p>
>-                                        [% END %]
>-                                    [% END %]
>-
>                                     <input type="hidden" name="barcode" value="[% barcode | html %]" />
>                                     <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
>                                     <input type="hidden" name="issueconfirmed" value="1" />
>@@ -350,12 +324,6 @@
>                                 </form>
>                             [% END %]
> 
>-                            [% IF ( RECALLED ) %]
>-                                <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
>-                                    <button class="print" type="submit" onclick="Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% RECALLED.id | html %]');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
>-                                </form>
>-                            [% END %]
>-
>                             <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
>                                 [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
>                                 <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
>@@ -373,9 +341,9 @@
>                                 [% END %]
>                             </form>
> 
>-                            [% IF ( RESERVED || ISSUED_TO_ANOTHER || RECALLED ) && (CAN_user_reserveforothers_place_holds ) %]
>+                            [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
>                                 [% UNLESS noissues %]
>-                                    <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber | html %]&borrowernumber=[% patron.borrowernumber | html %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
>+                                    <button type="submit" id="lientype" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber | html %]&borrowernumber=[% patron.borrowernumber | html %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
>                                 [% END %]
>                             [% END %]
>                         </div> 
>@@ -414,7 +382,7 @@
> 
>                                             [% IF ( fast_cataloging ) %]
>                                                 [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
>-                                                    <a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% patron.borrowernumber | html %]&amp;branch=[% branch | html %]&amp;duedatespec=[% duedatespec | html %]&amp;stickyduedate=[% stickyduedate | html %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
>+                                                    <a class="approve" id="lientype" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% patron.borrowernumber | html %]&amp;branch=[% branch | html %]&amp;duedatespec=[% duedatespec | html %]&amp;stickyduedate=[% stickyduedate | html %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
>                                                 [% END %]
>                                             [% END %]
>                                         </div>
>@@ -495,10 +463,6 @@
>                                 [% IF ( USERBLOCKEDOVERDUE ) %]
>                                     <li>Checkouts are BLOCKED because patron has overdue items.</li>
>                                 [% END %]
>-
>-                                [% IF ( RECALLED_INTRANSIT ) %]
>-                                    <li>Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) | html %].</li>
>-                                [% END %]
>                                 </ul>
> 
>                                 [% IF (forceallow) %]
>@@ -566,7 +530,7 @@
>                                                                     <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
>                                                                     <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" />
>                                                                     <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" />
>-                                                                    <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button>
>+                                                                    <button class="btn btn-default btn-xs" type="submit" id="lientype" name="x"><i class="fa fa-check"></i> Check out</button>
>                                                                 </form>
>                                                             </td>
>                                                         </tr>
>@@ -575,7 +539,7 @@
>                                                 </table>
>                                             </div> 
>                                             <div class="modal-footer">
>-                                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
>+                                                <button type="button" class="btn btn-default cancel" data-dismiss="modal">Cancel</button>
>                                             </div>
>                                         </div> 
>                                     </div> 
>@@ -610,11 +574,12 @@
>                             </div>
>                         [% END %]
> 
>-                        <div>
>+                        <div class="row">
>                             [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
>                                 <div class="col-sm-6">
>                                     <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
>                                         <input type="hidden" name="restoreduedatespec" />
>+                                        <div id="searchresults">
>                                         [% IF ( issue ) %]
>                                             <fieldset id="circ_circulation_issue" class="lastchecked">
>                                         [% ELSE %]
>@@ -628,7 +593,7 @@
> 
>                                         [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
> 
>-                                        <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
>+                                        <h3 class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</h3>
> 
>                                         [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
>                                             <div class="hint">Enter item barcode or keyword:</div>
>@@ -645,8 +610,8 @@
>                                         <div id="show-circ-settings">
>                                             <a href="#"><i class="fa-sign-out"></i></a>
>                                         </div>
>-                                        <button class="submit" id="principal" type="submit">Check out</button>
> 
>+                                        <button type="submit" class="btn btn-default principal">Check out</button>
> 
>                                         <div class="circ-settings">
> 
>@@ -670,33 +635,31 @@
>                                                 [% END %]
> 
>                                                 [% UNLESS ( noissues ) %]
>-                                                    [% IF Koha.Preference('AllowSetAutomaticRenewal') %]
>-                                                        <div id="set-automatic-renewal" class="circ-setting">
>-                                                            [% IF NEEDSCONFIRMATION %]
>-                                                                [% IF auto_renew %]
>-                                                                    [% IF patron.autorenew_checkouts %]
>-                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
>-                                                                        title="Patron has opted out of auto-renewal"/>
>-                                                                    [% ELSE %]
>-                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
>-                                                                    [% END %]
>-                                                                [% ELSE %]
>-                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
>-                                                                [% END %]
>-                                                            [% ELSE %]
>-                                                                [% IF ( auto_renew && patron.autorenew_checkouts ) %]
>-                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
>-                                                                [% ELSIF patron.autorenew_checkouts %]
>-                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
>-                                                                [% ELSE %]
>+                                                    <div id="set-automatic-renewal" class="circ-setting">
>+                                                        [% IF NEEDSCONFIRMATION %]
>+                                                            [% IF auto_renew %]
>+                                                                [% IF patron.autorenew_checkouts %]
>                                                                     <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
>                                                                     title="Patron has opted out of auto-renewal"/>
>+                                                                [% ELSE %]
>+                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
>                                                                 [% END %]
>+                                                            [% ELSE %]
>+                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
>+                                                            [% END %]
>+                                                        [% ELSE %]
>+                                                            [% IF ( auto_renew && patron.autorenew_checkouts ) %]
>+                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
>+                                                            [% ELSIF patron.autorenew_checkouts %]
>+                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
>+                                                            [% ELSE %]
>+                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
>+                                                                title="Patron has opted out of auto-renewal"/>
>                                                             [% END %]
>+                                                        [% END %]
> 
>-                                                            <label for="auto_renew">Automatic renewal</label>
>-                                                        </div>
>-                                                    [% END %]
>+                                                        <label for="auto_renew">Automatic renewal</label>
>+                                                    </div>
>                                                     [% IF Koha.Preference('decreaseLoanHighHolds') %]
>                                                         <div id="set_high_holds_overrride" class="circ-setting">
>                                                             [% IF NEEDSCONFIRMATION %]
>@@ -744,6 +707,7 @@
>                                                     <input type="hidden" name="charges" value="yes" />
>                                             [% END %]
>                                         </fieldset> 
>+                                        </div>
> 
>                                         [% IF ( issue ) %]
>                                             <div class="lastchecked">
>@@ -765,12 +729,13 @@
>                                 <div class="col-sm-6">
>                             [% END %]
> 
>+                            <div id="searchresults">
>                             [% IF ( noissues ) %]
>                                 [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
>-                                    <fieldset id="searchresults">
>+                                    <div id="circmessages" class="circmessage attention">
>                                 [% ELSE %]
>-                                    <h2>Checking out to [% INCLUDE 'patron-title.inc' %]</h2>
>-                                    <fieldset id="searchresults">
>+                                    <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
>+                                    <div id="circmessages" class="circmessage warning">
>                                 [% END %]
>                                 <h3>
>                                     Cannot check out!
>@@ -779,42 +744,42 @@
>                                     [% END %]
>                                 </h3>
>                             [% ELSE %]
>-                                <fieldset id="searchresults">
>+                                <div id="circmessages" class="circmessage attention">
>                             [% END %]
>+                            </div>
> 
>                             [% INCLUDE 'patron_messages.inc' %]
> 
>-
>-                        </fieldset> 
>+                        </div> 
>                     </div> 
>                 </div> 
> 
>                 <div id="patronlists" class="toptabs">
>                     <ul>
>                         <li>
>-                            <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
>+                            [% IF ( issuecount ) %]
>+                                <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
>+                            [% ELSE %]
>+                                <a href="#checkouts">0 Checkouts</a>
>+                            [% END %]
>                         </li>
> 
>                         [% IF relatives_issues_count %]
>-                            <li>
>-                                <a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts ([% relatives_issues_count | html %])</a>
>-                            </li>
>+                            <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
>                         [% END %]
> 
>                         <li>
>-                            <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
>+                            [% IF ( holds_count ) %]
>+                                <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
>+                            [% ELSE %]
>+                                <a href="#reserves" id="holds-tab">0 Holds</a>
>+                            [% END %]
>                         </li>
> 
>-                        [% IF Koha.Preference('UseRecalls') %]
>-                            <li>
>-                                <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
>-                            </li>
>-                        [% END %]
>-
>                         [% IF Koha.Preference('ArticleRequests') %]
>                             [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
>                             <li>
>-                                <a href="#article-requests" id="article-requests-tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
>+                                <a href="#article-requests" id="article-requests-tab"> [% current_article_requests.count | html %] Article requests</a>
>                             </li>
>                         [% END %]
> 
>@@ -822,8 +787,8 @@
>                             <li>
>                                 [% IF ( patron.return_claims.count ) %]
>                                     <a href="#return-claims" id="return-claims-tab">
>-                                        Claims
>-                                        ([% IF patron.return_claims.resolved.count == 0 %]
>+                                        Claim(s)
>+                                        [% IF patron.return_claims.resolved.count == 0 %]
>                                             <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
>                                         [% ELSE %]
>                                             <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
>@@ -832,21 +797,19 @@
>                                             <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
>                                         [% ELSE %]
>                                             <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
>-                                        [% END %])
>+                                        [% END %]
>                                     </a>
>                                 [% ELSE %]
>                                     <a href="#return-claims" id="return-claims-tab">
>-                                        Claims
>-                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
>-                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
>+                                        Claim(s)
>+                                        <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
>+                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
>                                     </a>
>                                 [% END %]
>                             </li>
>                         [% END %]
> 
>-                        <li>
>-                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a>
>-                        </li>
>+                        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.count | html %] Restrictions</a></li>
> 
>                         [% SET enrollments = patron.get_club_enrollments(1) %]
>                         [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
>@@ -898,7 +861,7 @@
>                                     <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
> 
>                                     [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
>-                                    [% IF hold_cancellation.count %]
>+                                    [% IF hold_cancellation %]
>                                         <select name="cancellation-reason">
>                                             <option value="">No reason given</option>
>                                             [% FOREACH reason IN hold_cancellation %]
>@@ -914,7 +877,7 @@
>                                     <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
>                                         <input type="hidden" name="from" value="circ" />
>                                         <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
>-                                        <input type="submit" value="Suspend all holds" />
>+                                        <input type="submit" class="principal" value="Suspend all holds" />
> 
>                                         [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
>                                         <label for="suspend_until">until</label>
>@@ -929,7 +892,7 @@
>                                         <input type="hidden" name="from" value="circ" />
>                                         <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
>                                         <input type="hidden" name="suspend" value="0" />
>-                                        <input type="submit" value="Resume all suspended holds" />
>+                                        <input type="submit" class="principal" value="Resume all suspended holds" />
>                                     </form>
>                                 </fieldset>
>                             [% END # /IF SuspendHoldsIntranet %]
>@@ -939,12 +902,6 @@
>                         [% END # /IF holds_count %]
>                     </div> 
> 
>-                    [% IF Koha.Preference('UseRecalls') %]
>-                        <div id="recalls">
>-                            [% INCLUDE 'recalls.inc' %]
>-                        </div>
>-                    [% END %]
>-
>                     [% IF Koha.Preference('ClaimReturnedLostValue') %]
>                         [% INCLUDE 'patron-return-claims.inc' %]
>                     [% END %]
>@@ -955,7 +912,7 @@
> 
>                 </div> 
>                 [% ELSIF borrowernumber # IF patron %]
>-                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
>+                    <div class="dialog message">Patron not found. <a id="lientype" href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
>                 [% END # /IF patron %]
> 
>                 </div> 
>@@ -999,6 +956,8 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>+    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
>+    [% INCLUDE 'timepicker.inc' %]
>     [% INCLUDE 'select2.inc' %]
>     [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
>     [% INCLUDE 'js-date-format.inc' %]
>@@ -1028,8 +987,8 @@
>     [% Asset.js("js/checkouts.js") | $raw %]
>     [% Asset.js("js/holds.js") | $raw %]
>     <script>
>-        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
>-        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
>+        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
>+        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
> 
>         [% IF borrowernumber and patron %]
>             if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
>@@ -1104,7 +1063,6 @@
>     </script>
>     [% INCLUDE 'str/members-menu.inc' %]
>     [% Asset.js("js/members-menu.js") | $raw %]
>-    [% Asset.js("js/recalls.js") | $raw %]
> [% END %]
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>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 4f4511a033..94142d34f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -1060,7 +1060,8 @@
>                         </form> 
> 
>                         [% IF ( riloop ) %]
>-                            <h2>Checked-in items</h2>
>+                        <fieldset id="searchresults">
>+                            <h3>Checked-in items</h3>
>                             <table id="checkedintable">
>                                 <thead>
>                                     <tr>
>@@ -1148,7 +1149,7 @@
>                                                         </span>
>                                                     </span>
>                                                 [% END %]
>-                                                <a class="btn btn-default btn-xs printcheckinslip" href="#" data-borrowernumber="[% riloo.patron.borrowernumber | html %]"><i class="fa fa-print"></i> Print checkin slip</a>
>+                                                <a class="btn btn-default btn-xs printcheckinslip" id="lientype" href="#" data-borrowernumber="[% riloo.patron.borrowernumber | html %]"><i class="fa fa-print"></i> Print checkin slip</a>
>                                             [% ELSE %]
>                                                 Not checked out
>                                             [% END %]
>@@ -1167,6 +1168,7 @@
>                                     </tr>
>                                 [% END # /FOREACH riloo %]
>                             </table> 
>+                            </fieldset>
>                         [% END # /IF riloop %]
>                     [% IF Koha.Preference('CircSidebar') %]
>                             </div> 
>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 d0bca84871..ac162e34ef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -93,6 +93,8 @@
> 
>                     <div>
>                         
>+                        
>+                        <div id="searchresults">
>                             [% IF ( was_renewed ) %]
>                             <fieldset id="searchresults">
>                             <div class="dialog message">
>@@ -104,6 +106,7 @@
>                             <div id="patron_messages" class="circmessage attention">
>                                 [% INCLUDE 'patron_messages.inc' %]
>                             </div>
>+                        </div>
> 
>                         <h1>
>                             [% UNLESS ( I ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 93a8f4281e..bc907bf666 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -285,7 +285,7 @@
>                             [% END %]
>                         [% UNLESS ( multi_hold ) %]
>                             <fieldset class="action">
>-                                <input type="submit" value="Place hold" />
>+                                <input type="submit" class="principal" value="Place hold" />
>                             </fieldset>
>                         [% ELSE %]
>                             <table id="requesttitles">
>@@ -569,17 +569,7 @@
>                         </ol>
> 
>                         [% UNLESS ( multi_hold ) %]
>-                            <fieldset class="action">
>-                                [% IF ( patron.borrowernumber ) %]
>-                                    [% IF ( override_required ) %]
>-                                        <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
>-                                    [% ELSIF ( none_available ) %]
>-                                        <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button>
>-                                    [% ELSE %]
>-                                        <button type="submit" class="btn btn-default">Place hold</button>
>-                                    [% END %]
>-                                [% END %]
>-                            </fieldset>
>+
> 
>                             [% FOREACH bibitemloo IN bibitemloop %]
>                                 <ol>
>@@ -896,14 +886,14 @@
>                         <fieldset class="action">
>                             [% IF ( patron AND patron.borrowernumber ) %]
>                                 [% IF ( override_required ) %]
>-                                    <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
>+                                    <button type="submit" class="btn btn-default principal warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
>                                 [% ELSIF ( none_available ) %]
>-                                    <button class="btn btn-default" type="submit">Place holds</button>
>+                                    <button class="btn btn-default" principal type="submit">Place holds</button>
>                                 [% ELSE %]
>                                     [% IF ( multi_hold ) %]
>-                                        <button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button>
>+                                        <button type="submit" class="btn btn-default principal" id="multi_hold_submit">Place holds</button>
>                                     [% ELSE %]
>-                                        <button type="submit" class="btn btn-default">Place hold</button>
>+                                        <button type="submit" class="btn btn-default principal">Place hold</button>
>                                     [% END %]
>                                 [% END %]
>                             [% END # /IF patron %]
>-- 
>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