From 1a20f3005bff09655c0b23f5384728b814987621 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 11 May 2012 15:25:05 -0400 Subject: [PATCH] ug 8078 [REVISED] my summary showing contents of incorrect tab This patch moves the holdings tab content to the correct position sequentially with regard to the order of the tabs themselves. My guess is that the jQuery upgrade has something to do with this change but I'm not sure why (probably something in our aging tabs plugin which works differently with the new jQuery version). Making the sequence of the tab contents match the sequence of the tabs seems to fix the problem. Revised to correct the error in placement of the tags markup in the staff client. Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain --- .../prog/en/modules/members/moremember.tt | 48 ++--- .../opac-tmpl/prog/en/modules/opac-user.tt | 165 +++++++++--------- 2 files changed, 106 insertions(+), 107 deletions(-) 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 d0ca42cf37..1e756df3af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -289,7 +289,7 @@ function validate1(date) { [% FOREACH attribute IN attributes_loop %] [% IF attribute.class %]

[% attribute.lib %]

- +
[% ELSE %]
[% END %] @@ -409,35 +409,27 @@ function validate1(date) {
-
- +
[% IF ( issueloop ) %]
- + @@ -459,7 +451,7 @@ function validate1(date) { [% END %] [% IF ( issueloo.red ) %] - - + [% IF ( issueloo.renew_failed ) %] @@ -496,9 +488,9 @@ function validate1(date) { [% IF ( issueloo.norenew_reason_on_reserve ) %] On Hold [% END %] - [% IF ( issueloo.norenew_reason_too_many ) %] + [% IF ( issueloo.norenew_reason_too_many ) %] Not renewable - [% END %] + [% END %] [% IF ( issueloo.can_confirm ) %] [% END %] @@ -546,7 +538,7 @@ function validate1(date) {
Due date Title Item type
+ [% ELSE %] [% END %] @@ -475,7 +467,7 @@ function validate1(date) { [% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %][% END %][% END %][% issueloo.itemtype_description %] [% issueloo.issuedate %] [% issueloo.issuingbranchname %][% issueloo.itemcallnumber %][% issueloo.itemcallnumber %] [% issueloo.charge %] [% issueloo.replacementprice %]
- + @@ -586,15 +578,23 @@ function validate1(date) { - + [% END %]
Due date Title Item type[% relissueloo.itemcallnumber %] [% relissueloo.charge %] [% relissueloo.replacementprice %][% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])
- + [% END %] - + +
+ [% IF ( totaldue_raw ) %] +

Total due: [% totaldue %]

+ [% ELSE %] +

No outstanding charges

+ [% END %] +
+
[% IF ( reservloop ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index b635aece72..2b88c7a495 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -120,77 +120,15 @@ $.tablesorter.addParser({ [% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]
  • Waiting
    • [% END %][% END %] [% IF ( reserves_count ) %]
  • Holds
    • [% END %] - -[% IF ( OPACFinesTab ) %] - - [% IF ( BORROWER_INF.amountoverfive ) %] -

    Fines and charges

    - - - - - - -
    Amount
    You currently owe fines and charges amounting to:[% BORROWER_INF.amountoutstanding %]
    - [% END %] - - [% IF ( BORROWER_INF.amountoverzero ) %] -

    Fines and charges

    - - - - -
    Amount
    You currently owe fines and charges amounting to:[% BORROWER_INF.amountoutstanding %]
    - [% END %] - - [% IF ( BORROWER_INF.amountlessthanzero ) %] -

    Credits

    - - - -
    Amount
    You have a credit of:[% BORROWER_INF.amountoutstanding %]
    - [% END %] -[% END %] - - [% END %] - - [% IF ( waiting_count ) %] - [% IF ( atdestination ) %] -
    - - - - - - - - [% FOREACH WAITIN IN WAITING %] - - - - - - - [% END %] -
    Holds waiting
    TitleHold datePick up library
    [% WAITIN.itemtype %] - [% WAITIN.waiting_title %] - - [% WAITIN.author %] - [% WAITIN.reservedate | $KohaDates %][% IF ( WAITIN.atdestination ) %]Waiting at [% WAITIN.branch %] - [% ELSE %] - In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %] - [% END %]
    - [% END %] - [% END %]
    [% IF ( issues_count ) %] - - + + - [% IF ( JacketImages ) %][% END %] + [% IF ( JacketImages ) %][% END %] [% UNLESS ( item_level_itypes ) %] [% END %] @@ -207,15 +145,15 @@ $.tablesorter.addParser({ [% END %] - - [% FOREACH ISSUE IN ISSUES %] + --> + [% FOREACH ISSUE IN ISSUES %] [% IF ( ISSUE.overdue ) %][% ELSE %][% END %] [% IF ( JacketImages ) %] [% END %]
    [% issues_count %] Item(s) checked out
      Title DueItem type
    @@ -259,27 +197,88 @@ $.tablesorter.addParser({
    - [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] - - [% END %] - + [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] + + [% END %] + [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %] -
    - - - [% FOREACH ISSUE IN ISSUES %] - - [% END %] - -
    - [% END %] +
    + + + [% FOREACH ISSUE IN ISSUES %] + + [% END %] + +
    + [% END %] [% ELSE %]
    You have nothing checked out
    [% END %]
    + +[% IF ( OPACFinesTab ) %] + + [% IF ( BORROWER_INF.amountoverfive ) %] +

    Fines and charges

    + + + + + + +
    Amount
    You currently owe fines and charges amounting to:[% BORROWER_INF.amountoutstanding %]
    + [% END %] + + [% IF ( BORROWER_INF.amountoverzero ) %] +

    Fines and charges

    + + + + +
    Amount
    You currently owe fines and charges amounting to:[% BORROWER_INF.amountoutstanding %]
    + [% END %] + + [% IF ( BORROWER_INF.amountlessthanzero ) %] +

    Credits

    + + + +
    Amount
    You have a credit of:[% BORROWER_INF.amountoutstanding %]
    + [% END %] +[% END %] - + [% END %] + + [% IF ( waiting_count ) %] + [% IF ( atdestination ) %] +
    + + + + + + + + [% FOREACH WAITIN IN WAITING %] + + + + + + + [% END %] +
    Holds waiting
    TitleHold datePick up library
    [% WAITIN.itemtype %] + [% WAITIN.waiting_title %] + + [% WAITIN.author %] + [% WAITIN.reservedate | $KohaDates %][% IF ( WAITIN.atdestination ) %]Waiting at [% WAITIN.branch %] + [% ELSE %] + In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %] + [% END %]
    + [% END %] + [% END %] + [% IF ( overdues_count ) %]
    -- 2.39.5
    Overdues ([% overdues_count %] total)