Attachment 79683 Details for Bug 21437 – Bug 21437: Update two-column templates with Bootstrap grid: Patron lists

[patch] Bug 21437: Update two-column templates with Bootstrap grid: Patron lists

Bug-21437-Update-two-column-templates-with-Bootstr.patch (text/plain), 4.79 KB, created by Jonathan Druart on 2018-10-01 00:07:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-10-01 00:07:41 UTC

Size: 4.79 KB

patch

obsolete

>From af271b4d72cbd88b70901d6a2fb214d57e4b5622 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 2 May 2018 18:37:11 +0000
>Subject: [PATCH] Bug 21437: Update two-column templates with Bootstrap grid:
> Patron lists
>
>This patch modifies the patron lists 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 -> Patron lists
>   -> View patron list
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/patron_lists/list.tt           | 28 ++++++++++++----------
> .../prog/en/modules/patron_lists/lists.tt          | 25 ++++++++++---------
> 2 files changed, 30 insertions(+), 23 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>index 44f1ce4c50..18799f3bf6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>@@ -7,7 +7,7 @@
> [% INCLUDE 'doc-head-close.inc' %]
> 
> [% Asset.css("css/datatables.css") | $raw %]
>-<style type="text/css">
>+<style>
>     #add_patrons_by_search {
>         display: none;
>     }
>@@ -28,10 +28,11 @@
> [% INCLUDE 'cat-search.inc' %]
> <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="lists.pl">Patron lists</a> &rsaquo; <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% list.id | html %]">[% list.name | html %]</a> &rsaquo; Add patrons</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>[% list.name | html %]</h1>
> 
>         [% IF ( not_found.size > 0 ) %]
>@@ -164,19 +165,22 @@
>             <button class="btn btn-default btn-sm merge-patrons" type="submit"><i class="fa fa-compress"></i> Merge selected patrons</button>
>         </form>
> 
>-            </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("js/autocomplete/patrons.js") | $raw %]
>-    <script type="text/javascript">
>+    <script>
>         var MSG_REMOVE_PATRON = _("Remove");
>         $(document).ready(function() {
>             $('#patrons_to_add_fieldset').hide();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index a50d609254..6e561ddeda 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>@@ -13,10 +13,10 @@
> [% INCLUDE 'cat-search.inc' %]
> <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; Patron lists</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">
>             <div class="btn-group">
>@@ -111,18 +111,21 @@
>            <div class="dialog message">There are no patron lists.</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 %]
>     [% INCLUDE 'datatables.inc' %]
> 
>-    <script type="text/javascript">
>+    <script>
>         $(document).ready(function() {
>             var patronExportModal = $("#patronExportModal");
>             var patronExportModalBody = $("#patronExportModal .modal-body")
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21437: 79526 | 79574 | 79683