Attachment 81372 Details for Bug 19945 – Bug 21435: Update two-column templates with Bootstrap grid: Tools part 3

[patch] Bug 21435: Update two-column templates with Bootstrap grid: Tools part 3

Bug-21435-Update-two-column-templates-with-Bootstr.patch (text/plain), 13.47 KB, created by Michal Denar on 2018-10-27 20:51:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Denar

Created: 2018-10-27 20:51:24 UTC

Size: 13.47 KB

patch

obsolete

>From 9e73a89daacd28bf308b1d066fa7ee050ec73caf Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 3 May 2018 17:06:54 +0000
>Subject: [PATCH] Bug 21435: Update two-column templates with Bootstrap grid:
> Tools part 3
>
>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 and "text/css" attributes from <style> 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 -> MARC modification templates
>   - View and edit templates
> - Tools -> Batch patron modification
>   - Test each step of the process
> - Tools -> Overdue notice/status triggers
> - Tools -> Upload patron images
>   - Test each step of the upload process
> - Tools -> Quote editor
>   -> Quote uploader
>     - Import quotes
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>
>https://bugs.koha-community.org/show_bug.cgi?id=19945
>---
> .../modules/tools/marc_modification_templates.tt   | 27 ++++++++++---------
> .../prog/en/modules/tools/modborrowers.tt          | 25 ++++++++++--------
> .../prog/en/modules/tools/overduerules.tt          | 27 ++++++++++---------
> .../prog/en/modules/tools/picture-upload.tt        | 30 ++++++++++++----------
> .../prog/en/modules/tools/quotes-upload.tt         | 27 +++++++++++--------
> .../intranet-tmpl/prog/en/modules/tools/quotes.tt  | 27 +++++++++++--------
> 6 files changed, 93 insertions(+), 70 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>index 1a7e95f874..d842568e01 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>@@ -4,7 +4,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Tools &rsaquo; MARC modification templates</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-<style type="text/css">
>+<style>
>     #add_action { display: none; }
> </style>
> </head>
>@@ -32,10 +32,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>
> 
>             <div id="toolbar" class="btn-toolbar">
>                 <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="btn btn-default btn-sm duplicate_template"><i class="fa fa-plus"></i> New template</a>
>@@ -330,17 +330,20 @@
>                 </div>
>                 </div>
>             </div>
>-        </div>
>-    </div>
> 
>-    <div class="yui-b">
>-        [% INCLUDE 'tools-menu.inc' %]
>-    </div>
>-  </div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'tools-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var MSG_MMT_SUBFIELDS_MATCH = _("Both subfield values should be filled or empty.");
>         var MSG_MMT_DESTINATION_REQUIRED = _("The destination should be filled.");
>         var MSG_MMT_CONTROL_FIELD_EMPTY = _("If the field is a control field, the subfield should be empty");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>index da76bd0da0..a1a4aee4c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>@@ -20,10 +20,11 @@
>     <a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron 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>
>+
>                 [% IF ( op == 'show_form' ) %]
>                 <h1>Batch patron modification</h1>
>                 <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/modborrowers.pl">
>@@ -288,18 +289,22 @@
>                     <a href="/cgi-bin/koha/tools/modborrowers.pl" title="New batch patrons modification">New batch patron modification</a>
>                 </p>
>                 [% END %]
>-            </div>
>-            </div>
>-            <div class="yui-b">
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>                 [% INCLUDE 'tools-menu.inc' %]
>-            </div>
>-        </div>
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var patron_attributes_lib = new Array();
>         var patron_attributes_values = new Array();
>         $(document).ready(function() {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>index 7538c8fe70..9c2863c741 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>@@ -14,11 +14,10 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Overdue notice/status triggers</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>Defining [% IF ( branch ) %]overdue actions for [% Branches.GetName( branch ) | html %][% ELSE %]default overdue actions[% END %]</h1>
>         <div class="help">
>@@ -150,16 +149,20 @@
>                 <div class="warning">You don't have patron categories defined, or the patron categories are not set to receive overdue notices.</div>
>                 <div class="warning">If this is not what you were expecting, go to <a href="../admin/categories.pl">patron categories</p></div>
>             [% END %]
>-    </div>
>-    </div>
>-    <div class="yui-b noprint">
>-        [% INCLUDE 'tools-menu.inc' %]
>-    </div>
>-</div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'tools-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var tab_map = { "1" : _("First"), "2" : _("Second"), "3" : _("Third")};
>         $(document).ready(function() {
>             $('#selectlibrary').find("input:submit").hide();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>index 45e3c483b4..d44de61b54 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>@@ -13,11 +13,12 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( TOTAL ) %]<a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a> &rsaquo; Results[% ELSE %]Upload patron images[% END %] </div>
> 
>-<div id="doc3" class="yui-t2">
>-    <div id="bd">
>-        <div id="yui-main">
>+<div class="main container-fluid">
>+    <div class="row">
>+        <div class="col-sm-10 col-sm-push-2">
>+            <main>
>+
> [% IF ( TOTAL ) %]
>-    <div class="yui-b">
>             [% IF ( ERRORS ) %]
> 				[% IF ( TCOUNTS ) %]
> 					<div class="dialog alert">
>@@ -81,9 +82,7 @@
>                     <li><a id="uploadmore" href="/cgi-bin/koha/tools/picture-upload.pl">Upload more images</a></li>
>                     <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li>
>                 [% END %]</ul>
>-            </div>
> [% ELSE %]
>-    <div class="yui-b">
>                 <h1>Upload patron images</h1>
>                 [% IF ( ERRORS ) %]
>                 <div class="dialog alert">
>@@ -132,20 +131,23 @@
> 						<a href="/cgi-bin/koha/tools/tools-home.pl" class="cancel">Cancel</a>
>                     </fieldset>
>                 </form>
>-	
>-            </div>	
> [% END %]
>-</div>
>-<div class="yui-b noprint">
>-    [% INCLUDE 'tools-menu.inc' %]
>-</div>
>-</div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'tools-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'str/members-menu.inc' %]
>     [% Asset.js("js/members-menu.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             $("#zipfile").click(function(){
>                 $("#cardnum").hide();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
>index 8f600aac2c..5c59c2819b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
>@@ -15,10 +15,11 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a> &rsaquo; Quote uploader</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 'quotes-upload-toolbar.inc' %]
>                 <h2>Quote uploader</h2>
>                 <div id="instructions">
>@@ -67,18 +68,22 @@
>                 </table>
>                 <fieldset id="footer" class="action" style="visibility: hidden;">
>                 </fieldset>
>-            </div>
>-        </div>
>-    <div class="yui-b noprint">
>-        [% INCLUDE 'tools-menu.inc' %]
>-    </div>
>-</div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'tools-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var oTable; //DataTable object
>         $(document).ready(function() {
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>index f59facc48e..e837ed8641 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
>@@ -14,10 +14,11 @@
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Quote editor</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 'quotes-toolbar.inc' %]
>                 <h2>Quote editor</h2>
>                 <div id="instructions">
>@@ -55,19 +56,23 @@
>                 </table>
>                 <fieldset id="footer" class="action">
>                 </fieldset>
>-            </div>
>-        </div>
>-    <div class="yui-b noprint">
>-        [% INCLUDE 'tools-menu.inc' %]
>-    </div>
>-</div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'tools-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/dataTables.fnReloadAjax.js") | $raw %]
>     [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var oTable; /* oTable needs to be global */
>         var sEmptyTable = _("No quotes available. Please use the 'Add quote' button to add a quote."); /* override the default message in datatables.inc */
>         $(document).ready(function() {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 19945: 70409 | 73351 | 73352 | 75688 | 75689 | 79046 | 79047 | 79048 | 79049 | 81371 | 81372 | 81373 | 81374 | 83745 | 83746 | 83747 | 83748