From 12b709bc8e11390d8caf53426293f90a2fd88c11 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Tue, 1 May 2018 17:39:51 +0000 Subject: [PATCH] Bug 20736: Update two-column templates with Bootstrap grid, Administration part 1 This patch modifies several acquisitions templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Budgets - View budgets list, view and edit budgets - View budget -> Planning -> Plan by months - Administration -> Funds - View funds list, view and edit funds - Acquisitions -> Vendor -> Contracts - View contracts list, view and edit contracts - Administration -> Audio alerts - Administration -> Authorized values Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> --- .../prog/en/modules/admin/aqbudgetperiods.tt | 25 ++++++++-------- .../prog/en/modules/admin/aqbudgets.tt | 33 +++++++++++++--------- .../prog/en/modules/admin/aqcontract.tt | 28 ++++++++++-------- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 27 ++++++++++-------- .../prog/en/modules/admin/audio_alerts.tt | 24 ++++++++-------- .../prog/en/modules/admin/authorised_values.tt | 26 +++++++++-------- 6 files changed, 92 insertions(+), 71 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index ea68e0d..e2ea805 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -113,10 +113,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> [% UNLESS close_form OR closed%] [% INCLUDE 'budgets-admin-toolbar.inc' %] @@ -485,12 +485,15 @@ </div> [% END %] -</div> -</div> -<div class="yui-b"> -[% INCLUDE 'acquisitions-menu.inc' %] -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'acquisitions-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] @@ -499,7 +502,7 @@ [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] [% END %] [% Asset.js("js/acq.js") %] - <script type="text/javascript"> + <script> // ################################################################################# // Javascript // ################################################################################# diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index dd72013..168cb41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -24,11 +24,10 @@ [% END %] </div> -<div id="doc3" class="yui-t2"> -<div id="bd"> -<div id="yui-main"> -<div class="yui-b" id="content"> - +<div class="main container-fluid"> + <div class="row"> + <div class="col-sm-10 col-sm-push-2"> + <main> [% UNLESS op == 'delete_confirm' %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %] @@ -392,9 +391,12 @@ </div> [% 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 op == 'list' %] <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get"> <a href="#" id="filterbutton">Filters</a> @@ -439,12 +441,15 @@ <input type="submit" class="submit" name="filter" value="Go" /> </fieldset> </form>[% END %] -[% INCLUDE 'acquisitions-menu.inc' %] -</div> -</div> + + [% INCLUDE 'acquisitions-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acq.js") %] - <script type="text/javascript"> + <script> var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n"; var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n"; var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n"; @@ -452,7 +457,7 @@ [% Asset.js("js/acq.js") %] [% IF op == 'add_form' %] - <script type="text/javascript"> + <script> //<![CDATA[ function userPopup() { @@ -611,7 +616,7 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] - <script type="text/javascript"> + <script> //<![CDATA[ // $(document).ready(function() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index 4b0ab5f..ec3e377 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -46,11 +46,10 @@ [% IF ( else ) %]Contracts[% 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> [% INCLUDE 'acquisitions-toolbar.inc' %] @@ -169,16 +168,21 @@ </div> [% END %] [% END %] -</div> -</div> -<div class="yui-b"> -[% INCLUDE 'vendor-menu.inc' %] -</div> -</div> + + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'acquisitions-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> + [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% Asset.js("js/acq.js") %] - <script type="text/javascript"> + <script> //<![CDATA[ // to check if the data are correctly entered. function Check(ff) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index 324e089..6d6555d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -19,10 +19,10 @@ <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]">Planning</a> › </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 'budgets-admin-toolbar.inc' %] @@ -174,9 +174,12 @@ [% 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> <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" /> @@ -266,13 +269,15 @@ </form> [% END %] -[% INCLUDE 'acquisitions-menu.inc' %] -</div> -</div> + [% INCLUDE 'acquisitions-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> + [% MACRO jsinclude BLOCK %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% Asset.js("js/acq.js") %] - <script type="text/javascript"> + <script> //<![CDATA[ function Check(f) { var ok=1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index ecf6226..066382c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -12,10 +12,10 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Audio alerts</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> <div id="toolbar" class="btn-toolbar"> <a class="btn btn-default btn-sm" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a> @@ -125,16 +125,18 @@ <button id="delete-alerts" type="submit" class="btn btn-default btn-sm disabled"><i class="fa fa-trash"></i> Delete selected alerts</button> </p> </form> - </div> - </div> - <div class="yui-b"> -[% INCLUDE 'admin-menu.inc' %] -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'admin-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") %] - <script type="text/javascript"> + <script> var MSG_AUDIO_EMPTY_SOUND = _("Please select or enter a sound."); var MSG_AUDIO_CONFIRM_DELETE = _("Are you sure you want to delete the selected audio alerts?"); var MSG_AUDIO_CHECK_CHECKBOXES = _("Check the box next to the alert you want to delete.") diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index a728a45..1be1fc1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -28,11 +28,10 @@ [% IF ( action_add_category ) %]New category[% END %][% END %] [% IF op == 'list' %]Authorized values[% 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 op == 'add_form' %] <h1> @@ -274,17 +273,20 @@ [% END %] -</div> -</div> -<div class="yui-b"> -[% INCLUDE 'admin-menu.inc' %] -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> + + <div class="col-sm-2 col-sm-pull-10"> + <aside> + [% INCLUDE 'admin-menu.inc' %] + </aside> + </div> <!-- /.col-sm-2.col-sm-pull-10 --> + </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") %] [% INCLUDE 'datatables.inc' %] - <script type="text/javascript"> + <script> $(document).ready(function() { $("#table_authorized_values").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ -- 2.1.4