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