@@ -, +, @@ Bootstrap - Checkouts - Relative's checkouts (if patron is a guarantor or guarantee to another patron with checkouts) - Holds - Article requests - Claims - Restrictions - Clubs --- .../prog/css/src/staff-global.scss | 5 - .../prog/en/includes/blocked-fines.inc | 2 +- .../prog/en/includes/borrower_debarments.inc | 2 +- .../prog/en/includes/checkouts-table.inc | 2 +- .../en/includes/patron-article-requests.inc | 2 +- .../prog/en/includes/patron-return-claims.inc | 2 +- .../en/includes/relatives-issues-table.inc | 2 +- .../prog/en/modules/circ/circulation.tt | 211 +++++++-------- .../prog/en/modules/members/moremember.tt | 242 +++++++++--------- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- .../prog/js/pages/circulation.js | 12 +- 11 files changed, 239 insertions(+), 245 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1246,11 +1246,6 @@ div { } } -#reserves, -#checkouts { - padding: 1em; -} - #sales { display: none; } --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -9,7 +9,7 @@ [% END %] [% IF CAN_user_updatecharges_remaining_permissions %] Make payment - Pay all charges + Pay all charges [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -1,7 +1,7 @@ [% USE raw %] [% USE Koha %] [% PROCESS 'patron_restrictions.inc' %] -
+
[% IF ( not debarments.defined || debarments.size < 1 ) %]

Patron is currently unrestricted.

[% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -1,7 +1,7 @@ [% USE Koha %] [% PROCESS 'modal-claims.inc' %] [% INCLUDE 'format_price.inc' %] -
+
[% IF ( issuecount ) %]

--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc @@ -1,6 +1,6 @@ [% USE Context %] [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %] -

+
[% IF current_article_requests.count > 0 %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc @@ -1,4 +1,4 @@ -
+

[% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %] Show all [% patron.return_claims.count | html %] claim(s) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc @@ -1,6 +1,6 @@ [% USE Koha %] [% IF ( relatives_issues_count ) %] -

+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -815,38 +815,38 @@
-
- - - - - - - - - - - - - - - -
Hold dateTitleCall numberItem typeBarcodePickup atExpirationPriorityCancel?Suspend?Status
- -
- - - [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] - [% IF hold_cancellation.count %] - - [% END %] -
- + [% INCLUDE borrower_debarments.inc %] + +
+ [% IF ( holds_count ) %] +
+ + + + + + + + + + + + + + + + + +
Hold dateTitleCall numberItem typeBarcodePickup atExpirationPriorityCancel?Suspend?Status
+ +
+ + + [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] + [% IF hold_cancellation.count %] + + [% END %] +
+
- [% IF Koha.Preference('SuspendHoldsIntranet') %] -
-
- - - - - [% IF Koha.Preference('AutoResumeSuspendedHolds') %] - - - Specify date on which to resume [% INCLUDE 'date-format.inc' %]: - [% END %] -
-
- -
-
- - - - -
-
- [% END # /IF SuspendHoldsIntranet %] - - [% ELSE # IF holds_count %] -

Patron has nothing on hold.

- [% END # /IF holds_count %] -
- - [% IF Koha.Preference('UseRecalls') %] -
- [% INCLUDE 'recalls.inc' %] -
- [% END %] + [% IF Koha.Preference('SuspendHoldsIntranet') %] +
+
+ + + + + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] + + + Specify date on which to resume [% INCLUDE 'date-format.inc' %]: + [% END %] +
+
+ +
+
+ + + + +
+
+ [% END # /IF SuspendHoldsIntranet %] + + [% ELSE # IF holds_count %] +

Patron has nothing on hold.

+ [% END # /IF holds_count %] +
- [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %] - [% INCLUDE 'patron-return-claims.inc' %] - [% END %] + [% IF Koha.Preference('UseRecalls') %] +
+ [% INCLUDE 'recalls.inc' %] +
+ [% END %] - [% IF Koha.Preference('ArticleRequests') %] - [% INCLUDE 'patron-article-requests.inc' %] - [% END %] + [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %] + [% INCLUDE 'patron-return-claims.inc' %] + [% END %] + [% IF Koha.Preference('ArticleRequests') %] + [% INCLUDE 'patron-article-requests.inc' %] + [% END %] +
[% ELSIF borrowernumber # IF patron %]
Patron not found. Return to search
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -653,43 +653,43 @@
-
    -
  • - Checkouts ([% issuecount || 0 | html %]) + - [% INCLUDE "checkouts-table.inc" %] +
    + [% INCLUDE "checkouts-table.inc" %] - [% INCLUDE "relatives-issues-table.inc" %] + [% INCLUDE "relatives-issues-table.inc" %] - [% IF ( fines ) %] -
    - [% IF ( fines ) %] -

    Total due: [% fines | $Price %]

    - [% ELSE %] -

    No outstanding charges

    - [% END %] -
    - [% END %] + [% IF ( fines ) %] +
    + [% IF ( fines ) %] +

    Total due: [% fines | $Price %]

    + [% ELSE %] +

    No outstanding charges

    + [% END %] +
    + [% END %] - [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %] -
    - Loading... -
    - [% END %] + [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %] +
    + Loading... +
    + [% END %] - [% INCLUDE borrower_debarments.inc %] - - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] -
    - [% IF ( holds_count ) %] -
    - - - - - - - - - - - - - - - - - -
    Hold dateTitleCall numberItem typeBarcodePickup atExpirationPriorityDelete?Suspend?Status
    - -
    - - - [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] - [% IF hold_cancellation.count %] - - - [% END %] -
    -
    + [% INCLUDE borrower_debarments.inc %] - [% IF Koha.Preference('SuspendHoldsIntranet') %] -
    -
    - - - - - [% IF Koha.Preference('AutoResumeSuspendedHolds') %] - - - Specify date on which to resume [% INCLUDE 'date-format.inc' %]: - [% END %] -
    -
    + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] +
    + [% IF ( holds_count ) %] +
    + + + + + + + + + + + + + + + + + +
    Hold dateTitleCall numberItem typeBarcodePickup atExpirationPriorityDelete?Suspend?Status
    -
    - - - - + + + [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] + [% IF hold_cancellation.count %] + + + [% END %]
    - [% END # IF SuspendHoldsIntranet %] - [% ELSE %] -

    Patron has nothing on hold.

    - [% END %] -
    [% # /div#reserves %] - [% END %] + [% IF Koha.Preference('SuspendHoldsIntranet') %] +
    +
    + + + + + [% IF Koha.Preference('AutoResumeSuspendedHolds') %] + + + Specify date on which to resume [% INCLUDE 'date-format.inc' %]: + [% END %] +
    +
    + +
    +
    + + + + +
    +
    + [% END # IF SuspendHoldsIntranet %] - [% IF Koha.Preference('UseRecalls') %] -
    - [% INCLUDE 'recalls.inc' %] -
    - [% END %] + [% ELSE %] +

    Patron has nothing on hold.

    + [% END %] +
    [% # /div#reserves %] + [% END %] - [% IF Koha.Preference('ClaimReturnedLostValue') %] - [% INCLUDE 'patron-return-claims.inc' %] - [% END %] + [% IF Koha.Preference('UseRecalls') %] +
    + [% INCLUDE 'recalls.inc' %] +
    + [% END %] - [% IF Koha.Preference('ArticleRequests') %] - [% INCLUDE 'patron-article-requests.inc' %] - [% END %] + [% IF Koha.Preference('ClaimReturnedLostValue') %] + [% INCLUDE 'patron-return-claims.inc' %] + [% END %] + [% IF Koha.Preference('ArticleRequests') %] + [% INCLUDE 'patron-article-requests.inc' %] + [% END %] +
@@ -901,19 +902,12 @@ }); } - $('#finesholdsissues').tabs({ - // Correct table sizing for tables hidden in tabs - // http://www.datatables.net/examples/api/tabs_and_scrolling.html - "show": function(event, ui) { - var oTable = $('div.dataTables_wrapper>table', ui.panel).dataTable(); - if ( oTable.length > 0 ) { - oTable.fnAdjustColumnSizing(); - } - }, - "activate": function( event, ui ) { - $("a", ui.newTab ).click(); + $("#finesholdsissues a[data-toggle='tab']").on("shown.bs.tab", function(e){ + var oTable = $('div.dataTables_wrapper > table', $(e.target.hash) ).dataTable(); + if ( oTable.length > 0 ) { + oTable.fnAdjustColumnSizing(); } - } ); + }); $("#view_restrictions").on("click",function(){ $('#debarments-tab-link').click(); --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ a/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -120,7 +120,7 @@ $(document).ready(function() { $("#holds-tab").on( "click", function(){ load_holds_table() } ); // If the holds tab is preselected on load, we need to load the table - if ( $("#holds-tab").parent().hasClass('ui-state-active') ) { load_holds_table() } + if ( $("#holds-tab").parent().hasClass('active') ) { load_holds_table() } function load_holds_table() { var holds = new Array(); --- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js +++ a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js @@ -8,10 +8,8 @@ $(document).ready(function() { return false; }); - $('#patronlists').tabs({ - activate: function( event, ui ) { - $("a", ui.newTab ).click(); - } + $("#patronlists a[data-toggle='tab']").on("shown.bs.tab", function(e){ + $(this).click(); }); $("#borrower_messages .cancel").on("click",function(){ @@ -91,6 +89,12 @@ $(document).ready(function() { $("#" + fieldID).val(""); }); + /* Preselect Bootstrap tab based on location hash */ + var hash = window.location.hash.substring(1); + if( hash ){ + var activeTab = $('a[href="#' + hash + '"]'); + activeTab && activeTab.tab('show'); + } }); --