Attachment 71208 Details for Bug 20033 – Bug 20033: Switch single-column templates to Bootstrap grid: Catalog

[patch] Bug 20033: Switch single-column templates to Bootstrap grid: Catalog

Bug-20033-Switch-single-column-templates-to-Bootst.patch (text/plain), 4.16 KB, created by Katrin Fischer on 2018-02-04 17:53:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-02-04 17:53:35 UTC

Size: 4.16 KB

patch

obsolete

>From b029f9a7572cde7d6a206dc02cbebc6debf2e9b9 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 18 Jan 2018 16:08:26 +0000
>Subject: [PATCH] Bug 20033: Switch single-column templates to Bootstrap grid:
> Catalog
>
>This patch updates a few catalog-related single-column templates to use
>the Bootstrap grid.
>
>- basket/basket.tt - The staff client cart. Add some items to the cart
>  and open the cart.
>
>- catalogue/advsearch.tt - The advanced search page.
>
>- catalogue/itemsearch.tt - The item search page, both the initial form
>  and the search results.
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt     |  9 +++++++--
> .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt     | 12 ++++++------
> .../intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt    | 11 +++++++++--
> 3 files changed, 22 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>index 428e5d455a..8ffb6eb6b8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>@@ -37,7 +37,10 @@
> </head>
> [% IF ( print_basket ) %]<body id="cart_basket" class="cart" onload="print();history.back();">[% ELSE %]<body id="cart_basket" class="cart">[% END %]
> 
>-<div id="doc" class="yui-t7">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-md-12">
>+
> <div class="container">
> [% UNLESS ( print_basket ) %]
> <h1>Your cart</h1>
>@@ -285,7 +288,9 @@
>     <input type="hidden" name="records" id="records" />
> </form>
> 
>-</div>
>+            </div>
>+        </div>
>+    </div>
> </div>
>             [% INCLUDE js_includes.inc %]
>             [% UNLESS ( print_basket ) %]
>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 2e32f6bac3..7c5bc09f39 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -10,9 +10,10 @@
> [% INCLUDE 'adv-search.inc' %]
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Advanced search</div>
> 
>-<div id="doc" class="yui-t7">
>-   <div id="bd">
>-	
>+<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">
> <h1>Advanced search</h1>
>@@ -96,7 +97,6 @@
> 
> </div>
> 
>-    <div class="yui-g">
>       <div id="advsearches" class="toptabs">
>       <ul>
>       [% FOREACH advsearchloo IN advancedsearchesloop %]
>@@ -263,11 +263,11 @@
>     </select>
>         </p>
> </fieldset>
>-
>-</div>
> </div>
>+
> </form>
> </div>
>+</div>
> 
> [% MACRO jsinclude BLOCK %]
>     <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
>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 e052169592..e3f3f8c722 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>@@ -113,7 +113,10 @@
>     <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; Item search
>   </div>
> 
>-  <div id="doc" class="yui-t7">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+
>     <div id="item-search-block">
>       <h1>Item search</h1>
>       <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
>@@ -191,9 +194,13 @@
>           </fieldset>
>       </form>
>     </div>
>+    </div>
>   </div>
>-  <div id="doc3" class="yui-t7">
>+    <div class="row">
>+        <div class="col-md-12">
>       <div id="results-wrapper"></div>
>+        </div>
>+      </div>
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>-- 
>2.14.1

Actions: View | Diff | Splinter Review

Attachments on bug 20033: 70697 | 70844 | 71208