Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

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

Browse source 
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>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2018-09-27 12:59:01 +00:00 committed by Nick Clemens
parent 8b1c379295
commit 15670cd590
6 changed files with 93 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
View file

@ -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> <!-- /.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 -->
[% INCLUDE 'intranet-bottom.inc' %]

27
koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
View file

@ -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> <!-- /.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>
function changeRemovedDateTrStatus() {
var Cellvalue = $("input[name='Cellvalue']:checked").val();
if(Cellvalue == "deleteditems") {

26
koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
View file

@ -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> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="col-sm-2 col-sm-pull-10">
<aside>
[% INCLUDE 'guided-reports-view.inc' %]
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]

42
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
View file

@ -83,10 +83,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 ) %]
@ -378,15 +379,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>
<!--- Summary and Matrix reports have not yet been implemented-->
<!--<div class="yui-u">Summary:
<img src="[% interface | html %]/[% theme | html %]/img/reports-summary-graphic.gif" /></div>
<div class="yui-u">Matrix:
<img src="[% interface | html %]/[% theme | html %]/img/reports-matrix-graphic.gif" /></div>-->
[% END %]
[% IF ( build3 ) %]
@ -400,8 +392,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 ) %]
@ -426,18 +419,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 %]
@ -905,9 +896,12 @@ $(document).ready(function() {
</form>
[% END %]
</div>
</div>
<div class="yui-b">
</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="col-sm-2 col-sm-pull-10">
<aside>
[% IF ( saved1 ) %]
<div id="saved-reports-filter">
@ -935,8 +929,10 @@ $(document).ready(function() {
[% INCLUDE 'guided-reports-view.inc' %]
</div>
</div>
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/charts.js") | $raw %]

27
koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
View file

@ -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> <!-- /.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({

26
koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
View file

@ -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> <!-- /.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' %]