From b0bdae0eb4c1114404f01b42df3eaa4438d82ae5 Mon Sep 17 00:00:00 2001
From: Solene Desvaux <sdesvaux@biblibre.com>
Date: Thu, 31 Mar 2022 11:16:07 +0200
Subject: [PATCH] Bug 30952: Catalogue module restyling

---
 .../prog/en/modules/catalogue/ISBDdetail.tt   |  1 -
 .../prog/en/modules/catalogue/MARCdetail.tt   |  1 -
 .../prog/en/modules/catalogue/advsearch.tt    | 83 ++++++++++---------
 .../prog/en/modules/catalogue/detail.tt       |  1 -
 .../prog/en/modules/catalogue/imageviewer.tt  |  1 -
 .../prog/en/modules/catalogue/issuehistory.tt |  1 -
 .../prog/en/modules/catalogue/itemsearch.tt   | 31 +++++--
 .../en/modules/catalogue/labeledMARCdetail.tt |  1 -
 .../prog/en/modules/catalogue/moredetail.tt   |  1 -
 .../prog/en/modules/catalogue/results.tt      |  1 -
 .../en/modules/catalogue/search-history.tt    |  1 -
 .../en/modules/catalogue/stockrotation.tt     |  1 -
 12 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
index 00e019de88..4f8fd1070f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
@@ -15,7 +15,6 @@
 <body id="catalog_ISBDdetail" class="catalog">
 
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index 1a4ecb6b86..b07e646029 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -16,7 +16,6 @@
 <body id="catalog_MARCdetail" class="catalog">
 
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
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 65215c6dd3..ef149c04df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -3,6 +3,9 @@
 [% USE Asset %]
 [% USE Branches %]
 [% SET footerjs = 1 %]
+[% formulaire = BLOCK %]
+    [% INCLUDE 'adv-search.inc' %]
+[% END %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Advanced search &rsaquo; Catalog &rsaquo; Koha</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -26,8 +29,7 @@
 [%- END -%]
 
 <body id="catalog_advsearch" class="catalog">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'adv-search.inc' %]
+[% INCLUDE 'header.inc' form=formulaire %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
@@ -40,48 +42,55 @@
             </a>
         </li>
     </ol>
+
+    <ol>
+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
+    </ol>
+    <ol>
+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
+    </ol>
 </nav>
 
 <div class="main container-fluid">
     <div class="row">
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
-            <form action="search.pl" method="get">
-                <div id="advanced-search">
-                    <input type="hidden" name="advsearch" value="1"/>
-                    <h1>Advanced search</h1>
-                    <p>
-                        <a href="/cgi-bin/koha/catalogue/itemsearch.pl">Go to item search</a>
-                        [% IF searchid %]
-                            <div id="previous_search_link"></div>
-                        [% END %]
-                    </p>
+<form action="search.pl" method="get">
+    <div id="advanced-search">
+        <input type="hidden" name="advsearch" value="1"/>
+        <h2>Advanced search</h2>
 
-                    <!-- SEARCH BUTTONS -->
-                    <div id="toolbar" class="btn-toolbar">
-                        <fieldset class="action" id="submit1">
-                            <div class="btn-group">
-                                <button class="btn btn-default" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
-                            </div>
-                            <div class="btn-group">
-                            [% IF ( expanded_options ) %]
-                                <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link"><i class="fa fa-search-minus"></i> Fewer options</a>
-                            </div>
-                            [% ELSE %]
-                                <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link"><i class="fa fa-search-plus"></i> More options</a>
-                            </div>
-                            [% END %]
-                            <div class="btn-group">
-                                <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
-                            </div>
-                        </fieldset> <!-- /.action -->
-                    </div> <!-- /#toolbar -->
-                    <!-- /SEARCH BUTTONS -->
+        <!-- SEARCH BUTTONS -->
+        <div id="toolbar" class="btn-toolbar">
+            <div>
+                <div class="btn-group">
+                    <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
+                </div>
+                <div class="btn-group">
+                    [% IF ( expanded_options ) %]
+                    <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="pat"><i class="fa fa-search-minus"></i> Fewer options</a>
+                </div>
+                    [% ELSE %]
+                        <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="pat"><i class="fa fa-search-plus"></i> More options</a>
+                </div>
+                    [% END %]
+                <div class="btn-group">
+                    <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="pat"><i class="fa fa-trash"></i> Clear fields</a>
+                </div>
+                <div class="btn-group">
+                    <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="pat"><i class="fa fa-search-minus"></i> Go to item search</a>
+                </div>
+                [% IF searchid %]
+                    <div id="previous_search_link"></div>
+                [% END %]
+            </div>
+        </div>
+        <!-- /SEARCH BUTTONS -->
 
                     [% IF ( outer_servers_loop ) %]
                         <!-- DATABASES -->
                         <fieldset>
-                            <legend>Select local databases</legend>
+                            <h3>Select local databases</h3>
                             [% FOREACH local_servers_loo IN local_servers_loop %]
                                 [% IF ( local_servers_loo.checked ) %]
                                     <input type="checkbox" id="[% local_servers_loo.id | html %]" name="[% local_servers_loo.name | html %]" checked="checked" value="[% local_servers_loo.value | html %]" />
@@ -99,7 +108,7 @@
                     [% IF ( outer_servers_loop ) %]
                         <!-- REMOTE DATABASES -->
                         <fieldset id="databases">
-                            <legend>Select remote databases</legend>
+                            <h3>Select remote databases</h3>
                             [% FOREACH outer_servers_loo IN outer_servers_loop %]
                                 [% IF ( outer_servers_loo.checked ) %]
                                     <input type="checkbox" id="[% outer_servers_loo.id | html %]" name="[% outer_servers_loo.name | html %]" checked="checked" value="[% outer_servers_loo.value | html %]" />
@@ -116,7 +125,7 @@
 
                     <!-- BOOLEAN SEARCH OPTIONS -->
                     <fieldset id="searchterms">
-                        <legend>Search for </legend>
+                        <h3>Search for </h3>
                         [% FOREACH query IN queries %]
                             [% IF ( expanded_options ) %]
                                 [% IF loop.first %]
@@ -195,7 +204,7 @@
                     <div class="tab-content">
                         [% FOREACH advsearchloo IN advancedsearchesloop %]
                             <div id="advsearch-[% advsearchloo.advanced_search_type | html %]"  role="tabpanel" class="tab-pane advsearch">
-                                <h4>Limit to any of the following:</h4>
+                                <h3>Limit to any of the following:</h3>
                                 <table>
                                     <tr>
                                         [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
@@ -236,7 +245,7 @@
                 [% IF ( expanded_options ) %]
                     <!-- BASIC LIMITS -->
                     <fieldset id="basiclimits">
-                        <legend>Limits</legend>
+                        <h3>Limits</h3>
                         <fieldset id="pubrange">
                             <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options -->
                             <p>
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 905fd07bd3..20106f8278 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -47,7 +47,6 @@
 <body id="catalog_detail" class="catalog">
 
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
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..6fde26b1ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
@@ -25,7 +25,6 @@
 <body id="catalog_imageviewer" class="catalog">
 
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
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 f537e57af9..685e0824fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -13,7 +13,6 @@
 <body id="catalog_issuehistory" class="catalog">
 
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 27521c1635..57ed833211 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -1,6 +1,9 @@
 [% USE raw %]
 [% USE To %]
 [% USE Asset %]
+[% formulaire = BLOCK %]
+    [% INCLUDE 'home-search.inc' %]
+[% END %]
 [% USE AuthorisedValues %]
 
 [%- BLOCK form_label -%]
@@ -148,8 +151,7 @@
 </head>
 
 <body id="catalog_itemsearch" class="catalog">
-  [% INCLUDE 'header.inc' %]
-  [% INCLUDE 'home-search.inc' %]
+  [% INCLUDE 'header.inc' form=formulaire %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
@@ -165,6 +167,14 @@
             </a>
         </li>
     </ol>
+
+    <ol>
+        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
+    </ol>
+
+    <ol>
+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
+    </ol>
 </nav>
 
 <div class="main container-fluid">
@@ -172,16 +182,23 @@
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
     <div id="item-search-block">
+<<<<<<< HEAD
       <h1>Item search</h1>
 
       <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
+=======
+      <h2>Item search</h2>
+>>>>>>> Bug 30952: Catalogue module restyling
       <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
           <div id="toolbar" class="btn-toolbar">
-              <fieldset class="action">
-                  <div class="btn-group">
-                      <button class="btn btn-default"><i class="fa fa-search"></i> Search</button>
-                  </div>
-              </fieldset>
+              <div>
+                <div class="btn-group">
+                  <button class="principal" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button>
+                </div>
+                <div class="btn-group">
+                  <a href="/cgi-bin/koha/catalogue/search.pl" class="pat"><i class="fa fa-search-minus"></i> Go to advanced search</a>
+                </div>
+              </div>
           </div>
           <fieldset>
             [% INCLUDE form_field_select name="homebranch" options = branches empty_option = "All libraries" %]
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..7b03e227e6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -17,7 +17,6 @@
 
 <body id="catlaog_labeledMARCdetail" class="catalog">
 	[% INCLUDE 'header.inc' %]
-	[% INCLUDE 'cat-search.inc' %]
 
     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
         <ol>
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..1d170fdb8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -13,7 +13,6 @@
 <body id="catalog_moredetail" class="catalog">
 [% USE KohaDates %]
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
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 0e550fd353..7947be0877 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -15,7 +15,6 @@
 
 <body id="catalog_results" class="catalog">
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 [% IntranetCoce    = Koha.Preference('IntranetCoce') %]
 [% CoceProviders   = Koha.Preference('CoceProviders') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
index 0ef57c025b..37fffc407e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
@@ -11,7 +11,6 @@
 <body id="catalogue_search-history" class="catalogue">
 
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
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..404e2fadbb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
@@ -10,7 +10,6 @@
 <body id="catalog_stockrotation" class="catalog">
 [% USE KohaDates %]
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'cat-search.inc' %]
 
 <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
     <ol>
-- 
2.17.1