Bugzilla – Attachment 131224 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) Fix documentation, subroutine calls, filters
Bug-8628-follow-up-Fix-documentation-subroutine-ca.patch (text/plain), 52.90 KB, created by
Aleisha Amohia
on 2022-03-02 02:57:47 UTC
(
hide
)
Description:
Bug 8628: (follow-up) Fix documentation, subroutine calls, filters
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2022-03-02 02:57:47 UTC
Size:
52.90 KB
patch
obsolete
>From e0306a34bc83ea3ec383603e12e734c3d60c5cef Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Wed, 2 Mar 2022 15:55:18 +1300 >Subject: [PATCH] Bug 8628: (follow-up) Fix documentation, subroutine calls, > filters > >--- > Koha/Sign.pm | 20 +-- > Koha/SignStream.pm | 20 +-- > Koha/SignStreams.pm | 20 +-- > Koha/Signs.pm | 20 +-- > Koha/SignsToStream.pm | 20 +-- > Koha/SignsToStreams.pm | 20 +-- > .../mysql/atomicupdate/bug_8628-digital-signs.perl | 2 +- > installer/data/mysql/kohastructure.sql | 2 +- > .../intranet-tmpl/prog/en/modules/tools/signs.tt | 141 +++++++++++---------- > .../opac-tmpl/bootstrap/en/modules/opac-signs.tt | 85 +++++++------ > opac/opac-signs.pl | 32 ++--- > tools/signs.pl | 29 ++--- > 12 files changed, 206 insertions(+), 205 deletions(-) > >diff --git a/Koha/Sign.pm b/Koha/Sign.pm >index 6c8c7fcc026..2234cd4ba5b 100644 >--- a/Koha/Sign.pm >+++ b/Koha/Sign.pm >@@ -4,18 +4,18 @@ package Koha::Sign; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/Koha/SignStream.pm b/Koha/SignStream.pm >index 185e21422a9..2de87ed16ac 100644 >--- a/Koha/SignStream.pm >+++ b/Koha/SignStream.pm >@@ -4,18 +4,18 @@ package Koha::SignStream; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/Koha/SignStreams.pm b/Koha/SignStreams.pm >index 26b55961099..25a526d2d73 100644 >--- a/Koha/SignStreams.pm >+++ b/Koha/SignStreams.pm >@@ -4,18 +4,18 @@ package Koha::SignStreams; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/Koha/Signs.pm b/Koha/Signs.pm >index da32aff670d..b4bee9a43e5 100644 >--- a/Koha/Signs.pm >+++ b/Koha/Signs.pm >@@ -4,18 +4,18 @@ package Koha::Signs; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/Koha/SignsToStream.pm b/Koha/SignsToStream.pm >index cc73371eb96..16f51f2fbf5 100644 >--- a/Koha/SignsToStream.pm >+++ b/Koha/SignsToStream.pm >@@ -4,18 +4,18 @@ package Koha::SignsToStream; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/Koha/SignsToStreams.pm b/Koha/SignsToStreams.pm >index c677bcbcf37..ac15aa07934 100644 >--- a/Koha/SignsToStreams.pm >+++ b/Koha/SignsToStreams.pm >@@ -4,18 +4,18 @@ package Koha::SignsToStreams; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl b/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl >index b496e31c9a3..2703bca1efd 100644 >--- a/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl >+++ b/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl >@@ -18,7 +18,7 @@ if( CheckVersion( $DBversion ) ) { > $dbh->do(q{ CREATE TABLE signs ( > sign_id int(11) NOT NULL auto_increment, -- primary key, used to identify signs > name varchar(64), -- name/title of the deck >- webapp int(1) NOT NULL DEFAULT 0, -- display as web app or normal page >+ webapp tinyint(1) NOT NULL DEFAULT 0, -- display as web app or normal page > transition char(16) NOT NULL DEFAULT 'none', -- transition to use between pages, must be one of the transitions defined by jQuery Mobile (see their docs) > swatch char(1) NOT NULL DEFAULT '', -- swatches determine the colors of page elements > idleafter int(11) NOT NULL default 0, -- seconds to wait before automatic page turning cicks in >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index aee00159199..6c92dba20a2 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -5384,7 +5384,7 @@ DROP TABLE IF EXISTS signs; > CREATE TABLE signs ( > `sign_id` int(11) NOT NULL auto_increment, -- primary key, used to identify signs > `name` varchar(64), -- name/title of the deck >- `webapp` int(1) NOT NULL DEFAULT 0, -- display as web app or normal page >+ `webapp` tinyint(1) NOT NULL DEFAULT 0, -- display as web app or normal page > `transition` char(16) NOT NULL DEFAULT 'none', -- transition to use between pages, must be one of the transitions defined by jQuery Mobile (see their docs) > `swatch` char(1) NOT NULL DEFAULT '', -- swatches determine the colors of page elements > `idleafter` int(11) NOT NULL default 0, -- seconds to wait before automatic page turning clicks in >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt >index 6fad2fe7c5f..931079996ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt >@@ -1,8 +1,9 @@ >+[% USE raw %] > [% USE Koha %] > [% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Tools › Digital signs</title> >+<title>Digital signs › Tools › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="tools_signs" class="tools"> >@@ -15,28 +16,28 @@ > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › > [% IF op == 'stream_form' %] > [% IF ( stream.sign_stream_id ) %] >- [% INCLUDE dslink %] Edit "[% stream.name %]" >+ [% INCLUDE dslink %] Edit "[% stream.name | html %]" > [% ELSE %] > [% INCLUDE dslink %] Add a new stream > [% END %] > [% ELSIF op == 'sign_form' %] > [% IF ( sign.sign_id ) %] >- [% INCLUDE dslink %] Edit "[% sign.name %]" >+ [% INCLUDE dslink %] Edit "[% sign.name | html %]" > [% ELSE %] > [% INCLUDE dslink %] Add a new sign > [% END %] > [% ELSIF op == 'edit_streams' %] >- [% INCLUDE dslink %] Edit streams attached to "[% sign.name %]" >+ [% INCLUDE dslink %] Edit streams attached to "[% sign.name | html %]" > [% ELSIF op == 'get_params' %] > [% INCLUDE dslink %] >- <a href="/cgi-bin/koha/tools/signs.pl?op=edit_streams&sign_id=[% sign.sign_id %]">Edit streams attached to "[% sign.name %]"</a> › >+ <a href="/cgi-bin/koha/tools/signs.pl?op=edit_streams&sign_id=[% sign.sign_id | uri %]">Edit streams attached to "[% sign.name | html %]"</a> › > Get parameters > [% ELSIF op == 'del_stream' %] >- [% INCLUDE dslink %] Delete stream "[% stream.name %]" >+ [% INCLUDE dslink %] Delete stream "[% stream.name | html %]" > [% ELSIF op == 'del_stream_ok' %] > [% INCLUDE dslink %] Stream deleted > [% ELSIF op == 'del_sign' %] >- [% INCLUDE dslink %] Delete sign "[% sign.name %]" >+ [% INCLUDE dslink %] Delete sign "[% sign.name | html %]" > [% ELSIF op == 'del_sign_ok' %] > [% INCLUDE dslink %] Sign deleted > [% ELSIF op == 'view_sign' %] >@@ -79,16 +80,16 @@ > [% ELSE %] > <h1>Add stream</h1> > [% END %] >- <form action="[% script_name %]" name="streamform" id="streamform" method="post"> >+ <form action="[% script_name | html %]" name="streamform" id="streamform" method="post"> > <input type="hidden" name="op" value="save_stream" /> > [% IF ( stream.sign_stream_id ) %] >- <input type="hidden" name="sign_stream_id" value="[% stream.sign_stream_id %]" /> >+ <input type="hidden" name="sign_stream_id" value="[% stream.sign_stream_id | html %]" /> > [% END %] > <fieldset class="rows"> > <ol> > <li> > <label for="name" class="required">Name</label> >- <input type="text" name="name" value="[% stream.name %]" required="required"> >+ <input type="text" name="name" value="[% stream.name | html %]" required="required"> > <span class="required">Required</span> > </li> > <li><label for="report" class="required">Report</label> >@@ -98,9 +99,9 @@ > [% END %] > [% FOREACH report IN reports %] > [% IF ( report.id == stream.saved_sql_id ) %] >- <option value="[% report.id %]" selected="selected">[% report.report_name %]</option> >+ <option value="[% report.id | html %]" selected="selected">[% report.report_name | html %]</option> > [% ELSE %] >- <option value="[% report.id %]">[% report.report_name %]</option> >+ <option value="[% report.id | html %]">[% report.report_name | html %]</option> > [% END %] > [% END %] > </select> >@@ -118,15 +119,15 @@ > [% ELSE %] > <h1>Add sign</h1> > [% END %] >- <form action="[% script_name %]" name="signform" id="signform" method="post"> >+ <form action="[% script_name | html %]" name="signform" id="signform" method="post"> > <input type="hidden" name="op" value="save_sign" /> > [% IF ( sign.sign_id ) %] >- <input type="hidden" name="sign_id" value="[% sign.sign_id %]" /> >+ <input type="hidden" name="sign_id" value="[% sign.sign_id | html %]" /> > [% END %] > <fieldset id="sign_general_info" class="rows"> > <legend id="general_info_lgd">General settings</legend> > <ol> >- <li><label for="name">Name</label><input type="text" name="name" value="[% sign.name %]" /></li> >+ <li><label for="name">Name</label><input type="text" name="name" value="[% sign.name | html %]" /></li> > </ol> > </fieldset> > <fieldset id="sign_appearance" class="rows"> >@@ -147,9 +148,9 @@ > <option value="">Default</option> > [% FOREACH swatch IN Koha.Preference('OPACDigitalSignsSwatches').split('') %] > [% IF swatch == sign.swatch %] >- <option value="[% swatch %]" selected="selected">[% swatch %]</option> >+ <option value="[% swatch | html %]" selected="selected">[% swatch | html %]</option> > [% ELSE %] >- <option value="[% swatch %]">[% swatch %]</option> >+ <option value="[% swatch | html %]">[% swatch | html %]</option> > [% END %] > [% END %] > </select> >@@ -158,9 +159,9 @@ > <select name="transition" id="transition"> > [% FOREACH transition IN [ 'none' 'fade' 'pop' 'flip' 'turn' 'flow' 'slidefade' 'slide' 'slideup' 'slidedown' ] %] > [% IF transition == sign.transition %] >- <option value="[% transition %]" selected="selected">[% transition %]</option> >+ <option value="[% transition | html %]" selected="selected">[% transition | html %]</option> > [% ELSE %] >- <option value="[% transition %]">[% transition %]</option> >+ <option value="[% transition | html %]">[% transition | html %]</option> > [% END %] > [% END %] > </select> >@@ -171,13 +172,13 @@ > <legend id="autopage_lgd">Automatic page turning</legend> > <ol> > <li><label for="idleafter">Idle after</label> >- <input type="text" name="idleafter" id="idleafter" value="[% sign.idleafter %]" size="4" /> seconds. (Set to 0 to disable automatic page turning.) >+ <input type="text" name="idleafter" id="idleafter" value="[% sign.idleafter | html %]" size="4" /> seconds. (Set to 0 to disable automatic page turning.) > </li> > <li><label for="pagedelay">Page delay</label> >- <input type="text" name="pagedelay" id="pagedelay" value="[% sign.pagedelay %]" size="4" /> seconds. >+ <input type="text" name="pagedelay" id="pagedelay" value="[% sign.pagedelay | html %]" size="4" /> seconds. > </li> > <li><label for="reloadafter">Reload after</label> >- <input type="text" name="reloadafter" id="reloadafter" value="[% sign.reloadafter %]" size="4" /> seconds. >+ <input type="text" name="reloadafter" id="reloadafter" value="[% sign.reloadafter | html %]" size="4" /> seconds. > </li> > </ol> > </fieldset> >@@ -185,7 +186,7 @@ > </form> > > [% ELSIF op == 'edit_streams' %] >- <h1>Edit streams attached to [% sign.name %]</h1> >+ <h1>Edit streams attached to [% sign.name | html %]</h1> > <h2>Streams already attached to this sign</h2> > [% IF ( sts.count ) %] > <table id="streams_attached"> >@@ -199,16 +200,16 @@ > <tbody> > [% FOREACH s IN sts %] > <tr> >- <td>[% s.sign_stream.name %]</td> >- <td>[% IF s.params %][% s.params %][% ELSE %]None[% END %]</td> >+ <td>[% s.sign_stream.name | html %]</td> >+ <td>[% IF s.params %][% s.params | html %][% ELSE %]None[% END %]</td> > <td class="actions"> > [% IF s.params %] >- <a href="/cgi-bin/koha/tools/signs.pl?op=get_params&sign_to_stream_id=[% s.sign_to_stream_id %]&sign_stream_id=[% s.sign_stream_id %]&sign_id=[% s.sign_id %]" class="btn btn-default btn-xs" title="Edit parameters"><i class="fa fa-pencil"></i></a> >+ <a href="/cgi-bin/koha/tools/signs.pl?op=get_params&sign_to_stream_id=[% s.sign_to_stream_id | uri %]&sign_stream_id=[% s.sign_stream_id | uri %]&sign_id=[% s.sign_id | uri %]" class="btn btn-default btn-xs" title="Edit parameters"><i class="fa fa-pencil"></i></a> > [% ELSE %] >- <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% s.sign_stream.saved_sql_id %]&phase=Edit SQL" class="btn btn-default btn-xs" title="Edit SQL"><i class="fa fa-pencil"></i></a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% s.sign_stream.saved_sql_id | uri %]&phase=Edit SQL" class="btn btn-default btn-xs" title="Edit SQL"><i class="fa fa-pencil"></i></a> > [% END %] > </td> >- <td class="actions"><a href="/cgi-bin/koha/tools/signs.pl?op=detach_stream_from_sign&sign_id=[% s.sign_id %]&sign_to_stream_id=[% s.sign_to_stream_id %]" class="btn btn-default btn-xs detach"><i class="fa fa-times"></i> Detach</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/tools/signs.pl?op=detach_stream_from_sign&sign_id=[% s.sign_id | uri %]&sign_to_stream_id=[% s.sign_to_stream_id | uri %]" class="btn btn-default btn-xs detach"><i class="fa fa-times"></i> Detach</a></td> > </tr> > [% END %] > </tbody> >@@ -218,15 +219,15 @@ > [% END %] > > <h2>Attach a new stream to this sign</h2> >- <form action="[% script_name %]" name="attach_stream_to_sign_form" id="attach_stream_to_sign_form" method="post"> >+ <form action="[% script_name | html %]" name="attach_stream_to_sign_form" id="attach_stream_to_sign_form" method="post"> > <input type="hidden" name="op" value="attach_stream_to_sign" /> >- <input type="hidden" name="sign_id" value="[% sign_id %]" /> >+ <input type="hidden" name="sign_id" value="[% sign_id | html %]" /> > <fieldset class="rows"> > <ol> > <li><label for="stream">Choose a stream to attach</label> > <select name="sign_stream_id" id="stream"> > [% FOREACH s IN streams %] >- <option value="[% s.sign_stream_id %]">[% s.name %]</option> >+ <option value="[% s.sign_stream_id | html %]">[% s.name | html %]</option> > [% END %] > </select> > </li> >@@ -236,14 +237,14 @@ > </form> > > [% ELSIF op == 'get_params' %] >- <h1>Parameters for [% stream.name %]</h1> >- Based on report: [% sql.report_name %] | <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% stream.saved_sql_id %]&phase=Edit SQL">Edit this report</a> >+ <h1>Parameters for [% stream.name | html %]</h1> >+ Based on report: [% sql.report_name | html %] | <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% stream.saved_sql_id | uri %]&phase=Edit SQL">Edit this report</a> > >- <form action="[% script_name %]" name="get_params_form" id="get_params_form" method="post"> >+ <form action="[% script_name | html %]" name="get_params_form" id="get_params_form" method="post"> > <input type="hidden" name="op" value="save_params" /> >- <input type="hidden" name="sign_to_stream_id" value="[% sign_to_stream_id %]" /> >- <input type="hidden" name="sign_stream_id" value="[% sign_stream_id %]" /> >- <input type="hidden" name="sign_id" value="[% sign_id %]" /> >+ <input type="hidden" name="sign_to_stream_id" value="[% sign_to_stream_id | html %]" /> >+ <input type="hidden" name="sign_stream_id" value="[% sign_stream_id | html %]" /> >+ <input type="hidden" name="sign_id" value="[% sign_id | html %]" /> > <fieldset class="rows"> > [% IF ( sts.params ) %] > <legend id="save_params_lgd">Edit parameters</legend> >@@ -252,7 +253,7 @@ > [% END %] > <ol> > <li><label for="stream">Parameters</label> >- <input type="text" size="60" name="parameters" id="parameters" value="[% sts.params %]" /> >+ <input type="text" size="60" name="parameters" id="parameters" value="[% sts.params | html %]" /> > </li> > </ol> > </fieldset> >@@ -274,14 +275,14 @@ > > [% ELSIF op == 'del_stream' %] > <div class="dialog alert"> >- <h3>Confirm deletion of stream <span class="ex">'[% stream.name %]'</span>?</h3> >- <form action="[% script_name %]" id ="confirm_stream_delete_form" method="post"> >+ <h3>Confirm deletion of stream <span class="ex">'[% stream.name | html %]'</span>?</h3> >+ <form action="[% script_name | html %]" id ="confirm_stream_delete_form" method="post"> > <input type="hidden" name="op" value="del_stream_ok" /> >- <input type="hidden" name="sign_stream_id" value="[% stream.sign_stream_id %]" /> >+ <input type="hidden" name="sign_stream_id" value="[% stream.sign_stream_id | html %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this stream</button> > </form> > >- <form action="[% script_name %]" id="cancel_stream_delete_form" method="get"> >+ <form action="[% script_name | html %]" id="cancel_stream_delete_form" method="get"> > <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> > </form> > </div> >@@ -289,21 +290,21 @@ > [% ELSIF op == 'del_stream_ok' %] > <div class="dialog message"> > <h3>Stream deleted</h3> >- <form action="[% script_name %]" method="get"> >+ <form action="[% script_name | html %]" method="get"> > <input type="submit" value="OK" class="approve" /> > </form> > </div> > > [% ELSIF op == 'del_sign' %] > <div class="dialog alert"> >- <h3>Confirm deletion of sign <span class="ex">'[% sign.name %]'</span>?</h3> >- <form action="[% script_name %]" id ="confirm_sign_delete_form" method="post"> >+ <h3>Confirm deletion of sign <span class="ex">'[% sign.name | html %]'</span>?</h3> >+ <form action="[% script_name | html %]" id ="confirm_sign_delete_form" method="post"> > <input type="hidden" name="op" value="del_sign_ok" /> >- <input type="hidden" name="sign_id" value="[% sign.sign_id %]" /> >+ <input type="hidden" name="sign_id" value="[% sign.sign_id | html %]" /> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this sign</button> > </form> > >- <form action="[% script_name %]" id="cancel_sign_delete_form" method="get"> >+ <form action="[% script_name | html %]" id="cancel_sign_delete_form" method="get"> > <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> > </form> > </div> >@@ -311,21 +312,21 @@ > [% ELSIF op == 'del_sign_ok' %] > <div class="dialog message"> > <h3>Sign deleted</h3> >- <form action="[% script_name %]" method="get"> >+ <form action="[% script_name | html %]" method="get"> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button> > </form> > </div> > > [% ELSIF op == 'view_sign' %] >- <h1>[% sign.name %]</h1> >+ <h1>[% sign.name | html %]</h1> > <h2>Streams</h2> > > [% IF ( streams ) %] > [% FOREACH stream IN streams %] >- <h3>[% stream.sign_stream.name %]</h3> >+ <h3>[% stream.sign_stream.name | html %]</h3> > <ul> > [% FOREACH record IN stream.records %] >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% record.biblionumber %]">[% record.title %]</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% record.biblionumber | uri %]">[% record.title | html %]</a></li> > [% END %] > </ul> > [% END %] >@@ -334,8 +335,8 @@ > [% END %] > > [% ELSIF op == 'view_stream' %] >- <h1>[% stream.name %]</h1> >- Based on report: [% stream.saved_sql_id.report_name %] | <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% stream.saved_sql_id %]&phase=Edit SQL">Edit this report</a> >+ <h1>[% stream.name | html %]</h1> >+ Based on report: [% stream.saved_sql_id.report_name | html %] | <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% stream.saved_sql_id | uri %]&phase=Edit SQL">Edit this report</a> > > <h2>SQL</h2> > <pre id="sql_output">[% stream.saved_sql_id.savedsql | html %]</pre> >@@ -374,21 +375,21 @@ > <tbody> > [% FOREACH s IN signs %] > <tr> >- <td><a href="/cgi-bin/koha/tools/signs.pl?op=view_sign&sign_id=[% s.sign_id %]">[% s.name %]</a></td> >+ <td><a href="/cgi-bin/koha/tools/signs.pl?op=view_sign&sign_id=[% s.sign_id | uri %]">[% s.name | html %]</a></td> > <td>[% IF ( s.webapp ) %]Yes[% ELSE %]No[% END %]</td> >- <td>[% s.swatch %]</td> >- <td>[% s.transition %]</td> >- <td>[% s.idleafter %]</td> >- <td>[% s.pagedelay %]</td> >- <td>[% s.reloadafter %]</td> >+ <td>[% s.swatch | html %]</td> >+ <td>[% s.transition | html %]</td> >+ <td>[% s.idleafter | html %]</td> >+ <td>[% s.pagedelay | html %]</td> >+ <td>[% s.reloadafter | html %]</td> > <td> > <div class="dropdown"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="opensignsactions[% s.sign_id %]" role="button" data-toggle="dropdown" href="#"> Actions <b class="caret"></b></a> >- <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="opensignsactions[% s.sign_id %]"> >- <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_sign&sign_id=[% s.sign_id %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_streams&sign_id=[% s.sign_id %]"><i class="fa fa-pencil"></i> Edit streams</a></li> >- <li><a href="/cgi-bin/koha/tools/signs.pl?op=del_sign&sign_id=[% s.sign_id %]"><i class="fa fa-trash"></i> Delete</a></li> >- [% IF ( OPACBaseURL ) %]<li><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-signs.pl?sign=[% s.sign_id %]" title="View this sign in the OPAC"><i class="fa fa-eye"></i> View sign</a></li>[% END %] >+ <a class="btn btn-default btn-xs dropdown-toggle" id="opensignsactions[% s.sign_id | html %]" role="button" data-toggle="dropdown" href="#"> Actions <b class="caret"></b></a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="opensignsactions[% s.sign_id | html %]"> >+ <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_sign&sign_id=[% s.sign_id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_streams&sign_id=[% s.sign_id | uri %]"><i class="fa fa-pencil"></i> Edit streams</a></li> >+ <li><a href="/cgi-bin/koha/tools/signs.pl?op=del_sign&sign_id=[% s.sign_id | uri %]"><i class="fa fa-trash"></i> Delete</a></li> >+ [% IF ( OPACBaseURL ) %]<li><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-signs.pl?sign=[% s.sign_id | uri %]" title="View this sign in the OPAC"><i class="fa fa-eye"></i> View sign</a></li>[% END %] > </ul> > </div> > </td> >@@ -414,11 +415,11 @@ > <tbody> > [% FOREACH s IN streams %] > <tr> >- <td><a href="/cgi-bin/koha/tools/signs.pl?op=view_stream&sign_stream_id=[% s.sign_stream_id %]">[% s.name %]</a></td> >- <td title="ID: [% s.saved_sql_id %]">[% s.saved_sql.report_name %]</td> >+ <td><a href="/cgi-bin/koha/tools/signs.pl?op=view_stream&sign_stream_id=[% s.sign_stream_id | uri %]">[% s.name | html %]</a></td> >+ <td title="ID: [% s.saved_sql_id | html %]">[% s.saved_sql.report_name | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/signs.pl?op=edit_stream&sign_stream_id=[% s.sign_stream_id %]"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/signs.pl?op=del_stream&sign_stream_id=[% s.sign_stream_id %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/signs.pl?op=edit_stream&sign_stream_id=[% s.sign_stream_id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/signs.pl?op=del_stream&sign_stream_id=[% s.sign_stream_id | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -480,7 +481,7 @@ > </thead> > <tbody> > [% FOREACH r IN records %] >- <tr><td>[% r.biblionumber %]</td><td>[% r.title %]</td></tr> >+ <tr><td>[% r.biblionumber | html %]</td><td>[% r.title | html %]</td></tr> > [% END %] > </tbody> > </table> >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 7b01f522267..71ad0300037 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt >@@ -1,3 +1,4 @@ >+[% USE raw %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -20,7 +21,7 @@ > [%- END -%] > [%- IF ( item.transfertwhen ) %] > [%- SET itemavailable = 0 -%] >- [%-%]In transit from [%- item.transfertfrom %] to [%- item.transfertto %] since [%- item.transfertwhen | $KohaDates %] >+ [%-%]In transit from [%- item.transfertfrom | html %] to [%- item.transfertto | html %] since [%- item.transfertwhen | $KohaDates %] > [%- END %] > [%- IF ( item.waiting ) -%] > [%- SET itemavailable = 0 -%] >@@ -33,13 +34,13 @@ > [%- IF ( item.itemnotforloan ) -%] > [%- SET itemavailable = 0 -%] > [%- IF ( item.notforloanvalueopac ) -%] >- [%- item.notforloanvalueopac -%] [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] >+ [%- item.notforloanvalueopac | html -%] [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] > [%- ELSE -%] >- [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] >+ [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] > [%- END -%] > [%- ELSIF ( item.notforloan_per_itemtype ) -%] > [%- SET itemavailable = 0 -%] >- [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] >+ [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] > [%- END -%] > [%- IF ( item.damaged ) -%] > [%- SET itemavailable = 0 -%] >@@ -50,25 +51,25 @@ > [%-%]On order > [%- END -%] > [%- IF ( itemavailable ) -%] >- [%-%]Available [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] >+ [%-%]Available [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] > [%- END -%] > [%- END -%] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( sign ) %][% sign.name %] - Koha[% ELSE %]Koha digital signs[% END %]</title> >+<title>[% IF ( sign ) %][% sign.name | html %] - Koha[% ELSE %]Koha digital signs[% END %]</title> > [%- IF ( sign.webapp ) %] > <meta name="apple-mobile-web-app-capable" content="yes" /> > <meta name="viewport" content="width=device-width, initial-scale=1"> > [% END -%] > [% BLOCK cssinclude %] > [%- IF Koha.Preference( 'OPACDigitalSignsCSS' ) != '' -%] >- <style type="text/css"> >- [% Koha.Preference( 'OPACDigitalSignsCSS' ) %] >+ <style> >+ [% Koha.Preference( 'OPACDigitalSignsCSS' ) | html %] > </style> >- [% Asset.css("lib/jquery/mobile/jquery.mobile.structure.min.css") %] >+ [% Asset.css("lib/jquery/mobile/jquery.mobile.structure.min.css") | $raw %] > [%- ELSE -%] >- [% Asset.css("css/signs.css") %] >- [% Asset.css("lib/jquery/mobile/jquery.mobile.min.css") %] >+ [% Asset.css("css/signs.css") | $raw %] >+ [% Asset.css("lib/jquery/mobile/jquery.mobile.min.css") | $raw %] > [%- END -%] > [% END # BLOCK cssinclude %] > [% INCLUDE 'doc-head-close.inc' %] >@@ -83,22 +84,22 @@ > [%- IF ( streams.0 ) -%] > [%# Iterate through the streams, creating one front page for each %] > [%- FOREACH s IN streams -%] >- <div data-role="page" class="page-stream" data-stream-id="[% s.sign_stream_id %]" data-theme="[% sign.swatch %]" id="stream_[% s.sign_stream_id %]"> >- <div data-role="header" data-theme="[% sign.swatch %]" data-position="fixed"> >+ <div data-role="page" class="page-stream" data-stream-id="[% s.sign_stream_id | html %]" data-theme="[% sign.swatch | html %]" id="stream_[% s.sign_stream_id | html %]"> >+ <div data-role="header" data-theme="[% sign.swatch | html %]" data-position="fixed"> > <div style="text-align: center;"> > [%# The header has a list of buttons for all the streams %] > [%- SET localstreams = streams -%] > [%- FOREACH stream IN localstreams -%] > [% IF s.sign_stream_id == stream.sign_stream_id %] >- <a href="#stream_[% stream.sign_stream_id %]" data-stream-id="[% stream.sign_stream_id %]" class="btn-stream stream-active" data-inline="true" data-icon="star" data-role="button">[% stream.name %]</a> >+ <a href="#stream_[% stream.sign_stream_id | uri %]" data-stream-id="[% stream.sign_stream_id | html %]" class="btn-stream stream-active" data-inline="true" data-icon="star" data-role="button">[% stream.name | html %]</a> > [% ELSE %] >- <a href="#stream_[% stream.sign_stream_id %]" data-stream-id="[% stream.sign_stream_id %]" class="btn-stream" data-inline="true" data-role="button">[% stream.name %]</a> >+ <a href="#stream_[% stream.sign_stream_id | uri %]" data-stream-id="[% stream.sign_stream_id | html %]" class="btn-stream" data-inline="true" data-role="button">[% stream.name | html %]</a> > [% END %] > [% END -%] > </div> > </div> <!-- /header --> > <div data-role="content" class="content"> >- <h1>[% s.name %]</h1> >+ <h1>[% s.name | html %]</h1> > </div> <!-- /content --> > </div> <!-- /page --> > >@@ -118,7 +119,7 @@ > <div data-role="content"> > <ul data-role="listview"> > [% FOREACH SIGN IN signs %] >- <li><a href="?sign=[% SIGN.sign_id %]" data-ajax="false">[% SIGN.name %]</a></li> >+ <li><a href="?sign=[% SIGN.sign_id | uri %]" data-ajax="false">[% SIGN.name | html %]</a></li> > [% END %] > </ul> > </div> >@@ -129,7 +130,7 @@ > [% INCLUDE 'opac-bottom.inc' is_popup=1 %] > [% BLOCK jsinclude %] > [% IF sign && Koha.Preference( 'OPACDigitalSigns') %] >- <script type="text/javascript"> >+ <script> > //<![CDATA[ > $(function (){ > var active_stream = '#' + $('.page-stream').first().attr('id'); >@@ -154,20 +155,20 @@ > idleTime++; > > [% IF ( sign.idleafter ) -%] >- if (idleTime >= [% sign.idleafter %]) { >+ if (idleTime >= [% sign.idleafter | html %]) { > doIdle = true; > } > [%- END -%] > > [%- IF ( sign.pagedelay ) -%] >- if (doIdle && idleTimePage >= [% sign.pagedelay %]) { >+ if (doIdle && idleTimePage >= [% sign.pagedelay | html %]) { > idleTimePage = 0; > swipe('next', true, true); > } > [%- END -%] > > [%- IF ( sign.reloadafter ) -%] >- if (doIdle && idleTime >= [% sign.reloadafter %]) { >+ if (doIdle && idleTime >= [% sign.reloadafter | html %]) { > resetIdle(); > window.location.reload(true); > } >@@ -367,15 +368,15 @@ > self.$cover.css('background-size', '100%'); > self.$cover.css('background-position', 'center center'); > self.$cover.css('background-repeat', 'no-repeat'); >- self.$cover.addClass('ui-bar-[% sign.swatch %]'); >+ self.$cover.addClass('ui-bar-[% sign.swatch | html %]'); > > if( !img_cache.have_cover(record) ) { > self.$vcontainer = $('<div class="cover-inner"/>'); >- self.$vcontainer.addClass('ui-bar-[% sign.swatch %]'); >+ self.$vcontainer.addClass('ui-bar-[% sign.swatch | html %]'); > self.$cover.append(self.$vcontainer); > > self.$cover.addClass('cover-blank'); >- self.$cover.css('border-color', $('.ui-bar-[% sign.swatch %]').first().css('background-color')); >+ self.$cover.css('border-color', $('.ui-bar-[% sign.swatch | html %]').first().css('background-color')); > > var $covertext = $('<div class="cover-text"></div>'); > $covertext.append($('<div class="title">'+record.title+'</div>')); >@@ -394,8 +395,8 @@ > var $cover = cover.$cover.clone(); > var $stream = $('#stream_'+sid); > >- var $page = $('<div data-role="page" data-close-btn="none" data-theme="[% sign.swatch %]" id="record_'+sid+'_'+cover.record.biblionumber+'"/>'); >- var $head = $('<div data-role="header" data-theme="[% sign.swatch %]"/>'); >+ var $page = $('<div data-role="page" data-close-btn="none" data-theme="[% sign.swatch | html %]" id="record_'+sid+'_'+cover.record.biblionumber+'"/>'); >+ var $head = $('<div data-role="header" data-theme="[% sign.swatch | html %]"/>'); > var $content = $('<div data-role="content" class="content"/>') > var $foot = $('<div data-role="foot" data-position="fixed" class="foot"/>') > >@@ -460,7 +461,7 @@ > var item = cover.record.items[i]; > > if(item.type) { >- $li.append($('<img src="/[% interface %]/lib/famfamfam/'+item.type+'.png" class="ui-li-icon"/>')); >+ $li.append($('<img src="/[% interface | html %]/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; >@@ -476,7 +477,7 @@ > /*************** > * footer > *******/ >- $foot.append($('<a href="#stream_'+sid+'" data-role="button" data-theme="[% sign.swatch %]" data-transition="[% sign.transition %]">'+_("Back")+'</a>')); >+ $foot.append($('<a href="#stream_'+sid+'" data-role="button" data-theme="[% sign.swatch | html %]" data-transition="[% sign.transition | html %]">'+_("Back")+'</a>')); > > /*************** > * page >@@ -494,23 +495,23 @@ > */ > var streams = { > [%- FOREACH stream IN streams %] >- '[% stream.sign_stream_id %]': { >- 'name': [% stream.name.json || '""' %], >+ '[% stream.sign_stream_id | html %]': { >+ 'name': [% stream.name.json || '""' | html %], > 'records': [ > [%- FOREACH record IN stream.records %] >- {'author': [% record.author.json || '""' %], >- 'title': [% record.title.json || '""' %], >- 'publisher': [% record.publishercode.json || '""' %], >- 'biblionumber': [% record.biblionumber.json || '""' %], >- 'isbn': [% record.isbn.json || '""' %], >+ {'author': [% record.author.json || '""' | html %], >+ 'title': [% record.title.json || '""' | html %], >+ 'publisher': [% record.publishercode.json || '""' | html %], >+ 'biblionumber': [% record.biblionumber.json || '""' | html %], >+ 'isbn': [% record.isbn.json || '""' | html %], > 'items': [ > [%- FOREACH item IN record.items %] > { >- 'type': [% item.itemtype.json || '""' %], >+ 'type': [% item.itemtype.json || '""' | html %], > 'datedue': "[% item.datedue | $KohaDates as_due_date => 1 %]", >- 'location': [% item.location.json || '""' %], >- 'location_description': [% item.location_description.json || '""' %], >- 'home_branch': "[% Branches.GetName(item.homebranch) | json %]", >+ 'location': [% item.location.json || '""' | html %], >+ 'location_description': [% item.location_description.json || '""' | html %], >+ 'home_branch': "[% Branches.GetName(item.homebranch) | json | html %]", > 'status': "[% INCLUDE item_status item = item %]" > > } >@@ -534,9 +535,9 @@ > > for(var i in streams[sid].records) { > var cover = new Cover(streams[sid].records[i]); >- var $link = $('<a href="#record_'+sid+'_'+cover.record.biblionumber+'" class="btn-record" data-transition="[% sign.transition %]"/>') >+ var $link = $('<a href="#record_'+sid+'_'+cover.record.biblionumber+'" class="btn-record" data-transition="[% sign.transition | html %]"/>') > $link.click(function(){ active_record = $(this).attr('href'); }); >- $content.append($link.append($('<div class="cover placeholder ui-bar-[% sign.swatch %] cover_'+cover.id+'" data-id="'+cover.id+'"/>'))); >+ $content.append($link.append($('<div class="cover placeholder ui-bar-[% sign.swatch | html %] cover_'+cover.id+'" data-id="'+cover.id+'"/>'))); > > cover.render(function(cover_rendered) { > var $coverPage = create_CoverPage(cover_rendered, sid); >@@ -558,7 +559,7 @@ > //]]> > </script> > [% END # IF ( sign ) %] >- [% Asset.js("lib/jquery/mobile/jquery.mobile.min.js") %] >+ [% Asset.js("lib/jquery/mobile/jquery.mobile.min.js") | $raw %] > [% END # BLOCK jsinclude %] > > </body> >diff --git a/opac/opac-signs.pl b/opac/opac-signs.pl >index 48904689b37..74347881235 100755 >--- a/opac/opac-signs.pl >+++ b/opac/opac-signs.pl >@@ -4,27 +4,27 @@ > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use CGI; >-use C4::Auth; >-use C4::Output; >-use C4::Biblio; >-use C4::Reports::Guided; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcBiblio GetBiblioData ); >+use C4::Reports::Guided qw( execute_query ); > use C4::Context; >-use C4::Koha; >-use C4::Items; >+use C4::Koha qw( GetNormalizedISBN ); >+use C4::Items qw( GetItemsInfo ); > use Koha::AuthorisedValues; > use Koha::Signs; > use Koha::SignStreams; >diff --git a/tools/signs.pl b/tools/signs.pl >index eff2784a35d..e243b59b972 100755 >--- a/tools/signs.pl >+++ b/tools/signs.pl >@@ -4,18 +4,18 @@ > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > =head1 NAME > >@@ -38,14 +38,14 @@ use Koha::SignStreams; > use Koha::SignsToStreams; > use Koha::Reports; > use CGI; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Log; >-use C4::Output; >-use C4::Reports::Guided; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Reports::Guided qw( get_saved_reports execute_query ); > use Modern::Perl; > >-my $cgi = new CGI; >+my $cgi = CGI->new; > my $dbh = C4::Context->dbh; > my $script_name = 'signs.pl'; > >@@ -53,7 +53,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ > template_name => "tools/signs.tt", > query => $cgi, > type => "intranet", >- authnotrequired => 0, > flagsrequired => { tools => 'edit_digital_signs' }, > debug => 0, > }); >-- >2.11.0
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