Attachment 48158 Details for Bug 15830 – Bug 15830 - Move Rotating Collections actions into a drop-down list

[patch] Bug 15830 - Move Rotating Collections actions into a drop-down list

Bug-15830---Move-Rotating-Collections-actions-into.patch (text/plain), 5.91 KB, created by Jonathan Druart on 2016-02-17 10:53:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-02-17 10:53:28 UTC

Size: 5.91 KB

patch

obsolete

>From efe7a7a4150c9d52ad0fbb27d89082d2a59c4a25 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Tue, 16 Feb 2016 04:01:13 +0000
>Subject: [PATCH] Bug 15830 - Move Rotating Collections actions into a
> drop-down list
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>To test:
>1) Go to Tools -> Rotating Collections
>2) Confirm actions (Add or remove items, Transfer, Edit, Delete) have moved into a drop down menu
>3) Confirm all of the actions work as expected
>
>Sponsored-by: Catalyst IT
>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../rotating_collections/rotatingCollections.tt    | 47 +++++++++++++++-------
> 1 file changed, 32 insertions(+), 15 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>index a807b6b..229e42c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>@@ -2,6 +2,8 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Tools &rsaquo; Rotating collections</title>
> [% INCLUDE 'doc-head-close.inc' %]
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>+[% INCLUDE 'datatables.inc' %]
> <script type="text/javascript">
>     $(document).ready(function(){
>         $(".confirmdelete").click(function(){
>@@ -13,6 +15,13 @@
>                 return false;
>             }
>         });
>+        $('#rotating-collections-table').dataTable($.extend(true, {}, dataTablesDefaults, {
>+            "autoWidth": false,
>+            "aoColumnDefs": [
>+                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
>+            ],
>+            "sPaginationType": "four_button"
>+        } ));
>     });
> </script>
> </head>
>@@ -32,28 +41,36 @@
>                 <h1>Rotating collections</h1>
>                 <div>
>                     [% IF ( collectionsLoop ) %]
>-                        <table>
>-                            <tr>
>-                                <th>Title</th>
>-                                <th>Description</th>
>-                                <th>Current location</th>
>-                                <th>&nbsp;</th>
>-                                <th>&nbsp;</th>
>-                                <th>&nbsp;</th>
>-                                <th>&nbsp;</th>
>-                            </tr>
>-
>+                        <table id="rotating-collections-table">
>+                            <thead>
>+                                <tr>
>+                                    <th>Title</th>
>+                                    <th>Description</th>
>+                                    <th>Current location</th>
>+                                    <th>&nbsp;</th>
>+                                </tr>
>+                            </thead>
>+                            <tbody>
>                             [% FOREACH collectionsLoo IN collectionsLoop %]
>                                 <tr>
>                                     <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId %]">[% collectionsLoo.colTitle %]</a></td>
>                                     <td>[% collectionsLoo.colDesc %]</td>
>                                     <td>[% Branches.GetName( collectionsLoo.colBranchcode ) %]</td>
>-                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId %]">Add or remove items</a></td>
>-                                    <td><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId %]">Transfer</a></td>
>-                                    <td><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId %]">Edit</a></td>
>-                                    <td><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]">Delete</a></td>
>+                                    <td>
>+                                    <div class="dropdown">
>+                                        <a class="btn btn-mini" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId %]" role="button" data-toggle="dropdown" href="#">
>+                                        Actions <b class="caret"></b></a>
>+                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId %]">
>+                                            <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId %]"><i class="fa fa-plus"></i> Add or remove items</a></li>
>+                                            <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId %]"><i class="fa fa-exchange"></i> Transfer</a></li>
>+                                            <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId %]"><i class="fa fa-pencil"></i> Edit</a></li>
>+                                            <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                                        </ul>
>+                                    </div>
>+                                    </td>
>                                 </tr>
>                             [% END %]
>+                            </tbody>
>                         </table>
>                     [% ELSE %]
>                         <div class="dialog message">There are no collections currently defined.</div>
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 15830: 48091 | 48106 | 48150 | 48151 | 48154 | 48158