From cdd956bc5fbabd9fe5bd79aa1d57a9acf1ba3753 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 23 Apr 2018 18:26:14 +0000
Subject: [PATCH] Bug 20641: Switch single-column templates to Bootstrap grid:
 Various, part 2

This patch updates various unrelated templates to use the Bootstrap
grid. In each case, confirm that the indicated page looks correct.

 - Acquisitions -> Vendor -> Add to basket -> From a staged file.
 - Logged-in user menu (in the upper right) -> Search history.
 - With plugins disabled in koha-conf.xml, go to Tools -> Tools plugins.
 - With the EasyAnalyticalRecords system preference set to 'Display,'
   view a bibliographic record.
   - Choose Edit -> Link to host item.
   - Submit a barcode to be linked.
 - Configure a MARC subfield (e.g. 100$a) to use the
   unimarc_field_225a_bis plugin.
   From the MARC edit page, trigger the plugin and confirm that the
   page in the popup window looks correct. Confirm that changes made in
   the popup window are saved to the corresponding field in the editor.
 - Administration -> Funds -> Edit a fund.
   - Click 'Select owner.'
   - Search for a patron.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/modules/acqui/addorderiso2709.tt     | 14 ++++++--------
 .../prog/en/modules/catalogue/search-history.tt  | 16 +++++++---------
 .../prog/en/modules/cataloguing/linkitem.tt      |  7 +++++--
 .../value_builder/unimarc_field_225a_bis.tt      | 12 +-----------
 .../prog/en/modules/common/patron_search.tt      |  5 +----
 .../prog/en/modules/labels/label-print.tt        |  6 +++---
 6 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 2d54193db2..3f5d736548 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -19,10 +19,10 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo;  Add orders from iso2709 file</div>
-<div id="doc3" class="yui-t2">
-   <div id="bd">
-       <div id="yui-main">
-           <div class="yui-b">
+
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-sm-6 col-sm-offset-3 col-md-8 col-md-offset-2">
              [% IF ( allmatch ) %]<div class="dialog alert">
               <h4>No records imported</h4>
              No record have been imported because they all match an existing record in your catalog.<br />You'll have to treat them individually.
@@ -420,10 +420,8 @@
                   </table>
                 </div>
                 [% END %]
-           </div>
-       </div>
-   </div>
-</div>
+            </div> [% # /div.col-sm-6 %]
+       </div> [% # /div.row %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") %]
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 a69e7a205f..ba8b175e44 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
@@ -17,11 +17,10 @@
   <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Search history
 </div>
 
-<div id="doc3" class="yui-t2">
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-12 col-md-8 col-md-offset-2">
 
-<div id="bd">
-  <div id="yui-main">
-    <div class="yui-b">
       <h1>Search history</h1>
       <div id="tabs" class="toptabs">
         <ul>
@@ -186,11 +185,10 @@
           [% IF !current_authority_searches && !previous_authority_searches %]
             <p>Your authority search history is empty.</p>
           [% END %]
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
+        </div> [% # /authority_tab %]
+      </div> [% # /tabs %]
+    </div> [% # /div.col-md-8 %]
+  </div> [% # /div.row %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
index 0741fce9ad..98ad4d15b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
@@ -6,7 +6,10 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Link a host item to <i>[% bibliotitle |html %]</i></div>
-<div id="doc3" class="yui-t2">
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
 
 [% IF ( error ) %]
     <div class="dialog alert">
@@ -19,7 +22,7 @@
     </form>
 [% ELSE %]
     [% IF ( success ) %]
-	<div class="dialog">The item has successfully been linked to <i>[% bibliotitle |html %]</i>.</div>    
+    <div class="dialog message">The item has successfully been linked to <i>[% bibliotitle |html %]</i>.</div>
 	<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
 	    <input type="submit" value="OK" />
 	    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt
index 7499cf4d73..c86d9c90f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt
@@ -2,20 +2,11 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; UNIMARC field 225a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<style type="text/css">
-    #custom-doc {
-        width:37.85em;
-        min-width:492px;
-        margin:auto;
-        text-align:left;
-    }
-</style>
 </head>
 
 <body id="cat_unimarc_field_225a_bis" class="cat">
 
-  <div id="custom-doc" class="yui-t7">
-    <div id="bd">
+    <div class="container-fluid">
       <h1>UNIMARC field 225a builder</h1>
       <div class="autocomplete">
         <form>
@@ -30,7 +21,6 @@
         </form>
       </div>
     </div>
-  </div>
 
 [% MACRO jsinclude BLOCK %]
     <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
index 476bf893c7..a1b4ad85d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
@@ -10,8 +10,7 @@
 
 <body id="common_patron_search" class="common">
 <div id="patron_search" class="yui-t7">
-  <div id="bd">
-    <div class="yui-g">
+    <div class="container-fluid">
 
         <form id="searchform">
             <fieldset class="brief">
@@ -88,8 +87,6 @@
         </div>
 
 <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div>
-</div>
-</div>
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index 914d375f72..ba4000614d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -42,7 +42,7 @@
                     <input type="button" class="gb-close" value="Done" />
                 </fieldset>
             </form>
-            [% ELSE %]
+        [% ELSE %]
             <h3>
                 [% IF ( label_ids ) %]
                     [% IF ( label_count == 1 ) %]Exporting [% label_count %] label[% ELSE %]Exporting [% label_count %] labels[% END %]
@@ -93,8 +93,8 @@
                     <a href="#" class="cancel gb-close">Cancel</a>
                 </fieldset>
             </form>
-            [% END %]
-        </div>
+        [% END %]
+    </div>
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") %]
-- 
2.39.5