From 14a95c33c79b9891fb276b26d5675155c43dbfa8 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 5 Apr 2021 09:34:34 +0000 Subject: [PATCH] Bug 27631: reports and serials folders Changed each of the pages in the reports and serials folders to have one

tag showing that describes the page, rather than the

describing the logo. The hierarchy of heading tags may be broken in many pages, but this will be dealt with in an additional bug. To test: 1) Go to the Staff Client 2) Apply patch 3) Go to each of the pages in the reports and serials folders and check that they have an obvious and descriptive heading 4) Ensure that the heading in the page is

Sponsored-by: Catalyst IT --- .../intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt | 1 + .../intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt | 6 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/subscription-renew.tt | 2 ++ 17 files changed, 25 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index 4db99d2c41..b410700b92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -15,9 +15,9 @@
+

Acquisitions statistics

[% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

Acquisitions statistics

[% IF ( mainloo.loopfilter.size ) %]

Filtered on:

[% FOREACH loopfilte IN mainloo.loopfilter %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt index 17a0ee21b0..461cf594e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -21,9 +21,9 @@
+

Patrons statistics

[% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

Patrons statistics

[% IF ( mainloo.loopfilter.size>0 ) %]

Filtered on:

[% FOREACH loopfilte IN mainloo.loopfilter %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index 17f6b400bf..150aac4b10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -16,9 +16,9 @@
+

Catalog statistics

[% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

Catalog statistics

[% IF ( mainloo.loopfilter ) %]

Filtered on:

[% FOREACH loopfilte IN mainloo.loopfilter %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt index f8395d3399..ae9889fece 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt @@ -3,6 +3,7 @@ +

Convert report

[% IF msg == 'no_report' %] There is no valid report for this id. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index c2c3138d94..4f6eec45c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -125,7 +125,7 @@ [% INCLUDE "reports-toolbar.inc" %] [% IF ( start ) %] -

Guided reports

+

Guided reports

Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.

Build and run reports

@@ -172,8 +172,8 @@ [% END %] [% IF ( saved1 ) %] - [% IF ( savedreports ) %]

Saved reports

+ [% IF ( savedreports ) %] [% IF ( filters.date || filters.author || filters.keyword ) %]

Filtered by: @@ -1058,6 +1058,7 @@ [% END #/IF ( execute ) %] [% IF ( create ) %] +

Create from SQL

Create report from SQL @@ -1142,6 +1143,7 @@ [% END # /IF saved_results %] [% IF ( showsql ) %] +

Saved reports - SQL

[% reportname | html %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt index 6a61633de9..7759d027bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -16,9 +16,9 @@
    +

    Average checkout period

    [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

    Average checkout period

    [% IF ( mainloo.loopfilter ) %]

    Filtered on:

    [% FOREACH loopfilte IN mainloo.loopfilter %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt index c39a606683..a5af8a048e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -19,9 +19,9 @@
    +

    Circulation statistics

    [% IF ( do_it ) %] [% FOREACH mainloo IN mainloop %] -

    Circulation statistics

    [% IF ( mainloo.loopfilter ) %]

    Filtered on:

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt index 89f256708b..d3d4885a9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -49,7 +49,7 @@ [% END %] [% ELSE %] -

      View a count of items held at your library grouped by item type

      +

      View a count of items held at your library grouped by item type

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt index e7edc4ee5f..4058bcc81f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -13,7 +13,7 @@
        - +

        Reports

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt index 0ee58a9ee9..d0ae51a08c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -20,9 +20,9 @@
        +

        Holds statistics

        [% IF ( do_it ) %] [% IF ( mainloop ) %] -

        Holds statistics

        [% IF ( loopfilter ) %]

        Filtered on:

          diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt index 24afcefd25..dd23ae1aef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt @@ -15,7 +15,7 @@
          -

          Preview routing list for [% title | html %]

          +

          Preview routing list for [% title | html %]

          diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index d1032e26d1..f5fc7cb6fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -21,7 +21,6 @@
          -[% INCLUDE 'blocking_errors.inc' %] [% IF ( op ) %]

          Create routing list for [% title | html %]

          @@ -29,6 +28,7 @@

          Edit routing list for [% title | html %]

          [% END %] +[% INCLUDE 'blocking_errors.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 989029eeb3..bf0a2735b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -90,11 +90,12 @@ $(document).ready(function() {
          - [% INCLUDE 'modals/serials_multi_receiving.inc' %] -

          Serial edition [% bibliotitle | html %] [% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) | html %])[% END %] [% IF ( callnumber ) %] callnumber: [% callnumber | html %][% END %]

          + + [% INCLUDE 'modals/serials_multi_receiving.inc' %] + [% IF internalnotes %]

          Nonpublic note: [% internalnotes | html | html_line_break %]

          [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt index 8b85891a2e..588a4dff16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt @@ -20,6 +20,8 @@ [% INCLUDE 'serials-toolbar.inc' %] +

          Serials

          +
          diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 3a538e1e8e..8b8b992bbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -207,9 +207,9 @@ [% INCLUDE 'serials-toolbar.inc' %] [% IF ( done_searched ) %] -

          Serials subscriptions ([% total | html %] found)

          +

          Serials subscriptions ([% total | html %] found)

          [% ELSE %] -

          Serials subscriptions search

          +

          Serials subscriptions search

          [% END %] [% UNLESS ( done_searched ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt index c684348deb..7dbbbc901f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt @@ -1,5 +1,5 @@ [% USE KohaDates %] -

          Prediction pattern

          +

          Prediction pattern

          [% IF (not_consistent_end_date) %]

          End date is not consistent with subscription length.

          [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index f3f8c16d09..b1d9714b46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -13,6 +13,8 @@
          +

          Serials subscription renew

          + [% INCLUDE 'blocking_errors.inc' %] [% IF op == 'renew' OR op =='multi_renew' %] -- 2.11.0