From bdb71b347172438bb5732714f0ac2eb14a510df3 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 25 Feb 2020 22:33:56 +0000 Subject: [PATCH] Bug 8628: (follow-up) Fixes for qa tools using Asset and Koha.Preference --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 0bfd9c7..64e6f52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -79,7 +79,7 @@
[% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_news - || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( UseKohaPlugins && CAN_user_plugins_tool ) + || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.Preference('UseKohaPlugins') && CAN_user_plugins_tool ) || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]

Additional tools

[% END %] @@ -119,7 +119,7 @@
Create and edit digital signs for the OPAC
[% END %] - [% IF ( UseKohaPlugins && CAN_user_plugins_tool ) %] + [% IF ( Koha.Preference('UseKohaPlugins') && CAN_user_plugins_tool ) %]
Tool plugins
Use tool plugins
[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt index 6990d3b..7b01f52 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt @@ -2,6 +2,7 @@ [% USE KohaDates %] [% USE Branches %] [% USE JSON.Escape %] +[% USE Asset %] [%- BLOCK item_status -%] [%- SET itemavailable = 1 -%] @@ -64,10 +65,10 @@ - + [% Asset.css("lib/jquery/mobile/jquery.mobile.structure.min.css") %] [%- ELSE -%] - - + [% Asset.css("css/signs.css") %] + [% Asset.css("lib/jquery/mobile/jquery.mobile.min.css") %] [%- END -%] [% END # BLOCK cssinclude %] [% INCLUDE 'doc-head-close.inc' %] @@ -436,7 +437,7 @@ } $carousel_container.append($carousel); - /* initilize carousel on pagecreate */ + /* initialize carousel on pagecreate */ $page.on("pagecreate", function(){ var carousel = new Carousel($carousel); $page.data('carousel', carousel); @@ -459,7 +460,7 @@ var item = cover.record.items[i]; if(item.type) { - $li.append($('')); + $li.append($('')); } var location = item.location_description ? item.location_description + _(" in ") + item.home_branch: item.home_branch; var item_info = item.status + _(" at ") + location; @@ -557,7 +558,7 @@ //]]> [% END # IF ( sign ) %] - + [% Asset.js("lib/jquery/mobile/jquery.mobile.min.js") %] [% END # BLOCK jsinclude %] -- 2.1.4