From 29c6b0f97e97118608245c41f33729b955513424 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 19 Feb 2014 15:53:13 -0500
Subject: [PATCH] Bug 9677 - Style button on notices and slips page with
 Bootstrap
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The toolbar button on the Notices & Slips page isn't styled with
Bootstrap as other toolbar buttons are. This patch corrects this.

The patch also removes some obsolete CSS.

To test go to Tools -> Notices and Slips. The toolbar button should look
correct and work correctly.

Patch works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
"yui-menu-button" is not contained in tt files.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 36eac129f7fdab89ffd77ba5f3bd3add688deedc)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css    | 6 ------
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 2d5ba24008..bf373c1484 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -397,17 +397,11 @@ dd {
 
 div#toolbar {
        background-color : #EDF4F6;
-	margin-bottom : .7em;
      padding: 5px 5px 5px 5px;
       border-radius: 5px 5px 0 0;
     border: 1px solid #E6F0F2;
 }
 
-div#toolbar .yui-menu-button button,
-div#toolbar .yui-button-button button {
-	line-height : 1.7em;
-}
-
 ul.toolbar {
 	padding-left : 0;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index d4c864ba39..c414787b0d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -135,8 +135,8 @@ $(document).ready(function() {
             </select>
       </p>
     [% END %]
-      <div id="toolbar">
-	      <input type="submit" id="newnotice" value="New Notice" />
+      <div id="toolbar" class="btn-toolbar">
+          <button type="submit" class="btn btn-small" id="newnotice"><i class="icon-plus"></i> New notice</button>
         <input type="hidden" id="op" name="op" />
       </div>
     </form>
-- 
2.39.5