Attachment 47987 Details for Bug 15784 – Bug 15784: Library deletion warning is incorrectly styled

[patch] Bug 15784: Library deletion warning is incorrectly styled

Bug-15784-Library-deletion-warning-is-incorrectly-.patch (text/plain), 2.74 KB, created by Jonathan Druart on 2016-02-12 15:11:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-02-12 15:11:09 UTC

Size: 2.74 KB

patch

obsolete

>From a2e4e58b82dbe7d0f6a3e6941b9eacec037fad12 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 3 Feb 2016 08:40:20 -0500
>Subject: [PATCH] Bug 15784: Library deletion warning is incorrectly styled
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>When deleting a library in Administration ->  Libraries and groups, the
>deletion confirmation message is not styled with the standard "dialog
>alert" <div>. This patch modifies the confirmation markup to match the
>standard.
>
>Revised to include Font Awesome icons. Depends on Bug 15785.
>
>To test, apply the patch and go to Administration -> Libraries and
>groups.
>
>- Try deleting a library. The confirmation box should have the standard
>  "dialog alert" class.
>- Test the 'confirm' and 'cancel' actions and make sure both complete
>  correctly.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Buttons display as expected.
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>---
> .../intranet-tmpl/prog/en/modules/admin/branches.tt    | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index 305741a..8c66bed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -202,18 +202,18 @@ tinyMCE.init({
> [% END %]
> 
> [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%]
>-    <form action="/cgi-bin/koha/admin/branches.pl" method="post">
>-        <fieldset>
>-            <legend>Confirm deletion of [% library.branchname %] ([% library.branchcode %])?</legend>
>+    <div class="dialog alert">
>+        <form action="/cgi-bin/koha/admin/branches.pl" method="post">
>+            <h3>Are you sure you want to delete [% library.branchname %] ([% library.branchcode %])?</h3>
>             <input type="hidden" name="op" value="delete_confirmed" />
>             <input type="hidden" name="branchcode" value="[% library.branchcode |html %]" />
>             <input type="hidden" name="branchname" value="[% library.branchname |html %]">
>-            <fieldset class="action">
>-                <input type="submit" value="Delete Library" />
>-                <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
>-            </fieldset>
>-        </fieldset>
>-    </form>
>+            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+        </form>
>+        <form action="/cgi-bin/koha/admin/branches.pl" method="get">
>+            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>+        </form>
>+    </div>
> [% END %]
> 
> [% IF op == 'list' %]
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 15784: 47858 | 47867 | 47976 | 47977 | 47987 | 47989 | 48734