Attachment 83297 Details for Bug 21569 – Bug 21569: Update two-column templates with Bootstrap grid: Circulation part 3

[patch] Bug 21569: Update two-column templates with Bootstrap grid: Circulation part 3

Bug-21569-Update-two-column-templates-with-Bootstr.patch (text/plain), 13.33 KB, created by Claire Gravely on 2018-12-17 15:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Claire Gravely

Created: 2018-12-17 15:10:05 UTC

Size: 13.33 KB

patch

obsolete

>From 20b43c6027482fa1ab9d59b9b2b1983b50a61675 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 2 May 2018 15:51:21 +0000
>Subject: [PATCH] Bug 21569: Update two-column templates with Bootstrap grid:
> Circulation part 3
>
>This patch modifies several circulation 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.
>
>To test, apply the patch and view the following pages, confirming that
>they look correct at various browser widths:
>
>With each of these pages, test with CircSidebar preference both on
>and off
>
> - Circulation -> Returns
> - Circulation -> Set library
> - Circulation -> Transfers to receive
> - Circulation -> Holds queue
> - Circulation -> Holds awaiting pickup
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>---
> .../intranet-tmpl/prog/en/modules/circ/returns.tt  | 53 +++++++++++++---------
> .../prog/en/modules/circ/selectbranchprinter.tt    | 40 ++++++++++------
> .../prog/en/modules/circ/transferstoreceive.tt     | 39 ++++++++++------
> .../prog/en/modules/circ/view_holdsqueue.tt        | 41 ++++++++++-------
> .../prog/en/modules/circ/waitingreserves.tt        | 39 ++++++++++------
> 5 files changed, 131 insertions(+), 81 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index dec258b..91b27a7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -45,12 +45,17 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
> 
>-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
>-
>-<div id="bd">
>-<div id="yui-main">
>-[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
>-<div class="yui-g">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-12">
>+            <main>
>+                <div class="row">
>+
>+                [% IF Koha.Preference('CircSidebar') %]
>+                    <div class="col-sm-10 col-sm-push-2">
>+                [% ELSE %]
>+                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% END %]
> 
>     [% IF hold_auto_filled %]
>         <div class="dialog alert hold-auto-filled">
>@@ -603,11 +608,11 @@
>     <div id="dropboxmode" class="dialog message" style="display:none;">
>         <p>Book drop mode.  (Effective checkin date is [% dropboxdate | html %] ).</p>
>     </div>
>-</div>
>-<div class="yui-g">
>+
>+<div class="row">
>     <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
>-    <div class="yui-u first">
>-        <fieldset>
>+    <div class="col-sm-6">
>+            <fieldset>
>             <legend>Check in</legend>
>             <label for="barcode">Enter item barcode: </label>
>             [% IF ( exemptfine ) %]
>@@ -644,7 +649,7 @@
> 
>             </fieldset>
>             </div>
>-            <div class="yui-u">
>+            <div class="col-sm-6">
>             <fieldset id="checkin_options">
>                 <legend>Options</legend>
>                     [% IF ( CAN_user_updatecharges_writeoff && overduecharges ) %]
>@@ -733,16 +738,20 @@
>         [% END %]
>     </table>
> [% END %]
>-</div>
>-[% IF Koha.Preference('CircSidebar') %]
>-</div>
>-<div class="yui-b noprint">
>-    [% INCLUDE 'circ-nav.inc' %]
>-</div>
>-[% END %]
>-</div>
>-</div>
>-</div>
>+
>+                    [% IF Koha.Preference('CircSidebar') %]
>+                            </div> 
>+                            <div class="col-sm-2 col-sm-pull-10">
>+                                <aside>
>+                                    [% INCLUDE 'circ-nav.inc' %]
>+                                </aside>
>+                            </div> 
>+                        </div> 
>+                    [% END %]
>+
>+            </main>
>+        </div> 
>+    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>@@ -751,7 +760,7 @@
>     [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
>     [% INCLUDE 'timepicker.inc' %]
> 
>-    <script type="text/javascript">
>+    <script>
>         function Dopop(link) {
>             var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
>             $("#barcode").focus();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
>index 3b113f2..f2a65c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
>@@ -3,7 +3,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<style type="text/css">
>+<style>
>     .noshow {display: none;}
> </style>
> </head>
>@@ -17,10 +17,18 @@
> &rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
> </div>
> 
>-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
>-  <div id="bd">
>-    <div id="yui-main">
>-      <div class="yui-b">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-12">
>+            <main>
>+                <div class="row">
>+
>+                [% IF Koha.Preference('CircSidebar') %]
>+                    <div class="col-sm-10 col-sm-push-2">
>+                [% ELSE %]
>+                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% END %]
>+
> 
> [% IF ( updated ) %]
> 
>@@ -88,12 +96,18 @@ Updated:<ul>
> 
> [% END %]
> 
>-      </div>
>-    </div>
>-[% IF Koha.Preference('CircSidebar') %]
>-<div class="yui-b noprint">
>-    [% INCLUDE 'circ-nav.inc' %]
>-</div>
>-[% END %]
>-</div>
>+                    [% IF Koha.Preference('CircSidebar') %]
>+                            </div> 
>+                            <div class="col-sm-2 col-sm-pull-10">
>+                                <aside>
>+                                    [% INCLUDE 'circ-nav.inc' %]
>+                                </aside>
>+                            </div> 
>+                        </div> 
>+                    [% END %]
>+
>+            </main>
>+        </div> 
>+    </div> 
>+
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>index 66e0683..6a019c8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
>@@ -16,12 +16,17 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to receive</div>
> 
>-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-12">
>+            <main>
>+                <div class="row">
> 
>-   <div id="bd">
>-	<div id="yui-main">
>-        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
>-	<div class="yui-g">
>+                [% IF Koha.Preference('CircSidebar') %]
>+                    <div class="col-sm-10 col-sm-push-2">
>+                [% ELSE %]
>+                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% END %]
> 
>         <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
> 	[% IF ( branchesloop ) %]
>@@ -81,19 +86,23 @@
>         <p>No transfers to receive</p>
>     [% END %]
> 
>-</div>
>-</div>
>-[% IF Koha.Preference('CircSidebar') %]
>-</div>
>-<div class="yui-b noprint">
>-    [% INCLUDE 'circ-nav.inc' %]
>-</div>
>-[% END %]
>-</div>
>+                    [% IF Koha.Preference('CircSidebar') %]
>+                            </div> 
>+                            <div class="col-sm-2 col-sm-pull-10">
>+                                <aside>
>+                                    [% INCLUDE 'circ-nav.inc' %]
>+                                </aside>
>+                            </div> 
>+                        </div> 
>+                    [% END %]
>+
>+            </main>
>+        </div> 
>+    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             [% FOREACH branchesloo IN branchesloop %]
>             $("#transferst[% branchesloo.branchcode | html %]").dataTable($.extend(true, {}, dataTablesDefaults, {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>index 07b9657..5c2b1dd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>@@ -25,12 +25,17 @@
> [% IF ( run_report ) %] &rsaquo; Results[% END %]
> </div>
> 
>-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc2" class="yui-t7">[% END %]
>-
>-   <div id="bd">
>-	<div id="yui-main">
>-        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
>-	<div class="yui-g">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-12">
>+            <main>
>+                <div class="row">
>+
>+                [% IF Koha.Preference('CircSidebar') %]
>+                    <div class="col-sm-10 col-sm-push-2">
>+                [% ELSE %]
>+                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% END %]
> 
> <h1>Holds queue</h1>
> 
>@@ -186,20 +191,24 @@
> </form>
> [% END %]
> 
>-</div>
>-</div>
>-[% IF Koha.Preference('CircSidebar') %]
>-</div>
>-<div class="yui-b noprint">
>-    [% INCLUDE 'circ-nav.inc' %]
>-</div>
>-[% END %]
>-</div>
>+                    [% IF Koha.Preference('CircSidebar') %]
>+                            </div> 
>+                            <div class="col-sm-2 col-sm-pull-10">
>+                                <aside>
>+                                    [% INCLUDE 'circ-nav.inc' %]
>+                                </aside>
>+                            </div> 
>+                        </div> 
>+                    [% END %]
>+
>+            </main>
>+        </div> 
>+    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             var holdst;
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index 94a58ed..79d4f0d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -19,12 +19,17 @@
> &rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
> </div>
> 
>-[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-12">
>+            <main>
>+                <div class="row">
> 
>-   <div id="bd">
>-    <div id="yui-main">
>-    [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
>-    <div class="yui-g">
>+                [% IF Koha.Preference('CircSidebar') %]
>+                    <div class="col-sm-10 col-sm-push-2">
>+                [% ELSE %]
>+                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
>+                [% END %]
> 
>         <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
>             [% IF ( all_branches_link ) %]
>@@ -99,19 +104,23 @@
>         </div>
>     [% END %]
> 
>-</div>
>-</div>
>-[% IF Koha.Preference('CircSidebar') %]
>-</div>
>-<div class="yui-b noprint">
>-    [% INCLUDE 'circ-nav.inc' %]
>-</div>
>-[% END %]
>-</div>
>+                    [% IF Koha.Preference('CircSidebar') %]
>+                            </div> 
>+                            <div class="col-sm-2 col-sm-pull-10">
>+                                <aside>
>+                                    [% INCLUDE 'circ-nav.inc' %]
>+                                </aside>
>+                            </div> 
>+                        </div> 
>+                    [% END %]
>+
>+            </main>
>+        </div> 
>+    </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             $('#resultlist').tabs();
>             $("th a").hide();
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21569: 80592 | 83297 | 83314