Attachment 70511 Details for Bug 11897 – Bug 11897: Fix style of button links, & form wording.

[patch] Bug 11897: Fix style of button links, & form wording.

Bug-11897-Fix-style-of-button-links--form-wording.patch (text/plain), 17.80 KB, created by Alex Sassmannshausen on 2018-01-15 18:19:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Sassmannshausen

Created: 2018-01-15 18:19:46 UTC

Size: 17.80 KB

patch

obsolete

>From 75ed35e8b7cbace4dfe8c23d2448913f62c76c9a Mon Sep 17 00:00:00 2001
>From: Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
>Date: Tue, 4 Apr 2017 15:19:51 +0200
>Subject: [PATCH] Bug 11897: Fix style of button links, & form wording.
>
>* koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc
>* koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>* koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>
>Signed-off-by: Kathleen Milne <kathleen.milne@cne-siar.gov.uk>
>---
> .../prog/en/includes/stockrotation-toolbar.inc     |  8 ++---
> .../prog/en/modules/catalogue/stockrotation.tt     | 18 +++++-----
> .../prog/en/modules/tools/stockrotation.tt         | 38 +++++++++++-----------
> 3 files changed, 32 insertions(+), 32 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc
>index 5bc4a8b295..c8e72e9dd6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc
>@@ -1,13 +1,13 @@
> [% USE Koha %]
> <div id="toolbar" class="btn-toolbar">
>     [% IF no_op_set %]
>-        <a id="addrota" class="btn btn-small" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a>
>+        <a id="addrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a>
>     [% END %]
>     [% IF op == 'manage_stages' %]
>-        <a id="addstage" class="btn btn-small" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_stage&amp;rota_id=[% rota_id %]"><i class="fa fa-plus"></i> New stage</a>
>+        <a id="addstage" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_stage&amp;rota_id=[% rota_id %]"><i class="fa fa-plus"></i> New stage</a>
>     [% END %]
>     [% IF op == 'manage_items' %]
>-        <a id="addrota" class="btn btn-small" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a>
>-        <a id="editrota" class="btn btn-small" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;rota_id=[% rota_id %]"><i class="fa fa-pencil"></i> Edit rota</a>
>+        <a id="addrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a>
>+        <a id="editrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&amp;rota_id=[% rota_id %]"><i class="fa fa-pencil"></i> Edit rota</a>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>index e4ead12837..e628c335b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
>@@ -88,25 +88,25 @@
>                                 [% IF item.stockrotationitem %]
>                                     [% in_transit = item.bib_item.get_transfer %]
>                                     [% IF !in_transit && item.stages.size > 1 %]
>-                                        <a class="btn btn-mini" href="?op=move_to_next_stage&amp;stage_id=[% item.stockrotationitem.stage.stage_id %]&amp;item_id=[% item.bib_item.id %]&amp;biblionumber=[% biblionumber %]">
>+                                        <a class="btn btn-default btn-sm" href="?op=move_to_next_stage&amp;stage_id=[% item.stockrotationitem.stage.stage_id %]&amp;item_id=[% item.bib_item.id %]&amp;biblionumber=[% biblionumber %]">
>                                     [% ELSE %]
>-                                        <a class="btn btn-mini" disabled>
>+                                        <a class="btn btn-default btn-sm" disabled>
>                                     [% END %]
>                                         <i class="fa fa-arrow-right"></i>
>                                         Move to next stage
>                                     </a>
>                                     [% IF !in_transit %]
>-                                        <a class="btn btn-mini" href="?op=toggle_in_demand&amp;stage_id=[% item.stockrotationitem.stage.stage_id %]&amp;item_id=[% item.bib_item.id %]&amp;biblionumber=[% biblionumber %]">
>+                                        <a class="btn btn-default btn-sm" href="?op=toggle_in_demand&amp;stage_id=[% item.stockrotationitem.stage.stage_id %]&amp;item_id=[% item.bib_item.id %]&amp;biblionumber=[% biblionumber %]">
>                                     [% ELSE %]
>-                                        <a class="btn btn-mini" disabled>
>+                                        <a class="btn btn-default btn-sm" disabled>
>                                     [% END %]
>                                         <i class="fa fa-fire"></i>
>                                         [% item.stockrotationitem.indemand ? 'Remove &quot;In demand&quot;' : 'Add &quot;In demand&quot;' %]
>                                     </a>
>                                     [% IF !in_transit %]
>-                                        <a class="btn btn-mini" href="?op=confirm_remove_from_rota&amp;stage_id=[% item.stockrotationitem.stage.stage_id %]&amp;item_id=[% item.bib_item.id %]&amp;biblionumber=[% biblionumber %]">
>+                                        <a class="btn btn-default btn-sm" href="?op=confirm_remove_from_rota&amp;stage_id=[% item.stockrotationitem.stage.stage_id %]&amp;item_id=[% item.bib_item.id %]&amp;biblionumber=[% biblionumber %]">
>                                     [% ELSE %]
>-                                        <a class="btn btn-mini" disabled>
>+                                        <a class="btn btn-default btn-sm" disabled>
>                                     [% END %]
>                                         <i class="fa fa-trash"></i>
>                                         Remove from rota
>@@ -118,7 +118,7 @@
>                                                 <option value="[% rota.rota_id %]">[% rota.title %]</option>
>                                             [% END %]
>                                         </select>
>-                                        <button class="btn btn-mini" type="submit"><i class="fa fa-plus"></i> Add to rota</button>
>+                                        <button class="btn btn-default btn-sm" type="submit"><i class="fa fa-plus"></i> Add to rota</button>
>                                         <input type="hidden" name="op" value="add_item_to_rota"></input>
>                                         <input type="hidden" name="item_id" value="[% item.bib_item.id %]"></input>
>                                         <input type="hidden" name="biblionumber" value="[% biblionumber %]"></input>
>@@ -140,8 +140,8 @@
>         <div class="dialog alert">
>             <h3>Are you sure you want to remove this item from it's rota?</h3>
>             <p>
>-                <a class="btn approve" href="?op=remove_item_from_stage&amp;stage_id=[% stage_id %]&amp;item_id=[% item_id %]&amp;biblionumber=[% biblionumber %]"><i class="fa fa-fw fa-check"></i>Yes</a>
>-                <a class="btn deny" href="?biblionumber=[% biblionumber %]"><i class="fa fa-fw fa-remove"></i>No</a>
>+                <a class="btn btn-default btn-sm approve" href="?op=remove_item_from_stage&amp;stage_id=[% stage_id %]&amp;item_id=[% item_id %]&amp;biblionumber=[% biblionumber %]"><i class="fa fa-fw fa-check"></i>Yes</a>
>+                <a class="btn btn-default btn-sm deny" href="?biblionumber=[% biblionumber %]"><i class="fa fa-fw fa-remove"></i>No</a>
>             </p>
>         </div>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>index acf9b89bbf..64e42e3cff 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>@@ -86,12 +86,12 @@
>                                         <td>[% rota.description %]</td>
>                                         <td>[% rota.stockrotationitems.count %]</td>
>                                         <td class="actions">
>-                                            <a class="btn btn-mini" href="?op=create_edit_rota&amp;rota_id=[% rota.rota_id %]">
>+                                            <a class="btn btn-default btn-sm" href="?op=create_edit_rota&amp;rota_id=[% rota.rota_id %]">
>                                                 <i class="fa fa-pencil"></i>
>                                                 Edit
>                                             </a>
>                                             <div class="btn-group" role="group">
>-                                                <button type="button" class="btn btn-mini dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
>+                                                <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
>                                                     Manage
>                                                     <i class="fa fa-caret-down"></i>
>                                                 </button>
>@@ -102,7 +102,7 @@
>                                                     [% END %]
>                                                 </ul>
>                                             </div>
>-                                            <a class="btn btn-mini" href="?op=toggle_rota&amp;rota_id=[% rota.rota_id %]">
>+                                            <a class="btn btn-default btn-sm" href="?op=toggle_rota&amp;rota_id=[% rota.rota_id %]">
>                                                 <i class="fa fa-power-off"></i>
>                                                 [% IF !rota.active %]
>                                                     Activate
>@@ -170,7 +170,7 @@
>                             </ol>
>                         </fieldset>
>                         <fieldset class="action">
>-                            <input type="submit" value="Submit">
>+                            <input type="submit" value="Save">
>                             <a href="/cgi-bin/koha/tools/stockrotation.pl" class="cancel">Cancel</a>
>                         </fieldset>
>                         [% IF rota.rota_id %]
>@@ -215,10 +215,10 @@
>                                         </span>
>                                         <span class="stageduration">[% stage.duration %]</span>
>                                         <span class="stageactions">
>-                                            <a class="btn btn-mini" href="?op=create_edit_stage&amp;stage_id=[% stage.stage_id %]">
>+                                            <a class="btn btn-default btn-sm" href="?op=create_edit_stage&amp;stage_id=[% stage.stage_id %]">
>                                                 <i class="fa fa-pencil"></i> Edit
>                                             </a>
>-                                            <a class="btn btn-mini" href="?op=confirm_delete_stage&amp;stage_id=[% stage.stage_id %]">
>+                                            <a class="btn btn-default btn-sm" href="?op=confirm_delete_stage&amp;stage_id=[% stage.stage_id %]">
>                                                 <i class="fa fa-trash"></i> Delete
>                                             </a>
>                                         </span>
>@@ -268,7 +268,7 @@
>                             </ol>
>                         </fieldset>
>                         <fieldset class="action">
>-                            <input type="submit" value="Submit">
>+                            <input type="submit" value="Save">
>                             <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&amp;rota_id=[% rota_id %]" class="cancel">Cancel</a>
>                         </fieldset>
>                         <input type="hidden" name="stage_id" value="[% stage.id %]">
>@@ -280,8 +280,8 @@
>                     <div class="dialog alert">
>                         <h3>Are you sure you wish to remove this item from it's rota</h3>
>                         <p>
>-                            <a class="btn approve" href="?op=remove_item_from_stage&amp;item_id=[% item_id %]&amp;stage_id=[% stage_id %]&amp;rota_id=[% rota_id %]"><i class="fa fa-fw fa-check"></i>Yes</a>
>-                            <a class="btn deny" href="?op=manage_items&amp;rota_id=[% rota_id %]"><i class="fa fa-fw fa-remove"></i>No</a>
>+                            <a class="btn btn-default btn-sm approve" href="?op=remove_item_from_stage&amp;item_id=[% item_id %]&amp;stage_id=[% stage_id %]&amp;rota_id=[% rota_id %]"><i class="fa fa-fw fa-check"></i>Yes</a>
>+                            <a class="btn btn-default btn-sm deny" href="?op=manage_items&amp;rota_id=[% rota_id %]"><i class="fa fa-fw fa-remove"></i>No</a>
>                         </p>
>                     </div>
>                 [% ELSIF (op == 'confirm_delete_stage') %]
>@@ -297,8 +297,8 @@
>                             </ul>
>                         [% END %]
>                         <p>
>-                            <a class="btn approve" href="?op=delete_stage&amp;stage_id=[% stage.stage_id %]"><i class="fa fa-fw fa-check"></i>Yes</a>
>-                            <a class="btn deny" href="?op=manage_stages&amp;rota_id=[% stage.rota.rota_id %]"><i class="fa fa-fw fa-remove"></i>No</a>
>+                            <a class="btn btn-default btn-sm approve" href="?op=delete_stage&amp;stage_id=[% stage.stage_id %]"><i class="fa fa-fw fa-check"></i>Yes</a>
>+                            <a class="btn btn-default btn-sm deny" href="?op=manage_stages&amp;rota_id=[% stage.rota.rota_id %]"><i class="fa fa-fw fa-remove"></i>No</a>
>                         </p>
>                     </div>
>                 [% ELSIF (op == 'manage_items') %]
>@@ -336,7 +336,7 @@
>                                 </ol>
>                             </fieldset>
>                             <fieldset class="action">
>-                                <input type="submit" value="Submit">
>+                                <input type="submit" value="Save">
>                             </fieldset>
>                             <input type="hidden" name="rota_id" value="[% rota.id %]">
>                             <input type="hidden" name="op" value="add_items_to_rota">
>@@ -381,25 +381,25 @@
>                                         <td class="actions">
>                                             [% in_transit = item.itemnumber.get_transfer %]
>                                             [% IF !in_transit && stages.size > 1 %]
>-                                                <a class="btn btn-mini" href="?op=move_to_next_stage&amp;rota_id=[% rota.id %]&amp;item_id=[% item.id %]&amp;stage_id=[% item.stage.stage_id %]">
>+                                                <a class="btn btn-default btn-sm" href="?op=move_to_next_stage&amp;rota_id=[% rota.id %]&amp;item_id=[% item.id %]&amp;stage_id=[% item.stage.stage_id %]">
>                                             [% ELSE %]
>-                                                <a class="btn btn-mini" disabled>
>+                                                <a class="btn btn-default btn-sm" disabled>
>                                             [% END %]
>                                                 <i class="fa fa-arrow-right"></i>
>                                                 Move to next stage
>                                             </a>
>                                             [% IF !in_transit %]
>-                                                <a class="btn btn-mini" href="?op=toggle_in_demand&amp;stage_id=[% item.stage.stage_id %]&amp;item_id=[% item.id %]&amp;rota_id=[% rota.id %]">
>+                                                <a class="btn btn-default btn-sm" href="?op=toggle_in_demand&amp;stage_id=[% item.stage.stage_id %]&amp;item_id=[% item.id %]&amp;rota_id=[% rota.id %]">
>                                             [% ELSE %]
>-                                                <a class="btn btn-mini" disabled>
>+                                                <a class="btn btn-default btn-sm" disabled>
>                                             [% END %]
>                                                 <i class="fa fa-fire"></i>
>                                                 [% item.indemand ? 'Remove &quot;In demand&quot;' : 'Add &quot;In demand&quot;' %]
>                                             </a>
>                                             [% IF !in_transit %]
>-                                                <a class="btn btn-mini" href="?op=confirm_remove_from_rota&amp;stage_id=[% item.stage.stage_id %]&amp;item_id=[% item.id %]&amp;rota_id=[% rota.id %]">
>+                                                <a class="btn btn-default btn-sm" href="?op=confirm_remove_from_rota&amp;stage_id=[% item.stage.stage_id %]&amp;item_id=[% item.id %]&amp;rota_id=[% rota.id %]">
>                                             [% ELSE %]
>-                                                <a class="btn btn-mini" disabled>
>+                                                <a class="btn btn-default btn-sm" disabled>
>                                             [% END %]
>                                                 <i class="fa fa-trash"></i>
>                                                 Remove from rota
>@@ -463,7 +463,7 @@
> 
>                             </fieldset>
>                             <fieldset class="action">
>-                                <input type="submit" value="Submit">
>+                                <input type="submit" value="Save">
>                             </fieldset>
>                             <input type="hidden" name="rota_id" value="[% rota_id %]">
>                             <input type="hidden" name="op" value="move_items_to_rota">
>-- 
>2.13.4

Actions: View | Diff | Splinter Review

Attachments on bug 11897: 25887 | 58207 | 58208 | 58209 | 58210 | 58211 | 58212 | 58213 | 58214 | 58215 | 58216 | 58217 | 58218 | 58219 | 58280 | 58281 | 58687 | 58692 | 58693 | 58694 | 58695 | 58696 | 60175 | 60715 | 61825 | 61826 | 61827 | 61828 | 61829 | 61830 | 61831 | 61832 | 61833 | 61834 | 61835 | 61836 | 61837 | 61838 | 61839 | 61885 | 62730 | 62750 | 62751 | 62752 | 62753 | 62754 | 62755 | 62756 | 62757 | 62758 | 62759 | 62760 | 62761 | 62762 | 62763 | 62764 | 62765 | 62766 | 62767 | 63063 | 63064 | 63065 | 63066 | 63067 | 63068 | 63069 | 63070 | 63071 | 63072 | 63073 | 63074 | 63075 | 63076 | 63077 | 63078 | 63079 | 63080 | 63114 | 64850 | 64851 | 65715 | 65716 | 65717 | 65718 | 65719 | 65720 | 65721 | 65722 | 65723 | 65724 | 65725 | 65726 | 65727 | 65728 | 65729 | 65730 | 65731 | 65732 | 65733 | 65734 | 65735 | 65736 | 65737 | 65738 | 65739 | 65740 | 65741 | 65742 | 65743 | 65744 | 65745 | 65746 | 65747 | 65748 | 65749 | 65750 | 65751 | 65752 | 65753 | 65754 | 65755 | 65756 | 65757 | 65758 | 66381 | 70496 | 70497 | 70498 | 70499 | 70500 | 70501 | 70502 | 70503 | 70504 | 70505 | 70506 | 70507 | 70508 | 70509 | 70510 | 70511 | 70512 | 70513 | 70514 | 70515 | 70516 | 70517 | 70518 | 70519 | 70520 | 70521 | 70522 | 70523 | 70524 | 72124 | 72125 | 72126 | 72127 | 72128 | 74003 | 74004 | 74005 | 74006 | 74007 | 74008 | 74010 | 74011 | 74012 | 74013 | 74014 | 74015 | 74016 | 74017 | 74197 | 74198 | 74199 | 74200 | 74201 | 74202 | 74203 | 74204 | 74205 | 74206 | 74319 | 74320 | 74360 | 74459 | 74460 | 74461 | 74462 | 74463 | 74464 | 74465 | 74466 | 74467 | 74468 | 74469 | 74470 | 75409 | 75410 | 75411 | 75412 | 75413 | 75414 | 75415 | 75416 | 75417 | 75418 | 75419 | 75420 | 76121 | 76122 | 76123 | 76124 | 76125 | 76126 | 76127 | 76128 | 76129 | 76130 | 76131 | 76132 | 76133 | 76134 | 76135 | 76144 | 76706 | 76707 | 76708 | 76709 | 76710 | 77623 | 77624 | 77625 | 77626 | 78387 | 78388 | 78389 | 78390 | 78391 | 78392 | 78393 | 78394 | 78404 | 78405 | 78406 | 78407 | 78408 | 79040 | 79041 | 79042 | 79043 | 79044 | 79738 | 79739 | 79740 | 79741 | 79742 | 79746 | 79747 | 79748 | 79749 | 79750 | 79964 | 79965 | 79966 | 79967 | 79968 | 79969 | 79970 | 79971 | 79972 | 79973 | 79974 | 79975 | 80068 | 80087 | 80088 | 80089 | 80090 | 80091 | 80092 | 80093 | 80094 | 80095 | 80096 | 80097 | 80098 | 80099 | 80100 | 80118 | 80260 | 80261 | 80262 | 80263 | 80264 | 80265 | 80266 | 80267 | 80268 | 80269 | 80270 | 80271 | 80272 | 80273 | 80274 | 80275 | 80289 | 80298 | 80299 | 80300