Bug 21965: Update two-column templates with Bootstrap grid: Patrons part 3

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

This patch also removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.

Markup has been corrected in paycollect.tt and readingrec.tt where a
table row lacked <tr>.

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

 - Patron -> Notices
 - Patron -> Purchase suggestions
 - Patron -> Circulation history
 - Patron -> Routing lists
 - Patron -> Statistics
 - Patron -> Fines
   -> Pay

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index 649026d..65f6c70 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -9,7 +9,7 @@
 <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.css("css/datatables.css") | $raw %]
 <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.css("css/datatables.css") | $raw %]

-<style type="text/css">
+<style>

     .notice { display: none; }
     .notice-title { font-weight: bold; display: block; }
 </style>
     .notice { display: none; }
     .notice-title { font-weight: bold; display: block; }
 </style>


@@ -21,10 +21,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Sent notices for [% INCLUDE 'patron-title.inc' %]</div>
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Sent notices for [% INCLUDE 'patron-title.inc' %]</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 'members-toolbar.inc' %]
 <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
 
 [% INCLUDE 'members-toolbar.inc' %]
 <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
 


@@ -82,18 +83,19 @@
     <div class="dialog message">There is no record of any messages that have been sent to this patron.</div>
 [% END %]
 
     <div class="dialog message">There is no record of any messages that have been sent to this patron.</div>
 [% END %]
 

-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->

 
 

-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]

-    <script type="text/javascript">
-
+    <script>

         $(document).ready(function() {
             $("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aaSorting": [[ 3, "desc" ]],
         $(document).ready(function() {
             $("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aaSorting": [[ 3, "desc" ]],

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index b58c4e6..207db5a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -16,11 +16,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Make a payment for [% patron.firstname | html %] [% patron.surname | html %]</div>
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Make a payment for [% patron.firstname | html %] [% patron.surname | html %]</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 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
 <!-- The manual invoice and credit buttons -->
 [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
 <!-- The manual invoice and credit buttons -->


@@ -141,12 +141,15 @@
 [% END %]
 </div></div>
 
 [% END %]
 </div></div>
 

-</div>
-</div>
-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
index e0af674..82f0fc8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -29,11 +29,11 @@
     [% END %]
 </div>
 
     [% END %]
 </div>
 

-<div id="doc3" class="yui-t2">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>

 
 

-<div id="bd">
-<div id="yui-main">
-<div class="yui-b">

 [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
 
 [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
 


@@ -84,7 +84,7 @@
             <th>Amount outstanding</th>
         </tr></thead>
     <tfoot>
             <th>Amount outstanding</th>
         </tr></thead>
     <tfoot>

-        <td colspan="3">Total amount payable:</td><td>[% amountoutstanding | format('%.2f') %]</td>
+        <tr><td colspan="3">Total amount payable:</td><td>[% amountoutstanding | format('%.2f') %]</td></tr>

     </tfoot>
     <tbody><tr>
             <td>
     </tfoot>
     <tbody><tr>
             <td>


@@ -144,7 +144,7 @@
             <th>Amount</th>
             <th>Amount outstanding</th>
         </tr></thead>
             <th>Amount</th>
             <th>Amount outstanding</th>
         </tr></thead>

-    <tfoot><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | format('%.2f') %]</td></tfoot>
+    <tfoot><tr><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | format('%.2f') %]</td></tr></tfoot>

     <tbody><tr>
             <td>[% description | html %] [% title | html %]</td>
             <td>[% accounttype | html %]</td>
     <tbody><tr>
             <td>[% description | html %] [% title | html %]</td>
             <td>[% accounttype | html %]</td>


@@ -225,18 +225,21 @@
     </form>
 [% END %]
 </div></div>
     </form>
 [% END %]
 </div></div>

-</div>
-</div>

 
 

-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]

-    <script type= "text/javascript">
+    <script>

         $(document).ready(function() {
             $('#payindivfine, #payfine').preventDoubleFormSubmit();
             $("#paid").on("change",function(){
         $(document).ready(function() {
             $('#payindivfine, #payfine').preventDoubleFormSubmit();
             $("#paid").on("change",function(){

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
index 31ca500..36fa494 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
@@ -20,12 +20,11 @@
 › Purchase suggestions for [% INCLUDE 'patron-title.inc' %]
 </div>
 
 &rsaquo; Purchase suggestions for [% INCLUDE 'patron-title.inc' %]
 </div>
 

-<div id="doc3" class="yui-t1">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>

 
 

-   <div id="bd">
-    <div id="yui-main">
-        <div class="yui-b">
-            <div class="yui-g">

                 <h2>Purchase suggestions</h2>
 
                 <div id="toolbar" class="btn-toolbar">
                 <h2>Purchase suggestions</h2>
 
                 <div id="toolbar" class="btn-toolbar">


@@ -102,19 +101,22 @@
                         <p>This patron has not submitted any purchase suggestions</p>
                     </div>
                 [% END %]
                         <p>This patron has not submitted any purchase suggestions</p>
                     </div>
                 [% END %]

-            </div>
-        </div>
-    </div>
-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]

-    <script type="text/javascript">
+    <script>

         $(document).ready(function() {
             $("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, {
                 'bPaginate': false,
         $(document).ready(function() {
             $("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, {
                 'bPaginate': false,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 1a499b5..edeb909 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -17,11 +17,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Circulation history for [% INCLUDE 'patron-title.inc' %]</div>
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Circulation history for [% INCLUDE 'patron-title.inc' %]</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 'members-toolbar.inc' %]
 <h1>Circulation history</h1>
 
 [% INCLUDE 'members-toolbar.inc' %]
 <h1>Circulation history</h1>
 


@@ -48,6 +48,7 @@
   <div id="readingrec" style="overflow:hidden">
     <table id="table_readingrec">
       <thead>
   <div id="readingrec" style="overflow:hidden">
     <table id="table_readingrec">
       <thead>

+        <tr>

         <th style="display:none;">Type</th>
         <th class="title-string">Date</th>
         <th class="anti-the">Title</th>
         <th style="display:none;">Type</th>
         <th class="title-string">Date</th>
         <th class="anti-the">Title</th>


@@ -59,6 +60,7 @@
         <th>Checked out from</th>
         <th class="title-string">Date due</th>
         <th class="title-string">Return date</th>
         <th>Checked out from</th>
         <th class="title-string">Date due</th>
         <th class="title-string">Return date</th>

+        </tr>

       </thead>
       <tbody>
       [% FOREACH issue IN loop_reading %]
       </thead>
       <tbody>
       [% FOREACH issue IN loop_reading %]


@@ -111,19 +113,22 @@
   </div>
 </div>
 [% END %]
   </div>
 </div>
 [% END %]

-</div>
-</div>

 
 

-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]

-    <script type="text/javascript" id="js">
+    <script id="js">

         $(document).ready(function() {
             var table = $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "sPaginationType": "four_button",
         $(document).ready(function() {
             var table = $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "sPaginationType": "four_button",

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
index fd607e6..bc256ff 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
@@ -15,10 +15,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</div>
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</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 'members-toolbar.inc' %]
 
 <!-- Search Bar -->
 [% INCLUDE 'members-toolbar.inc' %]
 
 <!-- Search Bar -->


@@ -79,14 +80,15 @@
 
 </div>
 
 
 </div>
 

+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->

 
 

-</div>
-</div>
-
-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
index 0d49464..307c5ff 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
@@ -24,11 +24,11 @@
 › [% UNLESS blocking_error %]Statistics for [% INCLUDE 'patron-title.inc' invert_name = 1 %][% END %]
 </div>
 
 &rsaquo; [% UNLESS blocking_error %]Statistics for [% INCLUDE 'patron-title.inc' invert_name = 1 %][% END %]
 </div>
 

-<div id="doc3" class="yui-t1">
+<div class="main container-fluid">
+    <div class="row">
+        <div class="col-sm-10 col-sm-push-2">
+            <main>

 
 

-   <div id="bd">
-    <div id="yui-main">
-        <div class="yui-b">

         [% INCLUDE 'members-toolbar.inc' %]
 
             <h3>Statistics for [% INCLUDE 'patron-title.inc' %]</h3>
         [% INCLUDE 'members-toolbar.inc' %]
 
             <h3>Statistics for [% INCLUDE 'patron-title.inc' %]</h3>


@@ -83,18 +83,22 @@
             [% ELSE %]
                 <div class="dialog message">There are no statistics for this patron.</div>
             [% END %]
             [% ELSE %]
                 <div class="dialog message">There are no statistics for this patron.</div>
             [% END %]

-        </div>
-    </div>
-<div class="yui-b">
-[% INCLUDE 'circ-menu.inc' %]
-</div>
-</div>
+
+            </main>
+        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+
+        <div class="col-sm-2 col-sm-pull-10">
+            <aside>
+                [% INCLUDE 'circ-menu.inc' %]
+            </aside>
+        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+     </div> <!-- /.row -->

 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]

-    <script type="text/javascript">
+    <script>

         $(document).ready(function() {
             $("#statistics").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "sDom": 't',
         $(document).ready(function() {
             $("#statistics").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "sDom": 't',