Attachment 79733 Details for Bug 21430 – Bug 21430: Update two-column templates with Bootstrap grid: Reports part 3

[patch] Bug 21430: Update two-column templates with Bootstrap grid: Reports part 3

Bug-21430-Update-two-column-templates-with-Bootstr.patch (text/plain), 12.82 KB, created by Jonathan Druart on 2018-10-01 15:06:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-10-01 15:06:45 UTC

Size: 12.82 KB

patch

obsolete

>From 28090d154c8266acda3b387ec65ad56ca8eb2e7b Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 27 Sep 2018 12:59:01 +0000
>Subject: [PATCH] Bug 21430: Update two-column templates with Bootstrap grid:
> Reports part 3
>
>This patch modifies several reports 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:
>
> - Reports -> Items with no checkouts
> - Reports -> Catalog statistics wizard
> - Reports -> Guided reports dictionary
> - Reports -> Guided reports, saved SQL reports
> - Reports -> Average loan time
> - Reports -> Circulation statistics wizard
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/reports/catalogue_out.tt       | 26 ++++++++------
> .../prog/en/modules/reports/catalogue_stats.tt     | 27 +++++++-------
> .../prog/en/modules/reports/dictionary.tt          | 26 ++++++++------
> .../en/modules/reports/guided_reports_start.tt     | 42 ++++++++++------------
> .../prog/en/modules/reports/issues_avg_stats.tt    | 27 +++++++-------
> .../prog/en/modules/reports/issues_stats.tt        | 26 +++++++-------
> 6 files changed, 93 insertions(+), 81 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>index 30d3d16686..9e2c533774 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>@@ -2,7 +2,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Reports &rsaquo; Items with no checkouts</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<style type="text/css">
>+<style>
> 	.sql {display: none;}
> </style>
> </head>
>@@ -12,10 +12,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> &rsaquo; Items with no checkouts</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>
> 
> [% IF ( do_it ) %]
> 	<h1>Items with no checkouts</h1>
>@@ -139,10 +139,14 @@
> 	</form>
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'reports-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'reports-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
>+
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>index 3b91a1aeba..a3462d6f2c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>@@ -11,11 +11,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]&rsaquo; <a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog statistics</a> &rsaquo; Results[% ELSE %]&rsaquo; Catalog statistics[% END %]</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>
> 
> [% IF ( do_it ) %]
> 	[% FOREACH mainloo IN mainloop %]
>@@ -291,16 +290,20 @@
> 	</fieldset>
> 	</form>
> [% END %]
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'reports-menu.inc' %]
>-</div>
>-</div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'reports-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         function changeRemovedDateTrStatus() {
>             var Cellvalue = $("input[name='Cellvalue']:checked").val();
>             if(Cellvalue == "deleteditems") {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>index ecb9f77270..d9fa12729c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>@@ -2,7 +2,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Reports &rsaquo; Guided reports &rsaquo; Dictionary</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<style type="text/css">fieldset.rows table { clear: none; margin: 0;}</style>
>+<style>fieldset.rows table { clear: none; margin: 0;}</style>
> </head>
> 
> <body id="rep_dictionary" class="rep">
>@@ -27,11 +27,11 @@
> [% ELSIF ( step_5 ) %] &rsaquo; <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a> &rsaquo; <strong>Step 5: Confirm definition</strong> 
> [% ELSE %] &rsaquo; <strong> Dictionary </strong>[% 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">
> [% IF ( start_dictionary ) %]
>     <div id="toolbar">
>         <a id="newdictionary" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a>
>@@ -260,12 +260,16 @@
> 
> </form>
> [% END %]
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'guided-reports-view.inc' %]
>-</div>
>-</div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'guided-reports-view.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index a12df46229..c31abbce39 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -80,10 +80,11 @@
>     </div>
> </div>
> 
>-<div id="doc3" class="yui-t1">
>-<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 "reports-toolbar.inc" %]
> 
> [% IF ( start ) %]
>@@ -375,15 +376,6 @@ canned reports and writing custom SQL reports.</p>
>     <input type="submit" name="submit" value="Next &gt;&gt;" />
> </fieldset>
> </form>
>-</div>
>-<div class="yui-gb"><div class="yui-u first"></div>
>-
>-
>-
>-
> [% END %]
> 
> [% IF ( build3 ) %]
>@@ -397,8 +389,9 @@ canned reports and writing custom SQL reports.</p>
>     <input type="hidden" name="public" value="[% public | html %]" />
>     <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" />
>     <fieldset>
>-<div class="yui-g">
>-<div class="yui-u first">	<div style="float: left;"><select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;">
>+<div class="row">
>+<div class="col-sm-6">
>+    <div style="float: left;"><select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;">
> [% FOREACH column IN columns %]
> [% IF ( column.table ) %]
> 
>@@ -423,18 +416,16 @@ canned reports and writing custom SQL reports.</p>
> <input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" /></div>
> </div>
> 
>-<div class="yui-u">
>+<div class="col-sm-6">
> <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px; height:300px;"></select>
> </div>
> </div>
> </fieldset>
>-<div class="yui-g">
> <fieldset class="action">
>     <input type="hidden" name="phase" value="Choose these columns" />
>     <input type="button" name="back" value="&lt;&lt; Back" class="goback" />
>     <input type="submit" name="submit" value="Next &gt;&gt;" />
> </fieldset>
>-</div>
> </form>
> 
> [% END %]
>@@ -900,9 +891,12 @@ $(document).ready(function() {
> </form>
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+
> 
> [% IF ( saved1 ) %]
> <div id="saved-reports-filter">
>@@ -930,8 +924,10 @@ $(document).ready(function() {
> 
> 
> [% INCLUDE 'guided-reports-view.inc' %]
>-</div>
>-</div>
>+            </aside>
>+        </div> 
>+     </div> 
>+
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>index ff4bd40cdd..8dcefd4b41 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
>@@ -11,11 +11,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]&rsaquo; <a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a> &rsaquo; Results [% ELSE %]&rsaquo; Average loan time[% END %]</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>
> 
> [% IF ( do_it ) %]
> 	[% FOREACH mainloo IN mainloop %]
>@@ -223,16 +222,20 @@
> 	</form>
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'reports-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'reports-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
>+
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             // http://jqueryui.com/demos/datepicker/#date-range
>             var dates = $( "#from, #to" ).datepicker({
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>index 43f2e30890..5d13e19cf0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
>@@ -3,7 +3,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Reports &rsaquo; Circulation statistics [% IF ( do_it ) %]&rsaquo; Results[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<style type="text/css">
>+<style>
> 	.sql {display:none;}
> </style>
> </head>
>@@ -14,11 +14,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]&rsaquo; <a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation statistics</a> &rsaquo; Results [% ELSE %]&rsaquo; Circulation statistics[% END %]</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>
> 
> [% IF ( do_it ) %]
>     [% FOREACH mainloo IN mainloop %]
>@@ -366,12 +365,15 @@
> 	</form>
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'reports-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'reports-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21430: 79506 | 79695 | 79733