Attachment 87927 Details for Bug 22698 – Bug 22698: Fix incorrect button classes

[patch] Bug 22698: Fix incorrect button classes

Bug-22698-Fix-incorrect-button-classes.patch (text/plain), 53.20 KB, created by Owen Leonard on 2019-04-12 16:21:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2019-04-12 16:21:23 UTC

Size: 53.20 KB

patch

obsolete

>From 4a07a1e11b896e0c0d295bfb9393670149c1c608 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 26 Mar 2019 16:34:34 +0000
>Subject: [PATCH] Bug 22698: Fix incorrect button classes
>
>This patch builds on Bug 22023 in making further corrections to toolbar
>button classes.
>
>To test, apply the patch and view the following pages to confirm that
>toolbar buttons are consistent:
>
>- Acquisitions -> Vendor -> View basket.
>- Administration -> Additional fields -> Select a table.
>- Administration -> Audio alerts.
>- Catalog -> Advanced search -> More/fewer options link
>- Cataloging -> Edit record -> Advanced editor -> Advanced search.
>- Cataloging -> Edit record -> Advanced editor -> Macros.
>- Cataloging -> Edit record -> MARC21 008 value builder.
>- Cataloging -> Search results.
>- Circulation -> Checkout notes.
>- Circulation: Sticky due date clear button, view restrictions, override
>   restrictions temporarily, add message, delete message
>- Course reserves: Toolbar buttons on that page and the course reserve
>   detail page.
>- ILL requests -> View ILL requests. The "New ILL request" and "List
>   requests" button.
>- Lists and Lists -> View list.
>- Patrons -> Search -> Merge patrons.
>- Patrons -> View patron -> "Edit" button on patron image (patronimages
>   must be enabled).
>- Patrons -> View patron -> "More" menu -> Manage API keys.
>- Patrons -> View patron -> "More" menu -> Set permissions.
>- Patrons -> View patron -> Delete circulation message link.
>- Patrons -> View patron -> Edit patron.
>- Patrons -> View patron -> Housebound.
>- Reports -> Dictionary.
>- Serials -> Numbering patterns.
>- Serials -> Subscription -> Receive.
>- Tools -> Labels -> Manage -> Label batches: Export selected.
>- Tools -> Patron card creator -> Manage -> Card batches -> Edit batch.
>- Tools -> Patron card creator. The "New" and "Manage" buttons.
>- Tools -> Patron clubs.
>- Tools -> Quote editor -> Import quotes.
>- Tools -> Rotating collections. Toolbar buttons on that page and the
>   collection view page.
>- Tools -> Tags.
>- Tools -> Upload local cover image.
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc   |  4 ++--
> koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc |  8 ++++----
> .../prog/en/includes/patroncards-toolbar.inc             |  4 ++--
> .../prog/en/includes/quotes-upload-toolbar.inc           |  6 +++---
> .../prog/en/includes/rotating-collections-toolbar.inc    |  8 ++++----
> .../prog/en/includes/virtualshelves-toolbar.inc          |  4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt  |  4 ++--
> .../prog/en/modules/admin/additional-fields.tt           |  2 +-
> .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt  |  2 +-
> .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt |  6 +++---
> .../prog/en/modules/cataloguing/addbooks.tt              |  2 +-
> .../intranet-tmpl/prog/en/modules/cataloguing/editor.tt  |  8 ++++----
> .../cataloguing/value_builder/marc21_field_008.tt        |  4 ++--
> .../intranet-tmpl/prog/en/modules/circ/checkout-notes.tt |  4 ++--
> .../intranet-tmpl/prog/en/modules/circ/circulation.tt    | 10 +++++-----
> koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt   |  6 +++---
> .../prog/en/modules/course_reserves/course-details.tt    |  8 ++++----
> .../prog/en/modules/course_reserves/course-reserves.tt   |  2 +-
> .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt    | 16 ++++++++--------
> .../intranet-tmpl/prog/en/modules/labels/label-manage.tt |  2 +-
> .../intranet-tmpl/prog/en/modules/members/apikeys.tt     |  2 +-
> .../intranet-tmpl/prog/en/modules/members/housebound.tt  |  4 ++--
> .../prog/en/modules/members/member-flags.tt              |  4 ++--
> .../prog/en/modules/members/memberentrygen.tt            |  2 +-
> .../prog/en/modules/members/merge-patrons.tt             |  2 +-
> .../intranet-tmpl/prog/en/modules/members/moremember.tt  |  4 ++--
> .../prog/en/modules/patroncards/edit-batch.tt            | 14 +++++++-------
> .../intranet-tmpl/prog/en/modules/reports/dictionary.tt  |  2 +-
> .../prog/en/modules/serials/serials-edit.tt              |  4 ++--
> .../en/modules/serials/subscription-numberpatterns.tt    |  6 +++---
> koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt   |  4 ++--
> .../intranet-tmpl/prog/en/modules/tools/upload-images.tt |  2 +-
> 32 files changed, 80 insertions(+), 80 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>index b225e85..a79a55f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -13,12 +13,12 @@
>             [% IF ( patron.image ) %]
>                 <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
>                 <div class="patronimage-controls">
>-                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm edit-patronimage" title="Edit patron image" href="#"><i class="fa fa-pencil"></i> Edit</a></div>
>+                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default edit-patronimage" title="Edit patron image" href="#"><i class="fa fa-pencil"></i> Edit</a></div>
>                 </div>
>             [% ELSE %]
>                 <div class="patronimage empty"></div>
>                 <div class="patronimage-controls">
>-                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm edit-patronimage" title="Add patron image" href="#"><i class="fa fa-plus"></i> Add</a></div>
>+                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default edit-patronimage" title="Add patron image" href="#"><i class="fa fa-plus"></i> Add</a></div>
>                 </div>
>             [% END %]
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc
>index f3ef56c..9499d7f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc
>@@ -4,7 +4,7 @@
>         [% IF backends_available %]
>           [% IF backends.size > 1 %]
>             <div class="dropdown btn-group">
>-                <button class="btn btn-sm btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
>+                <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
>                     <i class="fa fa-plus"></i> New ILL request <span class="caret"></span>
>                 </button>
>                 <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">
>@@ -14,16 +14,16 @@
>                 </ul>
>             </div>
>           [% ELSE %]
>-            <a id="ill-new" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backends.0 | html %]">
>+            <a id="ill-new" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backends.0 | html %]">
>                 <i class="fa fa-plus"></i> New ILL request
>             </a>
>           [% END %]
>         [% ELSE %]
>-            <a id="ill-new" class="btn btn-sm btn-default disabled" href="">
>+            <a id="ill-new" class="btn btn-default disabled" href="">
>                 <i class="fa fa-plus"></i> New ILL request
>             </a>
>         [% END %]
>-        <a id="ill-list" class="btn btn-sm btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
>+        <a id="ill-list" class="btn btn-default btn-group" href="/cgi-bin/koha/ill/ill-requests.pl">
>             <i class="fa fa-list"></i> List requests
>         </a>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>index 4f39e70..b0163a0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
>@@ -1,7 +1,7 @@
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
>+        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>             <li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>
>             <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>
>@@ -11,7 +11,7 @@
>         </ul>
>     </div>
>     <div class="btn-group">
>-        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
>+        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button>
>         <ul class="dropdown-menu">
>             <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>
>             <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>index b7554c8..b531be0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc
>@@ -1,5 +1,5 @@
> <div id="toolbar" class="btn-toolbar" style="visibility: hidden; position: absolute">
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="save_quotes" href="#"><i class="fa fa-save"></i> Save quotes</a></div>
>-        <div class="btn-group"><a class="btn btn-default btn-sm" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div>
>-        <div class="btn-group"><a href="/cgi-bin/koha/tools/quotes-upload.pl" id="cancel_quotes" class="btn btn-default btn-sm"><i class="fa fa-remove"></i> Cancel import</a></div>
>+        <div class="btn-group"><a class="btn btn-default" id="save_quotes" href="#"><i class="fa fa-save"></i> Save quotes</a></div>
>+        <div class="btn-group"><a class="btn btn-default" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div>
>+        <div class="btn-group"><a href="/cgi-bin/koha/tools/quotes-upload.pl" id="cancel_quotes" class="btn btn-default"><i class="fa fa-remove"></i> Cancel import</a></div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>index 804fcfa..179f40e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
>@@ -1,18 +1,18 @@
> [% INCLUDE 'blocking_errors.inc' %]
> <div id="toolbar" class="btn-toolbar">
>     <div class="btn-group">
>-        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a>
>+        <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a>
>     </div>
> 
>     [% IF ( colId ) %]
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a>
>+            <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId | html %]"><i class="fa fa-exchange"></i> Transfer</a>
>         </div>
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a>
>+            <a class="btn btn-default" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% colId | html %]"><i class="fa fa-pencil"></i> Edit</a>
>         </div>
>         <div class="btn-group">
>-            <a class="btn btn-default btn-sm confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a>
>+            <a class="btn btn-default confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% colId | html %]"><i class="fa fa-trash"></i> Delete</a>
>         </div>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>index e1ffa3e..c5a6306 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc
>@@ -5,7 +5,7 @@
> 
>     [% IF ( can_add_biblios ) %]
>         <div class="btn-group">
>-            <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#addToList">
>+            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#addToList">
>                 <i class="fa fa-plus"></i> Add items
>             </button>
>         </div>
>@@ -14,7 +14,7 @@
>     [% IF shelf AND op == 'view' %]
>         [% IF can_manage_shelf %]
>         <div class="btn-group">
>-            <button class="btn btn-default sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>+            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;referer=[% op | uri %]">Edit list</a></li>
>                 <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&amp;shelfnumber=[% shelf.shelfnumber | html %]">Delete list</a></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 0fcbf5a..96858b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -2,8 +2,8 @@
> [% USE Asset %]
> [% BLOCK csv_export %]
>     <div class="btn-group">
>-        <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
>-      <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
>+        <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
>+      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
>       <ul class="dropdown-menu" id="export-csv-menu">
>           <li><a href="#">Default</a></li>
>           [% IF csv_profiles %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>index e1d6380..d8f3f0d 100755
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>@@ -32,7 +32,7 @@
>     <div class="yui-b">
>     [% IF op == 'list' %]
>         <div id="toolbar" class="btn-toolbar">
>-            <a class="btn btn-default btn-sm" id="newfields" href="?op=add_form&amp;tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a>
>+            <a class="btn btn-default" id="newfields" href="?op=add_form&amp;tablename=[% tablename | uri %]"><i class="fa fa-plus"></i> Create field</a>
>         </div>
>     [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>index bc09e29..b88377f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>@@ -123,7 +123,7 @@
>                     </table>
> 
>                     <p>
>-                        <button id="delete-alerts" type="submit" class="btn btn-default btn-sm disabled"><i class="fa fa-trash"></i> Delete selected alerts</button>
>+                        <button id="delete-alerts" type="submit" class="btn btn-default disabled"><i class="fa fa-trash"></i> Delete selected alerts</button>
>                     </p>
>                 </form>
>             </main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>index 4fa2c03..fb2b2d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -32,14 +32,14 @@
>         </div>
>         <div class="btn-group">
>         [% IF ( expanded_options ) %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-sm btn-link"><i class="fa fa-search-minus"></i> Fewer options</a>
>+            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn btn-link"><i class="fa fa-search-minus"></i> Fewer options</a>
>         </div>
>         [% ELSE %]
>-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-sm btn-link"><i class="fa fa-search-plus"></i> More options</a>
>+            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn btn-link"><i class="fa fa-search-plus"></i> More options</a>
>         </div>
>         [% END %]
>         <div class="btn-group">
>-            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-sm btn-link"><i class="fa fa-trash"></i> Clear fields</a>
>+            <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
>         </div>
>     </fieldset>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>index 343c579..f72eb30 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
>@@ -45,7 +45,7 @@
>         </div>
>         [% END %]
>     [% IF ( total ) %]
>-        <div class="btn-group"><button type="submit" class="btn btn-default btn-sm merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
>+        <div class="btn-group"><button type="submit" class="btn btn-default merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
>     [% END %]
>   </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>index e8eb0d9..38633c4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
>@@ -133,8 +133,8 @@
>     </div>
>     <div class="col-md-9">
>         <div id="toolbar" class="btn-toolbar">
>-            <button class="btn btn-default btn-sm" type="submit"><i class="fa fa-search"></i> <span>Search</span></button>
>-            <button class="btn btn-default btn-sm" type="reset"><i class="fa fa-trash"></i> <span>Clear</span></button>
>+            <button class="btn btn-default" type="submit"><i class="fa fa-search"></i> <span>Search</span></button>
>+            <button class="btn btn-default" type="reset"><i class="fa fa-trash"></i> <span>Clear</span></button>
>         </div>
>         <ul id="advanced-search-fields">
>             <li>
>@@ -255,8 +255,8 @@
>     <div class="col-md-3"><ul id="macro-list"></ul></div>
>     <div class="col-md-9" id="macro-editor">
>         <div id="macro-toolbar" class="btn-toolbar">
>-            <button class="btn btn-default btn-sm" id="run-macro" title="Run and edit macros"><i class="fa fa-play"></i> Run macro</button>
>-            <button class="btn btn-default btn-sm" id="delete-macro" title="Delete macro"><i class="fa fa-trash"></i> Delete macro</button>
>+            <button class="btn btn-default" id="run-macro" title="Run and edit macros"><i class="fa fa-play"></i> Run macro</button>
>+            <button class="btn btn-default" id="delete-macro" title="Delete macro"><i class="fa fa-trash"></i> Delete macro</button>
>             <label for="macro-format">Format: </label> <select id="macro-format"></select>
>             <div id="macro-save-message"></div>
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
>index cf2b423..26f0f4e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt
>@@ -18,10 +18,10 @@
> <form name="f_pop" id="f_pop" style="display:block" onsubmit="report()" action="">
>     <div id="toolbar">
>         <div class="btn-group">
>-            <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
>+            <button type="submit" class="btn btn-default"><i class="fa fa-save"></i> Save</button>
>         </div>
>         <div class="btn-group">
>-            <button type="button" class="btn btn-default btn-sm close_window"><i class="fa fa-remove"></i> Cancel</button>
>+            <button type="button" class="btn btn-default close_window"><i class="fa fa-remove"></i> Cancel</button>
>         </div>
>     </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>index 58248c3..ec7cfaf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>@@ -50,8 +50,8 @@
>             [% IF ( notes.count ) %]
>                 <form id="mark_selected" method="post" action="/cgi-bin/koha/circ/checkout-notes.pl">
>                     <div id="toolbar" class="btn-toolbar">
>-                        <button type="submit" class="btn btn-default btn-sm" name="mark_selected-seen" value="seen" disabled="disabled"><i class="fa fa-eye"></i> Mark seen</button>
>-                        <button type="submit" class="btn btn-default btn-sm" name="mark_selected-notseen" value="notseen" disabled="disabled"><i class="fa fa-eye-slash"></i> Mark not seen</button>
>+                        <button type="submit" class="btn btn-default" name="mark_selected-seen" value="seen" disabled="disabled"><i class="fa fa-eye"></i> Mark seen</button>
>+                        <button type="submit" class="btn btn-default" name="mark_selected-notseen" value="notseen" disabled="disabled"><i class="fa fa-eye-slash"></i> Mark not seen</button>
>                     </div>
> 
>                     <fieldset class="action" style="cursor:pointer;">
>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 da0712d..c9da737 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -552,7 +552,7 @@ No patron matched <span class="ex">[% message | html %]</span>
>                     [% ELSE %]
>                         <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" />
>                     [% END %]
>-                    <button class="btn btn-default btn-sm action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
>+                    <button class="btn btn-default btn-xs action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
>                 </div>
>             [% END %]
>         [% END %]
>@@ -704,10 +704,10 @@ No patron matched <span class="ex">[% message | html %]</span>
>                        </i>
>                    [% END %]
>                    <br/>
>-                   <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
>+                   <a class="btn btn-default" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a>
>                     [% IF (noissues && patron && CAN_user_circulate_force_checkout) %]
>                         <span class="override_debarment">
>-                            <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm">Override restriction temporarily</a>
>+                            <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&amp;borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default">Override restriction temporarily</a>
>                         </span>
>                     [% END %]
>                </li>
>@@ -789,12 +789,12 @@ No patron matched <span class="ex">[% message | html %]</span>
>                         <i>"[% message.message | html %]"</i>
>                     </span>
>                     [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %]
>-                        <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id | html %]&amp;borrowernumber=[% message.borrowernumber | html %]" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
>+                        <a class="btn btn-link" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% message.message_id | html %]&amp;borrowernumber=[% message.borrowernumber | html %]" 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" class="btn btn-link btn-sm" 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" data-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
>     </div>
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>index 64338a5..5194c5b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>@@ -45,7 +45,7 @@
>                 [% IF CAN_user_clubs_edit_templates %]
>                     <div class="btn-toolbar">
>                         <div class="btn-group">
>-                            <a class="btn btn-sm btn-default" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a>
>+                            <a class="btn btn-default" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a>
>                         </div>
>                     </div>
>                 [% END %]
>@@ -106,9 +106,9 @@
>                     <div class="btn-toolbar">
>                         <div class="btn-group">
>                             [% IF club_templates %]
>-                                <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button>
>+                                <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button>
>                             [% ELSE %]
>-                                <button disabled="disabled" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button>
>+                                <button disabled="disabled" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button>
>                             [% END %]
>                             <ul class="dropdown-menu">
>                                 [% FOREACH t IN club_templates %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index 23bd446..446192d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -33,14 +33,14 @@
>             [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
>             <div id="toolbar">
>                 [% IF CAN_user_coursereserves_add_reserves %]
>-                    <a class="btn btn-default btn-sm" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Add reserves</a>
>-                    <a class="btn btn-default btn-sm" id="add_items" href="/cgi-bin/koha/course_reserves/batch_add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Batch add reserves</a>
>+                    <a class="btn btn-default" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Add reserves</a>
>+                    <a class="btn btn-default" id="add_items" href="/cgi-bin/koha/course_reserves/batch_add_items.pl?course_id=[% course.course_id | html %]"><i class="fa fa-plus"></i> Batch add reserves</a>
>                 [% END %]
>                 [% IF ( CAN_user_coursereserves_manage_courses ) %]
>-                    <a class="btn btn-default btn-sm" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id | html %]"><i class="fa fa-pencil"></i> Edit course</a>
>+                    <a class="btn btn-default" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id | html %]"><i class="fa fa-pencil"></i> Edit course</a>
>                 [% END %]
>                 [% IF ( CAN_user_coursereserves_manage_courses ) %]
>-                    <a class="btn btn-default btn-sm" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id | html %]&amp;action=del"><i class="fa fa-trash"></i> Delete course</a>
>+                    <a class="btn btn-default" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id | html %]&amp;action=del"><i class="fa fa-trash"></i> Delete course</a>
>                 [% END %]
>             </div>
>             [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>index 0a59960..12e5088 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>@@ -23,7 +23,7 @@
>                     [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
>                     <div id="toolbar">
>                         [% IF ( CAN_user_coursereserves_manage_courses ) %]
>-                            <a class="btn btn-default btn-sm" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a>
>+                            <a class="btn btn-default" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a>
>                         [% END %]
>                     </div>
>                     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index 2becaf5..ce73bac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -263,9 +263,9 @@
>                             <input type="hidden" name="method" value="delete" />
>                             <input type="hidden" name="confirmed" value="1" />
>                             <input type="hidden" name="illrequest_id" value="[% request.id | html %]" />
>-                            <button type="submit" class="btn btn-default btn-sm approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>+                            <button type="submit" class="btn btn-default approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
>                         </form>
>-                        <a class="btn btn-default btn-sm deny" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-remove"></i>No, do not delete</a>
>+                        <a class="btn btn-default deny" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]"><i class="fa fa-fw fa-remove"></i>No, do not delete</a>
>                     </div>
> 
>                 [% ELSIF query_type == 'illview' %]
>@@ -281,7 +281,7 @@
> 
>                     <h1>Manage ILL request</h1>
>                     <div id="request-toolbar" class="btn-toolbar">
>-                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
>+                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
>                         <span class="fa fa-pencil"></span>
>                         Edit request
>                         </a>
>@@ -289,7 +289,7 @@
>                             [% IF action.method == 'migrate' %]
>                                 [% IF backends.size > 2 %]
>                                     <div class="dropdown btn-group">
>-                                        <button class="btn btn-sm btn-default dropdown-toggle" type="button" id="ill-migrate-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
>+                                        <button class="btn btn-default dropdown-toggle" type="button" id="ill-migrate-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
>                                             <i class="fa [% action.ui_method_icon | html %]"></i> [% action.ui_method_name | html %] <span class="caret"></span>
>                                         </button>
>                                         <ul class="dropdown-menu" aria-labelledby="ill-migrate-dropdown">
>@@ -303,7 +303,7 @@
>                                 [% ELSIF backends.size == 2 %]
>                                     [% FOREACH backend IN backends %]
>                                         [% IF backend != request.backend %]
>-                                            <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]&amp;backend=[% backend | uri %]">
>+                                            <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]&amp;backend=[% backend | uri %]">
>                                             <span class="fa [% action.ui_method_icon | html %]"></span>
>                                             [% action.ui_method_name | html %]
>                                             </a>
>@@ -311,17 +311,17 @@
>                                     [% END %]
>                                 [% END %]
>                             [% ELSIF action.method != 0 %]
>-                                <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]">
>+                                <a title="[% action.ui_method_name | html %]" id="ill-toolbar-btn-[% action.id | lower | html %]" class="btn btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=[% action.method | uri %]&amp;illrequest_id=[% request.illrequest_id | uri %]">
>                                 <span class="fa [% action.ui_method_icon | html %]"></span>
>                                 [% action.ui_method_name | html %]
>                                 </a>
>                             [% END %]
>                         [% END %]
>-                        <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-sm btn-default pull-right" href="#">
>+                        <a title="Display supplier metadata" id="ill-request-display-metadata" class="btn btn-default pull-right" href="#">
>                             <span class="fa fa-eye"></span>
>                             Display supplier metadata
>                         </a>
>-                        <a title="ILL request log" id="ill-request-display-log" class="btn btn-sm btn-default pull-right" href="#">
>+                        <a title="ILL request log" id="ill-request-display-log" class="btn btn-default pull-right" href="#">
>                             <span class="fa fa-calendar"></span>
>                             ILL request log
>                         </a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>index cd5c52c..f598182 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>@@ -99,7 +99,7 @@
>                                     [% END %]
>                                 [% END %]
>                             </table>
>-                            [% IF ( print ) %]<button type="button" class="btn btn-default btn-sm" id="print">Export selected</button>[% END %]
>+                            [% IF ( print ) %]<button type="button" class="btn btn-default" id="print">Export selected</button>[% END %]
>                             </fieldset>
>                             </form>
>                             [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>index d3a05a3..3285dc1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt
>@@ -46,7 +46,7 @@
>                 <div id="keys">
>                     [% IF api_keys && api_keys.size > 0 %]
>                         <p>
>-                            <button class="btn btn-default btn-sm toggle_element" type="submit" id="show-api-form" data-element="#add-api-key"><i class="fa fa-plus"></i> Generate a new client id/key pair</button>
>+                            <button class="btn btn-default toggle_element" type="submit" id="show-api-form" data-element="#add-api-key"><i class="fa fa-plus"></i> Generate a new client id/key pair</button>
>                         </p>
>                         <table>
>                             <thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>index 9cc6eda..b42c291 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -186,8 +186,8 @@
>                   </ol>
>                 </fieldset>
>                 <fieldset class="action">
>-                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
>-                  <a class="cancel btn btn-link btn-sm"
>+                  <button type="submit" class="btn btn-default"><i class="fa fa-save"></i> Save changes</button>
>+                  <a class="cancel btn btn-link"
>                      href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">
>                     Cancel
>                   </a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>index 6c65d69..de955cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt
>@@ -29,8 +29,8 @@
> 
>     <div id="permissionstree">
>         <div id="permissions_toolbar" class="btn-toolbar">
>-            <button type="submit" class="btn btn-sm btn-default"><i class="fa fa-save"></i> Save</button>
>-            <a class="btn btn-sm btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a>
>+            <button type="submit" class="btn btn-default"><i class="fa fa-save"></i> Save</button>
>+            <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-remove"></i> Cancel</a>
>             <a class="toggleall toggleall_on btn btn-link" href="#"><i class="fa fa-plus-square-o"></i> Show all</a>
>             <a class="toggleall toggleall_off btn btn-link" href="#"><i class="fa fa-minus-square-o"></i> Hide all</a>
>             <div class="btn-group pull-right">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 52a6913..1ca6d63 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -141,7 +141,7 @@
>     [% IF opadd %]
>         <a class="btn btn-default" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
>     [% ELSE %]
>-        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">
>+        <a class="btn btn-default" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">
>     [% END %]
>         <i class="fa fa-times"></i> Cancel
>     </a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>index 0ae4644..94abaa3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
>@@ -129,7 +129,7 @@
>                 [% END %]
> 
>                 [% UNLESS error %]
>-                    <a class="btn btn-default btn-sm" href="moremember.pl?borrowernumber=[% keeper.id | html %]">View patron record</a>
>+                    <a class="btn btn-default" href="moremember.pl?borrowernumber=[% keeper.id | html %]">View patron record</a>
>                 [% END %]
>             [% END %]
>         </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index d64be13..3b03149 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -96,12 +96,12 @@
>                                                 <i>"[% patron_message.message | html %]"</i>
>                                             </span>
>                                             [% IF patron_message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %]
>-                                                <a class="btn btn-link btn-sm" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&amp;borrowernumber=[% patron_message.borrowernumber | html %]&amp;from=moremember" onclick="return confirm(MSG_CONFIRM_DELETE_MESSAGE);"><i class="fa fa-trash"></i> Delete</a>
>+                                                <a class="btn btn-link" href="/cgi-bin/koha/circ/del_message.pl?message_id=[% patron_message.message_id | html %]&amp;borrowernumber=[% patron_message.borrowernumber | html %]&amp;from=moremember" 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" class="btn btn-link btn-sm" 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" data-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
>                             </div>
>                         [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>index bcf488c..db6d10c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>@@ -57,13 +57,13 @@
>                                 </div>
>                             </form>
>                             <div id="batch-manage" class="action">
>-                                <a class="btn btn-default btn-sm" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %]
>-                                <a class="btn btn-default btn-sm" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a>
>-                                <a class="btn btn-default btn-sm" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a>
>-                                <a class="btn btn-default btn-sm" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a>
>-                                <a class="btn btn-default btn-sm" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a>
>-                                <a class="btn btn-default btn-sm" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a>
>-                                <a class="btn btn-default btn-sm" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %]
>+                                <a class="btn btn-default" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %]
>+                                <a class="btn btn-default" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a>
>+                                <a class="btn btn-default" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a>
>+                                <a class="btn btn-default" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a>
>+                                <a class="btn btn-default" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a>
>+                                <a class="btn btn-default" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a>
>+                                <a class="btn btn-default" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %]
>                             </div>
>                             [% IF ( table_loop ) %]
>                             <form name="items" class="checkboxed">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>index d9fa127..528bc1d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>@@ -34,7 +34,7 @@
> 
> [% IF ( start_dictionary ) %]
>     <div id="toolbar">
>-        <a id="newdictionary" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a>
>+        <a id="newdictionary" class="btn btn-default" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a>
>     </div>
> [% END %]
> <h1>Dictionary</h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>index 0423a41..37ccf50 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>@@ -424,9 +424,9 @@ $(document).ready(function() {
> 
> </table>
>     <fieldset class="action">
>-        <div class="btn-group"><input type="submit" value="Save" class="btn btn-default btn-sm"  accesskey="w" /></div>
>+        <div class="btn-group"><input type="submit" value="Save" class="btn btn-default"  accesskey="w" /></div>
>         [% UNLESS ( serialsadditems ) %]&nbsp;&nbsp;
>-            <div class="btn-group"><a href="#multi_receiving" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Multi receiving</a></div>
>+            <div class="btn-group"><a href="#multi_receiving" role="button" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Multi receiving</a></div>
>         [% END %]
> 
>     </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>index c2574c8..44d1cac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
>@@ -154,8 +154,8 @@
>               </table>
>             </fieldset>
>             <fieldset class="action">
>-              <button type="submit" class="btn btn-default btn-sm">Save</button>
>-              <button type="reset" class="btn btn-default btn-sm">Reset</button>
>+              <button type="submit" class="btn btn-default">Save</button>
>+              <button type="reset" class="btn btn-default">Reset</button>
>               <a class="cancel" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">Cancel</a>
>             </fieldset>
>           </form>
>@@ -221,7 +221,7 @@
>                 </tbody>
>               </table>
>               <fieldset class="action">
>-                  <button type="button" id="test_pattern" class="btn btn-default btn-sm">Test pattern</button>
>+                  <button type="button" id="test_pattern" class="btn btn-default">Test pattern</button>
>               </fieldset>
>               <div id="predictionpattern"></div>
>             </fieldset>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>index ace172b..aa052ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
>@@ -137,8 +137,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
>   </table>
>   [% END %]
>     [% IF ( tagloop ) %]<fieldset class="action">
>-   <button type="submit" value="Approve" class="btn btn-default btn-sm" id="approve_button" name="op-approve"><i class="fa fa-check"></i> Approve</button>
>-   <button type="submit" value="Reject" class="btn btn-default btn-sm"  id="reject_button" name="op-reject"><i class="fa fa-remove"></i> Reject</button>
>+   <button type="submit" value="Approve" class="btn btn-default" id="approve_button" name="op-approve"><i class="fa fa-check"></i> Approve</button>
>+   <button type="submit" value="Reject" class="btn btn-default"  id="reject_button" name="op-reject"><i class="fa fa-remove"></i> Reject</button>
>   </fieldset>[% END %]
>   </form>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>index e895d95..b341800 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>@@ -55,7 +55,7 @@
>     <span class="required">Required</span>
>         </div>	</li>
> </ol>
>-    <fieldset class="action"><button class="submit btn btn-default btn-sm">Upload file</button></fieldset>
>+    <fieldset class="action"><button class="submit btn btn-default">Upload file</button></fieldset>
> </fieldset>
> 
>     <div id="uploadpanel">
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 22698: 87927 | 87941 | 87978