Bugzilla – Attachment 79516 Details for
Bug 21433
Switch two-column templates to Bootstrap grid: Tools part 1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21433: Update two-column templates with Bootstrap grid: Tools part 1
Bug-21433-Update-two-column-templates-with-Bootstr.patch (text/plain), 10.79 KB, created by
Owen Leonard
on 2018-09-27 14:40:05 UTC
(
hide
)
Description:
Bug 21433: Update two-column templates with Bootstrap grid: Tools part 1
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-09-27 14:40:05 UTC
Size:
10.79 KB
patch
obsolete
>From ba25ef71807e440d863471ea8d5da2f737810c9a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 3 May 2018 16:06:37 +0000 >Subject: [PATCH] Bug 21433: Update two-column templates with Bootstrap grid: > Tools part 1 > >This patch modifies several tools 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: > > - Tools -> Automatic item modifications by age > - View and edit rules > - Tools -> Batch item modification start page > - Tools -> Batch delete records > - Starting page > - Confirmation page > - Completion page > - Tools -> Batch record modification > - Starting page > - Confirmation page > - Completion page > - Tools -> Batch patron deletion/anonymization > - Starting page > - Confirmation page > - Completion page > - Tools -> CSV profiles > - View and edit CSV profiles >--- > .../tools/automatic_item_modification_by_age.tt | 25 +++++++++++--------- > .../prog/en/modules/tools/batchMod.tt | 25 ++++++++++++-------- > .../prog/en/modules/tools/batch_delete_records.tt | 27 +++++++++++++--------- > .../en/modules/tools/batch_record_modification.tt | 26 ++++++++++++--------- > .../prog/en/modules/tools/cleanborrowers.tt | 25 +++++++++++--------- > .../prog/en/modules/tools/csv-profiles.tt | 25 +++++++++++--------- > 6 files changed, 88 insertions(+), 65 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index a156cd9..fbf23a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -20,10 +20,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 ( op == 'edit_form' ) %] > <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"> >@@ -217,19 +217,22 @@ > </div> > [% END %] > >- </div> >- </div> >- <div class="yui-b noprint"> >- [% INCLUDE 'tools-menu.inc' %] >- </div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %] > [% Asset.js("js/automatic_item_modification_by_age.js") | $raw %] > [% IF op == 'edit_form' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > [% IF ( op == 'edit_form' ) %] > $('#toolbar').fixFloat(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >index 4813dec..7f4be91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >@@ -19,10 +19,11 @@ > [% 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>Batch item [% IF ( del ) %]deletion[% ELSE %]modification[% END %]</h1> > <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batchMod.pl"> > <fieldset class="rows"> >@@ -68,12 +69,16 @@ > </fieldset> > > </form> >- </div> >- </div> >- <div class="yui-b"> >- [% INCLUDE 'tools-menu.inc' %] >- </div> >- </div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index a3140d2..dcfd7f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -18,10 +18,11 @@ > <a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</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>Batch record deletion</h1> > [% FOREACH message IN messages %] > [% IF message.type == 'success' %] >@@ -171,18 +172,22 @@ > [% ELSE %] > No action defined for the template. > [% END %] >-</div> >-</div> >-<div class="yui-b"> >- [% INCLUDE 'tools-menu.inc' %] >-</div> >-</div> >+ >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] >- <script type="text/javascript"> >+ <script> > var MSG_CANNOT_BE_DELETED = _("This record cannot be deleted, at least one item is currently checked out."); > $(document).ready(function() { > $("#selectall").click(function(e){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index fb03555..aed7d7a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -18,10 +18,11 @@ > <a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</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>Batch record modification</h1> > > [% IF ( messages ) %] >@@ -229,19 +230,22 @@ > No action defined for the template. > </div> > [% END %] >-</div> >-</div> >-<div class="yui-b"> >- [% INCLUDE 'tools-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function() { > $("#selectall").click(function(e){ > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >index 0170430..40aae31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >@@ -25,11 +25,11 @@ > [% IF step == 3 %] Finished [% 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 !OnlyMine %] > <form method="get" action="/cgi-bin/koha/tools/cleanborrowers.pl" id="selectlibrary"> > Select a library : >@@ -209,17 +209,20 @@ > <!-- Step 3 END --> > [% END %] > >-</div> >-</div> >-<div class="yui-b noprint"> >-[% INCLUDE 'tools-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript"> >+ <script> > $(document).ready(function(){ > $("#delete_patrons_form").on("submit",function(){ > return checkForm( this ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index f10083a..5983e18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -16,10 +16,10 @@ > › CSV export profiles > </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 | html %]"> >@@ -280,16 +280,19 @@ > [% END %] > [% END %] > >-</div> >-</div> >-<div class="yui-b noprint"> >-[% INCLUDE 'tools-menu.inc' %] >-</div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'tools-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >- <script type="text/javascript"> >+ <script> > function reloadPage(p) { > var id = p.value; > if (id != 0) { document.location = "/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=" + id; } >-- >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 21433
:
79516
|
80239
|
81592