From 5d472aba95bad9714f82074d2bd1a751d3aee72f Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 28 Sep 2015 10:36:28 -0400 Subject: [PATCH] Bug 14915 - Use Font Awesome instead of Glyphicons for the staff intranet We should be using Font Awesome for our icons instead of Glyphicons, for the reasons discussed on bug 13696. Test Plan: 1) Apply this patch 2) Note all Glyphicons have been replaced with FA icons in the staff intranet 3) git grep "icon-" ./koha-tmpl/intranet-tmpl/prog/en/modules/ should give no results 4) git grep "icon-" ./koha-tmpl/intranet-tmpl/prog/en/includes/ should give no results --- .../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/budgets-admin-toolbar.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 16 ++++++++-------- .../prog/en/includes/checkouts-table.inc | 8 ++++---- .../prog/en/includes/members-toolbar.inc | 12 ++++++------ .../prog/en/includes/messaging-preference-form.inc | 2 +- .../prog/en/includes/patron-toolbar.inc | 4 ++-- .../prog/en/includes/quotes-toolbar.inc | 6 +++--- .../prog/en/includes/quotes-upload-toolbar.inc | 4 ++-- .../prog/en/includes/reports-toolbar.inc | 6 +++--- .../en/includes/rotating-collections-toolbar.inc | 6 +++--- .../prog/en/includes/serials-toolbar.inc | 18 +++++++++--------- .../prog/en/includes/virtualshelves-toolbar.inc | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 14 +++++++------- .../prog/en/modules/acqui/basketgroup.tt | 10 +++++----- .../prog/en/modules/acqui/booksellers.tt | 4 ++-- .../prog/en/modules/acqui/invoices.tt | 8 ++++---- .../prog/en/modules/acqui/supplier.tt | 4 ++-- .../prog/en/modules/admin/aqbudgetperiods.tt | 10 +++++----- .../prog/en/modules/admin/auth_tag_structure.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 4 ++-- .../prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../prog/en/modules/admin/branches.tt | 4 ++-- .../prog/en/modules/admin/categorie.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 4 ++-- .../prog/en/modules/admin/currency.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../prog/en/modules/admin/oai_sets.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/admin/printers.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 4 ++-- .../prog/en/modules/authorities/authorities.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 14 +++++++------- .../prog/en/modules/catalogue/results.tt | 8 ++++---- .../prog/en/modules/cataloguing/addbiblio.tt | 8 ++++---- .../prog/en/modules/cataloguing/addbooks.tt | 6 +++--- .../prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 4 ++-- .../en/modules/course_reserves/course-details.tt | 6 +++--- .../en/modules/course_reserves/course-reserves.tt | 2 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 8 ++++---- .../prog/en/modules/reports/dictionary.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 12 ++++++------ .../prog/en/modules/serials/serials-search.tt | 12 ++++++------ .../prog/en/modules/suggestion/suggestion.tt | 6 +++--- .../prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- 57 files changed, 163 insertions(+), 163 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 c0007d1..41e9b5c 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() {
[% IF ( booksellerid ) %]
- New + New
[% IF ( CAN_user_acquisition_vendors_manage ) %] - + [% UNLESS ( basketcount OR subscriptioncount ) %] - + [% END %] [% END %] [% IF CAN_user_acquisition_order_receive && basketcount %] - + [% END %] [% ELSE %] - + [% END %]
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 9adbc7f..1f2b926 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)
- - + +
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 b460cdc..3af092f 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 ) %] - - + + [% UNLESS ( count ) %] - + [% END %] [% END %]
- Save + Save
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 d36c2ca..03c9b45 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 @@
[% IF ( budget_period_id ) %]
- +
- +
[% ELSE %] - + [% END %]
\ No newline at end of file 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 ee39f31..d40c677 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -136,7 +136,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription ) %]
- +
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 70edbc0..95b1870 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -135,28 +135,28 @@ function searchToHold(){ [% ELSE %] [% END %] - Edit + Edit [% END %] [% IF ( CAN_user_borrowers ) %] [% IF ( adultborrower AND activeBorrowerRelationship ) %] - Add child + Add child [% END %] [% IF ( CAN_user_borrowers ) %] - Change password + Change password [% END %] - Duplicate + Duplicate [% END %]
- +
- Search to hold + Search to hold
[% ELSE %] - + [% END %] [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] [% END %] + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] [% END %] [% IF ( stopwords_removed ) %]

Ignored the following common words: "[% stopwords_removed %]"

[% END %] 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 3bc00d5..d91d9b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -440,11 +440,11 @@ function Changefwk(FwkList) { [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] - + [% ELSE %]
- + @@ -457,11 +457,11 @@ function Changefwk(FwkList) { [% END %] [% ELSE %] - + [% END %] [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] - + [% IF (biblionumber) %] [% IF ( BiblioDefaultViewmarc ) %]
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 affa0fe..b2131a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -71,7 +71,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
- +
- + @@ -92,7 +92,7 @@
[% IF ( total ) %] -
+
[% END %]
[% END %] 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 064e308..368ad1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -759,7 +759,7 @@ No patron matched [% message %] [% END %]
- View restrictions + View restrictions [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] Override restriction temporarily 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 b8a679d..3fa54b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -620,9 +620,9 @@ $(document).ready(function () {