From cf45e67328106e7d0c7978e094e97b5943eca4a6 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Tue, 10 Jan 2017 12:21:05 +0000
Subject: [PATCH] Bug 17874: Bug 16239 followup - polishing things

This patch is made on top of bug 16239 to polish things.

Makes these changes:
- Buttons on add circulation message modal
- Dropdowns has top and bottom margin 4px instead of 3px
- btn-link class (for example in toolbar on advanced search pages)
- Delete circ message is btn-link
- Add new circ message is btn-link

Test plan:
- Confirm that all changes are as described above and that they make sense

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css            | 9 +++++++++
 koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt  | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index 41c9f9c..20ce983 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -2404,6 +2404,11 @@ a.btn:visited{
     color: #333333;
 }
 
+a.btn-link:link,
+a.btn-link:visited {
+    color: #004d99;
+}
+
 a.btn-link:hover {
     color : #538200;
 }
@@ -2420,6 +2425,10 @@ a.dropdown-toggle {
     white-space: nowrap;
 }
 
+.dropdown-menu > li > a {
+    padding: 4px 20px;
+}
+
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
     text-decoration: none;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index a1760c3..68dd762 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -248,8 +248,8 @@ function searchToHold(){
                     <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
                 </div>
                 <div class="modal-footer">
-                    <button class="btn approve" type="submit"><i class="fa fa-check"></i> Save</button>
-                    <button class="btn deny" href="#" class="cancel" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
+                    <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
+                    <button class="btn btn-default deny" href="#" class="cancel" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
                 </div>
             </form>
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 3d2b567..af88d33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -865,12 +865,12 @@ No patron matched <span class="ex">[% message | html %]</span>
                         <i>"[% message.message %]"</i>
                     </span>
                     [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %]
-                        <a class="btn-small" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id %]&amp;borrowernumber=[% message.borrowernumber %]" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
+                        <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id %]&amp;borrowernumber=[% message.borrowernumber %]" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
                     [% END %]
                 </li>
             [% END %]
         </ul>
-        <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
+        <a id="addnewmessageLabel" href="#add_message_form" class="btn btn-link btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
     </div>
 
 </div>
-- 
2.9.3