From d5ec11a0b994243d42d7510b6268fba78d52690a Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> Date: Mon, 24 May 2021 10:31:20 +0000 Subject: [PATCH] Bug 27741: catalogue folder Bug 27631 corrected the <h1> 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 <h1> are in the correct order and hierarchy Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> --- koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt | 6 +++--- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 1 - .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 6 ++++-- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- .../prog/en/modules/catalogue/stockrotation.tt | 6 +++--- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index d31ade3d23..34f287b434 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -4,7 +4,7 @@ [% IF ( opacfacets ) %] [% IF ( facets_loop ) %] <div id="search-facets"> -<h4>Refine your search</h4> +<h2>Refine your search</h2> <ul> <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi_not_availablity | $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul> [% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index f46e93a93c..ed7169ba5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -167,7 +167,7 @@ </ul> [% FOREACH advsearchloo IN advancedsearchesloop %] <div id="advsearch-[% advsearchloo.advanced_search_type | html %]" class="advsearch"> - <h4>Limit to any of the following:</h4> + <p><strong>Limit to any of the following:<strong></p> <table> <tr> [% FOREACH itemtypeloo IN advsearchloo.code_loop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 684a082ffa..c8e4150771 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -910,7 +910,7 @@ Note that permanent location is a code, and location may be an authval. [% END %] [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %] -<div id="editions"><h4>Editions</h4> +<div id="editions"><h2>Editions</h2> <table> [% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %] @@ -1011,7 +1011,7 @@ Note that permanent location is a code, and location may be an authval. <div class="modal-content"> <div class="modal-header"> <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> - <h3 id="marcPreviewLabel">MARC preview</h3> + <h2 id="marcPreviewLabel">MARC preview</h2> </div> <div class="modal-body"> <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt index 63cbeea4c4..4b4a1c73ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt @@ -54,7 +54,7 @@ [% INCLUDE 'cat-toolbar.inc' %] <h1>Images for <em>[% INCLUDE 'biblio-title.inc' %]</em></h1> -<h4>[% biblio.author | html %]</h4> +<h2>[% biblio.author | html %]</h2> [% IF ( LocalCoverImages == 1 ) %] [% IF images.size %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt index 53c0121d52..ac5664ea9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -39,14 +39,14 @@ <div class="col-sm-10 col-sm-push-2"> <main> -<h1>Checkout history for [% INCLUDE 'biblio-title.inc' %]</h1> -[% IF biblio.author %]<h3>by [% biblio.author | html %]</h3>[% END %] +<h1>Checkout history for [% INCLUDE 'biblio-title.inc' %] +[% IF biblio.author %]by [% biblio.author | html %]</h1>[% END %] [% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %] <div class="searchresults"> [% IF checkouts %] - <h4>Checked out [% checkouts.size | html %] times</h4> + <h2>Checked out [% checkouts.size | html %] times</h2> <table id="table_issues"> <thead><tr> [% IF show_patron_column %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt index 81732a1ce6..8be6861586 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt @@ -90,7 +90,6 @@ </aside> </div> <!-- /.col-sm-2.col-sm-pull-10 --> </div> <!-- /.row --> -[% END %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 6db25bb690..ccd59e12b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -46,8 +46,10 @@ <div id="catalogue_detail_biblio"> <h2>[% title | html %]</h2> - [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</h4>[% END %] - [% IF ( author ) %]<h4>by [% author | html %]</h4>[% END %] + <h2> + [% IF ( subtitle ) %][% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %][% END %] + [% IF ( author ) %]by [% author | html %][% END %] + </h2> <div class="listgroup"> <div class="rows"> <ol class="bibliodetails"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 92e035da93..615f51e0f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -73,9 +73,9 @@ [% IF ( total ) %] - <h3> + <h2> [% total | html %] result(s) found [% IF ( query_desc ) %]for <span class="results_query_desc">'[% query_desc | html %]'</span>[% END %][% IF limit_desc %] with limit(s): <span class="results_limit_desc">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %]. - </h3> + </h2> <div class="searchheader" id="searchheader"> <div id="selection_ops"> @@ -321,7 +321,7 @@ <form method="post" name="fz3950" class="fz3950bigrpad"> <button class="btn btn-default" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button> </form> - <h3>No results found</h3> + <h2>No results found</h2> [% IF ( searchdesc ) %] <p> No results match your search [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc | html %]'</span>[% END %][% IF ( limit_desc ) %] with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %]. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt index a081592272..dd2f2a0235 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt @@ -156,14 +156,14 @@ </table> [% END %] [% IF !items || items.size == 0 %] - <h1>No physical items for this record</h1> + <h2>No physical items for this record</h2> [% END %] [% IF !rotas || rotas.count == 0 %] - <h1>There are no rotas with stages assigned</h1> + <h2>There are no rotas with stages assigned</h2> [% END %] [% ELSIF op == 'confirm_remove_from_rota' %] <div class="dialog alert"> - <h3>Are you sure you want to remove this item from it's rota?</h3> + <h1>Are you sure you want to remove this item from it's rota?</h1> <p> <a class="btn btn-default btn-xs approve" href="?op=remove_item_from_stage&stage_id=[% stage_id | uri %]&item_id=[% item_id | uri %]&biblionumber=[% biblionumber | uri %]"><i class="fa fa-fw fa-check"></i>Yes</a> <a class="btn btn-default btn-xs deny" href="?biblionumber=[% biblionumber | uri %]"><i class="fa fa-fw fa-remove"></i>No</a> -- 2.20.1