projects / koha_ffzg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3e2936a)
Bug 20033: Switch single-column templates to Bootstrap grid: Catalog
authorOwen Leonard <oleonard@myacpl.org>
Thu, 18 Jan 2018 16:08:26 +0000 (16:08 +0000)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 15 Feb 2018 16:30:23 +0000 (13:30 -0300)
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>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt patch | blob | history

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 f1c2e07..28c0e78 100644 (file)
--- 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 e64abc0..51b5e34 100644 (file)
--- 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>
 <!-- MC-TYPE LIMITS -->
-    <div class="yui-g">
       <div id="advsearches" class="toptabs">
       <ul>
       [% FOREACH advsearchloo IN advancedsearchesloop %]
@@ -269,11 +269,11 @@
     </select>
         </p>
 </fieldset>
-<!-- /RANK LIMITS -->
-</div>
 </div>
+<!-- /RANK LIMITS -->
 </form>
 </div>
+</div>
 
 [% MACRO jsinclude BLOCK %]
     <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].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 dd01bab..172920b 100644 (file)
--- 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' %]
Unnamed repository; edit this file 'description' to name the repository.