@@ -, +, @@ --- C4/Auth.pm | 2 ++ .../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 ++++++++-------- .../intranet-tmpl/prog/en/includes/checkouts-table.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/members-toolbar.inc | 12 ++++++------ .../intranet-tmpl/prog/en/includes/patron-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/quotes-toolbar.inc | 6 +++--- .../prog/en/includes/quotes-upload-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 6 +++--- .../prog/en/includes/rotating-collections-toolbar.inc | 6 +++--- .../intranet-tmpl/prog/en/includes/serials-toolbar.inc | 18 +++++++++--------- .../prog/en/includes/virtualshelves-toolbar.inc | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 14 +++++++------- .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 8 ++++---- .../intranet-tmpl/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 ++-- .../intranet-tmpl/prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/branches.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../intranet-tmpl/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 +++++++------- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- .../prog/en/modules/cataloguing/addbiblio.tt | 8 ++++---- .../prog/en/modules/cataloguing/addbooks.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 4 ++-- .../prog/en/modules/course_reserves/course-details.tt | 6 +++--- .../prog/en/modules/course_reserves/course-reserves.tt | 2 +- .../prog/en/modules/members/purchase-suggestions.tt | 2 +- .../intranet-tmpl/prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 8 ++++---- .../prog/en/modules/reports/dictionary.tt | 2 +- .../prog/en/modules/reports/guided_reports_start.tt | 12 ++++++------ .../prog/en/modules/serials/serials-search.tt | 12 ++++++------ .../prog/en/modules/suggestion/suggestion.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++++----- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 ++++++------ 59 files changed, 174 insertions(+), 172 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -369,7 +369,9 @@ sub get_template_and_user { my $https = $in->{query}->https(); my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0; + warn ( C4::Context->preference("IconTheme") eq 'Font-Awesome' ? 'fa fa-fw fa' : 'icon'); $template->param( + icon_theme_classes => ( C4::Context->preference("IconTheme") eq 'Font-Awesome' ? 'fa fa-fw fa' : 'icon'), "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1, EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'), GoogleJackets => C4::Context->preference("GoogleJackets"), --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -10,7 +10,7 @@ function confirm_deletion() {
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -106,8 +106,8 @@ function finderjumpfull(page)