Bugzilla – Attachment 77879 Details for
Bug 20739
Update two-column templates with Bootstrap grid: Administration part 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20739: Update two-column templates with Bootstrap grid, Administration part 3
Bug-20739-Update-two-column-templates-with-Bootstr.patch (text/plain), 10.91 KB, created by
Claire Gravely
on 2018-08-16 09:38:13 UTC
(
hide
)
Description:
Bug 20739: Update two-column templates with Bootstrap grid, Administration part 3
Filename:
MIME Type:
Creator:
Claire Gravely
Created:
2018-08-16 09:38:13 UTC
Size:
10.91 KB
patch
obsolete
>From 51ff2898f226c26d389139717d49476a6b8a9d25 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 1 May 2018 18:46:33 +0000 >Subject: [PATCH] Bug 20739: Update two-column templates with Bootstrap grid, > Administration part 3 > >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 -> Columns settings > - Administration -> Patron categories > - View and edit patron categories > - Administration -> Cities and towns > - View and edit cities > - Administration -> Classification sources > - View and edit classification sources > - Administration -> MARC bibliographic framework test > >I'm not sure if this standalone interface is actually in use, but you >can navigate directly to /cgi-bin/koha/admin/clone-rules.pl to see a >form which is usually submitted from the circulation and fines rules >interface. View the page to confirm it looks correct. > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> >--- > .../prog/en/modules/admin/categories.tt | 25 ++++++++------ > .../prog/en/modules/admin/checkmarc.tt | 24 ++++++------- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 40 ++++++++++++---------- > .../prog/en/modules/admin/classsources.tt | 23 +++++++------ > .../prog/en/modules/admin/clone-rules.tt | 22 ++++++------ > .../prog/en/modules/admin/columns_settings.tt | 25 ++++++++------ > 6 files changed, 87 insertions(+), 72 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index c71e6fb..4934509 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -21,10 +21,10 @@ > [% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> › Category deleted[% END %] > [% IF op == 'list' %]Patron categories[% 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 %]"> >@@ -484,19 +484,22 @@ > [% 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") %] > [% Asset.js("js/messaging-preference-form.js") %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript"> >+ <script> > var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _."); > var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date."); > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >index db49419..38fbb6b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >@@ -12,11 +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> › MARC check > [% IF ( total ) %]: [% total %] errors found[% ELSE %] : Configuration OK![% 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>MARC bibliographic framework test</h1> > <table> >@@ -270,14 +269,15 @@ > <p><b>Configuration OK, you don't have errors in your MARC parameters table</b></p> > [% 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 %] > [% Asset.js("js/admin-menu.js") %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index f7daa3c..c2256fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -21,11 +21,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 %]"> >@@ -137,12 +136,14 @@ > [% IF cities.count %] > <table id="table_cities"> > <thead> >- <th>City ID</th> >- <th>City</th> >- <th>State</th> >- <th>ZIP/Postal code</th> >- <th>Country</th> >- <th>Actions</th> >+ <tr> >+ <th>City ID</th> >+ <th>City</th> >+ <th>State</th> >+ <th>ZIP/Postal code</th> >+ <th>Country</th> >+ <th>Actions</th> >+ </tr> > </thead> > <tbody> > [% FOREACH city IN cities %] >@@ -167,17 +168,20 @@ > [% 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' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $("#table_cities").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index c89bfdb..e2826ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -44,10 +44,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 ( class_source_form ) %] > [% IF ( edit_class_source ) %] >@@ -261,12 +261,15 @@ > > [% 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") %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >index 9adae50..fcc080a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >@@ -11,11 +11,11 @@ > > <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/smart-rules.pl">Circulation and fine rules</a> › Clone circulation and fine rules</div> > >-<div id="doc3" class="yui-t1"> >+<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"> > <h2>Cloning circulation and fine rules > [% IF frombranch %] from "[% Branches.GetName( frombranch ) %]"[% END %] > [% IF tobranch %] to "[% Branches.GetName( tobranch ) %]"[% END %] >@@ -59,13 +59,15 @@ > </form> > > [% END %] >- </div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> > >-</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 %] > [% Asset.js("js/admin-menu.js") %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index cfc1277..b1b5e06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -96,10 +96,11 @@ > [% 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> › Columns settings</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> >+ > <h2>Columns settings</h2> > <div id="modules"> > <h3><a href="#acqui">Acquisition</a></h3> >@@ -157,17 +158,19 @@ > </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") %] >- <script type="text/javascript"> >+ <script> > $(document).ready( function() { > var accordion = $( "#modules" ).accordion({ > collapsible: true, >-- >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 20739
:
77016
|
77879
|
77954