Bugzilla – Attachment 99616 Details for
Bug 8628
Add digital signs to the OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8628: (follow-up) Fixes for qa tools
Bug-8628-follow-up-Fixes-for-qa-tools.patch (text/plain), 3.95 KB, created by
Aleisha Amohia
on 2020-02-25 23:23:33 UTC
(
hide
)
Description:
Bug 8628: (follow-up) Fixes for qa tools
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2020-02-25 23:23:33 UTC
Size:
3.95 KB
patch
obsolete
>From bdb71b347172438bb5732714f0ac2eb14a510df3 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >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 @@ > > <div class="col-sm-4 col-sm-push-4"> > [% 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 ) %] > <h3>Additional tools</h3> > [% END %] >@@ -119,7 +119,7 @@ > <dd>Create and edit digital signs for the OPAC</dd> > [% END %] > >- [% IF ( UseKohaPlugins && CAN_user_plugins_tool ) %] >+ [% IF ( Koha.Preference('UseKohaPlugins') && CAN_user_plugins_tool ) %] > <dt><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></dt> > <dd>Use tool plugins</dd> > [% 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 @@ > <style type="text/css"> > [% Koha.Preference( 'OPACDigitalSignsCSS' ) %] > </style> >- <link rel="stylesheet" href="[% interface %]/lib/jquery/mobile/jquery.mobile.structure.min.css" /> >+ [% Asset.css("lib/jquery/mobile/jquery.mobile.structure.min.css") %] > [%- ELSE -%] >- <link rel="stylesheet" href="[% interface %]/bootstrap/css/signs.css" /> >- <link rel="stylesheet" href="[% interface %]/lib/jquery/mobile/jquery.mobile.min.css" /> >+ [% 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($('<img src="/opac-tmpl/lib/famfamfam/'+item.type+'.png" class="ui-li-icon"/>')); >+ $li.append($('<img src="/[% interface %]/lib/famfamfam/'+item.type+'.png" class="ui-li-icon"/>')); > } > 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 @@ > //]]> > </script> > [% END # IF ( sign ) %] >- <script src="/opac-tmpl/lib/jquery/mobile/jquery.mobile.min.js"></script> >+ [% Asset.js("lib/jquery/mobile/jquery.mobile.min.js") %] > [% END # BLOCK jsinclude %] > > </body> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8628
:
42703
|
42704
|
45968
|
45969
|
58602
|
58603
|
58604
|
58605
|
62338
|
64249
|
66246
|
66247
|
66248
|
66249
|
66250
|
77025
|
77026
|
77027
|
77028
|
77141
|
77142
|
77143
|
77144
|
77145
|
78709
|
80248
|
80249
|
80250
|
80252
|
82896
|
82897
|
82898
|
82899
|
82900
|
82901
|
83312
|
88821
|
88822
|
88823
|
88824
|
88825
|
88826
|
93054
|
93055
|
93056
|
93057
|
93058
|
93059
|
93066
|
93067
|
93068
|
93069
|
93070
|
93071
|
99608
|
99609
|
99610
|
99611
|
99612
|
99613
|
99614
|
99615
|
99616
|
99617
|
99618
|
99619
|
99620
|
99621
|
99622
|
99623
|
99624
|
99717
|
99718
|
99801
|
118472
|
118473
|
118474
|
118475
|
118476
|
118477
|
118478
|
118479
|
118480
|
119455
|
131223
|
131224
|
145645
|
145646
|
145647
|
145648
|
145649
|
145650
|
145651
|
145652
|
145653
|
145654
|
147000
|
147001
|
147002
|
147003
|
147004
|
147005
|
147006
|
147007
|
147008
|
147009
|
147010