From 61f504d77d2058b23d8cb2bcd980ace60a1f0366 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Wed, 2 May 2018 12:11:44 +0000 Subject: [PATCH] Bug 20741: Update two-column templates with Bootstrap grid: Administration part 5 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 in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Keywords to MARC mapping - Administration -> Item circulation alerts - Administration -> Item types - View and edit item types - Edit and item type and translate a description - Administration -> Koha to MARC mapping - Administration -> MARC frameworks -> MARC structure - View and edit tags --- .../prog/en/modules/admin/fieldmapping.tt | 25 +++++++++++-------- .../en/modules/admin/item_circulation_alerts.tt | 28 ++++++++++----------- .../prog/en/modules/admin/itemtypes.tt | 29 +++++++++++----------- .../prog/en/modules/admin/koha2marclinks.tt | 26 +++++++++---------- .../prog/en/modules/admin/localization.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 24 ++++++++++-------- 6 files changed, 71 insertions(+), 63 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt index 89463d1..b4a75a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt @@ -10,9 +10,12 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Keyword to MARC mapping</div> -<div id="doc3" class="yui-t2"> - <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> + <h2>Keyword to MARC mapping</h2> [% UNLESS ( fields.count ) %] <div class="dialog message"><p>There are no mappings for the [% IF framework.frameworktext %]<em>[% framework.frameworktext | html %]</em>[% ELSE %]default[% END %] framework. </p></div> @@ -67,17 +70,19 @@ [% END %] </table>[% END %] + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> - </div> - </div> - - <div class="yui-b"> - [% INCLUDE 'admin-menu.inc' %] - </div> - + <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") | $raw %] <script type="text/javascript"> + <script> $(document).ready(function() { $('#selectframework').find("input:submit").hide(); $('#framework').change(function() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt index d8c0b37..c6f1cf2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -5,7 +5,7 @@ [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Administration › Item circulation alerts</title> [% INCLUDE 'doc-head-close.inc' %] -<style type="text/css"> +<style> table.grid thead th { vertical-align: bottom; } @@ -47,12 +47,10 @@ table.grid td.default { [% INCLUDE 'prefs-admin-search.inc' %] <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Item circulation alerts </div> -<div id="doc3" class="yui-t1"> - -<div id="bd"> - -<div id="yui-main" class="circulation-alert"> -<div class="yui-b"> +<div class="main container-fluid"> + <div class="row"> + <div class="col-sm-10 col-sm-push-2"> + <main> <div class="yui-g"> <div class="yui-u first"> @@ -151,17 +149,19 @@ table.grid td.default { </div> </div> -</div> -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> -<div class="yui-b"> -[% INCLUDE 'admin-menu.inc' %] -</div> -</div> + <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") | $raw %] - <script type="text/javascript"> + <script> var $branch = "[% branch | html %]"; $(function(){ $('#alerttabs').tabs(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 828f222..b131f3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -25,7 +25,7 @@ Data deleted </title> [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") | $raw %] -<style type="text/css"> +<style> fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; } fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-active {background-color : #F4F8F9; } fieldset.rows .ui-tabs-panel { margin-right : 10px; margin-left : 10px;margin-bottom:10px;} @@ -58,12 +58,10 @@ Data deleted Item types administration [% 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 == 'list' %]<div id="toolbar" class="btn-toolbar"> <a class="btn btn-default btn-sm" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> @@ -389,18 +387,21 @@ Item types administration [% END %] [% 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") | $raw %] [% INCLUDE 'greybox.inc' %] [% INCLUDE 'datatables.inc' %] - <script type="text/javascript"> + <script> $(document).ready(function() { $('#icons').tabs(); $("#table_item_type").dataTable($.extend(true, {}, dataTablesDefaults, { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt index 0916e04..3bb9848 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -13,11 +13,10 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC Mapping</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> <h1>Koha to MARC mapping</h1> <br/> @@ -59,19 +58,20 @@ </form> -</div> -</div> - -<div class="yui-b"> -[% INCLUDE 'admin-menu.inc' %] -</div> + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> -</div> + <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 %] [% INCLUDE 'datatables.inc' %] [% Asset.js("js/admin-menu.js") | $raw %] - <script type="text/javascript"> + <script> function AddFld(kohafield) { var fieldstr = prompt( _("Adding a mapping for: %s.").format(kohafield) + "\n" + _("Please enter field tag and subfield code, separated by a comma. (For control fields: add '@' as subfield code.)\nThe change will be applied immediately.") ); var temp = fieldstr.split(','); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt index 841ac57..1eb74f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt @@ -55,7 +55,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - <script type="text/javascript"> + <script> function show_message( params ) { var type = params.type; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index ae9f628..9609717 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -34,10 +34,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> [% IF ( else ) %] <div id="toolbar" class="btn-toolbar"> @@ -246,19 +246,21 @@ [% END %] + </main> + </div> <!-- /.col-sm-10.col-sm-push-2 --> - </div> - </div> -<div class="yui-b"> -[% INCLUDE 'admin-menu.inc' %] -</div> -</div> + <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 %] [% INCLUDE 'datatables.inc' %] [% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %] - <script type="text/javascript"> + <script> $(document).ready(function() { $("#table_marctagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ -- 2.1.4