projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1d7622a)
Bug 8836 [Alt QA Followup] - Add confirmation dialog for deleting collections
authorOwen Leonard <oleonard@myacpl.org>
Fri, 31 Oct 2014 13:04:43 +0000 (09:04 -0400)
committerTomas Cohen Arazi <tomascohen@gmail.com>
Thu, 6 Nov 2014 18:12:20 +0000 (15:12 -0300)
The previous patch for adding a confirmation dialog didn't work to make
the confirmation message translatable. This alternate patch uses a
progressive-enhancement method recycled from Guided Reports to trigger a
warning and highlight the row which was clicked.

To test, apply the patch and try to delete an existing rotating
collection. You should get a confirmation dialog, and the corresponding
row in the table should be highlighted red.

Clicking cancel should cancel the deletion. Clicking OK should complete
the deletion.

To test the translatability of the confirmation message:

Run perl translate update [a language code, e.g. 'en-GB']
Search [lang]-i-staff-t-prog-v-3006000.po for the message string

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 60b0dc3..dc557c3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -280,7 +280,8 @@ tr.even td, tr.even.highlight td {
        font-weight : bold;
 }
 
-tr.warn td {
+tr.warn td,
+tr.warn:nth-child(odd) td {
        background-color: #FF9090;
 }
 
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 7124575..a807b6b 100644 (file)
--- 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,19 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Tools &rsaquo; Rotating collections</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+    $(document).ready(function(){
+        $(".confirmdelete").click(function(){
+            $(this).parents('tr').addClass("warn");
+            if(confirm(_("Are you sure you want to delete this collection?"))){
+                return true;
+            } else {
+                $(this).parents('tr').removeClass("warn");
+                return false;
+            }
+        });
+    });
+</script>
 </head>
 <body id="rcoll_rotatingCollections" class="tools rcoll">
 [% INCLUDE 'header.inc' %]
@@ -38,7 +51,7 @@
                                     <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 href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]">Delete</a></td>
+                                    <td><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId %]">Delete</a></td>
                                 </tr>
                             [% END %]
                         </table>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git