View | Details | Raw Unified | Return to bug 8628
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/bug_8628-digital-signs-sysprefs.sql (-3 / +4 lines)
Lines 1-3 Link Here
1
INSERT IGNORE INTO systempreferences (variable,value,explanation,type) VALUES ('OPACDigitalSigns',0,'Turn digital signs in the OPAC on or off.','YesNo');
1
INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`) VALUES
2
INSERT IGNORE INTO systempreferences (variable,explanation,type) VALUES ('OPACDigitalSignsCSS','Extra CSS to be included in all signs','Textarea');
2
('OPACDigitalSigns',0,NULL,'Turn digital signs in the OPAC on or off.','YesNo'),
3
INSERT IGNORE INTO systempreferences (variable,value,explanation,type) VALUES ('OPACDigitalSignsSwatches','abcde','List the swatches that can be chosen when creating a new sign','free');
3
('OPACDigitalSignsCSS','',NULL,'Extra CSS to be included in all signs','Textarea'),
4
('OPACDigitalSignsSwatches','abcde',NULL,'List the swatches that can be chosen when creating a new sign','free');
(-)a/installer/data/mysql/kohastructure.sql (-3 / +3 lines)
Lines 4111-4117 CREATE TABLE sign_streams ( Link Here
4111
  `name` varchar(64), -- name/title of the sign
4111
  `name` varchar(64), -- name/title of the sign
4112
  PRIMARY KEY (`sign_stream_id`),
4112
  PRIMARY KEY (`sign_stream_id`),
4113
  CONSTRAINT `sign_streams_ibfk_1` FOREIGN KEY (`saved_sql_id`) REFERENCES `saved_sql` (`id`) ON DELETE CASCADE
4113
  CONSTRAINT `sign_streams_ibfk_1` FOREIGN KEY (`saved_sql_id`) REFERENCES `saved_sql` (`id`) ON DELETE CASCADE
4114
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
4114
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4115
4115
4116
--
4116
--
4117
-- Table structure for table 'signs'
4117
-- Table structure for table 'signs'
Lines 4128-4134 CREATE TABLE signs ( Link Here
4128
  `pagedelay` int(11) NOT NULL default 0, -- seconds to wait before turning to a new page/record
4128
  `pagedelay` int(11) NOT NULL default 0, -- seconds to wait before turning to a new page/record
4129
  `reloadafter` int(11) NOT NULL default 0, -- seconds to wait before reloading all the pages
4129
  `reloadafter` int(11) NOT NULL default 0, -- seconds to wait before reloading all the pages
4130
  PRIMARY KEY (`sign_id`)
4130
  PRIMARY KEY (`sign_id`)
4131
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
4131
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4132
4132
4133
--
4133
--
4134
-- Table structure for table 'signs_to_streams'
4134
-- Table structure for table 'signs_to_streams'
Lines 4143-4149 CREATE TABLE signs_to_streams ( Link Here
4143
  PRIMARY KEY (`sign_to_stream_id`),
4143
  PRIMARY KEY (`sign_to_stream_id`),
4144
  CONSTRAINT `signs_to_streams_ibfk_1` FOREIGN KEY (`sign_stream_id`) REFERENCES `sign_streams` (`sign_stream_id`) ON DELETE CASCADE,
4144
  CONSTRAINT `signs_to_streams_ibfk_1` FOREIGN KEY (`sign_stream_id`) REFERENCES `sign_streams` (`sign_stream_id`) ON DELETE CASCADE,
4145
  CONSTRAINT `signs_to_streams_ibfk_2` FOREIGN KEY (`sign_id`) REFERENCES `signs` (`sign_id`) ON DELETE CASCADE
4145
  CONSTRAINT `signs_to_streams_ibfk_2` FOREIGN KEY (`sign_id`) REFERENCES `signs` (`sign_id`) ON DELETE CASCADE
4146
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
4146
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4147
4147
4148
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
4148
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
4149
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
4149
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
(-)a/installer/data/mysql/sysprefs.sql (+5 lines)
Lines 82-87 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
82
('BatchCheckoutsValidCategories','',NULL,'Patron categories allowed to checkout in a batch','Free'),
82
('BatchCheckoutsValidCategories','',NULL,'Patron categories allowed to checkout in a batch','Free'),
83
('BiblioAddsAuthorities','0',NULL,'If ON, adding a new biblio will check for an existing authority record and create one on the fly if one doesn\'t exist','YesNo'),
83
('BiblioAddsAuthorities','0',NULL,'If ON, adding a new biblio will check for an existing authority record and create one on the fly if one doesn\'t exist','YesNo'),
84
('BiblioDefaultView','normal','normal|marc|isbd','Choose the default detail view in the catalog; choose between normal, marc or isbd','Choice'),
84
('BiblioDefaultView','normal','normal|marc|isbd','Choose the default detail view in the catalog; choose between normal, marc or isbd','Choice'),
85
('BibtexExportAdditionalFields', '', NULL, 'Define additional BibTex tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'),
85
('BlockExpiredPatronOpacActions','1',NULL,'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis','YesNo'),
86
('BlockExpiredPatronOpacActions','1',NULL,'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis','YesNo'),
86
('BlockReturnOfWithdrawnItems','1','0','If enabled, items that are marked as withdrawn cannot be returned.','YesNo'),
87
('BlockReturnOfWithdrawnItems','1','0','If enabled, items that are marked as withdrawn cannot be returned.','YesNo'),
87
('BorrowerMandatoryField','surname|cardnumber',NULL,'Choose the mandatory fields for a patron\'s account','free'),
88
('BorrowerMandatoryField','surname|cardnumber',NULL,'Choose the mandatory fields for a patron\'s account','free'),
Lines 320-325 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
320
('OPACdefaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
321
('OPACdefaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
321
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
322
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
322
('OPACdidyoumean','',NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
323
('OPACdidyoumean','',NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
324
('OPACDigitalSigns',0,NULL, 'Turn digital signs in the OPAC on or off.','YesNo'),
325
('OPACDigitalSignsCSS','',NULL,'Extra CSS to be included in all signs','Textarea'),
326
('OPACDigitalSignsSwatches','abcde',NULL,'List the swatches that can be chosen when creating a new sign','free'),
323
('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
327
('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'),
324
('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
328
('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'),
325
('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
329
('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'),
Lines 459-464 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
459
('ReturnpathDefault','',NULL,'Use this email address as return path or bounce address for undeliverable emails','Free'),
463
('ReturnpathDefault','',NULL,'Use this email address as return path or bounce address for undeliverable emails','Free'),
460
('ReturnToShelvingCart','0','','If set, when any item is \'checked in\', it\'s location code will be changed to CART.','YesNo'),
464
('ReturnToShelvingCart','0','','If set, when any item is \'checked in\', it\'s location code will be changed to CART.','YesNo'),
461
('reviewson','1','','If ON, enables patron reviews of bibliographic records in the OPAC','YesNo'),
465
('reviewson','1','','If ON, enables patron reviews of bibliographic records in the OPAC','YesNo'),
466
('RisExportAdditionalFields', '', NULL, 'Define additional RIS tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'),
462
('RoutingListAddReserves','1','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'),
467
('RoutingListAddReserves','1','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'),
463
('RoutingListNote','To change this note edit <a href=\"/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped\">RoutingListNote</a> system preference.','70|10','Define a note to be shown on all routing lists','Textarea'),
468
('RoutingListNote','To change this note edit <a href=\"/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped\">RoutingListNote</a> system preference.','70|10','Define a note to be shown on all routing lists','Textarea'),
464
('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
469
('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+1 lines)
Lines 107-111 Link Here
107
    [%- CASE 'edit_clubs' -%]<span>Create and edit clubs</span>
107
    [%- CASE 'edit_clubs' -%]<span>Create and edit clubs</span>
108
    [%- CASE 'edit_templates' -%]<span>Create and edit club templates</span>
108
    [%- CASE 'edit_templates' -%]<span>Create and edit club templates</span>
109
    [%- CASE 'enroll' -%]<span>Enroll patrons in clubs</span>
109
    [%- CASE 'enroll' -%]<span>Enroll patrons in clubs</span>
110
    [%- CASE 'edit_digital_signs' -%]<span>Create and edit digital signs for the OPAC</span>
110
    [%- END -%]
111
    [%- END -%]
111
[%- END -%]
112
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt (-9 / +14 lines)
Lines 6-12 Link Here
6
[% INCLUDE 'datatables.inc' %]
6
[% INCLUDE 'datatables.inc' %]
7
<script type="text/javascript">
7
<script type="text/javascript">
8
//<![CDATA[
8
//<![CDATA[
9
    // prepare DOM for YUI Toolbar
10
    $(document).ready(function() {
9
    $(document).ready(function() {
11
        $("#table_signs").dataTable($.extend(true, {}, dataTablesDefaults, {
10
        $("#table_signs").dataTable($.extend(true, {}, dataTablesDefaults, {
12
            "aoColumnDefs": [
11
            "aoColumnDefs": [
Lines 16-22 Link Here
16
        }));
15
        }));
17
        $("#table_streams").dataTable($.extend(true, {}, dataTablesDefaults, {
16
        $("#table_streams").dataTable($.extend(true, {}, dataTablesDefaults, {
18
            "aoColumnDefs": [
17
            "aoColumnDefs": [
19
                { "aTargets" : [ -1 ], "bSearchable": false, "bSortable": false },
18
                { "aTargets": [ -1 ], "bSearchable": false, "bSortable": false },
20
            ],
19
            ],
21
            "sPaginationType": "four_button"
20
            "sPaginationType": "four_button"
22
        }));
21
        }));
Lines 83-90 Link Here
83
[% IF ( else ) %]
82
[% IF ( else ) %]
84
  <div id="toolbar">
83
  <div id="toolbar">
85
    <ul class="toolbar">
84
    <ul class="toolbar">
86
      <li><a id="newsign" href="?op=add_sign" class="btn btn-small"><i class="fa fa-plus"></i> New sign</a></li>
85
      <li><a id="newsign" href="/cgi-bin/koha/tools/signs.pl?op=add_sign" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> New sign</a></li>
87
      <li><a id="newstream" href="?op=add_stream" class="btn btn-small"><i class="fa fa-plus"></i> New stream</a></li>
86
      <li><a id="newstream" href="/cgi-bin/koha/tools/signs.pl?op=add_stream" class="btn btn-default btn-sm"><i class="fa fa-plus"></i> New stream</a></li>
88
    </ul>
87
    </ul>
89
  </div>
88
  </div>
90
[% END %]
89
[% END %]
Lines 223-230 Link Here
223
      <tr>
222
      <tr>
224
        <td>[% s.sign_stream.name %]</td>
223
        <td>[% s.sign_stream.name %]</td>
225
        <td>[% IF ( s.params ) %][% s.params %][% ELSE %]None[% END %]</td>
224
        <td>[% IF ( s.params ) %][% s.params %][% ELSE %]None[% END %]</td>
226
        <td class="actions">[% IF ( s.params ) %]<a href="?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-mini" 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-mini" title="Edit SQL"><i class="fa fa-pencil"></i></a>[% END %]</td>
225
        <td class="actions">
227
        <td class="actions"><a href="?op=detach_stream_from_sign&sign_id=[% sign.sign_id %]&sign_to_stream_id=[% s.sign_to_stream_id %]" class="btn btn-mini detach"><i class="fa fa-times"></i> Detach</a></td>
226
            [% IF ( s.params ) %]
227
                <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>
228
            [% ELSE %]
229
                <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>
230
            [% END %]
231
        </td>
232
        <td class="actions"><a href="/cgi-bin/koha/tools/signs.pl?op=detach_stream_from_sign&sign_id=[% sign.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>
228
      </tr>
233
      </tr>
229
    [% END %]
234
    [% END %]
230
    </tbody>
235
    </tbody>
Lines 404-410 Link Here
404
                <td>[% s.reloadafter %]</td>
409
                <td>[% s.reloadafter %]</td>
405
                <td>
410
                <td>
406
                    <div class="dropdown">
411
                    <div class="dropdown">
407
                        <a class="btn btn-mini dropdown-toggle" id="opensignsactions[% s.sign_id %]" role="button" data-toggle="dropdown" href="#"> Actions <b class="caret"></b></a>
412
                        <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>
408
                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="opensignsactions[% s.sign_id %]">
413
                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="opensignsactions[% s.sign_id %]">
409
                            <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_sign&amp;sign_id=[% s.sign_id %]"><i class="fa fa-pencil"></i> Edit</a></li>
414
                            <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_sign&amp;sign_id=[% s.sign_id %]"><i class="fa fa-pencil"></i> Edit</a></li>
410
                            <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_streams&amp;sign_id=[% s.sign_id %]"><i class="fa fa-pencil"></i> Edit streams</a></li>
415
                            <li><a href="/cgi-bin/koha/tools/signs.pl?op=edit_streams&amp;sign_id=[% s.sign_id %]"><i class="fa fa-pencil"></i> Edit streams</a></li>
Lines 438-445 Link Here
438
                <td><a href="?op=view_stream&amp;sign_stream_id=[% s.sign_stream_id %]">[% s.name %]</a></td>
443
                <td><a href="?op=view_stream&amp;sign_stream_id=[% s.sign_stream_id %]">[% s.name %]</a></td>
439
                <td>[% FOREACH r IN reports %][% IF r.id == s.saved_sql_id %][% r.report_name %][% END %][% END %]</td>
444
                <td>[% FOREACH r IN reports %][% IF r.id == s.saved_sql_id %][% r.report_name %][% END %][% END %]</td>
440
                <td class="actions">
445
                <td class="actions">
441
                    <a href="/cgi-bin/koha/tools/signs.pl?op=edit_stream&amp;sign_stream_id=[% s.sign_stream_id %]" class="btn btn-mini"><i class="fa fa-pencil"></i> Edit</a>
446
                    <a href="/cgi-bin/koha/tools/signs.pl?op=edit_stream&amp;sign_stream_id=[% s.sign_stream_id %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
442
                    <a href="/cgi-bin/koha/tools/signs.pl?op=del_stream&amp;sign_stream_id=[% s.sign_stream_id %]" class="btn btn-mini"><i class="fa fa-trash"></i> Delete</a>
447
                    <a href="/cgi-bin/koha/tools/signs.pl?op=del_stream&amp;sign_stream_id=[% s.sign_stream_id %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
443
                </td>
448
                </td>
444
            </tr>
449
            </tr>
445
        [% END %]
450
        [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt (-10 / +10 lines)
Lines 64-73 Link Here
64
      <style type="text/css">
64
      <style type="text/css">
65
        [% Koha.Preference( 'OPACDigitalSignsCSS' ) %]
65
        [% Koha.Preference( 'OPACDigitalSignsCSS' ) %]
66
      </style>
66
      </style>
67
      <link rel="stylesheet" href="/opac-tmpl/lib/jquery/mobile/jquery.mobile.structure.min.css" />
67
      <link rel="stylesheet" href="[% interface %]/lib/jquery/mobile/jquery.mobile.structure.min.css" />
68
    [%- ELSE -%]
68
    [%- ELSE -%]
69
      <link rel="stylesheet" href="/opac-tmpl/bootstrap/css/signs.css" />
69
      <link rel="stylesheet" href="[% interface %]/[% theme %]/css/signs.css" />
70
      <link rel="stylesheet" href="/opac-tmpl/lib/jquery/mobile/jquery.mobile.min.css" />
70
      <link rel="stylesheet" href="[% interface %]/lib/jquery/mobile/jquery.mobile.min.css" />
71
    [%- END -%]
71
    [%- END -%]
72
[% END # BLOCK cssinclude %]
72
[% END # BLOCK cssinclude %]
73
[% INCLUDE 'doc-head-close.inc' %]
73
[% INCLUDE 'doc-head-close.inc' %]
Lines 445-453 Link Here
445
445
446
                /* item info */
446
                /* item info */
447
                var $info = $('<div/>')
447
                var $info = $('<div/>')
448
                $info.append($('<span><strong>'+_('Author')+':</strong> ' + cover.record.author+'</span>'));
448
                $info.append($('<span><strong>'+_("Author")+':</strong> ' + cover.record.author+'</span>'));
449
                if(cover.record.publisher) {
449
                if(cover.record.publisher) {
450
                    $info.append($('<br/><span><strong>'+_('Publisher')+':</strong> ' + cover.record.publisher + '</span>'));
450
                    $info.append($('<br/><span><strong>'+_("Publisher")+':</strong> ' + cover.record.publisher + '</span>'));
451
                }
451
                }
452
452
453
                if(cover.record.items.length > 0) {
453
                if(cover.record.items.length > 0) {
Lines 461-471 Link Here
461
                    if(item.type) {
461
                    if(item.type) {
462
                        $li.append($('<img src="/opac-tmpl/lib/famfamfam/'+item.type+'.png" class="ui-li-icon"/>'));
462
                        $li.append($('<img src="/opac-tmpl/lib/famfamfam/'+item.type+'.png" class="ui-li-icon"/>'));
463
                    }
463
                    }
464
                    var location = item.location_description ?  item.location_description + _(' in ') + item.home_branch: item.home_branch;
464
                    var location = item.location_description ?  item.location_description + _(" in ") + item.home_branch: item.home_branch;
465
                    var item_info = item.status + _(' at ') + location;
465
                    var item_info = item.status + _(" at ") + location;
466
                    $li.append($('<h4>'+item_info+'</h4>'));
466
                    $li.append($('<h4>'+item_info+'</h4>'));
467
                    if(item.datedue) {
467
                    if(item.datedue) {
468
                        $li.append('<p>'+_('Date due') + ': ' + item.datedue+'</p>');
468
                        $li.append('<p>'+_("Date due") + ': ' + item.datedue+'</p>');
469
                    }
469
                    }
470
                    $items.append($li);
470
                    $items.append($li);
471
                }
471
                }
Lines 475-481 Link Here
475
                /***************
475
                /***************
476
                * footer
476
                * footer
477
                *******/
477
                *******/
478
                $foot.append($('<a href="#stream_'+sid+'" data-role="button" data-theme="[% sign.swatch %]" data-transition="[% sign.transition %]">'+_('Back')+'</a>'));
478
                $foot.append($('<a href="#stream_'+sid+'" data-role="button" data-theme="[% sign.swatch %]" data-transition="[% sign.transition %]">'+_("Back")+'</a>'));
479
479
480
480
481
                /***************
481
                /***************
Lines 540-546 Link Here
540
540
541
                    cover.render(function(cover_rendered) {
541
                    cover.render(function(cover_rendered) {
542
                        var $coverPage = create_CoverPage(cover_rendered, sid);
542
                        var $coverPage = create_CoverPage(cover_rendered, sid);
543
                        /* initilize active_record with first loaded record from active stream */
543
                        /* initialize active_record with first loaded record from active stream */
544
                        if(firstLoadedRecord && sid == $(active_stream).data('stream-id') ){
544
                        if(firstLoadedRecord && sid == $(active_stream).data('stream-id') ){
545
                            active_record = cover_rendered.$cover.attr('href');
545
                            active_record = cover_rendered.$cover.attr('href');
546
                            firstLoadedRecord = false;
546
                            firstLoadedRecord = false;
(-)a/opac/opac-signs.pl (-2 / +2 lines)
Lines 6-12 Link Here
6
#
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
10
# version.
11
#
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
Lines 41-47 my ( $template, $borrowernumber, $cookie ) = get_template_and_user({ Link Here
41
    'query'           => $query,
41
    'query'           => $query,
42
    'type'            => 'opac',
42
    'type'            => 'opac',
43
    'authnotrequired' => ( C4::Context->preference('OpacPublic') ? 1 : 0 ),
43
    'authnotrequired' => ( C4::Context->preference('OpacPublic') ? 1 : 0 ),
44
    'flagsrequired'   => { borrow => 1 },
44
    'flagsrequired'   => { borrowers => 1 },
45
});
45
});
46
46
47
if ( C4::Context->preference('OPACDigitalSigns') ) {
47
if ( C4::Context->preference('OPACDigitalSigns') ) {
(-)a/tools/signs.pl (-10 / +25 lines)
Lines 6-12 Link Here
6
#
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
10
# version.
11
#
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
Lines 150-158 if ( $op eq 'add_stream' ) { Link Here
150
} elsif ( $op eq 'save_sign' ) {
150
} elsif ( $op eq 'save_sign' ) {
151
151
152
    if ($cgi->param('sign_id')) {
152
    if ($cgi->param('sign_id')) {
153
        Koha::Signs->find( $cgi->param('sign_id') )->set({ name => $cgi->param('name'), webapp => $cgi->param('webapp'), swatch => $cgi->param('swatch'), transition => $cgi->param('transition'), idleafter => $cgi->param('idleafter'), pagedelay => $cgi->param('pagedelay'), reloadafter => $cgi->param('reloadafter') })->store; # modify
153
        Koha::Signs->find( scalar $cgi->param('sign_id') )->set({
154
            name        => scalar $cgi->param('name'),
155
            webapp      => scalar $cgi->param('webapp'),
156
            swatch      => scalar $cgi->param('swatch'),
157
            transition  => scalar $cgi->param('transition'),
158
            idleafter   => scalar $cgi->param('idleafter'),
159
            pagedelay   => scalar $cgi->param('pagedelay'),
160
            reloadafter => scalar $cgi->param('reloadafter')
161
        })->store; # modify
154
    } else {
162
    } else {
155
        Koha::Sign->new({ name => $cgi->param('name'), webapp => $cgi->param('webapp'), swatch => $cgi->param('swatch'), transition => $cgi->param('transition'), idleafter => $cgi->param('idleafter'), pagedelay => $cgi->param('pagedelay'), reloadafter => $cgi->param('reloadafter') })->store; # add new
163
        Koha::Sign->new({
164
            name        => scalar $cgi->param('name'),
165
            webapp      => scalar $cgi->param('webapp'),
166
            swatch      => scalar $cgi->param('swatch'),
167
            transition  => scalar $cgi->param('transition'),
168
            idleafter   => scalar $cgi->param('idleafter'),
169
            pagedelay   => scalar $cgi->param('pagedelay'),
170
            reloadafter => scalar $cgi->param('reloadafter')
171
        })->store; # add new
156
    }
172
    }
157
    print $cgi->redirect($script_name);
173
    print $cgi->redirect($script_name);
158
174
Lines 226-238 if ( $op eq 'add_stream' ) { Link Here
226
242
227
} elsif ( $op eq 'attach_stream_to_sign' && $sign_stream_id ne '' && $sign_id ne '' ) {
243
} elsif ( $op eq 'attach_stream_to_sign' && $sign_stream_id ne '' && $sign_id ne '' ) {
228
244
229
    Koha::SignsToStream->new({ sign_stream_id => $sign_stream_id, sign_id => $sign_id })->store;
245
    my $sign_to_stream = Koha::SignsToStream->new({ sign_stream_id => $sign_stream_id, sign_id => $sign_id })->store;
230
246
231
    # Check if the SQL associated with the stream needs parameters
247
    # Check if the SQL associated with the stream needs parameters
232
    my $stream = Koha::SignStreams->find( $sign_stream_id );
248
    my $stream = Koha::SignStreams->find( $sign_stream_id );
233
    my $sql = get_saved_report($stream->saved_sql_id);
249
    my $sql = get_saved_report($stream->saved_sql_id);
234
    if ( $sql->{'savedsql'} =~ m/WHERE/ ) {
250
    if ( $sql->{'savedsql'} =~ m/WHERE/ ) {
235
        print $cgi->redirect( $script_name . '?op=get_params&sign_to_stream_id=' . $sign_to_stream_id . '&sign_stream_id=' . $sign_stream_id . '&sign_id=' . $sign_id );
251
        print $cgi->redirect( $script_name . '?op=get_params&sign_to_stream_id=' . $sign_to_stream->sign_to_stream_id . '&sign_stream_id=' . $sign_stream_id . '&sign_id=' . $sign_id );
236
    } else {
252
    } else {
237
        print $cgi->redirect( $script_name . '?op=edit_streams&sign_id=' . $sign_id );
253
        print $cgi->redirect( $script_name . '?op=edit_streams&sign_id=' . $sign_id );
238
    }
254
    }
Lines 280-291 if ( $op eq 'add_stream' ) { Link Here
280
296
281
} else {
297
} else {
282
298
283
    my $streams = Koha::SignStreams->search({});
299
    my @streams = Koha::SignStreams->search({});
284
    my $signs   = Koha::Signs->search({});
300
    my @signs   = Koha::Signs->search({});
285
301
286
    $template->param(
302
    $template->param(
287
        'streams'     => $streams,
303
        'streams'     => \@streams,
288
        'signs'       => $signs,
304
        'signs'       => \@signs,
289
        'reports'     => get_saved_reports( { group => 'SIG' } ),
305
        'reports'     => get_saved_reports( { group => 'SIG' } ),
290
        'OPACBaseURL' => C4::Context->preference( 'OPACBaseURL' ) || '',
306
        'OPACBaseURL' => C4::Context->preference( 'OPACBaseURL' ) || '',
291
        'else'        => 1
307
        'else'        => 1
292
- 

Return to bug 8628