Attachment 50299 Details for Bug 16267 – Bug 16267: Making circ and fines rules actions buttons

[patch] Bug 16267: Making circ and fines rules actions buttons

Bug-16267-Making-circ-and-fines-rules-actions-butt.patch (text/plain), 7.86 KB, created by Aleisha Amohia on 2016-04-17 22:05:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2016-04-17 22:05:41 UTC

Size: 7.86 KB

patch

obsolete

>From 05ebbcfa6eb130de76ce3bcab6c5fa910b3d7ca7 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Thu, 14 Apr 2016 22:38:52 +0000
>Subject: [PATCH] Bug 16267: Making circ and fines rules actions buttons
>
>EDIT: Comment 3
>
>To test:
>1) Go to Admin -> Circulation and fines rules
>2) Fines rules
>	a) Confirm that buttons Edit, Delete, Save, and Clear all show as font awesome buttons and work as expected
>2) Default checkout, hold and return policy
>	a) Confirm that column heading is now Actions
>	b) Confirm that actions Save and Unset show as font awesome buttons and work as expected
>3) Checkout limit by patron category AND holds policy by item type
>	a) Confirm that buttons Add and Delete show as font awesome buttons and work as expected (you may need to add a rule to see the Delete button)
>4) Confirm that none of the buttons wrap on a narrower browser
>
>Sponsored-by: Catalyst IT
>---
> .../prog/en/modules/admin/smart-rules.tt           |   35 ++++++++++----------
> 1 file changed, 17 insertions(+), 18 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index c7e27ad..b8b9dfd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -173,7 +173,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                 <th>On shelf holds allowed</th>
>                 <th>Item level holds</th>
>                 <th>Rental discount (%)</th>
>-                <th colspan="2">&nbsp;</th>
>+                <th>Actions</th>
>             </tr>
>             </thead>
>             <tbody>
>@@ -251,9 +251,9 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                                                         <td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
>                                                         <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
> 							<td>[% rule.rentaldiscount %]</td>
>-                            <td><a href="#" class="editrule">Edit</a></td>
>-							<td>
>-								<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a>
>+                                                        <td class="actions">
>+                                                          <a href="#" class="editrule btn btn-mini"><i class="fa fa-pencil"></i> Edit</a>
>+                                                          <a class="btn btn-mini" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
> 							</td>
>                 	</tr>
>             	[% END %]
>@@ -329,10 +329,10 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                         </select>
>                     </td>
>                     <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
>-                    <td colspan="2">
>+                    <td class="actions">
>                         <input type="hidden" name="branch" value="[% current_branch %]"/>
>-                        <input type="submit" value="Save" class="submit" />
>-                        <input type="button" name="cancel" value="Clear" onclick="clear_edit();return false;" />
>+                        <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button>
>+                        <button name="cancel" onclick="clear_edit();return false;" class="btn btn-mini"><i class="fa fa-undo"></i> Clear</button>
>                     </td>
>                 </tr>
>                 <tfoot>
>@@ -380,8 +380,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                     <th>Total current on-site checkouts allowed</th>
>                     <th>Hold policy</th>
>                     <th>Return policy</th>
>-                    <th>&nbsp;</th>
>-                    <th>&nbsp;</th>
>+                    <th>Actions</th>
>                 </tr>
>                 <tr>
>                     <td><em>Defaults[% UNLESS ( default_rules ) %] (not set)[% END %]</em></td>
>@@ -437,9 +436,9 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                             </option>
>                         </select>
>                     </td>
>-                    <td><input type="submit" value="Save" class="submit" /></td>
>-                    <td>
>-                        <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=*&amp;branch=[% current_branch %]">Unset</a>
>+                    <td class="actions">
>+                        <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button>
>+                        <a class="btn btn-mini" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=*&amp;branch=[% current_branch %]"><i class="fa fa-undo"></i> Unset</a>
>                     </td>
>                 </tr>
>             </table>
>@@ -489,8 +488,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                             [% END %]
>                         </td>
> 
>-                        <td>
>-                            <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=[% branch_cat_rule_loo.categorycode %]&amp;branch=[% current_branch %]">Delete</a>
>+                        <td class="actions">
>+                            <a class="btn btn-mini" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&amp;categorycode=[% branch_cat_rule_loo.categorycode %]&amp;branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a>
>                         </td>
>                     </tr>
>                 [% END %]
>@@ -504,7 +503,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                     </td>
>                     <td><input name="maxissueqty" size="3" /></td>
>                     <td><input name="maxonsiteissueqty" size="3" /></td>
>-                    <td><input type="submit" value="Add" class="submit" /></td>
>+                    <td class="actions"><button type="submit" class="btn btn-mini"><i class="fa fa-plus"></i> Add</td>
>                 </tr>
>             </table>
>         </form>
>@@ -569,8 +568,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                                 Error - unknown option
>                             [% END %]
>                         </td>
>-                        <td>
>-                            <a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&amp;itemtype=[% branch_item_rule_loo.itemtype %]&amp;branch=[% current_branch %]">Delete</a>
>+                        <td class="actions">
>+                            <a class="btn btn-mini" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&amp;itemtype=[% branch_item_rule_loo.itemtype %]&amp;branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a>
>                         </td>
>                     </tr>
>                 [% END %]
>@@ -596,7 +595,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
>                             <option value="noreturn">Item floats</option>
>                         </select>
>                     </td>
>-                    <td><input type="submit" value="Add" class="submit" /></td>
>+                    <td class="actions"><button type="submit" class="btn btn-mini"><i class="fa fa-plus"></i> Add</button></td>
>                 </tr>
>             </table>
>         </form>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16267: 50251 | 50252 | 50299 | 50304 | 50306 | 50320