Attachment 43426 Details for Bug 14676 – Bug 14676 - UI/UX improvements to patron card creator

[patch] Bug 14676 - UI/UX improvements to patron card creator

Bug-14676---UIUX-improvements-to-patron-card-creat.patch (text/plain), 41.16 KB, created by Jonathan Druart on 2015-10-15 11:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-10-15 11:00:23 UTC

Size: 41.16 KB

patch

obsolete

>From 7b6d251bb61b4983ae2f1cd485fd3a65de5b982c Mon Sep 17 00:00:00 2001
>From: Liz Rea <liz@catalyst.net.nz>
>Date: Fri, 14 Aug 2015 11:14:41 +1200
>Subject: [PATCH] Bug 14676 - UI/UX improvements to patron card creator
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Reasoning
>
>Librarians will be doing patron card things in the following frequencies, from most frequent to least frequent:
>1. Creating new patron card batches - every day/every few days
>2. Managing existing card batches - every day/every few days
>3. Managing existing card layouts - as needed, infrequent
>5. Managing existing card templates - as needed, infrequent
>6. Creating new card layouts - as needed, infrequent
>7. Creating new card templates - as needed, infrequent
>8. Managing existing printer profiles - possibly once only!
>9. Creating new printer profiles - possibly once only!
>
>This change to the patron card creator aims to make the most frequently used items easily accessible at the top of the main area,
>reduces clutter on the page, and makes the label creator fall in line with UI paradigms found elsewhere in Koha.
>I think I've also improved the translatability here somewhat, please check that.
>
>To test:
>
>Open the patron card creator: More -> Tools -> Patron card creator
>Note that the toolbar has changed. It should be consistent across all of the patron card creator (it is an include).
>
>+ New menu:
>
>patron card batch
>1. make sure it looks ok - toolbar buttons are consistent at the top of the main block.
>2. add patrons both by borrowernumber, and by search
>3. note that the usual buttons have moved below the textarea, and now have icons.
>4. delete and export single patrons using the buttons corresponding to each patron
>5. select multiple and use the buttons above the table to remove and export selected patrons
>6. export a full batch
>7. deduplicate a batch
>There should be no regressions in functionality.
>
>Image
>1. This menu item should take you directly to the upload/delete images interface
>2. Upload an image, note success message is now below the form, eliminating the jumping box.
>3. Delete single images using the buttons
>4. Delete multiple images using the tickboxes and "Delete selected"
>5. Not deletion success message is below the table, eliminating the jumping box.
>
>Layout
>1. This menu item should take you directly to the "Edit layout" screen.
>2. no functional changes here.
>3. note toolbar at top is consistent
>
>Card template
>1. this menu item should take you directly to the "Edit patron card template" page.
>2. no functional changes here.
>3. note toolbar at top is consistent.
>
>Printer profile
>1. this menu item should take you directly to the "Edit printer profile" page.
>2. no functional changes here.
>3. note toolbar at top is consistent.
>
>+ Manage menu:
>
>Card batches
>1. This menu item should take you directly to the "currently available batches" page.
>2. select a batch to edit using the buttons - it should take you to the editing interface
>3. select a batch to delete using the buttons - it should ask for confirm.
>4. select several batches using the tickboxes, and select Export selected. Batches should be exported as normal.
>5. note toolbar at top is consistent.
>
>Images (this is actually the same page as on the new menu, I included it in both because it does both functions - can change if requested)
>1. This menu item should take you directly to the upload/delete images interface
>2. Upload an image, note success message is now below the form, eliminating the jumping box.
>3. Delete single images using the buttons
>4. Delete multiple images using the tickboxes and "Delete selected"
>5. Not deletion success message is below the table, eliminating the jumping box.
>
>Layouts
>1. This menu item should take you directly to the "currently available layouts" page.
>2. select a layout to edit using the buttons
>3. select a layout to delete using the buttons
>4. note toolbar at top is consistent.
>
>Card templates
>1. This menu item should take you directly to the "currently available templates" page.
>2. select a template to edit using the buttons
>3. select a template to delete using the buttons
>4. note toolbar at top is consistent.
>
>Printer profiles
>1. This menu item should take you directly to the "currently available profiles" page.
>2. select a profile to edit using the buttons
>3. select a profile to delete using the buttons
>4. note toolbar at top is consistent
>
>+ General
>* note that sidebar now only has "labels home" instead of the full "manage" list. It seemed redundant with the toolbar tidied up.
>
>Please note that I am happy to take suggestions/amendments to these changes.
>
>Followed test plan, behaves as advertised.
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/includes/patroncards-menu.inc          |  5 --
> .../prog/en/includes/patroncards-toolbar.inc       | 24 ++++++--
> .../prog/en/modules/common/patron_search.tt        |  4 +-
> .../prog/en/modules/patroncards/edit-batch.tt      | 39 +++++++-----
> .../prog/en/modules/patroncards/edit-layout.tt     | 13 +++-
> .../prog/en/modules/patroncards/edit-profile.tt    |  6 ++
> .../prog/en/modules/patroncards/edit-template.tt   |  6 ++
> .../prog/en/modules/patroncards/home.tt            | 17 ------
> .../prog/en/modules/patroncards/image-manage.tt    | 71 +++++++++++++++-------
> .../prog/en/modules/patroncards/manage.tt          | 20 ++++--
> .../prog/en/modules/patroncards/print.tt           |  8 +--
> patroncards/edit-batch.pl                          |  4 +-
> patroncards/image-manage.pl                        |  1 +
> patroncards/manage.pl                              |  4 ++
> 14 files changed, 142 insertions(+), 80 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc
>index 525ed1b..6e83009 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc
>@@ -1,9 +1,4 @@
> <div id="navmenu"><ul id="navmenulist">
>     <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator home</a></li>
>-    <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Manage layouts</a></li>
>-    <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Manage templates</a></li>
>-    <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Manage profiles</a></li>
>-    <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Manage batches</a></li>
>-    <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Manage images</a></li>
> </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>index ef32f2b..53f33cb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>@@ -1,6 +1,22 @@
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-small" id="layouts" href="/cgi-bin/koha/patroncards/edit-layout.pl?op=new">New layout</a>
>-    <a class="btn btn-small" id="templates" href="/cgi-bin/koha/patroncards/edit-template.pl?op=new">New template</a>
>-    <a class="btn btn-small" id="profiles" href="/cgi-bin/koha/patroncards/edit-profile.pl?op=new">New profile</a>
>-    <a class="btn btn-small" id="batches" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">New batch</a>
>+    <div class="btn-group">
>+        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New <span class="caret"></span></button>
>+        <ul class="dropdown-menu">
>+            <li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-layout.pl?op=new">Layout</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-template.pl?op=new">Card template</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/edit-profile.pl?op=new">Printer profile</a></li>
>+        </ul>
>+    </div>
>+    <div class="btn-group">
>+        <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-edit"></i> Manage <span class="caret"></span></button>
>+        <ul class="dropdown-menu">
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Layouts</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Card templates</a></li>
>+            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Printer profiles</a></li>
>+        </ul>
>+    </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>index 44117b2..38d9003 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>@@ -184,7 +184,7 @@ function filterByFirstLetterSurname(letter) {
>                     </li>
>                 </ol>
>                 <fieldset class="action">
>-                    <input type="submit" value="Search" />
>+                    <input class="btn btn-default" type="submit" value="Search" />
>                 </fieldset>
>             </fieldset>
>         <form>
>@@ -227,7 +227,7 @@ function filterByFirstLetterSurname(letter) {
>             </table>
>         </div>
> 
>-<div id="closewindow"><a href="#" class="close">Close</a></div>
>+<div id="closewindow"><a href="#" class="btn btn-default close">Close</a></div>
> </div>
> </div>
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>index e360cf2..129470a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>@@ -6,6 +6,7 @@
>     [% INCLUDE 'datatables.inc' %]
>     <script type="text/javascript">
>         //<![CDATA[
>+           var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this patron from the card batch?");
>            function DeleteConfirm() {
>                 var msg = _("Are you sure you want to delete batch %s?").format("[% batch_id %]");
>                 var answer = confirm(msg);
>@@ -88,10 +89,10 @@
>                         alert(_("Please select at least one card to export."));
>                         return;     // no batch selected
>                     }
>-                    return GB_showCenter(_("Export labels"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800);
>+                    return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800);
>                 }
>                 else if (mode == 'batch') {
>-                    return GB_showCenter(_("Export labels"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]", 700, 800);
>+                    return GB_showCenter(_("Export patron cards"), "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]", 700, 800);
>                 }
>                 else {
>                     // some pass-thru error trapping just in case...
>@@ -117,9 +118,9 @@
>          $(document).ready(function() {
>             $("#batcht").dataTable($.extend(true, {}, dataTablesDefaults, {
>                 "aoColumnDefs": [
>-                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }
>+                    { "aTargets": [ -2, -1 ], "bSortable": false, "bSearchable": false }
>                 ],
>-                "aaSorting": [[ 1, "asc" ]],
>+                "aaSorting": [[ 0, "asc" ]],
>                 "sPaginationType": "four_button"
>             }));
>             $("#additems").click(function(){
>@@ -168,15 +169,12 @@
>         <div id="bd">
>             <div id="yui-main">
>                 <div class="yui-b">
>+                    <div class="yui-g">
>+                    [% INCLUDE 'patroncards-toolbar.inc' %]
>+                        <div class="yui-u first">
> 
>-                <div id="toolbar" class="btn-toolbar">
>-                    <a class="btn btn-small" id="additems" href="#">Add item(s)</a>[% IF ( table_loop ) %]
>-                    <a class="btn btn-small" id="removeitems" href="#">Remove item(s)</a>
>-                    <a class="btn btn-small" id="deletebatch" href="#">Delete batch</a>
>-                    <a class="btn btn-small" id="deduplicate" href="#">Remove duplicates</a>
>-                    <a class="btn btn-small" id="exportitems" href="#">Export item(s)</a>
>-                    <a class="btn btn-small" id="exportbatch" href="#">Export batch</a>[% END %]
>-                </div>
>+                        </div>
>+                    </div>
> 
>                 [% IF ( duplicate_message ) %]
>                     <div class="dialog message">
>@@ -201,6 +199,13 @@
>                                     </fieldset>
>                                 </div>
>                             </form>
>+                            <div id="batch-manage" class="action">
>+                                <a class="btn btn-small" id="additems" href="#"><icon class="icon-plus"></icon> Add patron(s)</a>[% IF ( table_loop ) %]
>+                                <a class="btn btn-small" id="removeitems" href="#"><icon class="icon-trash"></icon> Remove selected patrons</a>
>+                                <a class="btn btn-small" id="deduplicate" href="#"><icon class="icon-minus"></icon> Remove duplicates</a>
>+                                <a class="btn btn-small" id="exportitems" href="#"><icon class="icon-share"></icon> Export selected card(s)</a>
>+                                <a class="btn btn-small" id="exportbatch" href="#"><icon class="icon-share"></icon> Export card batch</a>[% END %]
>+                            </div>
>                             [% IF ( table_loop ) %]
>                             <form name="items" class="checkboxed">
>                                 <h2>Items in batch number [% batch_id %]</h2>
>@@ -211,12 +216,12 @@
>                                                 <tr>
>                                                     [% FOREACH header_field IN table_loo.header_fields %]
>                                                         [% SWITCH header_field.field_label -%]
>-                                                            [% CASE "Card Number" -%]
>-                                                                <th>Card number</th>
>                                                             [% CASE "Summary" -%]
>-                                                                <th>Summary</th>
>+                                                                <th>Borrower name</th>
>                                                             [% CASE "Borrower Number" %]
>                                                                 <th>Borrower number</th>
>+                                                            [% CASE "Actions " %]
>+                                                                <th>Actions</th>
>                                                             [% CASE "Select" -%]
>                                                                 <th>Select</th>
>                                                             [% CASE %]
>@@ -230,6 +235,10 @@
>                                             <tr>
>                                                 [% FOREACH text_field IN table_loo.text_fields %]
>                                                     [% IF ( text_field.select_field ) %]
>+                                                        <td>
>+                                                            <a class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&amp;batch_id=[% batch_id %]&amp;label_id=[% text_field.field_value %]"><icon class="icon-trash"></icon> Delete</a>
>+                                                            <a class="btn btn-mini" href="#" onclick="GB_showCenter('Export single card','/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&label_id=[% text_field.field_value %]')"><icon class="icon-share"></icon> Export</a>
>+                                                        </td>
>                                                         <td><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>
>                                                     [% ELSE %]
>                                                         <td>[% text_field.field_value %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>index 3394a67..3c8a039 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
>@@ -120,12 +120,19 @@
>         <div id="bd">
>             <div id="yui-main">
>                 <div class="yui-b">
>+                    <div class="yui-g">
>+                    [% INCLUDE 'patroncards-toolbar.inc' %]
>+                        <div class="yui-u first">
>+
>+                        </div>
>+                    </div>
>+
>                 
>                 <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get">
>                 <div class="yui-g">
>                 <div class="yui-g first">
>                         <fieldset class="rows">
>-                            <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Patron card text layout</legend>
>+                            <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card text layout</legend>
>                             <ol>
>                                 <li>
>                                 <fieldset>
>@@ -346,7 +353,7 @@
>                 </div>
>                 <div class="yui-g">
>                     <fieldset class="rows">
>-                    <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Patron card graphic layout</legend>
>+                    <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout</legend>
>                     <ol>
> <!--
>                             <li>
>@@ -539,7 +546,7 @@
>                 </div>
>                 </div>
>                     <fieldset class="action">
>-                        <input type="submit" value="Save" />
>+                        <input class="btn btn-default" type="submit" value="Save" />
>                         <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Cancel</a>
>                         <input type="hidden" name="op" value="save" />
>                         <input type="hidden" name="layout_id" value="[% layout_id %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>index 8f50488..d8407c8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
>@@ -50,6 +50,12 @@
>         <div id="bd">
>         <div id="yui-main">
>             <div class="yui-b">
>+                    <div class="yui-g">
>+                    [% INCLUDE 'patroncards-toolbar.inc' %]
>+                        <div class="yui-u first">
>+
>+                        </div>
>+                    </div>
>                         <div class="yui-g">
>                             <h3>Edit printer profile</h3>
>                                 <div class="yui-g first">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>index 069161e..f7dabca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
>@@ -50,6 +50,12 @@
>         <div id="bd">
>             <div id="yui-main">
>                 <div class="yui-b">
>+                    <div class="yui-g">
>+                    [% INCLUDE 'patroncards-toolbar.inc' %]
>+                        <div class="yui-u first">
>+
>+                        </div>
>+                    </div>
>                     <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get">
>                     <div class="yui-g">
>                         <h3>Edit patron card template</h3>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>index 1862c8e..1537afc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
>@@ -18,23 +18,6 @@
>                     <div class="yui-g">
>                     [% INCLUDE 'patroncards-toolbar.inc' %]
>                         <div class="yui-u first">
>-                            <div class="justify homeimage">
>-                            <div class="lci_01"></div>
>-                            <div class="lci_02"></div>
>-                            <div class="lci_03"></div>
>-                                <h2>Welcome to Koha's Patron card creator module</h2>
>-                                <p>The Patron card creator allow you to use layouts and templates which you design to print a nearly unlimited variety of patron cards including barcodes. Here are some of the features of the Patron card creator module:</p>
>-                                <ul>
>-                                    <li>Customize patron card layouts</li>
>-                                    <li>Design custom card templates for printed patron cards</li>
>-                                    <li>Build and manage batches of patron cards</li>
>-                                    <li>Export single or multiple batches</li>
>-                                    <li>Export single or multiple patron cards from within a batch</li>
>-                                    <li>Export card data as a PDF readable by any standard PDF reader, making patron cards printable directly on a printer</li>
>-                                </ul>
>-                                <p>At the top of each screen within the Patron card creator, you will see a toolbar allowing quick access to relevant functions. The menu to the left of each screen also allows easy access to the different sections of the Patron card creator. The breadcrumb trail near the top of each screen will give specific indication as to where you are within the Patron Card Creator module and allow quick navigation to previously traversed sections. And finally, you can find more detailed information on each section of the Patron card creator by clicking the online help link at the upper left-hand corner of every page.</p>
>-                                <p>The developers of the Patron card creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via <a href="http://bugs.koha-community.org/">Koha Project Bugzilla</a>.</p>
>-                            </div>
>                         </div>
>                     </div>
>                 </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>index 2f53b93..b59f5cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
>@@ -3,6 +3,7 @@
>     [% INCLUDE 'doc-head-close.inc' %]
>     <script type="text/javascript">
>         //<![CDATA[
>+            var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this image?");
>             function DeleteConfirm() {
>                 var results = selected_images("delete");
>                 if (results.images != -1) {
>@@ -56,17 +57,16 @@
>     <div id="bd">
>         <div id="yui-main">
>             <div class="yui-b">
>+                    <div class="yui-g">
>+                    [% INCLUDE 'patroncards-toolbar.inc' %]
>+                        <div class="yui-u first">
>+
>+                        </div>
>+                    </div>
>                 [% INCLUDE 'patroncards-errors.inc' %]
>                 <div class="yui-g">
>                     <div class="yui-u first">
>                         <h1>Upload Images</h1>
>-                        [% IF ( IMPORT_SUCCESSFUL ) %]
>-                        <div id="dialog" class="dialog message">
>-                            <h3>Image successfully uploaded</h3>
>-                            <ul><li>File: [% SOURCE_FILE %]</li>
>-                            <li>Image name: [% IMAGE_NAME %]</li></ul>
>-                        </div>
>-                        [% END %]
>                         <form name="upload_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
>                             <fieldset class="brief">
>                                 <div class="hint">
>@@ -86,21 +86,23 @@
>                                     <input type="text" id="image_name" name="image_name" size="20" />
>                                 </li>
>                                 </ol>
>+                                <div class="action">
>+                                    <input type="hidden" name="op" value="upload" />
>+                                    <input class="btn btn-default" id="uploadsu" type="submit" value="Upload" />
>+                                </div>
>+                                [% IF ( IMPORT_SUCCESSFUL ) %]
>+                                    <div class="dialog message">
>+                                    <h3>Image successfully uploaded</h3>
>+                                    <ul><li>File: [% SOURCE_FILE %]</li>
>+                                    <li>Image name: [% IMAGE_NAME %]</li></ul>
>+                                    </div>
>+                                [% END %]
>                             </fieldset>
>-                            <fieldset class="action">
>-                                <input type="hidden" name="op" value="upload" />
>-                                <input id="uploadsu" type="submit" value="Upload" />
>-                                <a id="cancelul" href="/cgi-bin/koha/patroncards/home.pl" class="cancel">Cancel</a>
>-                            </fieldset>
>+
>                         </form>
>                     </div>
>                     <div class="yui-u">
>                     <h1>Delete Images</h1>
>-                        [% IF ( DELETE_SUCCESSFULL ) %]
>-                        <div id="dialog" class="dialog message">
>-                            <h3>Image(s) successfully deleted</h3>
>-                        </div>
>-                        [% END %]
>                         [% IF ( TABLE ) %]
>                         <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
>                             <fieldset class="brief">
>@@ -109,16 +111,30 @@
>                                 </div>
>                                <table>
>                                     [% FOREACH TABL IN TABLE %]
>+
>                                     [% IF ( TABL.header_fields ) %]
>+
>                                     <tr>
>                                     [% FOREACH header_field IN TABL.header_fields %]
>-                                        <th>[% header_field.field_label %]</th>
>+                                    [% SWITCH header_field.field_label -%]
>+                                        [% CASE "ID" %]
>+                                            <th>Image ID</th>
>+                                        [% CASE "Name" %]
>+                                            <th>Name</th>
>+                                        [% CASE " " %]
>+                                            <th>Delete</th>
>+                                        [% CASE %]
>+                                           <th>[% header_field.field_label %]</th>
>+                                    [% END %]
>                                     [% END %]
>                                     </tr>
>                                     [% ELSE %]
>                                     <tr>
>                                     [% FOREACH text_field IN TABL.text_fields %]
>                                     [% IF ( text_field.select_field ) %]
>+                                        <td>
>+                                            <a class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);" href="/cgi-bin/koha/patroncards/image-manage.pl?op=delete&image_id=[% text_field.field_value %]"><icon class="icon-trash"></icon> Delete</a>
>+                                        </td>
>                                         <td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>
>                                     [% ELSIF ( text_field.field_value ) %]
>                                         <td>[% text_field.field_value %]</td>
>@@ -130,11 +146,15 @@
>                                     [% END %]
>                                     [% END %]
>                                 </table>
>-                            </fieldset>
>-                            <fieldset class="action">
>-                                <input type="hidden" name="op" value="delete" />
>-                                <input type="button" id="delete" value="Delete" />
>-                                <a id="canceldel" href="/cgi-bin/koha/patroncards/home.pl" class="cancel">Cancel</a>
>+                                <div class="action">
>+                                    <input type="hidden" name="op" value="delete" />
>+                                    <input class="btn btn-default" type="button" id="delete" value="Delete selected" />
>+                                </div>
>+                                [% IF ( DELETE_SUCCESSFULL ) %]
>+                                <div id="dialog" class="dialog message">
>+                                    <h3>Image(s) successfully deleted</h3>
>+                                </div>
>+                                [% END %]
>                             </fieldset>
>                         </form>
>                         [% ELSE %]
>@@ -142,6 +162,11 @@
>                             <div class="hint">
>                                 No images are currently available.
>                             </div>
>+                            [% IF ( DELETE_SUCCESSFULL ) %]
>+                                <div id="dialog" class="dialog message">
>+                                    <h3>Image(s) successfully deleted</h3>
>+                                </div>
>+                            [% END %]
>                         </fieldset>
>                         [% END %]
>                     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>index 1daf3bd..1193188 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
>@@ -8,6 +8,7 @@
> [%-  CASE 'Profiles'  -%]Profiles
> [%-  CASE 'batch'     -%]batch
> [%-  CASE 'Batches'   -%]Batches
>+[%-  CASE 'Actions'   -%]Actions
> [%-  END -%]
> [% END %]
>     [% INCLUDE 'doc-head-open.inc' %]
>@@ -16,6 +17,7 @@
>     [% INCLUDE 'greybox.inc' %]
>     <script type="text/javascript">
>         //<![CDATA[
>+            var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this?");
>             function DeleteConfirm() {
>                 var element_id = selected_layout("delete");
>                 if (element_id>-1) {
>@@ -132,14 +134,24 @@
>                                 [% IF ( table_loo.header_fields ) %]
>                                 <tr>
>                                 [% FOREACH header_field IN table_loo.header_fields %]
>-                                    <th>[% header_field.field_label %]</th>
>+                                    [% SWITCH header_field.field_label -%]
>+                                        [% CASE "Select" -%]
>+                                             [% IF ( print ) %]<th>Select</th>[% END %]
>+                                        [% CASE %]
>+                                             <th>[% header_field.field_label %]</th>
>+                                        [% END -%]
>                                 [% END %]
>                                 </tr>
>                                 [% ELSE %]
>                                 <tr>
>                                 [% FOREACH text_field IN table_loo.text_fields %]
>                                 [% IF ( text_field.select_field ) %]
>-                                    <td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>
>+                                    <td>
>+                                      <a class="btn btn-mini" href="/cgi-bin/koha/patroncards/edit-[% card_element %].pl?op=edit&element_id=[% text_field.field_value %]"><icon class="icon-edit"></icon> Edit</a>
>+                                      [% IF ( print ) %]<a class="btn btn-mini" href="#" onclick="GB_showCenter('Export single batch','/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]')"><icon class="icon-share"></icon> Export</a>[% END %]
>+                                      <a class="btn btn-mini" onclick="return confirm(MSG_CONFIRM_DELETE);" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element %]&element_id=[% text_field.field_value %]"><icon class="icon-trash"></icon> Delete</a>
>+                                    </td>
>+                                    [% IF ( print ) %]<td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>[% END %]
>                                 [% ELSIF ( text_field.field_value ) %]
>                                     <td>[% text_field.field_value %]</td>
>                                 [% ELSE %]
>@@ -151,9 +163,7 @@
>                                 [% END %]
>                             </table>
>                             <fieldset class="action">
>-                                <input type="button" id="edit" value="Edit" />
>-                                <input type="button" id="delete" value="Delete" />
>-                                [% IF ( print ) %]<input type="button" id="print" value="Export" />[% END %]
>+                                [% IF ( print ) %]<input class="btn btn-sm" type="button" id="print" value="Export selected batches" />[% END %]
>                             </fieldset>
>                             </form>
>                             [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
>index fd33c3f..c5a2857 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
>@@ -38,15 +38,15 @@
>                     </fieldset>
> 
>                 <fieldset class="action">
>-                    <input type="button" class="submit" id="done" onclick="parent.parent.GB_hide();" value="Done" />
>+                    <input type="button" class="btn btn-default submit" id="done" onclick="parent.parent.GB_hide();" value="Done" />
>                 </fieldset>
>             </form>
>             [% ELSE %]
>             <h3>
>                     [% IF ( label_ids ) %]
>-                        [% IF ( card_count == 1 ) %]Exporting [% card_count %] patroncard[% ELSE %]Exporting [% card_count %] patroncards[% END %]
>+                        [% IF ( card_count == 1 ) %]Exporting [% card_count %] patron card[% ELSE %]Exporting [% card_count %] patron cards[% END %]
>                     [% ELSIF ( borrower_numbers ) %]
>-                        [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count %] patroncard[% ELSE %]Exporting [% borrower_count %] patroncards[% END %]
>+                        [% IF ( borrower_count == 1 ) %]Exporting [% borrower_count %] patron card[% ELSE %]Exporting [% borrower_count %] patron cards[% END %]
>                     [% ELSE %]
>                         [% IF ( multi_batch_count == 1 ) %][% multi_batch_count %] batch to export[% ELSE %][% multi_batch_count %] batches to export[% END %]
>                     [% END %]
>@@ -88,7 +88,7 @@
>                     </ol>
>                 </fieldset>
>                 <fieldset class="action">
>-                    <input type="submit" class="submit" value="Export" />
>+                    <input type="submit" class="btn btn-default submit" value="Export" />
>                     <a href="#" class="cancel" id="done" onclick="parent.parent.GB_hide();">Cancel</a>
>                 </fieldset>
>             </form>
>diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl
>index e30fc62..621281b 100755
>--- a/patroncards/edit-batch.pl
>+++ b/patroncards/edit-batch.pl
>@@ -47,9 +47,9 @@ my $duplicate_count = undef;
> my $duplicate_message = undef;
> my $db_rows = {};
> my $batch = undef;
>-my $display_columns = [ {_card_number   => {label => 'Card Number', link_field => 0}},
>-                        {_summary       => {label => 'Summary', link_field => 0}},
>+my $display_columns = [ {_summary       => {label => 'Summary', link_field => 0}},
>                         {borrowernumber => {label => 'Borrower Number', link_field => 0}},
>+                        {_action        => {label => 'Actions ', link_field => 0}},
>                         {select         => {label => 'Select', value => '_label_id'}},
>                       ];
> my $op = $cgi->param('op') || 'new';
>diff --git a/patroncards/image-manage.pl b/patroncards/image-manage.pl
>index d72c655..2a1ab3c 100755
>--- a/patroncards/image-manage.pl
>+++ b/patroncards/image-manage.pl
>@@ -37,6 +37,7 @@ my $source_file = "$file_name"; # otherwise we end up with what amounts to a poi
> my $display_columns = { image =>    [  #{db column      => {label => 'col label', is link?          }},
>                                         {image_id       => {label => 'ID',      link_field      => 0}},
>                                         {image_name     => {label => 'Name',    link_field      => 0}},
>+                                        {_delete        => {label => 'Delete', link_field => 0}},
>                                         {select         => {label => 'Select',  value           => 'image_id'}},
>                                     ],
> };
>diff --git a/patroncards/manage.pl b/patroncards/manage.pl
>index e5c54f5..316bb90 100755
>--- a/patroncards/manage.pl
>+++ b/patroncards/manage.pl
>@@ -51,22 +51,26 @@ my $db_rows = {};
> my $display_columns = { layout =>   [  # db column       => {col label                  is link?
>                                         {layout_id       => {label => 'Layout ID',      link_field      => 0}},
>                                         {layout_name     => {label => 'Layout',         link_field      => 0}},
>+                                        {_action         => {label => 'Action',         link_field      => 0}},
>                                         #{layout_xml      => {label => 'Layout XML',     link_field      => 0}},
>                                         {select          => {label => 'Select',         value           => 'layout_id'}},
>                                     ],
>                         template => [   {template_id     => {label => 'Template ID',    link_field      => 0}},
>                                         {template_code   => {label => 'Template Name',  link_field      => 0}},
>                                         {template_desc   => {label => 'Description',    link_field      => 0}},
>+                                        {_action         => {label => 'Action',         link_field      => 0}},
>                                         {select          => {label => 'Select',         value           => 'template_id'}},
>                                     ],
>                         profile =>  [   {profile_id      => {label => 'Profile ID',     link_field      => 0}},
>                                         {printer_name    => {label => 'Printer Name',   link_field      => 0}},
>                                         {paper_bin       => {label => 'Paper Bin',      link_field      => 0}},
>                                         {_template_code  => {label => 'Template Name',  link_field      => 0}},     # this display column does not have a corrisponding db column in the profile table, hence the underscore
>+                                        {_action         => {label => 'Action',         link_field      => 0}},
>                                         {select          => {label => 'Select',         value           => 'profile_id'}},
>                                     ],
>                         batch =>    [   {batch_id        => {label => 'Batch ID',       link_field      => 0}},
>                                         {_item_count     => {label => 'Item Count',     link_field      => 0}},
>+                                        {_action         => {label => 'Actions',        link_field      => 0}},
>                                         {select          => {label => 'Select',         value           => 'batch_id'}},
>                                     ],
> };
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 14676: 43393 | 43411 | 43426 | 43661 | 43662 | 43663