Attachment 77941 Details for Bug 20740 – Bug 20740: Update two-column templates with Bootstrap grid, Administration part 4

[patch] Bug 20740: Update two-column templates with Bootstrap grid, Administration part 4

Bug-20740-Update-two-column-templates-with-Bootstr.patch (text/plain), 10.28 KB, created by Jonathan Druart on 2018-08-16 19:07:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-08-16 19:07:09 UTC

Size: 10.28 KB

patch

obsolete

>From 554a6f6a59a077350cc8a69c960d68a611c90da6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 4 May 2018 15:18:59 +0000
>Subject: [PATCH] Bug 20740: Update two-column templates with Bootstrap grid,
> Administration part 4
>
>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 -> Currencies and exchange rates
>   - View and edit currencies
> - Administration -> Did you mean?
> - Administration -> EDI accounts
>   - View and edit accounts
> - Administration -> Library EANs
>   - View and edit EANs
> - Administration -> Item search fields
>   - View and edit item search fields
>
>Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/admin/currency.tt              | 25 ++++++++++++----------
> .../prog/en/modules/admin/didyoumean.tt            | 25 ++++++++++++----------
> .../prog/en/modules/admin/edi_accounts.tt          | 23 +++++++++++---------
> .../prog/en/modules/admin/edi_ean_accounts.tt      | 23 +++++++++++---------
> .../prog/en/modules/admin/items_search_field.tt    | 25 +++++++++++++---------
> .../prog/en/modules/admin/items_search_fields.tt   | 25 ++++++++++++----------
> 6 files changed, 83 insertions(+), 63 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>index 09a44d9147..febd7ac50d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>@@ -23,11 +23,11 @@
> [% 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 op == 'list' %]
> <div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-default btn-sm" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a>
>@@ -219,18 +219,21 @@
> 
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-[% INCLUDE 'admin-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'admin-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/admin-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>-    <script type="text/javascript">
>+    <script>
> 
>         function check_currency(val) {
>             if ( val == 1.0 ) {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>index 33881f7e5f..31851efb9a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>@@ -31,11 +31,11 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Did you mean?</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">
>         <h3>Did you mean?</h3>
>         <noscript><div class="dialog alert"><strong>Please enable Javascript:</strong>
>             Configuring 'Did you mean?' plugins requires Javascript. If
>@@ -62,16 +62,19 @@
>             <fieldset class="action"><button class="save-all submit" type="submit">Save configuration</button> <a href="/cgi-bin/koha/admin/didyoumean.pl" class="force_reload cancel">Cancel</a></fieldset>
>         </form>
> 
>-        </div>
>-        </div>
>-<div class="yui-b">
>-[% INCLUDE 'admin-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'admin-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/admin-menu.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             $( ".pluginlist" ).sortable();
>             $( ".plugin" ).addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" )
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>index 7b8f553966..51a4afff8f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>@@ -36,11 +36,11 @@
> [% 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 display %]
>     <div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-default btn-sm" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form">
>@@ -319,12 +319,15 @@
>     [% END %]
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-    [% INCLUDE 'admin-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'admin-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/admin-menu.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>index a7ef2db3ac..939b83499d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>@@ -36,11 +36,11 @@
> [% 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 display %]
>     <div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-default btn-sm" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form">
>@@ -165,12 +165,15 @@
> [% END %]
> [% END %]
> 
>-</div>
>-</div>
>-<div class="yui-b">
>-    [% INCLUDE 'admin-menu.inc' %]
>-</div>
>-</div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'admin-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/admin-menu.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>index 45babacc79..3cf8791b21 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>@@ -16,10 +16,11 @@
>     [% field.name | html %]
>   </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>Item search field: [% field.label | html %]</h1>
> 
>           <form action="/cgi-bin/koha/admin/items_search_field.pl" method="POST" class="validated">
>@@ -35,12 +36,16 @@
>                 <a class="cancel" href="/cgi-bin/koha/admin/items_search_fields.pl">Cancel</a>
>             </fieldset>
>           </form>
>-        </div>
>-      </div>
>-      <div class="yui-b">
>-        [% INCLUDE 'admin-menu.inc' %]
>-      </div>
>-    </div>
>+
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'admin-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/admin-menu.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>index 355adc66ee..bc3abf299a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>@@ -16,10 +16,10 @@
>     Item search fields
>   </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 class="btn btn-default btn-sm" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a>
>@@ -103,16 +103,19 @@
>             </fieldset>
>           </form>
> 
>-        </div>
>-      </div>
>-      <div class="yui-b">
>-        [% INCLUDE 'admin-menu.inc' %]
>-      </div>
>-    </div>
>+            </main>
>+        </div> 
>+
>+        <div class="col-sm-2 col-sm-pull-10">
>+            <aside>
>+                [% INCLUDE 'admin-menu.inc' %]
>+            </aside>
>+        </div> 
>+     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/admin-menu.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?");
>     </script>
>     [% Asset.js("js/item_search_fields.js") | $raw %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20740: 77017 | 77927 | 77941