From ca602f75c8965d3a36b0148e21824395f39aeeb3 Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Mon, 19 Apr 2021 05:22:08 +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

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 10 +++++++++-
 .../prog/en/includes/acquisitions-search.inc           |  2 +-
 .../intranet-tmpl/prog/en/includes/adv-search.inc      |  2 +-
 .../prog/en/includes/budgets-admin-search.inc          |  2 +-
 .../intranet-tmpl/prog/en/includes/cat-search.inc      |  2 +-
 .../prog/en/includes/cataloging-search.inc             |  2 +-
 .../intranet-tmpl/prog/en/includes/checkin-search.inc  |  2 +-
 .../intranet-tmpl/prog/en/includes/circ-search.inc     |  2 +-
 .../prog/en/includes/cities-admin-search.inc           |  2 +-
 .../prog/en/includes/contracts-admin-search.inc        |  2 +-
 .../prog/en/includes/currencies-admin-search.inc       |  2 +-
 .../prog/en/includes/desks-admin-search.inc            |  2 +-
 .../intranet-tmpl/prog/en/includes/home-search.inc     |  2 +-
 .../intranet-tmpl/prog/en/includes/letters-search.inc  |  2 +-
 .../prog/en/includes/patrons-admin-search.inc          |  2 +-
 .../prog/en/includes/prefs-admin-search.inc            |  2 +-
 .../intranet-tmpl/prog/en/includes/serials-search.inc  |  2 +-
 .../prog/en/includes/suggestions-add-search.inc        |  2 +-
 .../prog/en/includes/z3950-admin-search.inc            |  2 +-
 19 files changed, 27 insertions(+), 19 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 327fe0632a..4e9bbb2115 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -343,6 +343,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;
@@ -4684,7 +4692,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 8d4c79e7cd..a68f429195 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 fd188ddbe8..0d71209f11 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 39409999f2..56450d6616 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 a68e36abd4..efdb9bb976 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 9d81f7abf2..4326f09c78 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 de45b257d7..5e84e25a79 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 9e1d251927..38ba890300 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 710346c2a2..0b8eae4285 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 bc0028354c..6fd0aad660 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 19799eb5ca..1ccecacdc9 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 d102c4a729..3a3aa32722 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 db27659511..5a0dd0f28d 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/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 4aa9da5bcb..fce33e32d2 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 64f6fdb46a..c245343fcf 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 a76245128f..0247293045 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 80223345fd..1e2fb6b7fd 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">
-- 
2.39.5