From 30802285ec3a0ae08b5c5a7a6fcef7a83f59984c 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 4f24a2c3e0..6914ee4508 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 @@ -40,9 +40,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 9e3ca815c2..9f88c2e13d 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 @@ -46,9 +46,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 d1beb7d139..70098c0531 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 @@ -41,9 +41,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 d57cd7e513..9f0e7e42ec 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 @@ -173,7 +173,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

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

Saved reports

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

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

Create from SQL

Create report from SQL @@ -1190,6 +1191,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 50e031c322..8ea09878c9 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 @@ -41,9 +41,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 935dfdaf7d..43be478fa0 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 @@ -44,9 +44,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 23f90089c3..42918c5644 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -74,7 +74,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 6979974018..4c8a1621dd 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 @@ -24,7 +24,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 4b4826702d..bd0ee44066 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 @@ -45,9 +45,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 497a28fb9c..d44b569d22 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 @@ -32,7 +32,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 4a232d1945..1aa0210463 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -45,7 +45,6 @@
          -[% INCLUDE 'blocking_errors.inc' %] [% IF ( op ) %]

          Create routing list for [% title | html %]

          @@ -53,6 +52,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 922a71cd18..3ba857631d 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 @@ -104,11 +104,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 8e61fc018b..67bf32d564 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 @@ -31,6 +31,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 199a1dd34a..00fd391842 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 @@ -225,9 +225,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