Bug 20667: Update two-column templates with Bootstrap grid: Acquisitions part 1

This patch modifies several acquisitions templates to use the Bootstrap
grid instead of YUI.

This patch also removes obsolete "text/javascript" attributes from
<script> tags.

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

- Acquisitions -> Home page
- Acquisitions -> Vendor search results
- Acquisitions -> Vendor -> Basket groups
  -> Edit
- Acquisitions -> EDIFACT messages
  -> View EDIFACT message

Signed-off-by: Dilan Johnpullé <dilan@calyx.net.au>

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/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 5864a2f..d7ef803 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -15,11 +15,10 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Acquisitions</div>
 
-<div id="doc3" class="yui-t2">
-
-<div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
 [% INCLUDE 'acquisitions-toolbar.inc' %]
 
@@ -32,8 +31,12 @@
         <div class="dialog alert">Your administrator must define a budget in Administration</div>
         [% END %]
     [% END %]
-<div class="yui-g">
-<div class="yui-u first">
+<div class="row">
+    [% IF ( suggestion && suggestions_count ) %]
+        <div class="col-sm-6">
+    [% ELSE %]
+        <div class="col-sm-12">
+    [% END %]
 <div id="acqui_acqui_home_order">
     <fieldset>
         <legend>Manage orders</legend>
@@ -47,7 +50,7 @@
 </div>
 
 [% IF ( suggestion && suggestions_count ) %]
-<div class="yui-u">
+<div class="col-sm-6">
     <div id="acqui_acqui_home_suggestions">
         <fieldset>
         <legend>Pending suggestions</legend>
@@ -161,18 +164,21 @@
     </div>
     [% END %]
 
+</main>
+</div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+<div class="col-sm-2 col-sm-pull-10">
+    <aside>
+        [% INCLUDE 'acquisitions-menu.inc' %]
+    </aside>
 </div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'acquisitions-menu.inc' %]
-</div>
-</div>
+</div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %]
     [% Asset.js("js/acquisitions-menu.js") %]
-    <script type="text/javascript">
+    <script>
         dt_overwrite_html_sorting_localeCompare();
 
         $(document).ready(function() {

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index dab44d8..5614d70 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -22,9 +22,7 @@
   element position and are not recommended;
   we turn them off as a foundation for YUI
   CSS treatments. */
-#basketgroupcolumns {
-    width: 58em;
-}
+
 #ungrouped {
        overflow: auto;
        height: 400px;
@@ -136,10 +134,12 @@ function submitForm(form) {
     <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket grouping</div>
 [% END %]
 
-<div id="doc3" class="yui-t2">
-    <div id="bd">
-        <div id="yui-main">
-            <div class="yui-b">
+
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
                 [% IF ( grouping ) %]
                     [% IF (closedbg) %]
                         <div id="toolbar" class="btn-toolbar">
@@ -156,9 +156,9 @@ function submitForm(form) {
                     [% ELSE %]
                         <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
                     [% END %]
-                    <div id="basketgroupcolumns" class="yui-g">
+                    <div id="basketgroupcolumns" class="row">
                         [% UNLESS (closedbg) %]
-                            <div class="yui-u">
+                            <div class="col-xs-6 col-xs-push-6">
                                 <form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
                                     <div id="groups">
                                         <fieldset class="brief">
@@ -187,7 +187,7 @@ function submitForm(form) {
                                 </form>
                             </div>
                         [% END %]
-                        <div class="yui-u first">
+                        <div class="col-xs-6 col-xs-pull-6">
                             <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
                                 <fieldset id="various" class="brief">
                                     <ol>
@@ -217,7 +217,7 @@ function submitForm(form) {
                                                 <select name="deliveryplace" id="deliveryplace">
                                                     <option value="">--</option>
                                                     [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
-                                                <select>
+                                                </select>
                                             </li>
                                             <li><p>or</p></li>
                                             <li>
@@ -379,13 +379,16 @@ function submitForm(form) {
                         </div>
                     </div>
                 [% END %]
-            </div>
-        </div>
-        <div class="yui-b">
-            [% IF ( booksellerid ) %]
-                [% INCLUDE 'vendor-menu.inc' %]
-            [% END %]
-            [% INCLUDE 'acquisitions-menu.inc' %]
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% IF ( booksellerid ) %]
+                    [% INCLUDE 'vendor-menu.inc' %]
+                [% END %]
+                [% INCLUDE 'acquisitions-menu.inc' %]
+            </aside>
         </div>
-    </div>
+    </div> <!-- /.row -->
     [% INCLUDE 'intranet-bottom.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index f8c092d..4618e8d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -18,12 +18,11 @@
 
 <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; Search for vendor <em>[% supplier |html %]</em> </div>
 
-<div id="doc3" class="yui-t2">
-   
-    <div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
-    
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
+
 [% INCLUDE 'acquisitions-toolbar.inc' %]
 [% UNLESS ( count == 1 ) %]
     [% UNLESS count %]
@@ -176,20 +175,22 @@
         [% END %][%# FOREACH supplier IN loop_suppliers %]
     </div>
 [% END %][%# IF ( loop_suppliers.size ) %]
-</div>
-</div>
-<div class="yui-b">
-[% IF ( booksellerid ) %]
-[% INCLUDE 'vendor-menu.inc' %]
-[% END %]
-[% INCLUDE 'acquisitions-menu.inc' %]
-</div>
-</div>
+</main>
+</div> <!-- /.col-sm-10.col-sm-push-2 -->
+    <div class="col-sm-2 col-sm-pull-10">
+        <aside>
+            [% IF ( booksellerid ) %]
+                [% INCLUDE 'vendor-menu.inc' %]
+            [% END %]
+            [% INCLUDE 'acquisitions-menu.inc' %]
+        </aside>
+    </div>
+</div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
                 'sDom': 't',

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
index 67e4731..bdf9faf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
@@ -19,11 +19,10 @@
 &rsaquo; <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
 </div>
 
-<div id="doc3" class="yui-t2">
-
-<div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
 
 
 <h1>EDIFACT messages</h1>
@@ -102,18 +101,21 @@
     <div class="dialog message">There are no EDIFACT messages.</div>
 [% END %]
 
-</div>
-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'acquisitions-menu.inc' %]
-</div>
-</div>
+</div> <!-- /#acqui_edifactmsgs -->
+</main>
+</div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+    <div class="col-sm-2 col-sm-pull-10">
+        <aside>
+            [% INCLUDE 'acquisitions-menu.inc' %]
+        </aside>
+    </div>
+</div> <!-- /.row -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $('#edi_msgs').dataTable($.extend(true, {}, dataTablesDefaults, {
                 'aaSorting': [[1, "desc" ]],

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
index 0307e47..4e8ed58 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
@@ -11,10 +11,10 @@
 &rsaquo; <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
 </div>
 
-<div id="doc3" class="yui-t2">
-    <div id="bd">
-        <div id="yui-main">
-            <div class="yui-b">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>
                 <div id="edimsg">
                     [% IF no_message %]
                         <div class"dialog message">The requested message cannot be displayed</div>
@@ -26,10 +26,14 @@
                         </ul>
                     [% END %]
                 </div>
-            </div>
-        </div>
-        <div class="yui-b">
-            [% INCLUDE 'acquisitions-menu.inc' %]
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'acquisitions-menu.inc' %]
+            </aside>
         </div>
-    </div>
+    </div> <!-- /.row -->
+
 [% INCLUDE 'intranet-bottom.inc' %]