Bugzilla – Attachment 77015 Details for
Bug 20738
Update two-column templates with Bootstrap grid: Administration part 2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20738: Update two-column templates with Bootstrap grid, Administration part 2
Bug-20738-Update-two-column-templates-with-Bootstr.patch (text/plain), 10.21 KB, created by
Owen Leonard
on 2018-07-16 16:36:34 UTC
(
hide
)
Description:
Bug 20738: Update two-column templates with Bootstrap grid, Administration part 2
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-07-16 16:36:34 UTC
Size:
10.21 KB
patch
obsolete
>From ead1cb1101563e83b61c3d1efac9911cd284a458 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 1 May 2018 18:31:00 +0000 >Subject: [PATCH] Bug 20738: Update two-column templates with Bootstrap grid, > Administration part 2 > >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 -> Authority types > - View list of and edit authority types > -> MARC tag structure for an authority type > - View list of and edit tags > -> Subfields > - View list of and edit subfields > - Administration -> MARC bibliographic framework > - View list of and edit frameworks > - Administration -> Libraries > - View and edit libraries > - Administration -> Library transfer limits >--- > .../en/modules/admin/auth_subfields_structure.tt | 26 +++++++++++---------- > .../prog/en/modules/admin/auth_tag_structure.tt | 26 +++++++++++---------- > .../prog/en/modules/admin/authtypes.tt | 25 +++++++++++--------- > .../prog/en/modules/admin/biblio_framework.tt | 26 ++++++++++++--------- > .../en/modules/admin/branch_transfer_limits.tt | 27 ++++++++++++---------- > .../prog/en/modules/admin/branches.tt | 26 +++++++++++---------- > 6 files changed, 86 insertions(+), 70 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 8e6e6d3..96f92a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -25,11 +25,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 ( add_form ) %] > >@@ -326,16 +325,19 @@ > > [% 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") %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $('#subfieldtabs').tabs(); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index 435210f..f8f4d1b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -53,11 +53,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>Authority MARC framework for [% IF ( authtypecode ) %][% authtypecode %][% ELSE %]default framework[% END %]</h1> > >@@ -226,17 +225,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 %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/admin-menu.js") %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $("#table_authtagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index c75e410..752a68e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -27,10 +27,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> > > [% FOR m IN messages %] > <div class="dialog [% m.type %]"> >@@ -166,17 +166,20 @@ > </table> > [% 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 %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/admin-menu.js") %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $("#authtypes").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index beeaa66..cec192e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -27,10 +27,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> > > [% FOR m IN messages %] > <div class="dialog [% m.type %]"> >@@ -273,17 +273,21 @@ > </table> > > [% 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 %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/admin-menu.js") %] >- <script type="text/javascript"> >+ <script> > /* Set some variable needed in biblio_framework.js */ > var MSG_IMPORT_ERROR = _("Error importing the framework"); > var MSG_SELECT_FILE_FORMAT = _("Please select a CSV (.csv), ODS (.ods) or XML (.xml) spreadsheet file."); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index 3dd10b8..79ce634 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -14,11 +14,10 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Set library checkin and transfer policy</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> > > <h1>Library [% branchcode %] - [% Branches.GetName( branchcode ) %] Checkin and transfer policy</h1> > <form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary"> >@@ -78,18 +77,22 @@ > </fieldset> > </form> > </div> >- </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' %] > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $("#CheckAll").click(function(){ $("#transferlimit_tabs").checkCheckboxes(); return false; }); > $("#UncheckAll").click(function(){ $("#transferlimit_tabs").unCheckCheckboxes(); return false; }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index cbb0730..663aad3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -27,11 +27,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> > > [% FOREACH m IN messages %] > <div class="dialog [% m.type %]"> >@@ -235,18 +234,21 @@ > [% 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") %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/tiny_mce/tiny_mce.js") %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $("#branchest").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >-- >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 20738
:
77015
|
77878
|
77953