From 996d611d20a20f5d84dcee732b47b049f55009a1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 4 Nov 2021 17:48:08 +0000 Subject: [PATCH] Bug 27741: circ folder Bug 27631 corrected the

tags in each of the pages in the staff client. This bug deals with correcting the hierarchy of each of the other headings. To test: 1) Apply patch and dependencies 2) Go to each of the pages and check the headings under

are in the correct order and hierarchy Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard --- .../prog/en/includes/patron_messages.inc | 6 +- .../prog/en/modules/circ/bookcount.tt | 2 +- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../prog/en/modules/circ/circulation-home.tt | 12 ++-- .../prog/en/modules/circ/circulation.tt | 18 +++--- .../circ/circulation_batch_checkouts.tt | 4 +- .../prog/en/modules/circ/offline.tt | 2 +- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 4 +- .../prog/en/modules/circ/request-article.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 6 +- .../prog/en/modules/circ/returns.tt | 64 +++++++++---------- .../prog/en/modules/circ/waitingreserves.tt | 7 +- 14 files changed, 66 insertions(+), 67 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index 72e747bd14..b377637416 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -141,7 +141,7 @@ [% END %] [% IF ( waiting_here > 0 ) %] -

Holds waiting here ([% waiting_here | html %])

+

Holds waiting here ([% waiting_here | html %])

    [% FOREACH w IN WaitingHolds %] [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode() ) %] @@ -163,7 +163,7 @@ [% END %] [% IF ( waiting_elsewhere > 0 ) %] -

    Holds waiting at other libraries ([% waiting_elsewhere | html %])

    +

    Holds waiting at other libraries ([% waiting_elsewhere | html %])

      [% FOREACH w IN WaitingHolds %] [% IF ( w.branch.branchcode != Branches.GetLoggedInBranchcode() ) %] @@ -188,7 +188,7 @@ [% IF ( patron.borrowernotes ) %]
      -

      Notes

      +

      Notes

      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt index 5f31c5b7c7..5895a1e303 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -46,7 +46,7 @@ [% INCLUDE 'blocking_errors.inc' %] -

        Barcode [% barcode | html %]

        +

        Barcode [% barcode | html %]

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 1e175bd329..f51119eae6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -38,7 +38,7 @@

        Transfer items

        [% IF ( found ) %] -

        Reserve found

        +

        Reserve found

        Home libraryCurrent libraryDate arrived
        at current library
        Number of checkouts
        since last transfer
        [% IF ( reserved ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 53b1be8a89..e24891c048 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -29,7 +29,7 @@
        -

        Circulation

        +

        Circulation

        • @@ -71,7 +71,7 @@
        -

        Holds

        +

        Holds

        • @@ -94,7 +94,7 @@
          [% IF Koha.Preference('ArticleRequests') %] -

          Patron request

          +

          Patron request

          [% END %] -

          Transfers

          +

          Transfers

            [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %] @@ -118,7 +118,7 @@
          -

          Overdues

          +

          Overdues

            [% IF ( CAN_user_circulate_overdues_report ) %] @@ -145,7 +145,7 @@
          -

          Offline circulation

          +

          Offline circulation

          [% IF (AllowOfflineCirculation) %] Built-in offline circulation interface 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 75049315f2..955702db5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -103,9 +103,9 @@ [% IF ( NEEDSCONFIRMATION ) %]
          [% IF CAN_user_circulate_force_checkout or ADDITIONAL_MATERIALS %] -

          Please confirm checkout

          +

          Please confirm checkout

          [% ELSE %] -

          Cannot check out

          +

          Cannot check out

          [% END %]
            @@ -352,7 +352,7 @@ [% IF ( IMPOSSIBLE ) %]
            [% IF ( UNKNOWN_BARCODE ) %] -

            Barcode not found

            +

            Barcode not found

            [% END %] @@ -479,7 +479,7 @@