Bug 21307: Switch two-column templates to Bootstrap grid: Cataloging

This patch modifies two cataloging templates to use the Bootstrap grid
instead of YUI.

To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:

 - Cataloging -> Edit record using the advanced editor
 - Cataloging -> Edit items

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 828860b..2cd658b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -28,10 +28,10 @@
  &rsaquo; <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Items</a>
 </div>
 
-<div id="doc3" class="yui-t7">
-
-   <div id="bd">
-       <div id="yui-main">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-12">
+            <main>
 
 <h1>Items for [% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</h1>
 
@@ -113,12 +113,13 @@
         </table>
         </div>
     [% END %]
-</div>
-<div class="yui-gf">
-<div class="yui-u first">
-[% INCLUDE 'biblio-view-menu.inc' %]
-</div>
-<div class="yui-u">
+
+<div class="row">
+    <div class="col-sm-2">
+        [% INCLUDE 'biblio-view-menu.inc' %]
+    </div>
+    <div class="col-sm-10">
+
 <div id="cataloguing_additem_newitem">
     <form id="f" method="post" action="/cgi-bin/koha/cataloguing/additem.pl" name="f">
     <input type="hidden" name="op" value="[% op | html %]" />
@@ -247,11 +248,18 @@
 
 
     </form>
-</div>
-</div><!-- /yui-u -->
-</div><!-- /yui-gf -->
+                            </div> <!-- /.col-sm-10 -->
+                        </div> <!-- /.row -->
+                    </div> <!-- /div -->
+                </div> <!-- /#cataloguing_additem_itemlist -->
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-</div>
-</div>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'admin-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
index 38633c4..260eff9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
@@ -19,13 +19,13 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> &rsaquo; Editor</div>
 
-<div id="doc3" class="yui-t2">
-<div id="bd">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
 <h1 id="title">Cataloging editor</h1>
 
-<div id="yui-main"><div class="yui-b">
-
 <div id="editor">
     <input id="import-records-input" type="file" style="display: none">
     <div id="toolbar" class="btn-toolbar">
@@ -87,32 +87,32 @@
         </div>
     </div>
 </div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
-</div></div>
-
-<div class="yui-b" id="sidebar">
-
-<h3>Search</h3>
-<form id="quicksearch">
-    <fieldset class="brief">
-    <ol>
-        <li><label for="search-by-keywords">Keywords:</label></li>
-        <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li>
-        <li><label for="search-by-author">Author:</label></li>
-        <li><input class="search-box" data-qualifier="author" id="search-by-author" placeholder="(Ctrl-Alt-A)" /></li>
-        <li><label for="search-by-isbn">ISBN:</label></li>
-        <li><input class="search-box" data-qualifier="isbn" id="search-by-isbn" placeholder="(Ctrl-Alt-I)" /></li>
-        <li><label for="search-by-title">Title:</label></li>
-        <li><input class="search-box" data-qualifier="title" id="search-by-title" placeholder="(Ctrl-Alt-T)" /></li>
-        <li><a href="#" id="show-advanced-search" title="Show advanced search (Ctrl-Alt-S)">Advanced &raquo;</a></li>
-    </fieldset>
-</form>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                <h3>Search</h3>
+                <form id="quicksearch">
+                    <fieldset class="brief">
+                    <ol>
+                        <li><label for="search-by-keywords">Keywords:</label></li>
+                        <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li>
+                        <li><label for="search-by-author">Author:</label></li>
+                        <li><input class="search-box" data-qualifier="author" id="search-by-author" placeholder="(Ctrl-Alt-A)" /></li>
+                        <li><label for="search-by-isbn">ISBN:</label></li>
+                        <li><input class="search-box" data-qualifier="isbn" id="search-by-isbn" placeholder="(Ctrl-Alt-I)" /></li>
+                        <li><label for="search-by-title">Title:</label></li>
+                        <li><input class="search-box" data-qualifier="title" id="search-by-title" placeholder="(Ctrl-Alt-T)" /></li>
+                        <li><a href="#" id="show-advanced-search" title="Show advanced search (Ctrl-Alt-S)">Advanced &raquo;</a></li>
+                    </fieldset>
+                </form>
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->
 
 </div>
 
-</div>
-</div>
-
 <div id="advanced-search-ui" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="advanced-search-title" aria-hidden="true">
 <div class="modal-dialog modal-lg">
 <div class="modal-content">