From 4599aa312a1b955330d820ea5b0ed40d9a777ee7 Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Fri, 5 Feb 2021 02:40:53 +0000
Subject: [PATCH] Bug 27631: Changed <h1> around logo to <div>

To test:
1) Look at Staff Client and the logo
2) Apply patch
3) Check Koha logo moves to the middle of the page when zooming in
4) Ensure page source shows logo inside <div> and not <h1>

Sponsored-by: Catalyst IT
---
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss         | 10 +++++++++-
 .../intranet-tmpl/prog/en/includes/acquisitions-search.inc     |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc        |  2 +-
 .../intranet-tmpl/prog/en/includes/budgets-admin-search.inc    |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc        |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc    |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc       |  2 +-
 .../intranet-tmpl/prog/en/includes/cities-admin-search.inc     |  2 +-
 .../intranet-tmpl/prog/en/includes/contracts-admin-search.inc  |  2 +-
 .../intranet-tmpl/prog/en/includes/currencies-admin-search.inc |  2 +-
 .../intranet-tmpl/prog/en/includes/desks-admin-search.inc      |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc       |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc    |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc     |  2 +-
 .../intranet-tmpl/prog/en/includes/patrons-admin-search.inc    |  2 +-
 .../intranet-tmpl/prog/en/includes/prefs-admin-search.inc      |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc    |  2 +-
 .../intranet-tmpl/prog/en/includes/suggestions-add-search.inc  |  2 +-
 .../intranet-tmpl/prog/en/includes/z3950-admin-search.inc      |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt       |  8 ++++----
 21 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index e250462415..c590743eec 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -312,6 +312,14 @@ h1 {
     }
 }
 
+#logo {
+     border: 0 none;
+     float: left;
+     margin: .75em .3em .75em .7em;
+     padding: 0;
+     width: 180px;
+}
+
 h2 {
     font-size: 146.5%;
     font-weight: bold;
@@ -4455,7 +4463,7 @@ div .suggestion_note {
         }
     }
 
-    h1#logo {
+    div#logo {
         float: none;
         margin: auto;
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index 22bcc14b43..0cc00c18df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -1,5 +1,5 @@
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Acquisitions Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Acquisitions Resident Search Box -->
 <div id="header_search">
 <div id="supplier_search" class="residentsearch">
     <label class="tip" for="supplier">Search vendors:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
index a62f8e3556..6e48161e3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
@@ -1,5 +1,5 @@
 <div class="gradient">
-    <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
+    <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div>
 
     <!-- Begin main page resident search box -->
     <div id="header_search">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
index 894f844a1b..20b2ea1af6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -1,7 +1,7 @@
 [% USE Koha %]
 [% USE Branches %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Fund Admin Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Fund Admin Resident Search Box -->
 
 <div id="header_search">
     <div id="budgets_search" class="residentsearch">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index cdafcfe01f..a213a302ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Catalogue Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Catalogue Resident Search Box -->
 <div id="header_search">
 
 [% INCLUDE 'patron-search-box.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 20c7d9d2c3..af6a7c612f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Cataloging Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cataloging Resident Search Box -->
     <div id="header_search">
         <div id="addbooks_search" class="residentsearch">
             <form name="search" action="addbooks.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index ef3a232e78..a3b99ccc14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Checkin Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Checkin Resident Search Box -->
 <div id="header_search">
 [% INCLUDE 'patron-search-box.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 8892c0d264..cb5fe17eb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Circulation Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Circulation Resident Search Box -->
 
 <div id="header_search">
     [% INCLUDE 'patron-search-box.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 294af36d9c..6f245c4e05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Cities Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cities Resident Search Box -->
 <div id="header_search">
 	<div id="city_search" class="residentsearch">
 	<form action="[% script_name | html %]" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index d6060cea7d..a2dede67f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Patrons Admin Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box -->
 
 <div id="header_search">
 	<div id="contract_description_search" class="residentsearch">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index 70e00c92b2..603da1de59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Currencies Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Currencies Resident Search Box -->
 <div id="header_search">
 	<div id="currency_search" class="residentsearch">
         <form action="[% script_name | html %]" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
index 5b67592d68..f6c18dd634 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></h1><!-- Begin Desks Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></div><!-- Begin Desks Resident Search Box -->
 <div id="header_search">
         <div id="desk_search" class="residentsearch">
         <form action="[% script_name|html %]" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index eb397b8b5a..258006d4d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Main page Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Main page Resident Search Box -->
 
 <div id="header_search">
     [% INCLUDE 'patron-search-box.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 3f60b68533..d91a94c0ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Notices Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Notices Resident Search Box -->
 <div id="header_search">
 	<div id="notices_search" class="residentsearch">
 <form action="/cgi-bin/koha/tools/letter.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index b8aee067d9..b233601ade 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -5,7 +5,7 @@
 [% PROCESS 'html_helpers.inc' %]
 [% PROCESS 'patronfields.inc' %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Patrons Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Resident Search Box -->
 <div id="header_search">
     <div id="patron_search" class="residentsearch">
     <form action="/cgi-bin/koha/members/member.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 80a24122ff..81ba508518 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Patrons Admin Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Patrons Admin Resident Search Box -->
 <div id="header_search">
 	<div id="patron_category_search" class="residentsearch">
 	<form action="[% script_name | html %]" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
index 996f7cacad..d430ede022 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div>
 <div id="header_search">
 	<div id="syspref_search" class="residentsearch">
 	    <form action="/cgi-bin/koha/admin/preferences.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index ee25012e20..a13584fb06 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-  <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Serials Resident Search Box -->
+  <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Serials Resident Search Box -->
   <div id="header_search">
     <div id="subscription_search" class="residentsearch">
     <p class="tip">Search subscriptions:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 12b3fab3a5..3df9826833 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Suggestions Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Suggestions Resident Search Box -->
 <div id="header_search">
 	<div id="suggestions_search" class="residentsearch">
     <p class="tip">Suggestions search:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 51f77ee0b3..944409f365 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin z3950 Admin Resident Search Box -->
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin z3950 Admin Resident Search Box -->
 <div id="header_search">
     <div id="z3950_search" class="residentsearch">
 	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index b780ad16f6..76c5369e19 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -193,12 +193,12 @@
                     [% END %]
 
                     [% IF shelf AND op == 'view' %]
-                        <h2>
+                        <h1>
                             [% shelf.shelfname | html %]
                             <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="rss-list-link noprint" aria-label="Subscribe to this list">
                                 <i class="fa fa-fw fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this list"></i>
                             </a>
-                        </h2>
+                        </h1>
 
                         [% IF ( itemsloop ) %]
                             [% SET contents = shelf.get_contents %]
@@ -617,7 +617,7 @@
                             <fieldset class="rows">
                                 [% IF op == 'add_form' %]
                                     <div id="addshelf">
-                                    <legend>Create a new list</legend>
+                                    <h1>Create a new list</h1>
                                     <input type="hidden" name="op" value="add" />
                                 [% ELSE %]
                                     <legend>Editing <em>[% shelf.shelfname | html %]</em></legend>
@@ -699,7 +699,7 @@
                         </form>
 
                     [% ELSIF op == 'list' %]
-                        <h2>Lists</h2>
+                        <h1>Lists</h1>
                         <div class="toptabs ui-tabs ui-widget ui-widget-content ui-corner-all">
                             <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
                                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-- 
2.11.0