Bugzilla – Attachment 57017 Details for
Bug 16239
Upgrade Bootstrap in the staff client
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16239: Update templates
Bug-16239-Update-templates.patch (text/plain), 312.09 KB, created by
Josef Moravec
on 2016-11-01 11:21:35 UTC
(
hide
)
Description:
Bug 16239: Update templates
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2016-11-01 11:21:35 UTC
Size:
312.09 KB
patch
obsolete
>From 43cf22e590e2a9143611eac86c7e542900efab52 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Fri, 21 Oct 2016 20:48:38 +0200 >Subject: [PATCH] Bug 16239: Update templates > >--- > .../prog/en/includes/acquisitions-toolbar.inc | 10 +-- > .../prog/en/includes/auth-finder-search.inc | 4 +- > .../prog/en/includes/authorities-toolbar.inc | 12 ++-- > .../prog/en/includes/blocked-fines.inc | 4 +- > .../prog/en/includes/borrower_debarments.inc | 2 +- > .../prog/en/includes/budgets-admin-toolbar.inc | 8 +-- > .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 26 ++++--- > .../prog/en/includes/cateditor-ui.inc | 24 +++---- > .../prog/en/includes/checkouts-table.inc | 8 +-- > .../prog/en/includes/doc-head-close.inc | 1 + > .../intranet-tmpl/prog/en/includes/header.inc | 8 +-- > .../prog/en/includes/intranet-bottom.inc | 6 +- > .../prog/en/includes/labels-toolbar.inc | 4 +- > .../prog/en/includes/members-toolbar.inc | 24 ++++--- > .../prog/en/includes/patron-toolbar.inc | 6 +- > .../prog/en/includes/patroncards-toolbar.inc | 4 +- > .../prog/en/includes/quotes-toolbar.inc | 6 +- > .../prog/en/includes/quotes-upload-toolbar.inc | 6 +- > .../prog/en/includes/reports-toolbar.inc | 14 ++-- > .../en/includes/rotating-collections-toolbar.inc | 8 +-- > .../prog/en/includes/serials-toolbar.inc | 18 ++--- > .../prog/en/includes/virtualshelves-toolbar.inc | 10 +-- > .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 36 ++++++---- > .../prog/en/modules/acqui/basketgroup.tt | 10 +-- > .../prog/en/modules/acqui/booksellers.tt | 14 ++-- > .../prog/en/modules/acqui/edifactmsgs.tt | 12 ++-- > .../prog/en/modules/acqui/invoices.tt | 2 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 8 ++- > .../prog/en/modules/acqui/neworderempty.tt | 12 +++- > .../prog/en/modules/acqui/newordersuggestion.tt | 4 +- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 ++- > .../prog/en/modules/acqui/supplier.tt | 8 +-- > .../en/modules/acqui/tables/members_results.tt | 4 +- > .../prog/en/modules/acqui/transferorder.tt | 8 +-- > .../prog/en/modules/acqui/z3950_search.tt | 8 ++- > .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- > .../prog/en/modules/admin/aqbudgets.tt | 2 +- > .../prog/en/modules/admin/aqcontract.tt | 4 +- > .../prog/en/modules/admin/audio_alerts.tt | 8 +-- > .../en/modules/admin/auth_subfields_structure.tt | 2 +- > .../prog/en/modules/admin/auth_tag_structure.tt | 4 +- > .../prog/en/modules/admin/authorised_values.tt | 8 +-- > .../prog/en/modules/admin/authtypes.tt | 4 +- > .../prog/en/modules/admin/biblio_framework.tt | 38 +++++++--- > .../prog/en/modules/admin/branches.tt | 12 ++-- > .../prog/en/modules/admin/categories.tt | 6 +- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +- > .../prog/en/modules/admin/classsources.tt | 12 ++-- > .../prog/en/modules/admin/currency.tt | 6 +- > .../prog/en/modules/admin/edi_accounts.tt | 4 +- > .../prog/en/modules/admin/edi_ean_accounts.tt | 6 +- > .../prog/en/modules/admin/items_search_fields.tt | 6 +- > .../prog/en/modules/admin/itemtypes.tt | 6 +- > .../prog/en/modules/admin/koha2marclinks.tt | 2 +- > .../en/modules/admin/marc_subfields_structure.tt | 4 +- > .../prog/en/modules/admin/marctagstructure.tt | 6 +- > .../prog/en/modules/admin/matching-rules.tt | 6 +- > .../prog/en/modules/admin/oai_set_mappings.tt | 4 +- > .../prog/en/modules/admin/oai_sets.tt | 4 +- > .../prog/en/modules/admin/patron-attr-types.tt | 6 +- > .../prog/en/modules/admin/printers.tt | 2 +- > .../admin/searchengine/elasticsearch/mappings.tt | 6 +- > .../prog/en/modules/admin/smart-rules.tt | 22 +++--- > .../prog/en/modules/admin/sms_providers.tt | 6 +- > .../prog/en/modules/admin/systempreferences.tt | 6 +- > .../prog/en/modules/admin/z3950servers.tt | 6 +- > .../prog/en/modules/authorities/authorities.tt | 4 +- > .../en/modules/authorities/searchresultlist.tt | 2 +- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 14 ++-- > .../prog/en/modules/catalogue/advsearch.tt | 8 +-- > .../prog/en/modules/catalogue/detail.tt | 12 ++-- > .../prog/en/modules/catalogue/itemsearch.tt | 2 +- > .../prog/en/modules/catalogue/results.tt | 12 ++-- > .../prog/en/modules/cataloguing/addbiblio.tt | 22 +++--- > .../prog/en/modules/cataloguing/addbooks.tt | 22 +++--- > .../prog/en/modules/cataloguing/additem.tt | 2 +- > .../prog/en/modules/cataloguing/editor.tt | 83 +++++++++++++--------- > .../prog/en/modules/cataloguing/merge.tt | 8 ++- > .../en/modules/cataloguing/z3950_auth_search.tt | 10 ++- > .../prog/en/modules/cataloguing/z3950_search.tt | 9 ++- > .../prog/en/modules/circ/circulation.tt | 14 ++-- > .../prog/en/modules/circ/offline-mf.tt | 1 + > .../intranet-tmpl/prog/en/modules/circ/offline.tt | 4 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 22 ++++-- > .../prog/en/modules/circ/transferstoreceive.tt | 2 +- > .../prog/en/modules/common/patron_search.tt | 2 +- > .../en/modules/course_reserves/course-details.tt | 14 ++-- > .../en/modules/course_reserves/course-reserves.tt | 2 +- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- > .../prog/en/modules/labels/label-edit-batch.tt | 16 ++--- > .../prog/en/modules/labels/label-manage.tt | 6 +- > .../intranet-tmpl/prog/en/modules/labels/result.tt | 8 +-- > .../prog/en/modules/members/boraccount.tt | 6 +- > .../prog/en/modules/members/memberentrygen.tt | 26 +++---- > .../prog/en/modules/members/notices.tt | 2 +- > .../en/modules/members/purchase-suggestions.tt | 2 +- > .../en/modules/members/tables/guarantor_search.tt | 2 +- > .../en/modules/members/tables/members_results.tt | 2 +- > .../prog/en/modules/patron_lists/list.tt | 4 +- > .../prog/en/modules/patron_lists/lists.tt | 10 ++- > .../prog/en/modules/patroncards/edit-batch.tt | 16 ++--- > .../prog/en/modules/patroncards/edit-layout.tt | 2 +- > .../prog/en/modules/patroncards/image-manage.tt | 6 +- > .../prog/en/modules/patroncards/manage.tt | 6 +- > .../modules/patroncards/tables/members_results.tt | 2 +- > .../prog/en/modules/plugins/plugins-home.tt | 4 +- > .../prog/en/modules/reports/dictionary.tt | 4 +- > .../en/modules/reports/guided_reports_start.tt | 4 +- > .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- > .../rotating_collections/rotatingCollections.tt | 2 +- > .../prog/en/modules/serials/acqui-search-result.tt | 4 +- > .../prog/en/modules/serials/add_fields.tt | 6 +- > .../prog/en/modules/serials/checkexpiration.tt | 4 +- > .../prog/en/modules/serials/result.tt | 4 +- > .../en/modules/serials/routing-preview-slip.tt | 2 +- > .../prog/en/modules/serials/routing.tt | 2 +- > .../prog/en/modules/serials/serials-collection.tt | 10 +-- > .../prog/en/modules/serials/serials-search.tt | 8 +-- > .../en/modules/serials/subscription-frequencies.tt | 6 +- > .../modules/serials/subscription-numberpatterns.tt | 6 +- > .../en/modules/serials/tables/members_results.tt | 2 +- > .../prog/en/modules/suggestion/suggestion.tt | 6 +- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 20 +++--- > .../tools/automatic_item_modification_by_age.tt | 10 +-- > .../prog/en/modules/tools/batchMod-del.tt | 6 +- > .../prog/en/modules/tools/batchMod-edit.tt | 6 +- > .../en/modules/tools/batch_record_modification.tt | 10 ++- > .../prog/en/modules/tools/csv-profiles.tt | 2 +- > .../prog/en/modules/tools/koha-news.tt | 6 +- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 10 +-- > .../prog/en/modules/tools/manage-marc-import.tt | 12 ++-- > .../modules/tools/marc_modification_templates.tt | 22 +++--- > .../prog/en/modules/tools/stage-marc-import.tt | 4 +- > .../intranet-tmpl/prog/en/modules/tools/upload.tt | 10 +-- > .../prog/en/modules/virtualshelves/shelves.tt | 8 +-- > .../virtualshelves/tables/shelves_results.tt | 4 +- > 138 files changed, 651 insertions(+), 519 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index af24d52..a82ab41 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -10,7 +10,7 @@ function confirm_deletion() { > <div id="toolbar" class="btn-toolbar"> > [% IF ( booksellerid ) %] > <div class="btn-group"> >- <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New >+ <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >@@ -26,15 +26,15 @@ function confirm_deletion() { > </ul> > </div> > [% IF ( CAN_user_acquisition_vendors_manage ) %] >- <div class="btn-group"><a class="btn btn-small" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div> > [% UNLESS ( basketcount OR subscriptioncount ) %] >- <div class="btn-group"><a class="btn btn-small" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div> > [% END %] > [% END %] > [% IF CAN_user_acquisition_order_receive && basketcount %] >- <div class="btn-group"><a class="btn btn-small" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="fa fa-inbox"></i> Receive shipments</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]"><i class="fa fa-inbox"></i> Receive shipments</a></div> > [% END %] > [% ELSE %] >- <div class="btn-group"><a class="btn btn-small" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >index fad1b4c..16a666e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >@@ -106,8 +106,8 @@ function finderjumpfull(page) > </script> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="clear" class="btn btn-small"><i class="fa fa-trash"></i> Clear field</a></div> >- <div class="btn-group"><a href="#" id="createnew" class="btn btn-small"><i class="fa fa-plus"></i> Create new authority</a></div> >+ <div class="btn-group"><a href="#" id="clear" class="btn btn-default btn-sm"><i class="fa fa-trash"></i> Clear field</a></div> >+ <div class="btn-group"><a href="#" id="createnew" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> Create new authority</a></div> > </div> > <form name="f" method="get" action="auth_finder.pl"> > <input type="hidden" name="source" value="[% source %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >index 6001e43..582a4ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >@@ -28,15 +28,15 @@ > > [% IF ( authid ) %] > [% IF ( CAN_user_editauthorities ) %] >- <div class="btn-group"><a class="btn btn-small" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="fa fa-pencil"></i> Edit</a></div> >- <div class="btn-group"><a class="btn btn-small" id="dupAuth" href="authorities.pl?authid=[% authid %]&op=duplicate"><i class="fa fa-copy"></i> Duplicate</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="editAuth" href="authorities.pl?authid=[% authid %]"><i class="fa fa-pencil"></i> Edit</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="dupAuth" href="authorities.pl?authid=[% authid %]&op=duplicate"><i class="fa fa-copy"></i> Duplicate</a></div> > [% UNLESS ( count ) %] >- <div class="btn-group"><a href="#" class="btn btn-small" id="delAuth"><i class="fa fa-trash"></i> Delete</a></div> >+ <div class="btn-group"><a href="#" class="btn btn-default btn-sm" id="delAuth"><i class="fa fa-trash"></i> Delete</a></div> > [% END %] > [% END %] > > <div class="btn-group"> >- <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save >+ <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >@@ -50,7 +50,7 @@ > > [% IF ( CAN_user_editauthorities ) %] > <div class="btn-group"> >- <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New authority >+ <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New authority > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >@@ -60,7 +60,7 @@ > </ul> > </div> > <div class="btn-group"> >- <a class="btn btn-small" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a> >+ <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a> > </div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >index 0789789..21098f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -7,7 +7,7 @@ > [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% END %] >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" class="btn btn-mini" >Make payment</a> >- <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]" class="btn btn-mini" >Pay all fines</a></li> >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" class="btn btn-default btn-xs" >Make payment</a> >+ <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]" class="btn btn-default btn-xs" >Pay all fines</a></li> > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >index a72a76e..7b4b25d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >@@ -66,7 +66,7 @@ > <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td> > [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] > <td> >- <a class="remove_restriction btn btn-mini" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&borrower_debarment_id=[% d.borrower_debarment_id %]&action=del"> >+ <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&borrower_debarment_id=[% d.borrower_debarment_id %]&action=del"> > <i class="fa fa-trash"></i> Remove > </a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >index 7172a8d..e9d61a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >@@ -1,7 +1,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( budget_period_id ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li> > [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %] >@@ -14,7 +14,7 @@ > </div> > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=[% budget_period_id %]">Edit budget [% budget_period_description %]</a></li> > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&budget_period_id=[% budget_period_id %]">Duplicate budget [% budget_period_description %]</a></li> >@@ -22,7 +22,7 @@ > </div> > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Planning <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_acquisition_planning_manage ) %] > <li> >@@ -55,7 +55,7 @@ > </div> > > [% ELSE %] >- <div class="btn-group"><a class="btn btn-small" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form"><i class="fa fa-plus"></i> New budget</a></div> > [% END %] > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index a8868ab..46e9ed1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -130,7 +130,7 @@ > [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || > CAN_user_serials_create_subscription ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li> >@@ -155,7 +155,7 @@ CAN_user_serials_create_subscription ) %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">Edit record</a></li> >@@ -212,7 +212,7 @@ CAN_user_serials_create_subscription ) %] > [% END %] > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber %]">BIBTEX</a></li> > <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li> >@@ -227,25 +227,25 @@ CAN_user_serials_create_subscription ) %] > > [% IF ( virtualshelves && intranetbookbag ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">Add to <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">Add to <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="#" id="addtocart">Cart</a></li> > <li><a href="#" id="addtoshelf">List</a></li> > </ul> > </div> > [% ELSIF ( virtualshelves ) %] >- <div class="btn-group"><a id="addtoshelf" class="btn btn-small"><i class="fa fa-list"></i> Add to list</a> </div> >+ <div class="btn-group"><a id="addtoshelf" class="btn btn-default btn-sm"><i class="fa fa-list"></i> Add to list</a> </div> > [% ELSIF ( intranetbookbag ) %] >- <div class="btn-group"><a id="addtocart" class="btn btn-small"><i class="fa fa-shopping-cart"></i> Add to cart</a> </div> >+ <div class="btn-group"><a id="addtocart" class="btn btn-default btn-sm"><i class="fa fa-shopping-cart"></i> Add to cart</a> </div> > [% END %] > >- <div class="btn-group"><a id="printbiblio" class="btn btn-small"><i class="fa fa-print"></i> Print</a></div> >+ <div class="btn-group"><a id="printbiblio" class="btn btn-default btn-sm"><i class="fa fa-print"></i> Print</a></div> > > [% IF ( CAN_user_reserveforothers ) %] > [% UNLESS ( norequests ) %] > [% IF ( holdfor ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> > <i class="fa fa-sticky-note-o"></i> > Place hold > <span class="caret"></span> >@@ -256,7 +256,7 @@ CAN_user_serials_create_subscription ) %] > </ul> > </div> > [% ELSE %] >- <div class="btn-group"><a id="placehold" class="btn btn-small" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div> >+ <div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="fa fa-sticky-note-o"></i> Place hold</a></div> > [% END %] > [% END %] > [% END %] >@@ -268,7 +268,9 @@ CAN_user_serials_create_subscription ) %] > </div> > > <!--Modal for Dublin Core--> >- <div class="modal hide" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true"> >+ <div class="modal" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> > <h3 id="exportLabelexportModal_">Exporting to Dublin Core...</h3> >@@ -288,10 +290,12 @@ CAN_user_serials_create_subscription ) %] > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn">Export</button> >+ <button type="submit" class="btn btn-default">Export</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > <input type="hidden" name="op" value="export" /> > <input type="hidden" name="bib" value="[% biblionumber %]" /> > </form> >+ </div> >+ </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index 0e4c279..14e9023 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -387,7 +387,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } > > function showResultsBox(data) { >- $('#search-top-pages, #search-bottom-pages').find('.pagination').empty(); >+ $('#search-top-pages, #search-bottom-pages').find('nav').empty(); > $('#searchresults thead tr').empty(); > $('#searchresults tbody').empty(); > $('#search-serversinfo').empty().append('<li>' + _("Loading...") + '</li>'); >@@ -527,7 +527,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > var max_page = Math.ceil( data.total_fetched / data.page_size ) - 1; > > if ( cur_page != 0 ) { >- pages.push( '<li><a class="search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '">« ' + _("Previous") + '</a></li>' ); >+ pages.push( '<li><a class="search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '"><span aria-hidden="true">«</span> ' + _("Previous") + '</a></li>' ); > } > > for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) { >@@ -539,10 +539,10 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } > > if ( cur_page < max_page ) { >- pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' »</a></li>' ); >+ pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' <span aria-hidden="true">»</span></a></li>' ); > } > >- $( '#search-top-pages, #search-bottom-pages' ).find( '.pagination' ).html( pages.length > 1 ? ( '<ul>' + pages.join( '' ) + '</ul>' ) : '' ); >+ $( '#search-top-pages, #search-bottom-pages' ).find( 'nav' ).html( pages.length > 1 ? ( '<ul class="pagination pagination-sm">' + pages.join( '' ) + '</ul>' ) : '' ); > > var $overlay = $('#search-overlay'); > $overlay.find('span').text(_("Loading")); >@@ -776,14 +776,14 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } ); > }, 100); > >- $("#advanced-search-ui, #search-results-ui, #macro-ui").css( { >- marginLeft: function() { >- return -($(this).width() / 2); >- } >- } ); >+// $("#advanced-search-ui, #search-results-ui, #macro-ui").css( { >+// marginLeft: function() { >+// return -($(this).width() / 2); >+// } >+// } ); > } > >- $( '#macro-ui' ).on( 'shown', function() { >+ $( '#macro-ui' ).on( 'shown.bs.modal', function() { > if ( macroEditor ) return; > > macroEditor = CodeMirror( >@@ -838,7 +838,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > > // Click bindings > $( '#save-record, #save-dropdown a' ).click( function() { >- $( '#save-record' ).find('i').attr( 'class', 'icon-loading' ).siblings( 'span' ).text( _("Saving...") ); >+ $( '#save-record' ).find('i').attr( 'class', 'fa fa-spinner' ).siblings( 'span' ).text( _("Saving...") ); > > function finishCb(result) { > if ( result.error == 'syntax' ) { >@@ -882,7 +882,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } > } ); > >- $( '#save-record' ).find('i').attr( 'class', 'icon-hdd' ); >+ $( '#save-record' ).find('i').attr( 'class', 'fa fa-hdd-o' ); > > if ( result.error ) { > // Reset backend info >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >index 78d3989..681dbfc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc >@@ -3,7 +3,7 @@ > [% IF ( issuecount ) %] > <div id="issues-table-loading-message"> > <p> >- <a id="issues-table-load-now-button" href="#" class="btn"><i class="fa fa-book"></i> Show checkouts</a> >+ <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> Show checkouts</a> > </p> > </div> > <form name="issues" action="/cgi-bin/koha/tools/export.pl" method="post" class="checkboxed"> >@@ -44,8 +44,8 @@ > [% END %] > [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <button class="btn" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button> >- <button class="btn" id="RenewAll"><i class="fa fa-book"></i> Renew all</button> >+ <button class="btn btn-default" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button> >+ <button class="btn btn-default" id="RenewAll"><i class="fa fa-book"></i> Renew all</button> > [% END %] > </fieldset> > >@@ -65,7 +65,7 @@ > <input type="hidden" id="output_format" name="output_format" value="iso2709" /> > <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" /> > <input type="hidden" id="record_type" name="record_type" value="bibs" /> >- <button class="btn btn-small" id="export_submit"><i class="fa fa-download"></i> Export</button> >+ <button class="btn btn-default btn-sm" id="export_submit"><i class="fa fa-download"></i> Export</button> > </fieldset> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >index 078a6c3..1257a12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc >@@ -20,6 +20,7 @@ > > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap-theme.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" /> > <link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> > [% INCLUDE intranetstylesheet.inc %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >index 193bcc1..2c88c6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >@@ -1,7 +1,7 @@ > [% USE Branches %] >-<div id="header" class="navbar navbar-static-top"> >- <div class="navbar-inner"> >- <ul id="toplevelmenu" class="nav"> >+<div id="header" class="navbar navbar-default"> >+ <div class="container-fluid"> >+ <ul id="toplevelmenu" class="nav navbar-nav"> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %] > [% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %] > <li class="dropdown"> >@@ -45,7 +45,7 @@ > </ul> > </li> > </ul> >- <ul class="nav pull-right"> >+ <ul class="nav navbar-nav pull-right"> > [% IF ( loggedinusername ) %] > <li class="dropdown"> > <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >index f9103ce..c705409 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >@@ -2,9 +2,9 @@ > > [% IF ( languages_loop ) %] > [% UNLESS ( one_language_enabled ) %] >- <div id="changelanguage" class="navbar navbar-fixed-bottom"> >- <div class="navbar-inner"> >- <ul id="i18nMenu" class="nav"> >+ <div id="changelanguage" class="navbar navbar-default navbar-fixed-bottom"> >+ <div class="container-fluid"> >+ <ul id="i18nMenu" class="nav navbar-nav"> > [% FOREACH languages_loo IN languages_loop %] > > [% IF ( languages_loo.group_enabled ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc >index 2e312de..d9bb897 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc >@@ -1,6 +1,6 @@ > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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/labels/label-edit-batch.pl?op=new">Label batch</a></li> > <li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li> >@@ -9,7 +9,7 @@ > </ul> > </div> > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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/labels/label-manage.pl?label_element=batch">Label batches</a></li> > <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li> >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 bb8b68d..80262ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -134,25 +134,25 @@ function searchToHold(){ > <div id="toolbar" class="btn-toolbar"> > [% IF ( CAN_user_borrowers ) %] > [% IF ( guarantor ) %] >- <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&guarantorid=[% guarantor.borrowernumber %]&categorycode=[% categorycode %]"> >+ <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&guarantorid=[% guarantor.borrowernumber %]&categorycode=[% categorycode %]"> > [% ELSE %] >- <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"> >+ <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"> > [% END %] > <i class="fa fa-pencil"></i> Edit</a> > [% END %] > > [% IF ( CAN_user_borrowers ) %] > [% IF ( adultborrower AND activeBorrowerRelationship ) %] >- <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% borrowernumber %]"><i class="fa fa-plus"></i> Add child</a> >+ <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% borrowernumber %]"><i class="fa fa-plus"></i> Add child</a> > [% END %] > [% IF ( CAN_user_borrowers ) %] >- <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a> >+ <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a> > [% END %] >- <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"><i class="fa fa-copy"></i> Duplicate</a> >+ <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"><i class="fa fa-copy"></i> Duplicate</a> > [% END %] > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_borrowers ) %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %] > <li><a id="printslip" href="#">Print slip</a></li> >@@ -164,13 +164,13 @@ function searchToHold(){ > </div> > > [% IF ( CAN_user_reserveforothers ) %] >- <a id="searchtohold" class="btn btn-small" href="#"><i class="fa fa-search"></i> Search to hold</a> >+ <a id="searchtohold" class="btn btn-default btn-sm" href="#"><i class="fa fa-search"></i> Search to hold</a> > [% END %] > >- <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-small"><i class="fa fa-comment-o"></i> Add message</a> >+ <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default btn-sm"><i class="fa fa-comment-o"></i> Add message</a> > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( CAN_user_borrowers ) %] > <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=[% destination %]&reregistration=y">Renew patron</a></li> >@@ -213,7 +213,9 @@ function searchToHold(){ > </div> > > <!-- Modal --> >-<div id="add_message_form" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addnewmessageLabel" aria-hidden="true"> >+<div id="add_message_form" class="modal" tabindex="-1" role="dialog" aria-labelledby="addnewmessageLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-body"> > <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f"> > <fieldset id="borrower_messages" class="brief"> >@@ -252,4 +254,6 @@ function searchToHold(){ > <input type="submit" value="Save" /> </form><a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </fieldset> > </div> >+ </div> >+ </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >index 0ad0308..ea89124 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >@@ -5,21 +5,21 @@ > [% UNLESS ( no_add ) %] > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]">[% category.description %]</a></li>[% END %] > </ul> > </div> > [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode %]&quickadd=true">[% category.description %]</a></li>[% END %] > </ul> > </div> > [% END %] > [% IF CAN_user_tools_manage_patron_lists %] >- <a class="btn btn-small" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i>Patron lists</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/patron_lists/lists.pl"><i class="fa fa-edit"></i>Patron lists</a> > [% END %] > > </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 c22bf06..9f411f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc >@@ -1,6 +1,6 @@ > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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> >@@ -10,7 +10,7 @@ > </ul> > </div> > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-edit"></i> Manage <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc >index a0a5b96..621480b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc >@@ -1,5 +1,5 @@ > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a class="btn btn-small" id="add_quote" href="#"><i class="fa fa-plus"></i> Add quote</a></div> >- <div class="btn-group"><a class="btn btn-small" id="delete_quote" href="#"><i class="fa fa-trash"></i> Delete quote(s)</a></div> >- <div class="btn-group"><a class="btn btn-small" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="add_quote" href="#"><i class="fa fa-plus"></i> Add quote</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 class="btn btn-default btn-sm" id="import_quotes" href="/cgi-bin/koha/tools/quotes-upload.pl"><i class="fa fa-folder-open"></i> Import quotes</a></div> > </div> >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 617e3b3..b7554c8 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-small" id="save_quotes" href="#"><i class="fa fa-save"></i> Save quotes</a></div> >- <div class="btn-group"><a class="btn btn-small" 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-small"><i class="fa fa-remove"></i> Cancel import</a></div> >+ <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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index aa86bc2..0ea3cea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -1,7 +1,7 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF ( CAN_user_reports_create_reports ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li> > <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li> >@@ -13,13 +13,13 @@ > [% IF ( CAN_user_reports_create_reports ) %] > [% UNLESS ( editsql ) # Do not show edit button on edit page %] > <div class="btn-group"> >- <a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Edit%20SQL"> >+ <a id="editreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Edit%20SQL"> > <i class="fa fa-pencil"></i> Edit > </a> > </div> > [% END %] > <div class="btn-group"> >- <a class="btn btn-small" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% original_sql || sql |uri %]&reportname=[% reportname |uri %]&notes=[% notes |uri %]"> >+ <a class="btn btn-default btn-sm" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% original_sql || sql |uri %]&reportname=[% reportname |uri %]&notes=[% notes |uri %]"> > <i class="fa fa-copy"></i> Duplicate > </a> > </div> >@@ -27,7 +27,7 @@ > > [% IF ( CAN_user_reports_delete_reports ) %] > <div class="btn-group"> >- <a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved"> >+ <a class="delete btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved"> > <i class="fa fa-trash"></i> Delete > </a> > </div> >@@ -35,12 +35,12 @@ > > [% UNLESS ( errors ) # Unless there are errors saving a report %] > <div class="btn-group"> >- <a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report"> >+ <a id="runreport" class="btn btn-default btn-sm" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report"> > <i class="fa fa-play"></i> Run report > </a> > </div> > <div class="btn-group"> >- <a class="btn btn-small" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id %]"> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id %]"> > <i class="fa fa-clock-o"></i> Schedule > </a> > </div> >@@ -48,7 +48,7 @@ > > [% IF ( execute ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=csv&sql=[% sql |uri %]&reportname=[% name |uri %]">Comma separated text</a></li> > <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=tab&sql=[% sql |uri %]&reportname=[% name |uri %]">Tab separated text</a></li> >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 c4652ea..9dd3e7a 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 >@@ -14,18 +14,18 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=new"><i class="fa fa-plus"></i> New collection</a> >+ <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> > </div> > > [% IF ( colId ) %] > <div class="btn-group"> >- <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]"><i class="fa fa-exchange"></i> Transfer</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% colId %]"><i class="fa fa-exchange"></i> Transfer</a> > </div> > <div class="btn-group"> >- <a class="btn btn-small" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% colId %]"><i class="fa fa-pencil"></i> Edit</a> > </div> > <div class="btn-group"> >- <a class="btn btn-small confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-sm confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% colId %]"><i class="fa fa-trash"></i> Delete</a> > </div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >index b368317..ecc9e55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >@@ -39,16 +39,16 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF CAN_user_serials_create_subscription %] > [% IF biblionumber_for_new_subscription %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > [% END %] > > [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] > [% UNLESS ( cannotedit ) %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> > [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %] > <li> [% END %] >@@ -76,16 +76,16 @@ > > [% IF not cannotedit or CAN_user_serials_receive_serials %] > [% IF CAN_user_serials_renew_subscription and not closed %] >- <div class="btn-group"><a id="renew" class="btn btn-small" href="#"><i class="fa fa-refresh"></i> Renew</a></div> >+ <div class="btn-group"><a id="renew" class="btn btn-default btn-sm" href="#"><i class="fa fa-refresh"></i> Renew</a></div> > [% END %] > [% IF CAN_user_serials_receive_serials and not closed %] >- <div class="btn-group"><a id="receive" class="btn btn-small" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div> >+ <div class="btn-group"><a id="receive" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div> > [% END %] > [% UNLESS cannotedit %] > [% IF closed %] >- <div class="btn-group"><a id="reopen" class="btn btn-small" href="#"><i class="fa fa-repeat"></i> Reopen</a></div> >+ <div class="btn-group"><a id="reopen" class="btn btn-default btn-sm" href="#"><i class="fa fa-repeat"></i> Reopen</a></div> > [% ELSE %] >- <div class="btn-group"><a id="close" class="btn btn-small" href="#"><i class="fa fa-times-circle"></i> Close</a></div> >+ <div class="btn-group"><a id="close" class="btn btn-default btn-sm" href="#"><i class="fa fa-times-circle"></i> Close</a></div> > [% END %] > [% END %] > [% END %] >@@ -93,9 +93,9 @@ > [% ELSIF CAN_user_serials_create_subscription %] > <div id="toolbar" class="btn-toolbar"> > [% IF ( biblionumber_for_new_subscription ) %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > </div> > [% END %] >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 8d7a482..0f034dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >@@ -27,12 +27,12 @@ > </script> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a id="newshelf" class="btn btn-small" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&referer=[% op %]"><i class="fa fa-plus"></i> New list</a></div> >+ <div class="btn-group"><a id="newshelf" class="btn btn-default btn-sm" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=add_form&referer=[% op %]"><i class="fa fa-plus"></i> New list</a></div> > > [% IF shelf AND op == 'view' %] > [% IF can_manage_shelf %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm 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&shelfnumber=[% shelf.shelfnumber %]&referer=[% op %]">Edit list</a></li> > <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&shelfnumber=[% shelf.shelfnumber %]">Delete list</a></li> >@@ -41,7 +41,7 @@ > [% END %] > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber %]">iso2709</a></li> > <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelf.shelfnumber %]">RIS</a></li> >@@ -51,7 +51,7 @@ > [% END %] > </ul> > </div> >- <div class="btn-group"><a class="btn btn-small" href="#" id="sendlist"><i class="fa fa-envelope"></i> Send list</a></div> >- <div class="btn-group"><a class="btn btn-small" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber %]&print=1"><i class="fa fa-print"></i> Print list</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" href="#" id="sendlist"><i class="fa fa-envelope"></i> Send list</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="printlist" target="_blank" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber %]&print=1"><i class="fa fa-print"></i> Print list</a></div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index c7b04cf..4c9fecb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -273,7 +273,9 @@ > </li> > </ol> > </fieldset> >- <div id="dataPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="dataPreviewLabel">MARC preview</h3> >@@ -282,7 +284,9 @@ > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > [% END %] >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 77ec72e..1000c03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -184,22 +184,22 @@ > [% UNLESS ( closedate ) %] > <div id="toolbar" class="btn-toolbar"> > [% IF active %] >- <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> >+ <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> > [% END %] >- <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="btn btn-small" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> >+ <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="btn btn-default btn-sm" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> > [%# FIXME This action should not be available for everyone %] >- <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div> >+ <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default btn-sm" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div> > [% IF ( unclosable ) %] > [% ELSIF ( uncertainprices ) %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" class="btn btn-small" id="uncertpricesbutton">Uncertain prices</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" class="btn btn-default btn-sm" id="uncertpricesbutton">Uncertain prices</a></div> > [% ELSE %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a> >+ <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a> > </div> > [% END %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/basket.pl?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/basket.pl?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div> > [% IF ediaccount %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> > [% END %] > [% IF ( active && books_loop ) %] > <div class="btn-group"> >@@ -212,7 +212,9 @@ > [% END %] > </div> > <!-- Modal for confirm deletion box--> >- <div class="modal hide" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true"> >+ <div class="modal" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3>Confirm deletion</h3> >@@ -228,7 +230,7 @@ > <input type="hidden" name="basketno" value="[% basketno %]" /> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > <input type="hidden" name="delbiblio" value="0" /> >- <button type="submit" class="btn btn-default">Delete basket</button> >+ <button type="submit" class="btn btn-default btn-default">Delete basket</button> > </form> > </div> > [% ELSE %] >@@ -246,7 +248,7 @@ > <input type="hidden" name="basketno" value="[% basketno %]" /> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > <input type="hidden" name="delbiblio" value="0" /> >- <button type="submit" class="btn btn-default">Delete basket and orders</button> >+ <button type="submit" class="btn btn-default btn-default">Delete basket and orders</button> > </form> > > <form action="/cgi-bin/koha/acqui/basket.pl" method="get"> >@@ -254,18 +256,20 @@ > <input type="hidden" name="basketno" value="[% basketno %]" /> > <input type="hidden" name="booksellerid" value="[% booksellerid %]" /> > <input type="hidden" name="delbiblio" value="1" /> >- <button type="submit" class="btn btn-default">Delete basket, orders, and records</button> >+ <button type="submit" class="btn btn-default btn-default">Delete basket, orders, and records</button> > </form> > > </div> > [% END %] >+ </div> >+ </div> > </div> > <!-- End of Modal--> > [% ELSE %] > [% UNLESS ( grouped ) %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen this basket</a></div> >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/basket.pl?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div> >+ <div class="btn-group"><a href="#" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen this basket</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/basket.pl?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div> > </div> > [% END %] > [% END %] >@@ -711,7 +715,9 @@ > [% UNLESS ( closedate ) %] > > <!-- Modal --> >- <div id="addtoBasket" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel" aria-hidden="true"> >+ <div id="addtoBasket" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-body"> > [% IF active %] > [% INCLUDE 'acquisitions-add-to-basket.inc' %] >@@ -720,6 +726,8 @@ > <div class="modal-footer"> > <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </div> >+ </div> >+ </div> > </div> > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index d89602a..1ee7083 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -141,10 +141,10 @@ function submitForm(form) { > [% IF ( grouping ) %] > [% IF (closedbg) %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="[% script_name %]?op=reopen&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]&mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div> >- <div class="btn-group"><a href="[% script_name %]?op=export&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div> >- <div class="btn-group"><a href="[% script_name %]?op=print&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div> >- <div class="btn-group"><a href="[% script_name %]?op=ediprint&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> >+ <div class="btn-group"><a href="[% script_name %]?op=reopen&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]&mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div> >+ <div class="btn-group"><a href="[% script_name %]?op=export&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div> >+ <div class="btn-group"><a href="[% script_name %]?op=print&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div> >+ <div class="btn-group"><a href="[% script_name %]?op=ediprint&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> > </div> > [% END %] > [% IF (name && closedbg) %] >@@ -286,7 +286,7 @@ function submitForm(form) { > </div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> > </div> > <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1> > <div id="basket_groups" class="toptabs"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index ff92a91..1384c1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -88,13 +88,13 @@ $(document).ready(function() { > <span class="action"> > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( supplier.active ) %] >- <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&op=add_form"><i class="fa fa-plus"></i> New basket</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&op=add_form"><i class="fa fa-plus"></i> New basket</a> > [% ELSE %] > (inactive) > [% END %] > [% END %] > [% IF ( supplier.loop_basket.size ) %] >- <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="fa fa-inbox"></i> Receive shipment</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="fa fa-inbox"></i> Receive shipment</a> > [% END %] > </span> > <div class="baskets"> >@@ -161,18 +161,22 @@ $(document).ready(function() { > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]"><i class="fa fa-eye"></i> View</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]"><i class="fa fa-eye"></i> View</a> > > [% IF not basket.closedate and supplier.active %] >- <a class="btn btn-mini" id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> >+ <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> > <!-- Modal --> >- <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]"> >+ <div id="addtoBasket[% basket.basketno %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-body"> > [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %] > </div> > <div class="modal-footer"> > <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a> > </div> >+ </div> >+ </div> > </div> > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 93a1c03..7ab801a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -100,8 +100,8 @@ $(document).ready(function() { > <td>[% msg.filename %]</td> > > <td class="actions"> >- <a class="btn btn-mini view_message" target="_blank" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id %]"><i class="fa fa-search"></i> View message</a> >- <a class="btn btn-mini delete_msg" href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=delete&message_id=[% msg.id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs view_message" target="_blank" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id %]"><i class="fa fa-search"></i> View message</a> >+ <a class="btn btn-default btn-xs delete_msg" href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=delete&message_id=[% msg.id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -110,7 +110,9 @@ $(document).ready(function() { > </table> > > <!-- Modal to display EDIFACT messages --> >-<div class="modal hide" id="EDI_modal" tabindex="-1" role="dialog" aria-labelledby="EDI_modal_label" aria-hidden="true"> >+<div class="modal" id="EDI_modal" tabindex="-1" role="dialog" aria-labelledby="EDI_modal_label" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> > <h3 id="EDI_modal_label">EDIFACT message</h3> >@@ -119,7 +121,9 @@ $(document).ready(function() { > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index f451b74..79f1b79 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -148,7 +148,7 @@ $(document).ready(function() { > <td> > > <div class="dropdown dropup"> >- <a class="btn btn-mini dropdown-toggle" id="invoiceactions[% invoice.invoiceid %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 21b428c..4be532b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -101,7 +101,9 @@ > [% END %] > </tbody> > </table> >- <div id="marcPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div id="marcPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="marcPreviewLabel">MARC preview</h3> >@@ -110,7 +112,9 @@ > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index e8463d1..497f4fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -658,15 +658,23 @@ $(document).ready(function() > </fieldset> > </form> > >-<div id="procModal" data-backdrop="static" class="modal hide fade" aria-labelledby="procModal" aria-hidden="true"> >+<div id="procModal" data-backdrop="static" class="modal fade" aria-labelledby="procModal" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-body"> > <h3>Processing multiple items</h3> > </div> >+ </div> >+ </div> > </div> > >-<div id="multiCountModal" class="modal hide fade" aria-labelledby="multiCountModal" aria-hidden="true"> >+<div id="multiCountModal" class="modal fade" aria-labelledby="multiCountModal" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <h3>Invalid number of copies</h3> > <p>Please enter a <b>number</b>, greater than or equal to 1</p> >+ </div> >+ </div> > </div> > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 35a9bdb..9ef247c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -72,9 +72,9 @@ > </td> > <td class="actions"> > [% IF ( suggestions_loo.biblionumber ) %] >- <a href="neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]&biblio=[% suggestions_loo.biblionumber %]" class="btn btn-mini"><i class="fa fa-plus"></i> Order</a> >+ <a href="neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]&biblio=[% suggestions_loo.biblionumber %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a> > [% ELSE %] >- <a href="neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]" class="btn btn-mini"><i class="fa fa-plus"></i> Order</a> >+ <a href="neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&suggestionid=[% suggestions_loo.suggestionid %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a> > [% END %] > </td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 57755df..b9d1f15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -463,7 +463,9 @@ > [% ELSE %]There are no received orders.[% END %] > </div> > >-<div id="dataPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="dataPreviewLabel">MARC preview</h3> >@@ -472,7 +474,9 @@ > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 4ab50fd..16696a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -52,7 +52,7 @@ > [% END %] > <input type="hidden" class="contact_claimissues_hidden" name="contact_claimissues" value="[% contact.claimissues %]"></input> > </li> >- [% IF contact.id %]<li><button class="btn delete-contact"><i class="fa fa-trash"></i> Delete contact</li>[% END %] >+ [% IF contact.id %]<li><button class="btn btn-default delete-contact"><i class="fa fa-trash"></i> Delete contact</li>[% END %] > </ol> > [% END %] > >@@ -217,7 +217,7 @@ function delete_contact(ev) { > [% INCLUDE edit_contact %] > </fieldset> > [% END %] >- <button id="add-contact" class="btn"><i class="fa fa-plus"></i> Add another contact</button> >+ <button id="add-contact" class="btn btn-default"><i class="fa fa-plus"></i> Add another contact</button> > </fieldset> > </div> > <div class="yui-g"> >@@ -395,8 +395,8 @@ function delete_contact(ev) { > <td><span title="[% contract.contractstartdate %]">[% contract.contractstartdate | $KohaDates %]</span></td> > <td><span title="[% contract.contractenddate %]">[% contract.contractenddate | $KohaDates %]</span></td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=[% contract.contractnumber %]&booksellerid=[% contract.booksellerid %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt >index ebe4612..1ff3156 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt >@@ -16,9 +16,9 @@ > "[% data.category_description |html %] ([% data.category_type |html %])", > "dt_action": > [%- IF selection_type == 'select' -%] >- "<a class=\"btn btn-mini select_user\" href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-borrowerdata=\"[% To.json(data) | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) | html %]\" />" >+ "<a class=\"btn btn-default btn-xs select_user\" href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-borrowerdata=\"[% To.json(data) | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) | html %]\" />" > [%- ELSE -%] >- "<a href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\" class=\"btn btn-mini add_user\"><i class=\"fa fa-plus\"></i> Add</a>" >+ "<a href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\" class=\"btn btn-default btn-xs add_user\"><i class=\"fa fa-plus\"></i> Add</a>" > [%- END -%] > }[% UNLESS loop.last %],[% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >index 8f84663..d9d8bbc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -76,7 +76,7 @@ > <td>[% basket.basketname %] (#[% basket.basketno %])</td> > <td>[% basket.createdby %]</td> > <td>[% basket.creationdate | $KohaDates %]</td> >- <td><a class="btn btn-mini confirm_transfer" href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]">Choose</a> >+ <td><a class="btn btn-default btn-xs confirm_transfer" href="transferorder.pl?basketno=[% basket.basketno %]&ordernumber=[% ordernumber %]">Choose</a> > </tr> > [% END %] > </tbody> >@@ -105,7 +105,7 @@ > [% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn %][% END %] > [% IF ( ordersloo.publishercode ) %]<br />Publisher :[% ordersloo.publishercode %][% END %] > </td> >- <td><a class="btn btn-mini" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td> >+ <td><a class="btn btn-default btn-xs" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td> > </tr> > [% END %] > </tbody> >@@ -129,7 +129,7 @@ > [% FOREACH bookseller IN booksellersloop %] > <tr> > <td>[% bookseller.name %]</td> >- <td><a class="btn btn-mini" href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id %][% IF (ordernumber) %]&ordernumber=[% ordernumber %][% END %]">Choose</a></td> >+ <td><a class="btn btn-default btn-xs" href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id %][% IF (ordernumber) %]&ordernumber=[% ordernumber %][% END %]">Choose</a></td> > </tr> > [% END %] > </tbody> >@@ -140,7 +140,7 @@ > [% END %] > </div> > >-<div id="closewindow"><a href="#" class="btn btn-default close">Cancel</a></div> >+<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Cancel</a></div> > > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index e7e8fff..90123aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -151,7 +151,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </table> > > >- <div id="dataPreview" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div id="dataPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="dataPreviewLabel">MARC preview</h3> >@@ -160,7 +162,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index ecedbea..76f0701 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -3,7 +3,7 @@ > > [%- BLOCK action_menu %] > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="budgetmenu_[% block_budget_id %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="budgetmenu_[% block_budget_id %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget_id %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 8d288ac..a3c9ee9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -425,7 +425,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") > [% ELSE %] > <td> > <div class="dropdown dropup"> >- <a class="btn btn-mini dropdown-toggle" id="budgetactions[% budget.budget_id %]_[% budget.budget_period_id %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="budgetactions[% budget.budget_id %]_[% budget.budget_period_id %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id %]_[% budget.budget_period_id %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index 304688a..1cff513 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -192,8 +192,8 @@ function Check(ff) { > <td>[% loo.contractstartdate %]</td> > <td>[% loo.contractenddate %]</td> > <td class="actions"> >- <a href="[% loo.script_name %]?op=add_form&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a href="[% loo.script_name %]?op=delete_confirm&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a> >+ <a href="[% loo.script_name %]?op=add_form&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="[% loo.script_name %]?op=delete_confirm&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% 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 e43f173..400ffe3 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 >@@ -21,7 +21,7 @@ > <div class="yui-b"> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a> >+ <a class="btn btn-default btn-sm" id="newalert" href="/cgi-bin/koha/admin/audio_alerts.pl"><i class="fa fa-plus"></i> New alert</a> > </div> > > <form id="new-alert-form" action="audio_alerts.pl" method="post" class="validated"> >@@ -38,7 +38,7 @@ > <li> > <label for="sound" class="required">Sound: </label> > <input id="sound" name="sound" type="text" class="required input-large" placeholder="sound" /> >- <button id="play-sound" class="btn btn-mini disabled"><i class="fa fa-play"></i> Play sound</button> >+ <button id="play-sound" class="btn btn-default btn-xs disabled"><i class="fa fa-play"></i> Play sound</button> > <span class="required">Required</span> > </li> > <li> >@@ -112,14 +112,14 @@ > <td>[% a.selector %]</td> > <td>[% a.sound %]</td> > <td> >- <a class="btn btn-mini edit" data-soundid="[% a.id %]" data-precedence="[% a.precedence %]" data-selector="[% a.selector %]" data-sound="[% a.sound %]"><i class="fa fa-pencil"></i> Edit</a></td> >+ <a class="btn btn-default btn-xs edit" data-soundid="[% a.id %]" data-precedence="[% a.precedence %]" data-selector="[% a.selector %]" data-sound="[% a.sound %]"><i class="fa fa-pencil"></i> Edit</a></td> > </tr> > [% END %] > </tbody> > </table> > > <p> >- <button id="delete-alerts" type="submit" class="btn btn-small disabled"><i class="fa fa-trash"></i> Delete selected alerts</button> >+ <button id="delete-alerts" type="submit" class="btn btn-default btn-sm disabled"><i class="fa fa-trash"></i> Delete selected alerts</button> > </p> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index a05043c..c8ef5c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -307,7 +307,7 @@ > [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder %],[% END %] > [% END %] > </td> >- <td><a href="[% loo.delete %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a></td> >+ <td><a href="[% loo.delete %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %] > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index 9e01b5b..cc458a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -180,7 +180,7 @@ > [% IF ( else ) %] > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a class="btn btn-small" id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&authtypecode=[% authtypecode %]"><i class="fa fa-plus"></i> New tag</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&authtypecode=[% authtypecode %]"><i class="fa fa-plus"></i> New tag</a></div> > </div> > > <h2>Select an authority framework</h2> >@@ -220,7 +220,7 @@ > <td>[% loo.authorised_value %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="authtagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield %]"> > <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> Subfields</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index f4f56cf..34aad44 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -164,8 +164,8 @@ $(document).ready(function() { > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a id="addauth" class="btn btn-small" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category %]"><i class="fa fa-plus"> </i> New authorized value for [% category %]</a> >- <a id="addcat" class="btn btn-small" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a> >+ <a id="addauth" class="btn btn-default btn-sm" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=[% category %]"><i class="fa fa-plus"> </i> New authorized value for [% category %]</a> >+ <a id="addcat" class="btn btn-default btn-sm" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form"><i class="fa fa-plus"> </i> New category</a> > </div> > > <h1>Authorized values</h1> >@@ -291,8 +291,8 @@ $(document).ready(function() { > No limitation > [% END %] > </td> >- <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete btn btn-mini" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield %]&id=[% loo.id %]"><i class="fa fa-trash"></i> Delete</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield %]&id=[% loo.id %]"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %] > </tbody></table>[% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index 7cad110..699549e3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -141,7 +141,7 @@ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a id="authtype" class="btn btn-small" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a> >+ <a id="authtype" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form"><i class="fa fa-plus"></i> New authority type</a> > </div> > > <h1>Authority types</h1> >@@ -165,7 +165,7 @@ > <td>[% authority_type.auth_tag_to_report %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="authtypeactions[% authority_type.authtypecode %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="authtypeactions[% authority_type.authtypecode %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode %]"> > <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index 50cd4b2..030b9e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -67,7 +67,7 @@ > > [% IF op == 'list'%] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a> >+ <a class="btn btn-default btn-sm" id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form"><i class="fa fa-plus"></i> New framework</a> > </div> > [% END %] > >@@ -143,7 +143,7 @@ > <td>Default framework</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="frameworkactions[% loo.frameworkcode %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode %]"> >@@ -154,7 +154,9 @@ > <li><a href="#" data-toggle="modal" data-target="#importModal_[% framework.frameworkcode %][% frameworks.count %]" title="Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-download"></i> Import</a></li> > </ul> > <!-- Modal to export default framework --> >- <div class="modal hide" id="exportModal_default" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_default" aria-hidden="true"> >+ <div class="modal" id="exportModal_default" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_default" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="exportLabelexportModal_default">Export default framework</h3> >@@ -169,14 +171,18 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn">Export</button> >+ <button type="submit" class="btn btn-default">Export</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </form> >+ </div> >+ </div> > </div> > > <!-- Modal to import default framework --> >- <div class="modal hide" id="importModal_[% framework.frameworkcode %][% frameworks.count %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_default[% frameworks.count %]" aria-hidden="true"> >+ <div class="modal" id="importModal_[% framework.frameworkcode %][% frameworks.count %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_default[% frameworks.count %]" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="importLabelexportModal_[% framework.frameworkcode %][% frameworks.count %]">Import default framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods)</h> >@@ -189,10 +195,12 @@ > <div id="importing_default" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn">Import</button> >+ <button type="submit" class="btn btn-default">Import</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </form> >+ </div> >+ </div> > </div> > </div> > </td> >@@ -204,7 +212,7 @@ > <td>[% loo.frameworktext %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="frameworkactions[% loo.frameworkcode %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode %]"> >@@ -217,7 +225,9 @@ > <li><a href="#" data-toggle="modal" data-target="#importModal_[% loo.frameworkcode %][% loop.count %]" title="Import framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-download"></i> Import</a></li> > </ul> > <!-- Modal to export other framework --> >- <div class="modal hide" id="exportModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true"> >+ <div class="modal" id="exportModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]">Export [% loo.frameworktext %] framework</h3> >@@ -232,14 +242,18 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn">Export</button> >+ <button type="submit" class="btn btn-default">Export</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </form> >+ </div> >+ </div> > </div> > > <!-- Modal to import other framework --> >- <div class="modal hide" id="importModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true"> >+ <div class="modal" id="importModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]">Import [% loo.frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods)</h3> >@@ -252,10 +266,12 @@ > <div id="importing_[% loo.frameworkcode %]" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /><span class="importing_msg"></span></div> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn">Import</button> >+ <button type="submit" class="btn btn-default">Import</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button> > </div> > </form> >+ </div> >+ </div> > </div> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 77356ac..5c1f98f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -125,8 +125,8 @@ tinyMCE.init({ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> >- <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=add_form_category"><i class="fa fa-plus"></i> New group</a> >+ <a class="btn btn-default btn-sm" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a> >+ <a class="btn btn-default btn-sm" id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=add_form_category"><i class="fa fa-plus"></i> New group</a> > </div> > [% END %] > >@@ -269,8 +269,8 @@ tinyMCE.init({ > </td> > <td>[% library.branchip %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/branches.pl?op=delete_confirm&branchcode=[% library.branchcode %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=delete_confirm&branchcode=[% library.branchcode %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -300,8 +300,8 @@ tinyMCE.init({ > <td>[% category.categorycode %]</td> > <td>[% category.codedescription %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/branches.pl?categorycode=[% category.categorycode %]&op=add_form_category"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/branches.pl?categorycode=[% category.categorycode %]&op=delete_confirm_category"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?categorycode=[% category.categorycode %]&op=add_form_category"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?categorycode=[% category.categorycode %]&op=delete_confirm_category"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index 7f1fb53..b28b634 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -330,7 +330,7 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a> >+ <a class="btn btn-default btn-sm" id="newcategory" href="/cgi-bin/koha/admin/categories.pl?op=add_form"><i class="fa fa-plus"></i> New category</a> > </div> > > <h2>Patron categories</h2> >@@ -457,8 +457,8 @@ > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=add_form&categorycode=[% category.categorycode |uri %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/categories.pl?op=delete_confirm&categorycode=[% category.categorycode |uri %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 25a6564..7acb4d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -138,7 +138,7 @@ > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a> >+ <a class="btn btn-default btn-sm" id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form"><i class="fa fa-plus"></i> New city</a> > </div> > > <h2>Cities</h2> >@@ -165,8 +165,8 @@ > <td>[% city.city_zipcode %]</td> > <td>[% city.city_country %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/cities.pl?op=add_form&cityid=[% city.cityid %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/cities.pl?op=delete_confirm&cityid=[% city.cityid %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/cities.pl?op=add_form&cityid=[% city.cityid %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/cities.pl?op=delete_confirm&cityid=[% city.cityid %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index 2785ebb..7a2d611 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -185,8 +185,8 @@ > [% IF ( display_lists ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newsource" href="[% script_name %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >- <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> >+ <a class="btn btn-default btn-sm" id="newsource" href="[% script_name %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a> >+ <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a> > </div> > > <h2>Classification sources</h2> >@@ -214,8 +214,8 @@ > <td>[% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% class_source.sortrule %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=edit_source&class_source=[% class_source.code |html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% class_source.script_name %]?op=delete_source&class_source=[% class_source.code |html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -244,8 +244,8 @@ > <td>[% class_sort_rule.description %]</td> > <td>[% class_sort_rule.sort_routine %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=edit_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name %]?op=delete_sort_rule&sort_rule=[% class_sort_rule.rule |html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 1bbacf2..3f2c5bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -64,7 +64,7 @@ > <div class="yui-b"> > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> >+ <a class="btn btn-default btn-sm" id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form"><i class="fa fa-plus"></i> New currency</a> > </div> > [% END %] > >@@ -224,8 +224,8 @@ > <td style="color:green;">[% IF currency.active %]â[% END %]</td> > <td>[% IF currency.archived %]Yes[% END %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=add_form&currency_code=[% currency.currency %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/currency.pl?op=delete_confirm&currency_code=[% currency.currency %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 24e8cc0..4779d33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >@@ -40,7 +40,7 @@ > <div class="yui-b"> > [% IF display %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"> >+ <a class="btn btn-default btn-sm" id="newediacct" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form"> > <i class="fa fa-plus"></i> > New account > </a> >@@ -307,7 +307,7 @@ > <td>N</td> > [% END %] > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=acct_form&id=[% account.id %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_accounts.pl?op=delete_confirm&id=[% account.id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >index 03614ad..d4cac68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >@@ -40,7 +40,7 @@ > <div class="yui-b"> > [% IF display %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"> >+ <a class="btn btn-default btn-sm" id="newediean" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form"> > <i class="fa fa-plus"></i> > New EAN > </a> >@@ -149,8 +149,8 @@ > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&id=[% ean.id %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&id=[% ean.id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >index a67f081..d3dc4f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >@@ -22,7 +22,7 @@ > <div class="yui-b"> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> >+ <a class="btn btn-default btn-sm" id="new_search_field" href="/cgi-bin/koha/admin/items_search_fields.pl"><i class="fa fa-plus"></i> New search field</a> > </div> > > [% IF field_added %] >@@ -77,8 +77,8 @@ > <td>[% field.tagsubfield %]</td> > <td>[% field.authorised_values_category %]</td> > <td> >- <a class="btn btn-mini" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name %]" title="Edit [% field.name %] field"><i class="fa fa-pencil"></i> Edit</a> >- <a class="field-delete btn btn-mini" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_field.pl?name=[% field.name %]" title="Edit [% field.name %] field"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="field-delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/items_search_fields.pl?op=del&name=[% field.name %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index 95bbb7b..c3f3a10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -89,7 +89,7 @@ Item types administration > > > [% IF op == 'list' %]<div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> >+ <a class="btn btn-default btn-sm" id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form"><i class="fa fa-plus"></i> New item type</a> > </div>[% END %] > > [% FOREACH m IN messages %] >@@ -383,8 +383,8 @@ Item types administration > </td> > <td>[% itemtype.checkinmsg | html_line_break %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype |html %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype |html %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype |html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index 7df9910..5949983 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -110,7 +110,7 @@ $(document).ready(function() { > <td>[% loo.tagfield %]</td> > <td>[% loo.tagsubfield %]</td> > <td>[% loo.liblibrarian %]</td> >- <td><a href="[% loo.edit %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a></td> >+ <td><a href="[% loo.edit %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a></td> > </tr> > [% END %] > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index 4e70bfc..1588934 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -286,8 +286,8 @@ > [% END %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield %]&frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield %]&tagsubfield=[% loo.tagsubfield %]&frameworkcode=[% frameworkcode %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield %]&frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield %]&tagsubfield=[% loo.tagsubfield %]&frameworkcode=[% frameworkcode %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index 249991d..0e353f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -59,7 +59,7 @@ $(document).ready(function() { > > [% IF ( else ) %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode %]"><i class="fa fa-plus"></i> New tag</a> >+ <a class="btn btn-default btn-sm" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode %]"><i class="fa fa-plus"></i> New tag</a> > </div>[% END %] > > <h1>MARC Framework for [% IF framework %][% framework.frameworktext %] ([% framework.frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1> >@@ -212,7 +212,7 @@ $(document).ready(function() { > <td>[% loo.authorised_value %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="marctagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield %]"> > <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> Subfields</a></li> >@@ -233,7 +233,7 @@ $(document).ready(function() { > <td>[% loo.authorised_value %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="marctagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield %]"> > <li><a href="[% loo.subfield_link %]"><i class="fa fa-eye"></i> Subfields</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index 07bbc7a..ff878e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -599,7 +599,7 @@ function CheckRuleForm(f) { > [% IF ( display_list ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a> >+ <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a> > </div> > > <h2>Record matching rules</h2> >@@ -625,8 +625,8 @@ function CheckRuleForm(f) { > <td>[% available_matching_rule.code %]</td> > <td>[% available_matching_rule.description %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=edit_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name %]?op=delete_matching_rule&matcher_id=[% available_matching_rule.matcher_id |html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >index b887077..ca36bc6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -95,7 +95,7 @@ function hideDialogBox() { > OR > [% END %] > </td> >- <td><button class="btn btn-mini clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td> >+ <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td> > </tr> > [% END %] > [% ELSE %] >@@ -108,7 +108,7 @@ function hideDialogBox() { > </select></td> > <td><input type="text" name="marcvalue" /></td> > <td><input type="button" id="ORbutton" value="OR" /></td> >- <td><button class="btn btn-mini clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td> >+ <td><button class="btn btn-default btn-xs clear-field" type="button"><i class="fa fa-trash"></i> Delete</button></td> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index dc30103..7201733 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -92,7 +92,7 @@ $(document).ready(function() { > [% ELSE %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a> >+ <a class="btn btn-default btn-sm" id="newoaiset" href="/cgi-bin/koha/admin/oai_sets.pl?op=new"><i class="fa fa-plus"></i> New set</a> > </div> > > <h2>OAI sets</h2> >@@ -124,7 +124,7 @@ $(document).ready(function() { > </td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="oaisetsactions[% set.id %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id %]"> > <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 6fb7c97..f9f148d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -217,7 +217,7 @@ $(document).ready(function() { > [% IF ( display_list ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newrule" href="[% script_name %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a> >+ <a class="btn btn-default btn-sm" id="newrule" href="[% script_name %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a> > </div> > > <h2>Patron attribute types</h2> >@@ -275,8 +275,8 @@ $(document).ready(function() { > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-mini" href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code |html %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini" href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code |html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=edit_attribute_type&code=[% item.code |html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="[% item.script_name %]?op=delete_attribute_type&code=[% item.code |html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >index 62c0258..45e6d39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >@@ -148,7 +148,7 @@ > [% IF ( else ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="fa fa-plus"></i> New printer</a> >+ <a class="btn btn-default btn-sm" id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form"><i class="fa fa-plus"></i> New printer</a> > </div> > > <h2>Printers</h2> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index 154f06e..ab285a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -235,7 +235,7 @@ a.add, a.delete { > <td> > <input name="mapping_marc_field" type="text" value="[% mapping.marc_field %]" /> > </td> >- <td><a class="btn btn-mini delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> >+ <td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %] > </tbody> >@@ -279,14 +279,14 @@ a.add, a.delete { > </selected> > </td> > <td><input data-id="mapping_marc_field" type="text" /></td> >- <td><a class="btn btn-mini add"><i class="fa fa-plus"></i> Add</a></td> >+ <td><a class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> Add</a></td> > </tr> > </tfoot> > </table> > </div> > [% END %] > </div> >- <p><button class="btn" type="submit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button></p> >+ <p><button class="btn btn-default" type="submit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button></p> > </form> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index e0b92eb..4543f9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -289,8 +289,8 @@ $(document).ready(function() { > </td> > <td>[% rule.rentaldiscount %]</td> > <td class="actions"> >- <a href="#" class="editrule btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a> >+ <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -378,8 +378,8 @@ $(document).ready(function() { > <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td> > <td class="actions"> > <input type="hidden" name="branch" value="[% current_branch %]"/> >- <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button> >- <button name="cancel" class="clear_edit btn btn-mini"><i class="fa fa-undo"></i> Clear</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> >+ <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button> > </td> > </tr> > <tfoot> >@@ -520,8 +520,8 @@ $(document).ready(function() { > </select> > </td> > <td class="actions"> >- <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch %]" id="unset"><i class="fa fa-undo"></i> Unset</a> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=*&branch=[% current_branch %]" id="unset"><i class="fa fa-undo"></i> Unset</a> > </td> > </tr> > </table> >@@ -572,7 +572,7 @@ $(document).ready(function() { > </td> > > <td class="actions"> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=[% branch_cat_rule_loo.categorycode %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-cat&categorycode=[% branch_cat_rule_loo.categorycode %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -586,7 +586,7 @@ $(document).ready(function() { > </td> > <td><input name="maxissueqty" size="3" /></td> > <td><input name="maxonsiteissueqty" size="3" /></td> >- <td class="actions"><button type="submit" class="btn btn-mini"><i class="fa fa-plus"></i> Add</td> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td> > </tr> > </table> > </form> >@@ -664,7 +664,7 @@ $(document).ready(function() { > </select> > </td> > <td class="actions"> >- <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > </td> > </td> > </tr> >@@ -741,7 +741,7 @@ $(document).ready(function() { > [% END %] > </td> > <td class="actions"> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&itemtype=[% branch_item_rule_loo.itemtype %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete-branch-item&itemtype=[% branch_item_rule_loo.itemtype %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -782,7 +782,7 @@ $(document).ready(function() { > <option value="noreturn">Item floats</option> > </select> > </td> >- <td class="actions"><button type="submit" class="btn btn-mini"><i class="fa fa-plus"></i> Add</button></td> >+ <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td> > </tr> > </table> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index 3e991f9..c61fc86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -24,7 +24,7 @@ > <div class="yui-b"> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> >+ <a class="btn btn-default btn-sm" id="new_provider" href="#"><i class="fa fa-plus"></i> New SMS provider</a> > </div> > > <h2>SMS cellular providers</h2> >@@ -48,10 +48,10 @@ > <td id="domain_[% p.id %]">[% p.domain %]</td> > <td id="patrons_using_[% p.id %]">[% p.patrons_using %]</td> > <td class="actions"> >- <a class="btn btn-mini edit" href="#" id="edit_[% p.id %]" data-providerid="[% p.id %]"> >+ <a class="btn btn-default btn-xs edit" href="#" id="edit_[% p.id %]" data-providerid="[% p.id %]"> > <i class="fa fa-pencil"></i> Edit > </a> >- <a class="btn btn-mini delete" href="#" data-providerid="[% p.id %]" data-patrons_using="[% p.patrons_using %]" id="delete_[% p.id %]"> >+ <a class="btn btn-default btn-xs delete" href="#" data-providerid="[% p.id %]" data-patrons_using="[% p.patrons_using %]" id="delete_[% p.id %]"> > <i class="fa fa-trash"></i> Delete > </a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index b035d00..4f8f511 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -308,7 +308,7 @@ > [% IF ( else ) %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newstopword" href="[% script_name %]?op=add_form"><i class="fa fa-plus"></i> New preference</a> >+ <a class="btn btn-default btn-sm" id="newstopword" href="[% script_name %]?op=add_form"><i class="fa fa-plus"></i> New preference</a> > </div> > > [% IF ( tab != 'local_use' ) %] >@@ -432,11 +432,11 @@ > <input type="hidden" name="prefoptions" value="[% loo.prefoptions |html %]" /> > <input type="hidden" name="preftype" value="[% loo.type %]" /> > <input type="hidden" name="explanation" value="[% loo.explanation |html %]" /> >- <button type="submit" class="btn btn-mini"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button> > </form> > </td> > >- <td class="actions"><a class="btn btn-mini" href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-mini" href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></td> >+ <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete %]"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %]</tbody> > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index dda1a0f..4a6a968 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -218,8 +218,8 @@ > > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a> >- <a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> >+ <a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a> >+ <a id="newserver" class="btn btn-default btn-sm" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a> > </div> > <h3>Z39.50/SRU servers administration</h3> > [% IF id %] >@@ -243,7 +243,7 @@ > </td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="reportactions[% savedreport.id %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 260746d..ceb6e60 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -204,9 +204,9 @@ function confirmnotdup(redirect){ > <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> > > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="#" id="addauth" class="btn btn-small" accesskey="w"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="addauth" class="btn btn-default btn-sm" accesskey="w"><i class="fa fa-save"></i> Save</a></div> > <div class="btn-group"> >- <a class="btn btn-small" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50 search</a> >+ <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50 search</a> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index a5df004..563c44e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -90,7 +90,7 @@ function searchauthority() { > [% IF ( CAN_user_editauthorities ) %] > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="authactions[% resul.authid %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="authactions[% resul.authid %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid %]"> > <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid %]"><i class="fa fa-pencil"></i> Edit</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index ce2fc16..c4f0e11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -46,14 +46,14 @@ > > <div id="toolbar" class="btn-toolbar"> > [% IF ( verbose ) %] >- <a href="basket.pl" class="btn btn-small showdetails showless"><i class="fa fa-folder"></i> Brief display</a> >+ <a href="basket.pl" class="btn btn-default btn-sm showdetails showless"><i class="fa fa-folder"></i> Brief display</a> > [% ELSE %] >- <a href="basket.pl" class="btn btn-small showdetails showmore"><i class="fa fa-folder-open"></i> More details</a> >+ <a href="basket.pl" class="btn btn-default btn-sm showdetails showmore"><i class="fa fa-folder-open"></i> More details</a> > [% END %] > >- <a class="btn btn-small" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a> >+ <a class="btn btn-default btn-sm" href="basket.pl" id="send_cart"><i class="fa fa-envelope"></i> Send</a> > <div class="btn-group"> >- <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a> >+ <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list %]">iso2709</a></li> > <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list %]">RIS</a></li> >@@ -63,9 +63,9 @@ > [% END %] > </ul> > </div> >- <a class="btn btn-small" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a> >- <a class="btn btn-small" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a> >- <a class="btn btn-small close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a> >+ <a class="btn btn-default btn-sm" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a> >+ <a class="btn btn-default btn-sm" href="basket.pl" id="empty_cart"><i class="fa fa-trash"></i> Empty and close</a> >+ <a class="btn btn-default btn-sm close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a> > </div> > [% END %] > >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 c6bdc23..6f7af24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -39,18 +39,18 @@ > <div id="toolbar" class="btn-toolbar"> > <fieldset class="action" id="submit1"> > <div class="btn-group"> >- <button class="btn btn-small" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> >+ <button class="btn btn-default btn-sm" type="submit" accesskey="s"><i class="fa fa-search"></i> Search</button> > </div> > <div class="btn-group"> > [% IF ( expanded_options ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0" class="btn-small"><i class="fa fa-search-minus"></i> Fewer options</a> >+ <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> > </div> > [% ELSE %] >- <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1" class="btn-small"><i class="fa fa-search-plus"></i> More options</a> >+ <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> > </div> > [% END %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options %]" class="btn-small"><i class="fa fa-trash"></i> Clear fields</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options %]" class="btn btn-sm btn-link"><i class="fa fa-trash"></i> Clear fields</a> > </div> > </fieldset> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 2b6583b..7654b56 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -91,7 +91,7 @@ function verify_images() { > no_images_msg = '<p>' + no_images_msg + '</p>'; > [% IF ( CAN_user_tools_upload_local_cover_images ) %] > var please_upload = _("Please select the image file to upload. %sUpload%s").format( >- "<a class='btn btn-mini' href='/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image'><i class='fa fa-upload' aria-hidden='true'></i> ", >+ "<a class='btn btn-default btn-xs' href='/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image'><i class='fa fa-upload' aria-hidden='true'></i> ", > "</a>"); > no_images_msg += "<p id='upload_image'>" + please_upload + '</p>'; > [% END %] >@@ -838,7 +838,7 @@ function verify_images() { > [% IF CAN_user_editcatalogue_edit_items %] > <td class="actions"> > [% UNLESS item.cannot_be_edited %] >- <a class="btn btn-mini" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]#edititem"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]#edititem"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > </td> > [% END %] >@@ -1123,7 +1123,9 @@ function verify_images() { > </form> > </div> > >-<div id="marcPreview" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+<div id="marcPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="marcPreviewLabel">MARC preview</h3> >@@ -1132,7 +1134,9 @@ function verify_images() { > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 55f553e..f9cea3d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -372,7 +372,7 @@ > <div id="toolbar" class="btn-toolbar"> > <fieldset class="action"> > <div class="btn-group"> >- <button class="btn btn-small"><i class="fa fa-search"></i> Search</button> >+ <button class="btn btn-default btn-sm"><i class="fa fa-search"></i> Search</button> > </div> > </fieldset> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 031c1f8..31bc04f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -262,7 +262,7 @@ function placeHold () { > function forgetPatron(){ > $.removeCookie("holdfor", { path: '/' }); > $(".holdforlink").remove(); >- $("#placeholdc").html("<a class=\"btn btn-mini placehold\" href=\"#\"><i class=\"fa fa-sticky-note-o\"></i> "+_("Place hold")+"</a>"); >+ $("#placeholdc").html("<a class=\"btn btn-default btn-xs placehold\" href=\"#\"><i class=\"fa fa-sticky-note-o\"></i> "+_("Place hold")+"</a>"); > } > > function addToList () { >@@ -374,8 +374,8 @@ var holdForPatron = function () { > [% IF ( CAN_user_reserveforothers && DisplayMultiPlaceHold ) %] > [% IF ( holdfor ) %] > <div id="placeholdc" class="btn-group"> >- <button class="btn btn-mini placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button> >- <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default btn-xs placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button> >+ <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -386,17 +386,17 @@ var holdForPatron = function () { > </ul> > </div> > [% ELSE %] >- <div id="placeholdc" class="btn-group"><a class="btn btn-mini placehold" href="#"><i class="fa fa-sticky-note-o"></i> Place hold</a></div> >+ <div id="placeholdc" class="btn-group"><a class="btn btn-default btn-xs placehold" href="#"><i class="fa fa-sticky-note-o"></i> Place hold</a></div> > [% END %] > [% END %] > >- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div class="btn-group"><a class="btn btn-mini" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>[% END %] >+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div class="btn-group"><a class="btn btn-default btn-xs" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>[% END %] > </div> > </div> > [% ELSE %] > <div id="searchheader"> > <form method="post" name="fz3950" class="fz3950bigrpad"> >- <button class="btn" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button> >+ <button class="btn btn-default" type="button" id="z3950submit"><i class="fa fa-search"></i> Z39.50/SRU search</button> > </form> > <h3>No results found</h3> > [% IF ( searchdesc ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 1aa98ed..7a50096 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -452,12 +452,12 @@ function Changefwk() { > [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] > [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] > <!-- Action is under fast cataloging - Save button redirecting to items --> >- <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-small"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</a></div> > [% ELSE %] > <!-- Not using fast cataloging - Display split menu --> > <div class="btn-group"> >- <button class="btn btn-small" id="saverecord"><i class="fa fa-save"></i> Save</button> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default btn-sm" id="saverecord"><i class="fa fa-save"></i> Save</button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -469,15 +469,15 @@ function Changefwk() { > [% END %] > [% ELSE %] > <!-- User cannot edit items - single button redirecting to view --> >- <div class="btn-group"><a href="#" id="saveandview" class="btn btn-small"><i class="fa fa-save"></i> Save</a></div> >+ <div class="btn-group"><a href="#" id="saveandview" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</a></div> > [% END %] > > [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] >- <div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> >+ <div class="btn-group"><a class="btn btn-default btn-sm" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div> > [% END %] > > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> > <ul id="settings-menu" class="dropdown-menu"> > [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 %] > <li><a href="#" id="switcheditor">Switch to advanced editor</a></li> >@@ -519,23 +519,23 @@ function Changefwk() { > [% IF (biblionumber) %] > [% IF ( BiblioDefaultViewmarc ) %] > <div class="btn-group"> >- <a class="btn btn-small" id="cancel" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> > </div> > [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] > <div class="btn-group"> >- <a class="btn btn-small" id="cancel" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> > </div> > [% ELSIF ( BiblioDefaultViewisbd ) %] > <div class="btn-group"> >- <a class="btn btn-small" id="cancel" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> > </div> > [% ELSE %] > <div class="btn-group"> >- <a class="btn btn-small" id="cancel" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> >+ <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber |url %]">Cancel</a> > </div> > [% END %] > [% ELSE %] >- <a class="btn btn-small" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> >+ <a class="btn btn-default btn-sm" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a> > [% END %] > [% END %] > </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 1313ba1..892c872 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -94,10 +94,10 @@ > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <div id="toolbar" class="btn-toolbar"> > [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 %] >- <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-small"><i class="fa fa-pencil"></i> Advanced editor</a> >+ <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Advanced editor</a> > [% END %] > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New record <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New record <span class="caret"></span></button> > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> > [% FOREACH framework IN frameworks %] >@@ -106,8 +106,8 @@ > </ul> > </div> > <div class="btn-group"> >- <button class="btn btn-small" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default btn-sm" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >@@ -118,7 +118,7 @@ > </ul> > </div> > [% IF ( total ) %] >- <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="fa fa-compress"></i> Merge selected</button></div> >+ <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> > [% END %] > </div> > [% END %] >@@ -199,7 +199,7 @@ > </td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="cataloguesearchactions[% resultsloo.biblionumber %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="cataloguesearchactions[% resultsloo.biblionumber %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% resultsloo.biblionumber %]"> >@@ -246,7 +246,7 @@ > <td>[% breeding_loo.file %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id %]"> >@@ -267,7 +267,9 @@ > </div> > [% END %] > >-<div id="dataPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="dataPreviewLabel">Preview</h3> >@@ -276,7 +278,9 @@ > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index db83ef8..7eaec91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -202,7 +202,7 @@ function confirm_deletion() { > [% ELSE %] > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="itemactions[% item_loo.itemnumber %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="itemactions[% item_loo.itemnumber %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item_loo.itemnumber %]"> >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 f94affa..dd3ab74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt >@@ -30,19 +30,19 @@ > <div id="editor"> > <input id="import-records-input" type="file" style="display: none"> > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-small" id="new-record" title="Open fresh record"><i class="fa fa-plus"></i> <span>New record</span></button> >+ <button class="btn btn-default btn-sm" id="new-record" title="Open fresh record"><i class="fa fa-plus"></i> <span>New record</span></button> > <div class="btn-group"> >- <button class="btn btn-small" id="save-record" title="Save current record (Ctrl-S)"><i class="fa fa-hdd-o"></i> <span>Save</span></button> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"> >+ <button class="btn btn-default btn-sm" id="save-record" title="Save current record (Ctrl-S)"><i class="fa fa-hdd-o"></i> <span>Save</span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> > <span class="caret"></span> > </button> > <ul class="dropdown-menu" id="save-dropdown"> > </ul> > </div> >- <button class="btn btn-small" id="import-records" title="Import an ISO2709 or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >- <button class="btn btn-small" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> >+ <button class="btn btn-default btn-sm" id="import-records" title="Import an ISO2709 or MARCXML record"><i class="fa fa-download"></i> <span>Import record...</span></button> >+ <button class="btn btn-default btn-sm" id="open-macros" title="Run and edit macros"><i class="fa fa-play"></i> <span>Macros...</span></button> > <div class="btn-group"> >- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> Settings <span class="caret"></span></button> > <ul id="prefs-menu" class="dropdown-menu"> > <li><a id="switch-editor" href="#">Switch to basic editor</a></li> > <li><a id="set-field-widgets" href="#"></a></li> >@@ -60,8 +60,8 @@ > <li><a class="set-font" style="font-family: Monaco" href="#">Monaco</a></li> > </ul> > </div> >- <button class="btn btn-small" id="show-alerts" title="Previous alerts"><i class="fa fa-bell"></i> Alerts <span class="caret"></span></button> >- <button class="btn btn-small" id="show-shortcuts" title="Supported keyboard shortcuts"><i class="fa fa-keyboard-o"></i> Keyboard shortcuts <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm" id="show-alerts" title="Previous alerts"><i class="fa fa-bell"></i> Alerts <span class="caret"></span></button> >+ <button class="btn btn-default btn-sm" id="show-shortcuts" title="Supported keyboard shortcuts"><i class="fa fa-keyboard-o"></i> Keyboard shortcuts <span class="caret"></span></button> > </div> > [%# CodeMirror instance will be inserted here %] > <div id="statusbar"> >@@ -97,25 +97,28 @@ > </div> > </div> > >-<div id="advanced-search-ui" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="advanced-search-title" aria-hidden="true"> >+<div id="advanced-search-ui" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="advanced-search-title" aria-hidden="true"> >+<div class="modal-dialog modal-lg"> >+<div class="modal-content"> > > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="advanced-search-title">Advanced search</h3> > </div> >- >-<form id="advanced-search" class="modal-body"> >- <div class="span3"> >+<div class="modal-body"> >+ <form id="advanced-search"> >+ <div class="row"> >+ <div class="col-md-3"> > <div id="search-facets"> > <ul> > <li>Servers:<ul id="advanced-search-servers"></ul></li> > </ul> > </div> > </div> >- <div class="span9"> >+ <div class="col-md-9"> > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-small" type="submit"><i class="fa fa-search"></i> <span>Search</span></button> >- <button class="btn btn-small" type="reset"><i class="fa fa-trash"></i> <span>Clear</span></button> >+ <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> > </div> > <ul id="advanced-search-fields"> > <li> >@@ -168,31 +171,37 @@ > </li> > </ul> > </div> >-</form> >- >+ </div> >+ </form> >+</div> >+</div> >+</div> > </div> > >-<div id="search-results-ui" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="search-results-title" aria-hidden="true"> >+<div id="search-results-ui" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="search-results-title" aria-hidden="true"> >+<div class="modal-dialog modal-lg"> >+<div class="modal-content"> > > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="search-results-title">Results</h3> > </div> > >-<div class="modal-body row-fluid"> >- <div class="span3"> >+<div class="modal-body"> >+ <div class="row"> >+ <div class="col-md-3"> > <div id="search-facets"> > <ul> > <li>Servers:<ul id="search-serversinfo"></ul></li> > </ul> > </div> > </div> >- <div class="span9"> >+ <div class="col-md-9"> > <!-- tabindex attribute allows JS-controlled focus --> > <div id="searchresults" tabindex="-1"> > <div id="search-top-pages"> >- <div class="pagination pagination-small"> >- </div> >+ <nav aria-label="Search results navigation"> >+ </nav> > </div> > > <table> >@@ -203,35 +212,43 @@ > </table> > > <div id="search-bottom-pages"> >- <div class="pagination pagination-small"> >- </div> >+ <nav aria-label="Search results navigation"> >+ </nav> > </div> > </div> > </div> >- <div id="search-overlay"><span>Loading...</span><div class="progress progress-striped active"><div class="bar" style="width: 100%"></div></div></div> >+ </div> >+ <div id="search-overlay"><span>Loading...</span><div class="progress"><div class="progress-bar progress-bar-striped active" style="width: 100%"></div></div></div> >+</div> >+</div> > </div> > > </div> > >-<div id="macro-ui" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="macro-title" aria-hidden="true"> >+<div id="macro-ui" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="macro-title" aria-hidden="true"> >+<div class="modal-dialog modal-lg"> >+<div class="modal-content"> > > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="macro-title">Macros</h3> > </div> > >-<div class="modal-body row-fluid"> >- <div class="span3"><ul id="macro-list"></ul></div> >- <div class="span9" id="macro-editor"> >+<div class="modal-body"> >+ <div class="row"> >+ <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-small" id="run-macro" title="Run and edit macros"><i class="fa fa-play"></i> Run macro</button> >- <button class="btn btn-small" id="delete-macro" title="Delete macro"><i class="fa fa-trash"></i> Delete macro</button> >+ <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> > <label for="macro-format">Format: </label> <select id="macro-format"></select> > <div id="macro-save-message"></div> > </div> > </div> >+ </div> >+</div> >+</div> > </div> >- > </div> > > <div id="shortcuts-contents" style="display: none"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index d23c34b..9bda478 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -239,7 +239,9 @@ $(document).ready(function(){ > </fieldset> > </form> > >-<div id="dataPreview" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+<div id="dataPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="dataPreviewLabel">Preview</h3> >@@ -248,7 +250,9 @@ $(document).ready(function(){ > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index 07e69df..d2efaa2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -123,15 +123,17 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <td>[% breeding_loo.heading %]</td> > <td>[% breeding_loo.heading_code %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewMARC btn btn-mini"><i class="fa fa-eye"></i> Show MARC</a> >- <a href="#" class="import_record btn btn-mini" data-breedingid="[% breeding_loo.breedingid %]" data-heading_code="[% breeding_loo.heading_code %]" data-authid="[% breeding_loo.authid %]"><i class="fa fa-download"></i> Import</a> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> Show MARC</a> >+ <a href="#" class="import_record btn btn-default btn-xs" data-breedingid="[% breeding_loo.breedingid %]" data-heading_code="[% breeding_loo.heading_code %]" data-authid="[% breeding_loo.authid %]"><i class="fa fa-download"></i> Import</a> > </td> > </tr> > [% END %] > [% END %]</tbody> > </table> > >- <div id="marcPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div id="marcPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="marcPreviewLabel">MARC preview</h3> >@@ -139,6 +141,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <div class="modal-body"> > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> >+ </div> >+ </div> > </div> > > <form method="post" action="z3950_auth_search.pl" id="page_form" name="page_form" class="checkboxed"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index c7bc15a..b42f761 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -46,7 +46,7 @@ $(document).ready(function(){ > .linktools a { font-size : 85%; text-decoration:none; padding:.3em;;background-color:#FFF; display:block;float:left;border-right:1px solid #DDD;} > .linktools a:hover { background-color:#EEE;color:#CC3300;border-right:1px solid #CCC;} > tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : transparent; } >-#dataPreview { width : 90%; margin-left : -45%; top: 5%; } .modal-body { max-height: 380px; } .modal-header { padding: 0 14px; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } } >+#dataPreview { width : 90%; top: 5%; } .modal-body { max-height: 380px; } .modal-header { padding: 0 14px; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } } > </style> > [% IF ( opsearch ) %] > <style type="text/css"> >@@ -166,7 +166,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% END %]</tbody> > </table> > >-<div id="dataPreview" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+<div id="dataPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="dataPreviewLabel">Preview</h3> >@@ -174,7 +176,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > <div class="modal-body"> > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> >- >+ </div> >+ </div> > </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 a937bf1..5630553 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -602,7 +602,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% ELSE %] > <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> > [% END %] >- <button type="submit" class="btn">Check out</button> >+ <button type="submit" class="btn btn-default">Check out</button> > > <div id="show-checkout-settings"> > <a href="#"><i class="fa fa-caret-right checkout-settings-icon"></i> Checkout settings</a> >@@ -625,7 +625,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-small 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-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> > </div> > [% END %] > [% END %] >@@ -778,10 +778,10 @@ No patron matched <span class="ex">[% message | html %]</span> > </i> > [% END %] > <br/> >- <a class="btn btn-small" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a> >+ <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a> > [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] > <span class="override_debarment"> >- <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% borrowernumber %]" class="btn btn-small">Override restriction temporarily</a> >+ <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% borrowernumber %]" class="btn btn-default btn-sm">Override restriction temporarily</a> > </span> > [% END %] > </li> >@@ -1009,7 +1009,9 @@ No patron matched <span class="ex">[% message | html %]</span> > </div>[% END %][% END %] > </div> > <!-- Modal --> >-<div id="barcodeSubmittedModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true"> >+<div id="barcodeSubmittedModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <h3 id="barcodeSubmittedModalLabel">Barcode submitted</h3> > </div> >@@ -1017,5 +1019,7 @@ No patron matched <span class="ex">[% message | html %]</span> > <div class="modal-body"> > <p>You have already submitted a barcode, please wait for the checkout to process...</p> > </div> >+ </div> >+ </div> > </div> > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >index c2dc188..3a29622 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt >@@ -5,6 +5,7 @@ CACHE MANIFEST > CACHE: > /cgi-bin/koha/circ/offline.pl > [% interface %]/lib/bootstrap/bootstrap.min.css >+[% interface %]/lib/bootstrap/bootstrap-theme.min.css > [% interface %]/lib/bootstrap/bootstrap.min.js > [% interface %]/lib/jquery/images/ui-icons_222222_256x240.png > [% interface %]/lib/jquery/images/ui-icons_454545_256x240.png >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index d03833c..2bd1b4c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >@@ -626,9 +626,9 @@ $(document).ready(function () { > <div id="offline-sync" style="display: none;" class="yui-b offline-sync"> > <div id="toolbar" class="btn-toolbar"> > [% IF (AllowOfflineCirculation) %] >- <a href="#" id="download-records" class="btn btn-small"><i class="fa fa-arrow-down"></i>Download records</a> >+ <a href="#" id="download-records" class="btn btn-default btn-sm"><i class="fa fa-arrow-down"></i>Download records</a> > [% END %] >- <a href="#" id="upload-transactions" class="btn btn-small"><i class="fa fa-arrow-up"></i>Upload transactions</a> >+ <a href="#" id="upload-transactions" class="btn btn-default btn-sm"><i class="fa fa-arrow-up"></i>Upload transactions</a> > </div> > <div class="yui-g"> > <h1>Offline circulation</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index c0b9c90..5918db5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -254,6 +254,8 @@ $(document).ready(function () { > [% IF ( found ) %] > [% IF ( waiting ) %] > <div id="hold-found1" class="modal fade audio-alert-action"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <form method="post" action="returns.pl" class="confirm"> > <div class="modal-header"> > <h3> >@@ -329,20 +331,22 @@ $(document).ready(function () { > <div class="modal-footer"> > <input type="hidden" name="cancel_reserve" value="0" /> > >- <button type="submit" class="btn approve"> >+ <button type="submit" class="btn btn-default approve"> > <i class="fa fa-check"></i> Confirm > </button> > > <input type="hidden" name="print_slip" value="0" /> >- <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit();"> >+ <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();"> > <i class="fa fa-print"></i> Print and confirm > </button> > >- <button type="submit" class="btn deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();"> >+ <button type="submit" class="btn btn-default deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();"> > <i class="fa fa-times"></i> Cancel hold > </button> > </div> > </form> >+ </div> >+ </div> > </div> > [% END %] > >@@ -457,6 +461,8 @@ $(document).ready(function () { > [% IF ( reserved ) %] > <!-- reserved --> > <div id="hold-found2" class="modal fade audio-alert-action"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <form method="post" action="returns.pl" class="confirm"> > <div class="modal-header"> > <h3> >@@ -544,17 +550,17 @@ $(document).ready(function () { > > <div class="modal-footer"> > [% IF ( transfertodo ) %] >- <button type="submit" class="btn approve"> >+ <button type="submit" class="btn btn-default approve"> > <i class="fa fa-check"></i> Confirm hold and transfer > </button> >- <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit()"> >+ <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit()"> > <i class="fa fa-print"></i> Print slip, transfer, and confirm > </button> > [% ELSE %] >- <button type="submit" class="btn approve"> >+ <button type="submit" class="btn btn-default approve"> > <i class="fa fa-check"></i> Confirm hold > </button> >- <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit();"> >+ <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();"> > <i class="fa fa-print"></i> Print slip and confirm > </button> > [% END %] >@@ -564,6 +570,8 @@ $(document).ready(function () { > </button> > </div> > </form> >+ </div> >+ </div> > </div> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 227c2f5..fc3a91f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -82,7 +82,7 @@ $(document).ready(function() { > </td> > <td>[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) %][% END %]</td> > <td>[% reser.itemcallnumber %]</td> >- <td class="actions"><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber %]&canceltransfer=1&dest=ttr" class="btn btn-mini"><i class="fa fa-times"></i> Cancel transfer</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber %]&canceltransfer=1&dest=ttr" class="btn btn-default btn-xs"><i class="fa fa-times"></i> Cancel transfer</a></td> > </tr> > [% END %]</tbody> > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >index 4deed87..8b52cac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >@@ -249,7 +249,7 @@ function filterByFirstLetterSurname(letter) { > </table> > </div> > >-<div id="closewindow"><a href="#" class="btn btn-default close">Close</a></div> >+<div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> > </div> > </div> > [% INCLUDE 'intranet-bottom.inc' %] >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 99aa832..9360706 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 >@@ -54,9 +54,9 @@ > [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %] > <div id="toolbar"> > <ul class="toolbar"> >- [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-small" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="fa fa-plus"></i> Add reserves</a></li>[% END %] >- [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit course</a></li>[% END %] >- [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-small" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del"><i class="fa fa-trash"></i> Delete course</a></li>[% END %] >+ [% IF CAN_user_coursereserves_add_reserves %]<li><a class="btn btn-default btn-sm" id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]"><i class="fa fa-plus"></i> Add reserves</a></li>[% END %] >+ [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-default btn-sm" id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit course</a></li>[% END %] >+ [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a class="btn btn-default btn-sm" id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del"><i class="fa fa-trash"></i> Delete course</a></li>[% END %] > </ul> > </div><!-- /toolbar --> > [% END %] >@@ -202,16 +202,16 @@ > [% IF CAN_user_coursereserves_add_reserves || CAN_user_coursereserves_delete_reserves %] > <td class="actions"> > [% IF CAN_user_coursereserves_add_reserves %] >- <a class="btn btn-mini" href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup&return=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup&return=[% course.course_id %]"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > > [% IF CAN_user_coursereserves_delete_reserves %] > [% IF cr.item.onloan %] >- <a class="btn btn-mini disabled checkedout" href="#" class="delete_item" data-toggle="tooltip" data-placement="left" title="This item is checked out"> >+ <a class="btn btn-default btn-xs disabled checkedout" href="#" class="delete_item" data-toggle="tooltip" data-placement="left" title="This item is checked out"> > [% ELSIF cr.item.itemlost %] >- <a class="btn btn-mini disabled itemlost" href="#" class="delete_item" data-toggle="tooltip" data-placement="left" title="This item is lost"> >+ <a class="btn btn-default btn-xs disabled itemlost" href="#" class="delete_item" data-toggle="tooltip" data-placement="left" title="This item is lost"> > [% ELSE %] >- <a class="btn btn-mini" href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" class="delete_item" > >+ <a class="btn btn-default btn-xs" href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" class="delete_item" > > [% END %] > <i class="fa fa-trash"></i> Remove</a> > [% 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 99e6014..97c2f65 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 >@@ -30,7 +30,7 @@ $(document).ready(function() { > <div id="toolbar"> > <ul class="toolbar"> > [% IF ( CAN_user_coursereserves_manage_courses ) %] >- <li><a class="btn btn-small" id="new_course" href="/cgi-bin/koha/course_reserves/course.pl"><i class="fa fa-plus"></i> New course</a></li> >+ <li><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></li> > [% END %] > </ul> > </div><!-- /toolbar --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 060ba39..f3b4d73 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -30,7 +30,7 @@ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this news item? This > <div id="adminwarning" class="dialog alert"> > <p><strong>Warning:</strong> You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p> > <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p> >-<p><a class="btn btn-small" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p> >+<p><a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-plus"> </i> Create patron</a></p> > </div> > [% END %] > <div class="yui-u first"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index 62d5613..ed905a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -226,12 +226,12 @@ > </div> > </form> > <div id="batch-manage" class="btn-toolbar"> >- <a class="btn btn-small" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a>[% IF ( table_loop ) %] >- <a class="btn btn-small" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</a> >- <a class="btn btn-small" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >- <a class="btn btn-small" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >- <a class="btn btn-small" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected items</a> >- <a class="btn btn-small" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a>[% END %] >+ <a class="btn btn-default btn-sm" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a>[% IF ( table_loop ) %] >+ <a class="btn btn-default btn-sm" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</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 items</a> >+ <a class="btn btn-default btn-sm" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export full batch</a>[% END %] > </div> > [% IF ( table_loop ) %] > <form name="items" class="checkboxed"> >@@ -265,8 +265,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> >- <a class="btn btn-mini export" href="#" data-batch-id="[% batch_id %]" data-label-id="[% text_field.field_value |html %]"><i class="fa fa-share-square-o"></i> Export</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id |url %]&label_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id %]" data-label-id="[% text_field.field_value |html %]"><i class="fa fa-share-square-o"></i> Export</a> > </td> > <td><input type="checkbox" name="action" value="[% text_field.field_value %]"></td> > [% ELSE %] >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 938bc4b..3444b21 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 >@@ -148,8 +148,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/labels/label-edit-[% label_element |url %].pl?op=edit&element_id=[% text_field.field_value |url %]"><i class="fa fa-edit"></i> Edit</a> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element %]&element_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/labels/label-edit-[% label_element |url %].pl?op=edit&element_id=[% text_field.field_value |url %]"><i class="fa fa-edit"></i> Edit</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=[% label_element %]&element_id=[% text_field.field_value |url %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% IF label_element == 'batch' %] <td><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>[% END %] > [% ELSIF ( text_field.field_value ) %] >@@ -162,7 +162,7 @@ > [% END %] > [% END %] > </table> >- [% IF ( print ) %]<button type="button" class="btn btn-sm" id="print">Export selected</button>[% END %] >+ [% IF ( print ) %]<button type="button" class="btn btn-default btn-sm" id="print">Export selected</button>[% END %] > </fieldset> > </form> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index a2051b6..e8e0180 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -73,8 +73,8 @@ > > <form name="resultform" action=""> > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><button type="button" class="btn btn-small" id="add_items"><i class="fa fa-plus"></i> Add checked</button></div> >- <div class="btn-group"><a href="#" class="btn btn-small close"><i class="fa fa-times-circle"></i> Done</a></div> >+ <div class="btn-group"><button type="button" class="btn btn-default btn-sm" id="add_items"><i class="fa fa-plus"></i> Add checked</button></div> >+ <div class="btn-group"><a href="#" class="btn btn-default btn-sm close"><i class="fa fa-times-circle"></i> Done</a></div> > </div> > <div><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></div> > >@@ -116,7 +116,7 @@ z [% END -%] > <td><input type="checkbox" name="action" value="[% text_field.field_value %]"></td> > [% ELSIF ( text_field.link_field ) %] > <td> >- <a class="btn btn-mini select_item" data-item-number="[% text_field.field_value %]" data-batch-id="[% batch_id %]" data-field-type="[% text_field.type %]"><i class="fa fa-plus"></i> Add</a> >+ <a class="btn btn-default btn-xs select_item" data-item-number="[% text_field.field_value %]" data-batch-id="[% batch_id %]" data-field-type="[% text_field.type %]"><i class="fa fa-plus"></i> Add</a> > </td> > [% ELSE %] > <td>[% text_field.field_value %]</td> >@@ -147,7 +147,7 @@ z [% END -%] > <a href="label-item-search.pl?startfrom=[% startfromnext %]&ccl_query=[% ccl_query %]&resultsperpage=[% resultsperpage %]&op=do_search&batch_id=[% batch_id %]">>></a> > [% END %] > </p> >- <div id="closewindow"><a href="#" class="btn btn-default close">Close</a></div> >+ <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Close</a></div> > [% END %] > </div> > [% INCLUDE 'popup-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index ca0a804..98de9f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -109,13 +109,13 @@ $(document).ready(function() { > [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td> > <td class="actions"> > [% IF ( account.payment ) %] >- <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a> >+ <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a> > [% ELSE %] >- <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a> >+ <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a> > [% END %] > [% IF ( reverse_col) %] > [% IF ( account.payment ) %] >- <a href="boraccount.pl?action=reverse&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-undo"></i> Reverse</a> >+ <a href="boraccount.pl?action=reverse&accountlines_id=[% account.accountlines_id %]&borrowernumber=[% account.borrowernumber %]" class="btn btn-default btn-xs"><i class="fa fa-undo"></i> Reverse</a> > [% ELSE %] > > [% END %] >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 6afaa7a..9da144c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -211,13 +211,13 @@ $(document).ready(function() { > <div id="toolbar" class="btn-toolbar"> > [% UNLESS ( check_member ) %] > [% IF quickadd && opadd %] >- <button class="btn btn-small toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button> >+ <button class="btn btn-default btn-sm toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button> > [% END %] >- <button class="btn btn-small toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button> >+ <button class="btn btn-default btn-sm toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button> > [% IF opadd %] >- <a class="btn btn-small" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform"> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform"> > [% ELSE %] >- <a class="btn btn-small" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> > [% END %] > <i class="fa fa-times"></i> Cancel > </a> >@@ -356,19 +356,19 @@ $(document).ready(function() { > > [% UNLESS ( opduplicate ) %] > [% IF ( female ) %] >- <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" checked="checked" /> >+ <label for="sex-female"><input type="radio" name="sex" id="sex-female" value="F" checked="checked" /> Female</label> > [% ELSE %] >- <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" /> >+ <label for="sex-female"><input type="radio" name="sex" id="sex-female" value="F" /> Female</label> > [% END %] > [% IF ( male ) %] >- <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" checked="checked" /> >+ <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" checked="checked" /> Male</label> > [% ELSE %] >- <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" /> >+ <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" /> Male</label> > [% END %] > [% IF ( none ) %] >- <label for="sex-none">None specified </label><input type="radio" name="sex" id="sex-none" value="" checked="checked" /> >+ <label for="sex-none"><input type="radio" name="sex" id="sex-none" value="" checked="checked" /> None specified</label> > [% ELSE %] >- <label for="sex-none">None specified </label><input type="radio" name="sex" id="sex-none" value="" /> >+ <label for="sex-none"><input type="radio" name="sex" id="sex-none" value="" /> None specified</label> > [% END %] > [% ELSE %] > <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" /> >@@ -928,18 +928,20 @@ $(document).ready(function() { > [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %] > </label> > [% IF CAN_user_circulate_manage_restrictions %] >- <label for="yes[% flagloo.name %]">Yes </label> >+ <label for="yes[% flagloo.name %]"> > [% IF ( flagloo.yes ) %] > <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" /> > [% ELSE %] > <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" /> > [% END %] >- <label for="no[% flagloo.name %]">No </label> >+ Yes </label> >+ <label for="no[% flagloo.name %]"> > [% IF ( flagloo.no ) %] > <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" checked="checked"/> > [% ELSE %] > <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" /> > [% END %] >+ No </label> > [% ELSE %] > [% IF flagloo.yes %]Yes[% ELSE %]No[% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index 662a72e..1886eb8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -82,7 +82,7 @@ > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="hidden" name="message_id" value="[% QUEUED_MESSAGE.message_id %]" /> > <fieldset class="action"> >- <button class="btn btn-mini" type="submit">Resend</button> >+ <button class="btn btn-default btn-xs" type="submit">Resend</button> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 96f6081..a6f1e8f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -37,7 +37,7 @@ > <h2>Purchase suggestions</h2> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% borrowernumber %]&redirect=purchase_suggestions&borrowernumber=[% borrowernumber %]"><i class="fa fa-plus"></i> New purchase suggestion</a> >+ <a class="btn btn-default btn-sm" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% borrowernumber %]&redirect=purchase_suggestions&borrowernumber=[% borrowernumber %]"><i class="fa fa-plus"></i> New purchase suggestion</a> > </div> > > [% IF suggestions %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt >index 53f445b..f1bb9a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt >@@ -17,7 +17,7 @@ > "dt_address": > "[% INCLUDE escape_address data=data %]", > "dt_action": >- "<a href=\"#\" class=\"btn btn-mini select_user\" data-borrowernumber=\"[% data.borrowernumber %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) | html %]\" />" >+ "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber %]\" name=\"borrower_data[% data.borrowernumber %]\" value=\"[% To.json(data) | html %]\" />" > }[% UNLESS loop.last %],[% END %] > [% END %] > ] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >index afef708..666b59c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt >@@ -32,7 +32,7 @@ > "dt_borrowernotes": > "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]", > "dt_action": >- "<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]' class='btn btn-mini'><i class='fa fa-pencil'></i> Edit</a>", >+ "<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% data.borrowernumber %]' class='btn btn-default btn-xs'><i class='fa fa-pencil'></i> Edit</a>", > "borrowernumber": > "[% data.borrowernumber %]" > }[% UNLESS loop.last %],[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index 79cf84d..956cc28 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -105,7 +105,7 @@ $(document).ready(function() { > <span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | > <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span> | > <div class="btn-group"> >- <button class="btn btn-mini list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button> >+ <button class="btn btn-default btn-xs list-remove" type="submit"><i class="fa fa-trash"></i> Remove selected</button> > </div> > </div> > >@@ -152,7 +152,7 @@ $(document).ready(function() { > </table> > > <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" /> >- <button type="submit" class="btn btn-small"><i class="fa fa-trash" aria-hidden="true"></i> Remove selected patrons</button> >+ <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-trash" aria-hidden="true"></i> Remove selected patrons</button> > </form> > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index a3d8866..14c3cf8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -67,7 +67,7 @@ > > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <a class="btn btn-small" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a> >+ <a class="btn btn-default btn-sm" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a> > </div> > </div> > >@@ -91,7 +91,7 @@ > <td>[% l.patron_list_patrons_rs.count || 0 %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="listactions[% l.patron_list_id %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="listactions[% l.patron_list_id %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id %]"> >@@ -127,7 +127,9 @@ > </table> > > <!-- Modal to print patron cards --> >- <div class="modal hide" id="patronExportModal" tabindex="-1" role="dialog" aria-labelledby="patronExportModal_label" aria-hidden="true"> >+ <div class="modal" id="patronExportModal" tabindex="-1" role="dialog" aria-labelledby="patronExportModal_label" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> > <h3 id="patronExportModal_label">Print patron cards</h3> >@@ -135,6 +137,8 @@ > <div class="modal-body"> > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> >+ </div> >+ </div> > </div> > > [% ELSE %] >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 9131ee4..eabc2fe 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 >@@ -209,12 +209,12 @@ > </div> > </form> > <div id="batch-manage" class="action"> >- <a class="btn btn-small" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %] >- <a class="btn btn-small" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a> >- <a class="btn btn-small" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> >- <a class="btn btn-small" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >- <a class="btn btn-small" id="exportitems" href="#"><i class="fa fa-share-square-o"></i> Export selected card(s)</a> >- <a class="btn btn-small" id="exportbatch" href="#"><i class="fa fa-share-square-o"></i> Export card batch</a>[% END %] >+ <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="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 %] > </div> > [% IF ( table_loop ) %] > <form name="items" class="checkboxed"> >@@ -246,8 +246,8 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="btn btn-mini delete" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&batch_id=[% batch_id %]&label_id=[% text_field.field_value %]"><i class="fa fa-trash"></i> Delete</a> >- <a class="btn btn-mini export" href="#" data-batch-id="[% batch_id %]" data-label-id="[% text_field.field_value %]"><i class="fa fa-share-square-o"></i> Export</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&batch_id=[% batch_id %]&label_id=[% text_field.field_value %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id %]" data-label-id="[% text_field.field_value %]"><i class="fa fa-share-square-o"></i> Export</a> > </td> > <td><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index 75b217f..5b078eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >@@ -546,7 +546,7 @@ > </div> > </div> > <fieldset class="action"> >- <input class="btn btn-default" type="submit" value="Save" /> >+ <input class="btn btn-default btn-default" type="submit" value="Save" /> > <a class="cancel" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Cancel</a> > <input type="hidden" name="op" value="save" /> > <input type="hidden" name="layout_id" value="[% layout_id %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >index 17387bd..2700265 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >@@ -90,7 +90,7 @@ > </ol> > <div class="action"> > <input type="hidden" name="op" value="upload" /> >- <input class="btn btn-default" id="uploadsu" type="submit" value="Upload" /> >+ <input class="btn btn-default btn-default" id="uploadsu" type="submit" value="Upload" /> > </div> > [% IF ( IMPORT_SUCCESSFUL ) %] > <div class="dialog message"> >@@ -135,7 +135,7 @@ > [% FOREACH text_field IN TABL.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="delete_image btn btn-mini" href="/cgi-bin/koha/patroncards/image-manage.pl?op=delete&image_id=[% text_field.field_value %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="delete_image btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/image-manage.pl?op=delete&image_id=[% text_field.field_value %]"><i class="fa fa-trash"></i> Delete</a> > </td> > <td align="center"><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td> > [% ELSIF ( text_field.field_value ) %] >@@ -150,7 +150,7 @@ > </table> > <div class="action"> > <input type="hidden" name="op" value="delete" /> >- <input class="btn btn-default" type="button" id="delete" value="Delete selected" /> >+ <input class="btn btn-default btn-default" type="button" id="delete" value="Delete selected" /> > </div> > [% IF ( DELETE_SUCCESSFULL ) %] > <div id="dialog" class="dialog message"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index efdf9fb..dd7a73a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -208,9 +208,9 @@ > [% FOREACH text_field IN table_loo.text_fields %] > [% IF ( text_field.select_field ) %] > <td> >- <a class="btn btn-mini" href="/cgi-bin/koha/patroncards/edit-[% card_element %].pl?op=edit&element_id=[% text_field.field_value %]"><i class="fa fa-edit"></i> Edit</a> >- [% IF ( print ) %]<a class="btn btn-mini export" data-batch-id="[% text_field.field_value |url %]" href="/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]"><i class="fa fa-share-square-o"></i> Export</a>[% END %] >- <a class="btn btn-mini delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element %]&element_id=[% text_field.field_value %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/patroncards/edit-[% card_element %].pl?op=edit&element_id=[% text_field.field_value %]"><i class="fa fa-edit"></i> Edit</a> >+ [% IF ( print ) %]<a class="btn btn-default btn-xs export" data-batch-id="[% text_field.field_value |url %]" href="/cgi-bin/koha/patroncards/print.pl?batch_id=[% text_field.field_value |url %]"><i class="fa fa-share-square-o"></i> Export</a>[% END %] >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/manage.pl?op=delete&card_element=[% card_element %]&element_id=[% text_field.field_value %]"><i class="fa fa-trash"></i> Delete</a> > </td> > [% IF ( print ) %]<td><input type="checkbox" name="action" value="[% text_field.field_value %]" /></td>[% END %] > [% ELSIF ( text_field.field_value ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt >index e3455be..61c34d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/tables/members_results.tt >@@ -19,7 +19,7 @@ > "dt_borrowernotes": > "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]", > "dt_action": >- "<a href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\" class=\"btn btn-mini add_user\"><i class=\"fa fa-plus\"></i> Add</a>" >+ "<a href=\"#\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\" class=\"btn btn-default btn-xs add_user\"><i class=\"fa fa-plus\"></i> Add</a>" > }[% UNLESS loop.last %],[% END %] > [% END %] > ] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index e4adb7c..d7dcf3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -32,7 +32,7 @@ > > [% IF ( CAN_user_plugins_manage ) %] > <div class="btn-toolbar" id="toolbar"> >- <a href="/cgi-bin/koha/plugins/plugins-upload.pl" id="upload_plugin" class="btn btn-small"><i class="fa fa-upload"></i> Upload plugin</a> >+ <a href="/cgi-bin/koha/plugins/plugins-upload.pl" id="upload_plugin" class="btn btn-default btn-sm"><i class="fa fa-upload"></i> Upload plugin</a> > </div> > [% END %] > >@@ -87,7 +87,7 @@ > [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] > <td class="actions"> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="pluginactions[% plugin.class %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="pluginactions[% plugin.class %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class %]"> >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 cbbc1d1..e32d300 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -51,7 +51,7 @@ > [% IF ( start_dictionary ) %] > <div id="toolbar"> > <ul class="toolbar"> >- <li><a id="newdictionary" class="btn btn-small" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition"><i class="fa fa-plus"></i> New definition</a></li> >+ <li><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></li> > </ul> > </div> > [% END %] >@@ -96,7 +96,7 @@ > <td class="actions"><form method="post" action="/cgi-bin/koha/reports/dictionary.pl"> > <input type="hidden" name="id" value="[% definition.id %]" /> > <input type="hidden" name="phase" value="Delete Definition" /> >- <button type="submit" name="submit" class="btn btn-mini" id="delete"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" name="submit" class="btn btn-default btn-xs" id="delete"><i class="fa fa-trash"></i> Delete</button> > </form></td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 71fed7f..b4e6992 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -372,8 +372,8 @@ canned reports and writing custom SQL reports.</p> > <td> > <div class="dropup"> > <div class="btn-group"> >- <a class="btn btn-mini" role="button" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Run%20this%20report"><i class="fa fa-play"></i> Run</a> >- <a class="btn btn-mini dropdown-toggle" id="reportactions[% savedreport.id %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >+ <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Run%20this%20report"><i class="fa fa-play"></i> Run</a> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id %]"> > <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Show%20SQL"><i class="fa fa-search"></i> Show</a></li> > [% IF ( CAN_user_reports_create_reports ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index 65cb829..5373fc3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -53,8 +53,8 @@ > [% review.review |html %] > </td> > <td> >- [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-check"></i> Approve</a>[% END %] >- <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> >+ [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %] >+ <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> > </td> > </tr> > [% END %]</tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index f8d8598..7cf35f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >@@ -58,7 +58,7 @@ > <td>[% Branches.GetName( collectionsLoo.colBranchcode ) %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-mini" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId %]"> > <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId %]"><i class="fa fa-plus"></i> Add or remove items</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt >index a3580ff..ccd6cfa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt >@@ -43,7 +43,7 @@ $(document).ready(function(){ > [% FOREACH loop_supplier IN loop_suppliers %] > <tr> > <td>[% loop_supplier.name %]</td> >- <td><a class="btn btn-mini select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid %]" data-vendorname="[% loop_supplier.name |html%]">Choose</a></td> >+ <td><a class="btn btn-default btn-xs select_vendor" href="#" data-vendorid="[% loop_supplier.aqbooksellerid %]" data-vendorname="[% loop_supplier.name |html%]">Choose</a></td> > </tr> > [% END %] > </table> >@@ -51,7 +51,7 @@ $(document).ready(function(){ > > <p><a href="/cgi-bin/koha/serials/acqui-search.pl">Perform a new search</a></p> > >- <div id="closewindow"><a href="#" class="btn btn-default close">Cancel</a></div> >+ <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Cancel</a></div> > > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index 5f90da6..c74bf15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -58,7 +58,7 @@ > <div class="yui-b"> > [% IF op == 'list' %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newfields" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form"><i class="fa fa-plus"></i> New fields</a> >+ <a class="btn btn-default btn-sm" id="newfields" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form"><i class="fa fa-plus"></i> New fields</a> > </div> > [% END %] > >@@ -109,8 +109,8 @@ > [% IF field.searchable %]Yes[% ELSE %]No[% END %] > </td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form&field_id=[% field.id %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="confirmdelete btn btn-mini" href="/cgi-bin/koha/serials/add_fields.pl?op=delete&field_id=[% field.id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form&field_id=[% field.id %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="confirmdelete btn btn-default btn-xs" href="/cgi-bin/koha/serials/add_fields.pl?op=delete&field_id=[% field.id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >index 80b8857..8a59bbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -111,8 +111,8 @@ > [% subscriptions_loo.expirationdate | $KohaDates %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptions_loo.subscriptionid %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid %]" data-subscriptionid="[% subscriptions_loo.subscriptionid %]" class="btn btn-mini renew_subscription"><i class="fa fa-refresh"></i> Renew</a> >+ <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptions_loo.subscriptionid %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid %]" data-subscriptionid="[% subscriptions_loo.subscriptionid %]" class="btn btn-default btn-xs renew_subscription"><i class="fa fa-refresh"></i> Renew</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >index 6566893..2c5a14f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt >@@ -52,7 +52,7 @@ > <td> > [% resultsloo.issn |html %] > </td> >- <td><a class="btn btn-mini select_title" data-biblionumber="[% resultsloo.biblionumber %]" href="#" title="Choose this record">Choose</a></td> >+ <td><a class="btn btn-default btn-xs select_title" data-biblionumber="[% resultsloo.biblionumber %]" href="#" title="Choose this record">Choose</a></td> > </tr> > [% END %] > </table> >@@ -75,7 +75,7 @@ > > <p><a href="subscription-bib-search.pl">Search for another record</a></p> > >-<div id="closewindow"><a class="btn btn-default close" href="#">Close</a></div> >+<div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> > > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt >index b5bbf24..5019820 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt >@@ -46,7 +46,7 @@ > <p id="routingnote">[% routingnotes %]</p> > </div> > >- <div id="closewindow" class="noprint"><a class="btn btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default close" href="#">Close</a></div> >+ <div id="closewindow" class="noprint"><a class="btn btn-default btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default btn-default close" href="#">Close</a></div> > > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >index 026682a..b0b32ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >@@ -86,7 +86,7 @@ function reorder_item(sid,rid,rank){ > [% END %] > </select> > </td> >- <td><a class="btn btn-mini" href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&subscriptionid=[% subscriptionid %]&op=delete"><i class="fa fa-trash"></i> Delete</a></td> >+ <td><a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&subscriptionid=[% subscriptionid %]&op=delete"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %] > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 293c5bf..628276e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -135,14 +135,14 @@ $(document).ready(function() { > [% UNLESS subscription.closed %] > [% IF ( routing && CAN_user_serials_routing ) %] > [% IF ( subscription.hasRouting ) %] >- <a class="btn btn-mini" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="fa fa-pencil"></i> Edit routing list</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="fa fa-pencil"></i> Edit routing list</a> > [% ELSE %] >- <a class="btn btn-mini" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&op=new"><i class="fa fa-plus"></i> Create routing list</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&op=new"><i class="fa fa-plus"></i> Create routing list</a> > [% END %] > [% END %] >- [% IF ( subscription.abouttoexpire ) %]<a class="btn btn-mini" href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;"><i class="fa fa-refresh"></i> Renew</a> >+ [% IF ( subscription.abouttoexpire ) %]<a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;"><i class="fa fa-refresh"></i> Renew</a> > [% ELSE %] >- [% IF ( subscription.subscriptionexpired ) %]<a class="btn btn-mini" href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;"><i class="fa fa-refresh"></i> Renew</a> >+ [% IF ( subscription.subscriptionexpired ) %]<a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;"><i class="fa fa-refresh"></i> Renew</a> > [% ELSE %] > > [% END %] >@@ -309,7 +309,7 @@ $(document).ready(function() { > </td> > [% IF ( routing ) %] > <td class="actions"> >- <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-mini"><i class="fa fa-print"></i> Print list</a> >+ <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print list</a> > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 1822b88..4f12677 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -212,10 +212,10 @@ > <div class="dropdown"> > <div class="btn-group"> > [% IF ( CAN_user_serials_receive_serials ) %] >- <a class="btn btn-mini" role="button" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7"><i class="fa fa-inbox"></i> Serial receive</a> >- <a class="btn btn-mini dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> >+ <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7"><i class="fa fa-inbox"></i> Serial receive</a> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> > [% ELSE %] >- <a class="btn btn-mini dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a> > [% END %] > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid %]"> > >@@ -319,7 +319,7 @@ > [% END %] > <td> > <div class="dropdown"> >- <a class="btn btn-mini dropdown-toggle" id="closedsubactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="closedsubactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="closedsubactions[% subscription.subscriptionid %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >index 4fc936b..e277210 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >@@ -161,7 +161,7 @@ $(document).ready(function() { > [% ELSE %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newfrequency" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=new"><i class="fa fa-plus"></i> New frequency</a> >+ <a class="btn btn-default btn-sm" id="newfrequency" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=new"><i class="fa fa-plus"></i> New frequency</a> > </div> > > <h1>Frequencies</h1> >@@ -213,8 +213,8 @@ $(document).ready(function() { > <td>[% frequency.unitsperissue %]</td> > <td>[% frequency.displayorder %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete_frequency btn btn-mini" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=modify&frequencyid=[% frequency.id %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete_frequency btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-frequencies.pl?op=del&frequencyid=[% frequency.id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >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 9d6d267..70b0503 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 >@@ -327,7 +327,7 @@ $(document).ready(function(){ > [% END %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a> >+ <a class="btn btn-default btn-sm" id="newnumberpattern" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=new"><i class="fa fa-plus"></i> New numbering pattern</a> > </div> > > [% IF (numberpatterns_loop.size) %] >@@ -349,8 +349,8 @@ $(document).ready(function(){ > <td>[% numberpattern.numberingmethod %]</td> > <td>[% numberpattern.displayorder %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="delete_pattern btn btn-mini" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=modify&id=[% numberpattern.id %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="delete_pattern btn btn-default btn-xs" href="/cgi-bin/koha/serials/subscription-numberpatterns.pl?op=del&id=[% numberpattern.id %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt >index 6453d48..2379369 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt >@@ -13,7 +13,7 @@ > "dt_branch": > "[% data.branchname |html %]", > "dt_action": >- "<a href=\"#\" class=\"add_user btn btn-mini\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\">Add</a>" >+ "<a href=\"#\" class=\"add_user btn btn-default btn-xs\" data-borrowernumber=\"[% data.borrowernumber %]\" data-firstname=\"[% data.firstname %]\" data-surname=\"[% data.surname %]\">Add</a>" > }[% UNLESS loop.last %],[% END %] > [% END %] > ] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index f1d06d7..7b1a934 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -203,8 +203,8 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > <div class="yui-b"> > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&edit_field=[% suggestionid %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-sm" id="editsuggestion" href="suggestion.pl?op=edit&suggestionid=[% suggestionid %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-sm" id="deletesuggestion" href="suggestion.pl?op=delete&edit_field=[% suggestionid %]"><i class="fa fa-trash"></i> Delete</a> > </div> > > <fieldset class="rows"> >@@ -472,7 +472,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o > > [% IF ( op_else ) %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newsuggestion" href="suggestion.pl?op=add"><i class="fa fa-plus"></i> New purchase suggestion</a> >+ <a class="btn btn-default btn-sm" id="newsuggestion" href="suggestion.pl?op=add"><i class="fa fa-plus"></i> New purchase suggestion</a> > </div> > > <h1>Suggestions management</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index 919c8fe..798e252 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -71,7 +71,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </li> > [% END %]</ul>[% ELSE %]This record has no items.[% END %] > </td> >- <td><form method="post" action="/cgi-bin/koha/tags/list.pl"><input type="hidden" name="op" value="del" /><input type="hidden" name="tag" value="[% tag %]" /><input type="hidden" name="tag_id" value="[% title.tag_id %]" /><button type="submit" class="delete btn btn-small"><i class="fa fa-trash"></i> Remove tag</button></form></td> >+ <td><form method="post" action="/cgi-bin/koha/tags/list.pl"><input type="hidden" name="op" value="del" /><input type="hidden" name="tag" value="[% tag %]" /><input type="hidden" name="tag_id" value="[% title.tag_id %]" /><button type="submit" class="delete btn btn-default btn-sm"><i class="fa fa-trash"></i> Remove tag</button></form></td> > </tr> > [% END %] > </table> >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 b89fe6c..9b7ecd1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -273,11 +273,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% IF ( tagloo.approved ) %] > <td class="actions"><span class="ajax_buttons" style="visibility:hidden"> > [% IF ( tagloo.approved == -1 ) %] >- <button class="ok btn btn-mini" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button> >- <button class="rej btn btn-mini" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Rejected" name="reject"><i class="fa fa-remove"></i> Rejected</button> >+ <button class="ok btn btn-default btn-xs" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button> >+ <button class="rej btn btn-default btn-xs" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Rejected" name="reject"><i class="fa fa-remove"></i> Rejected</button> > [% ELSE %] >- <button class="ok btn btn-mini" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Approved" name="approve"><i class="fa fa-check"></i> Approved</button> >- <button class="rej btn btn-mini" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button> >+ <button class="ok btn btn-default btn-xs" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Approved" name="approve"><i class="fa fa-check"></i> Approved</button> >+ <button class="rej btn btn-default btn-xs" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button> > [% END %] > </span> > </td> >@@ -285,8 +285,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > </td> > [% ELSE %] > <td class="actions"><span class="ajax_buttons" style="visibility:hidden"> >- <button class="ok btn btn-mini" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button> >- <button class="rej btn btn-mini" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button> >+ <button class="ok btn btn-default btn-xs" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button> >+ <button class="rej btn btn-default btn-xs" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button> > </span> > </td> > [% UNLESS ( filter_approved_pending ) %]<td> </td>[% END %] >@@ -300,8 +300,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-small" id="approve_button" name="op-approve"><i class="fa fa-check"></i> Approve</button> >- <button type="submit" value="Reject" class="btn btn-small" id="reject_button" name="op-reject"><i class="fa fa-remove"></i> Reject</button> >+ <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> > </fieldset>[% END %] > </form> > </div> >@@ -329,7 +329,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > <div class="description">Enter a word or phrase to check against approved/rejected lists: </div> > <form method="post" action="/cgi-bin/koha/tags/review.pl"> > <input type="text" size="14" name="test" id="test" /> >- <fieldset class="action"><button type="submit" value="Test" class="btn btn-small" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> >+ <fieldset class="action"><button type="submit" value="Test" class="btn btn-default btn-sm" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset> > <div id="verdict"> > [% IF ( test_term ) %] > [% IF ( verdict_ok ) %] >@@ -380,7 +380,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > </ol> >- <fieldset class="action"><button type="submit" class="btn btn-small"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> >+ <fieldset class="action"><button type="submit" class="btn btn-default btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index 5c1984c..946ad3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -43,24 +43,24 @@ > <h3>Rules for automatic item modifications by age</h3> > <div id="toolbar" class="btn-toolbar"> > <div class="btn-group"> >- <button class="btn btn-small add_rule"><i class="fa fa-plus"></i> Add rule</button> >+ <button class="btn btn-default btn-sm add_rule"><i class="fa fa-plus"></i> Add rule</button> > </div> > <div class="btn-group"> >- <button type="submit" id="save_rules" class="btn btn-small"><i class="fa fa-save"></i> Save</button> >+ <button type="submit" id="save_rules" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button> > </div> > <div class="btn-group"> >- <a class="btn btn-small" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl"><i class="fa fa-remove"></i> Cancel</a> > </div> > </div> > [% ELSE %] > <h3>Automatic item modifications by age</h3> > [% IF ( rules ) %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a> >+ <a class="btn btn-default btn-sm" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a> > </div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a> >+ <a class="btn btn-default btn-sm" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-plus"></i> Add rules</a> > </div> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 8014d9e..d66d15d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -192,11 +192,11 @@ $(document).ready(function(){ > > <p> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] >- <a class="btn" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]"><i class="fa fa-check-square-o"></i> Return to the record</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% ELSIF src %] >- <a class="btn" href="[% src %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> >+ <a class="btn btn-default" href="[% src %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> > [% ELSE %] >- <a class="btn" href="/cgi-bin/koha/tools/batchMod.pl?del=1"><i class="fa fa-check-square-o"></i> Return to batch item deletion</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl?del=1"><i class="fa fa-check-square-o"></i> Return to batch item deletion</a> > [% END %] > </p> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 5eb138e..2fd838f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -262,11 +262,11 @@ $(document).ready(function(){ > [% ELSE %] <!-- // show --> > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] >- <a class="btn" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]"><i class="fa fa-check-square-o"></i> Return to the record</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]"><i class="fa fa-check-square-o"></i> Return to the record</a> > [% ELSIF src %] >- <a class="btn" href="[% src %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> >+ <a class="btn btn-default" href="[% src %]"><i class="fa fa-check-square-o"></i> Return to where you were</a> > [% ELSE %] >- <a class="btn" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> >+ <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a> > [% END %] > </fieldset> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index e5dad6c..d81382c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -185,7 +185,9 @@ $(document).ready(function() { > [% END %] > [% END %] > </select> >- <div id="marcPreview" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div id="marcPreview" class="modal" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="marcPreviewLabel">MARC preview</h3> >@@ -194,7 +196,9 @@ $(document).ready(function() { > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > [% IF recordtype == 'biblio' %] >@@ -218,7 +222,7 @@ $(document).ready(function() { > <td>[% biblio.biblionumber %]</td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td> > <td class="actions"> >- <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber %]&mmtid=[% mmtid %]" class="previewMARC btn btn-mini" data-record_type="biblio" data-record_id="[% biblio.biblionumber %]" data-mmtid="[% mmtid %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> >+ <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber %]&mmtid=[% mmtid %]" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber %]" data-mmtid="[% mmtid %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index 46fc155..45a1193 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -218,7 +218,7 @@ function reloadPage(p) { > [% IF op == 'list' %] > > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> >+ <a class="btn btn-default btn-sm" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a> > </div> > > <h2>CSV profiles</h2> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index 074f875..13d8e94 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -88,7 +88,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > <div class="dialog alert">Error: Required news title missing!</div> > [% END %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&lang=[% lang %]"><i class="fa fa-plus"></i> New entry</a> >+ <a class="btn btn-default btn-sm" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&lang=[% lang %]"><i class="fa fa-plus"></i> New entry</a> > </div> > [% END %] > >@@ -257,8 +257,8 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > [% opac_new.new %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% opac_new.idnew %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% opac_new.idnew %]" class="delete_news btn btn-mini"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% opac_new.idnew %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% opac_new.idnew %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %]</tbody> >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 35ca75d..129e1bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -179,7 +179,7 @@ $(document).ready(function() { > </p> > [% END %] > <div id="toolbar" class="btn-toolbar"> >- <button type="submit" class="btn btn-small" id="newnotice"><i class="fa fa-plus"></i> New notice</button> >+ <button type="submit" class="btn btn-default btn-sm" id="newnotice"><i class="fa fa-plus"></i> New notice</button> > <input type="hidden" id="op" name="op" /> > </div> > </form> >@@ -228,16 +228,16 @@ $(document).ready(function() { > [% ELSE %] > [% select_for_copy %] > [% END %] >- <button class="btn btn-mini"><i class="fa fa-clone"></i> Copy</button> >+ <button class="btn btn-default btn-xs"><i class="fa fa-clone"></i> Copy</button> > </form> > [% END %] > </td> > <td class="actions"> > [% IF can_edit %] >- <a class="btn btn-mini" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=[% lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]"><i class="fa fa-pencil"></i> Edit</a> > [% END %] > [% IF !lette.protected && can_edit %] >- <a class="btn btn-mini" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[%lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&branchcode=[%lette.branchcode %]&module=[% lette.module %]&code=[% lette.code %]"><i class="fa fa-trash"></i> Delete</a> > [% END %] > </td> > </tr> >@@ -429,7 +429,7 @@ $(document).ready(function() { > </select> > </td> > <td class="actions"> >- <button type="button" data-containerid="[% letter.message_transport_type %]" class="btn btn-small insert">Insert <i class="fa fa-long-arrow-right"></i></button> >+ <button type="button" data-containerid="[% letter.message_transport_type %]" class="btn btn-default btn-sm insert">Insert <i class="fa fa-long-arrow-right"></i></button> > </td> > <td><textarea name="content" id="content_[% letter.message_transport_type %]" cols="80" rows="15">[% letter.content %]</textarea></td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 32796f0..9968491 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -466,13 +466,13 @@ Page > <form method="post" action="[% batch_lis.script_name %]" name="clean_batch_[% batch_lis.import_batch_id %]" id="clean_batch_[% batch_lis.import_batch_id %]" class="batch_form batch_clean" > > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id %]" /> > <input type="hidden" name="op" value="clean-batch" /> >- <button type="submit" class="btn btn-mini"><i class="fa fa-eraser"></i> Clean</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-eraser"></i> Clean</button> > </form> > [% ELSIF ( batch_lis.import_status == 'cleaned' ) %] > <form method="post" action="/cgi-bin/koha/tools/manage-marc-import.pl" name="delete_batch_[% batch_lis.import_batch_id %]" id="delete_batch_[% batch_lis.import_batch_id %]" class="batch_form batch_delete"> > <input type="hidden" name="import_batch_id" value="[% batch_lis.import_batch_id %]" /> > <input type="hidden" name="op" value="delete-batch" /> >- <button type="submit" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</button> >+ <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button> > </form> > [% END %] > </td> >@@ -508,7 +508,9 @@ Page > </thead> > </table> > >- <div id="marcPreview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div id="marcPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="marcPreviewLabel" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="marcPreviewLabel">MARC preview</h3> >@@ -517,7 +519,9 @@ Page > <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button> >+ </div> >+ </div> > </div> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 198b029..759c273 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -52,9 +52,9 @@ > <div class="yui-b"> > > <div id="toolbar" class="btn-toolbar"> >- <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="btn btn-small duplicate_template"><i class="fa fa-plus"></i> New template</a> >+ <a href="#" data-toggle="modal" data-template_id="" data-target="#createTemplate" id="new_template" class="btn btn-default btn-sm duplicate_template"><i class="fa fa-plus"></i> New template</a> > [% IF ( template_id != '' ) %] >- <a href="#" id="new_action" class="btn btn-small"><i class="fa fa-plus"></i> New action</a> >+ <a href="#" id="new_action" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> New action</a> > [% END %] > </div> > >@@ -82,9 +82,9 @@ > <tr> > <td>[% TemplatesLoo.name %]</td> > <td class="actions"> >- <a class="btn btn-mini" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a> >- <a class="btn btn-mini duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a> >- <a class="btn btn-mini delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id %]&op=delete_template" onclick="return confirmDeleteAction();"><i class="fa fa-fw fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id %]&op=select_template" ><i class="fa fa-fw fa-pencil"></i> Edit actions</a> >+ <a class="btn btn-default btn-xs duplicate_template" href="#" data-toggle="modal" data-template_id="[% TemplatesLoo.template_id %]" data-target="#createTemplate"><i class="fa fa-fw fa-copy"></i> Duplicate</a> >+ <a class="btn btn-default btn-xs delete_template" href="/cgi-bin/koha/tools/marc_modification_templates.pl?template_id=[% TemplatesLoo.template_id %]&op=delete_template" onclick="return confirmDeleteAction();"><i class="fa fa-fw fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -177,7 +177,7 @@ > </td> > <td>[% ActionsLoo.description %]</td> > <td> >- <a class="btn btn-mini" href="#modaction" onclick='editAction( >+ <a class="btn btn-default btn-xs" href="#modaction" onclick='editAction( > "[% ActionsLoo.mmta_id |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", > "[% ActionsLoo.ordering |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", > "[% ActionsLoo.action |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >@@ -200,7 +200,7 @@ > );updateAllEvery();'><i class="fa fa-pencil"></i> Edit</a> > </td> > <td> >- <a class="btn btn-mini" href="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="marc_modification_templates.pl?template_id=[% ActionsLoo.template_id %]&op=delete_action&mmta_id=[% ActionsLoo.mmta_id %]" onclick="return confirmDeleteAction();"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END # /FOREACH ActionsLoo %] >@@ -304,7 +304,9 @@ > [% END # /IF TemplatesLoop %] > > <!-- Modal to create new template --> >- <div class="modal hide" id="createTemplate" tabindex="-1" role="dialog" aria-labelledby="LabelcreateTemplate" aria-hidden="true"> >+ <div class="modal" id="createTemplate" tabindex="-1" role="dialog" aria-labelledby="LabelcreateTemplate" aria-hidden="true"> >+ <div class="modal-dialog"> >+ <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > <h3 id="LabelcreateTemplate">Create a new template</h3> >@@ -333,10 +335,12 @@ > </fieldset> > </div> > <div class="modal-footer"> >- <button type="submit" class="btn">Submit</button> >+ <button type="submit" class="btn btn-default">Submit</button> > <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> > </div> > </form> >+ </div> >+ </div> > </div> > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 4d57a13..2383451 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -99,8 +99,8 @@ function cbUpload( status, fileid ) { > > [% IF ( uploadmarc ) %] > <div id="toolbar" class="btn-toolbar"> >- <a class="btn btn-small" href="/cgi-bin/koha/tools/stage-marc-import.pl"><i class="fa fa-plus"></i> Stage MARC records</a> >- <a class="btn btn-small" href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% import_batch_id %]"><i class="fa fa-list-ul"></i> Manage staged records</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stage-marc-import.pl"><i class="fa fa-plus"></i> Stage MARC records</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% import_batch_id %]"><i class="fa fa-list-ul"></i> Manage staged records</a> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 524c9f2..acf767c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -121,7 +121,7 @@ > > [% BLOCK closer %] > [% IF plugin %] >- <div id="closewindow"><a class="btn btn-default close" href="#">Close</a></div> >+ <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> > [% END %] > [% END %] > >@@ -142,7 +142,7 @@ > </fieldset> > </form> > [% IF plugin %] >- <div id="closewindow"><a class="btn btn-default close" href="#">Close</a></div> >+ <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> > [% END %] > [% END %] > >@@ -172,11 +172,11 @@ > [% END %] > <td class="actions"> > [% IF plugin %] >- <button class="btn btn-mini choose_entry" data-record-hashvalue="[% record.hashvalue %]"><i class="fa fa-plus"></i> Choose</button> >+ <button class="btn btn-default btn-xs choose_entry" data-record-hashvalue="[% record.hashvalue %]"><i class="fa fa-plus"></i> Choose</button> > [% END %] >- <button class="btn btn-mini download_entry" data-record-id="[% record.id %]"><i class="fa fa-download"></i> Download</button> >+ <button class="btn btn-default btn-xs download_entry" data-record-id="[% record.id %]"><i class="fa fa-download"></i> Download</button> > [% IF record.owner == owner || CAN_user_tools_upload_manage %] >- <button class="btn btn-mini delete_entry" data-record-id="[% record.id %]"><i class="fa fa-trash"></i> Delete</button> >+ <button class="btn btn-default btn-xs delete_entry" data-record-id="[% record.id %]"><i class="fa fa-trash"></i> Delete</button> > [% END %] > </td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 62b17a0..a276236 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -165,7 +165,7 @@ $(document).ready(function(){ > [% END %] > param1 +="<option value=\"newlist\">"+_("[ New list ]")+"<\/option>" > [% END %] >- param1 += "<\/select> <button id=\"cartsubmit\" type=\"submit\" class=\"btn btn-mini\">"+_("Save")+"</button>"; >+ param1 += "<\/select> <button id=\"cartsubmit\" type=\"submit\" class=\"btn btn-default btn-xs\">"+_("Save")+"</button>"; > $("span.addto").html(param1); > $("#cartsubmit").on("click",function(e){ > cartList(); >@@ -396,12 +396,12 @@ function placeHold () { > <span class="addto">| </span> > > [% IF CAN_user_reserveforothers && Koha.Preference('DisplayMultiPlaceHold') %] >- <div class="btn-group"><button class="btn btn-mini placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button></div> >+ <div class="btn-group"><button class="btn btn-default btn-xs placehold"><i class="fa fa-sticky-note-o"></i> Place hold</button></div> > [% END %] > [% IF can_remove_biblios %] >- <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="fa fa-trash"></i> Remove selected</button></div> >+ <div class="btn-group"><button type="submit" class="btn btn-default btn-xs list-remove"><i class="fa fa-trash"></i> Remove selected</button></div> > [% END %] >- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>[% END %] >+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-default btn-xs merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>[% END %] > </div> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >index d8fa6f0..bf1305a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >@@ -37,7 +37,7 @@ > [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%] > [%~ action_block = action_block _ '<input type="hidden" name="category" value="' _ type _ '" />' ~%] > [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >- [%~ action_block = action_block _ '<button class="editshelf btn btn-mini"><i class="fa fa-pencil"></i> Edit</button>' ~%] >+ [%~ action_block = action_block _ '<button class="editshelf btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</button>' ~%] > [%~ action_block = action_block _ '</form> ' ~%] > [%~ END ~%] > [%~ IF can_manage_shelf OR can_delete_shelf ~%] >@@ -48,7 +48,7 @@ > [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber _ '" />' ~%] > [%~ action_block = action_block _ '<input type="hidden" name="category" value="' _ type _ '" />' ~%] > [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%] >- [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-mini"><i class="fa fa-trash"></i> Delete</button>' ~%] >+ [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button>' ~%] > [%~ action_block = action_block _ '</form>' ~%] > [%~ END ~%] > [%~ ELSE ~%] >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=57017">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16239
:
56159
|
56160
|
56161
|
56162
|
56163
|
56201
|
56329
|
56330
|
56331
|
56332
|
56333
|
56334
|
56335
|
56529
|
56530
|
56531
|
56532
|
56533
|
56534
|
56535
|
56536
|
56537
|
56538
|
56539
|
56563
|
56729
|
56730
|
56731
|
56732
|
57016
|
57017
|
57018
|
57019
|
57020
|
57021
|
57022
|
57374
|
57375
|
57376
|
57377
|
57378
|
57379
|
57381
|
57416
|
57417
|
57418
|
57419
|
57420
|
57772
|
57773
|
57774
|
57775
|
57776
|
58067
|
58068
|
58069
|
58070
|
58071
|
58317
|
58318
|
58319
|
58320
|
58321
|
58322
|
58323
|
58678
|
58679
|
58680
|
58681
|
58682
|
58683
|
58691
|
58697
|
58722
|
58729
|
58731
|
58732
|
58733
|
58734
|
58735
|
58736
|
58737
|
58738