Bug 20034: Switch single-column templates to Bootstrap grid: Circulation

This patch updates two single-column circulation templates to
use the Bootstrap grid.

- circulation-home.tt - Circulation home page. This patch corrects what
  appears to have been a long-broken three-column layout.

- article-requests.tt - Article requests list. Turn on the
  ArticleRequests system preference if necessary. Go to Circulation ->
  Article requests.

Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.

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>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index da5d885..744bb54 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -21,10 +21,9 @@
         <a href="/cgi-bin/koha/circ/article-requests.pl">Article requests</a>
     </div>
 
-<div id="doc" class="yui-t7">
-    <div id="bd">
-        <div id="yui-main">
-            <div class="yui-g">
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
                 <h1>Article requests</h1>
 
@@ -39,7 +38,7 @@
                             [% END %]
                         [% END %]
                     </select>
-                    <button type="submit" class="btn btn-default btn-sm" type="submit">
+                    <button type="submit" class="btn btn-default btn-xs">
                         <i class="fa fa-refresh"></i> Update
                     </button>
                 </form>
@@ -308,7 +307,7 @@
                                 [% END %]
                             </tbody>
                         </table>
-                    </div>
+
                 </div>
             </div>
         </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index fa49df9..c74a443 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -10,14 +10,14 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Circulation</div>
 
-<div id="doc" class="yui-t7">
-   
-   <div id="bd">
-       <div class="yui-g"> 
+    <div class="main container-fluid">
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2">
 
 <h1>Circulation</h1>
 
-<div class="yui-u first">      
+<div class="row">
+<div class="col-sm-4">
        <ul>
         <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
         <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
@@ -32,10 +32,10 @@
            [% END %]
        [% END %]
        </ul>
-       </div>
+</div>
+
+<div class="col-sm-4">
 
-       <div class="yui-u">
-       
 <h5>Circulation reports</h5>
 <ul>
     <li>    <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
@@ -56,11 +56,10 @@
         <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
     [% END %]
 </ul>
-       
-       </div>
 
+</div>
 
-       <div class="yui-u">
+<div class="col-sm-4">
         <h5>Offline circulation</h5>
                <ul>
             [% IF (AllowOfflineCirculation) %]
@@ -74,11 +73,14 @@
             </ul>
                </ul>
        </div>
-
 </div>
-    <div class="yui-g" id="intranet-circulation-home-html">
-        [% Koha.Preference('IntranetCirculationHomeHTML') %]
+
+    <div class="row" id="intranet-circulation-home-html">
+        <div class="col-md-12">
+            [% Koha.Preference('IntranetCirculationHomeHTML') %]
+        </div>
     </div>
 </div>
+</div>
 
 [% INCLUDE 'intranet-bottom.inc' %]