Bugzilla – Attachment 79488 Details for
Bug 21428
Switch two-column templates to Bootstrap grid: Reports part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21428: Update two-column templates with Bootstrap grid: Reports part 1
Bug-21428-Update-two-column-templates-with-Bootstr.patch (text/plain), 10.94 KB, created by
Owen Leonard
on 2018-09-27 12:06:54 UTC
(
hide
)
Description:
Bug 21428: Update two-column templates with Bootstrap grid: Reports part 1
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-09-27 12:06:54 UTC
Size:
10.94 KB
patch
obsolete
>From aede143f1cc85b2c69ab9b152caa409446e5e263 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 3 May 2018 11:58:10 +0000 >Subject: [PATCH] Bug 21428: Update two-column templates with Bootstrap grid: > Reports part 1 > >This patch modifies several administration 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 -> Acquisitions statistics wizard > - Reports -> Patrons with the most checkouts > - Reports -> Patrons who haven't checked out > - Reports -> Patrons statistics wizard > - Reports -> Cash register statistics wizard > - Reports -> Most-circulated items >--- > .../prog/en/modules/reports/acquisitions_stats.tt | 27 +++++++++++--------- > .../prog/en/modules/reports/bor_issues_top.tt | 26 ++++++++++--------- > .../prog/en/modules/reports/borrowers_out.tt | 26 ++++++++++--------- > .../prog/en/modules/reports/borrowers_stats.tt | 26 ++++++++++--------- > .../prog/en/modules/reports/cash_register_stats.tt | 29 ++++++++++++---------- > .../prog/en/modules/reports/cat_issues_top.tt | 26 ++++++++++--------- > 6 files changed, 87 insertions(+), 73 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >index 0ae8f30..5180b54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >@@ -10,11 +10,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics</a> › Results[% ELSE %] › Acquisitions 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 %] >@@ -300,16 +299,20 @@ > </fieldset> > </form> > [% END %] >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'reports-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% 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/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index 8eb406c..a33b13e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >@@ -13,11 +13,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a> › Results[% ELSE %]› Patrons with the most checkouts[% 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 %] >@@ -182,16 +181,19 @@ > </form> > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'reports-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% 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/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >index ddf5fbe..34a6bd1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt >@@ -10,11 +10,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › Patrons 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 ) %] > [% FOREACH mainloo IN mainloop %] >@@ -118,16 +117,19 @@ > </form> > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'reports-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $("#to").datepicker({ maxDate: "-1D" }); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >index 5edd401..9a4dc10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >@@ -3,7 +3,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports [% IF ( do_it ) %]› Patrons statistics › Results[% ELSE %]› Patrons statistics[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css"> >+<style> > .sql {display:none;} > .debug {display:none;} > </style> >@@ -15,11 +15,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › <a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons statistics</a>[% IF ( do_it ) %] › Results[% 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 %] >@@ -288,12 +287,15 @@ > </form> > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'reports-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index 60ed350..d0c26fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >@@ -24,11 +24,10 @@ > [% 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> > > <h1>Cash register statistics</h1> > <form method="post" action="/cgi-bin/koha/reports/cash_register_stats.pl" id="frmCashRegister"> >@@ -246,16 +245,20 @@ > </table> > > [% END %] [%# do_it %] >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'reports-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" id="js"> >+ <script id="js"> > $(document).ready(function() { > $("#tbl_cash_register_stats").dataTable($.extend(true, {}, dataTablesDefaults, { > "iDisplayLength": 50, >@@ -264,7 +267,7 @@ > }); > </script> > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > actTotal = ""; > > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >index d9ff9bf..6cef6f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt >@@ -11,11 +11,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> › [% IF ( do_it ) %]<a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a> › Results[% ELSE %]Most-Circulated Items[% 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 ) %] > >@@ -181,16 +180,19 @@ > </form> > [% END %] > >-</div> >-</div> >-<div class="yui-b"> >-[% INCLUDE 'reports-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'reports-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > [% UNLESS ( do_it ) %] > $(document).ready(function() { > // http://jqueryui.com/demos/datepicker/#date-range >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21428
:
79488
|
79693
|
79731