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

(-)a/installer/data/mysql/atomicupdate/bug_18421_add_coce_intranet.perl (-1 / +1 lines)
Lines 14-20 my $current_coce_pref = C4::Context->preference('Coce') || 0; Link Here
14
14
15
# add two new systempreferences in order to have distinct behavior between intranet and OPAC
15
# add two new systempreferences in order to have distinct behavior between intranet and OPAC
16
$dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
16
$dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
17
        ('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff intranet', 'YesNo'),
17
        ('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'),
18
        ('OpacCoce','$current_coce_pref', NULL, 'If on, enables cover retrieval from the configured Coce server in the OPAC', 'YesNo')
18
        ('OpacCoce','$current_coce_pref', NULL, 'If on, enables cover retrieval from the configured Coce server in the OPAC', 'YesNo')
19
        ;") or die "Error applying Bug 18421: error inserting new values into database: ". $dbh->errstr . "\n";
19
        ;") or die "Error applying Bug 18421: error inserting new values into database: ". $dbh->errstr . "\n";
20
20
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 247-253 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
247
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
247
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
248
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
248
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
249
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
249
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
250
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff intranet', 'YesNo'),
250
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'),
251
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
251
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
252
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
252
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
253
('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'),
253
('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref (-1 / +1 lines)
Lines 422-428 Enhanced Content: Link Here
422
              choices:
422
              choices:
423
                  yes: Enable
423
                  yes: Enable
424
                  no: "Don't enable"
424
                  no: "Don't enable"
425
            - a Coce image cache service in the staff intranet.
425
            - a Coce image cache service in the staff client.
426
        -
426
        -
427
            - Coce server URL
427
            - Coce server URL
428
            - pref: CoceHost
428
            - pref: CoceHost
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-6 / +4 lines)
Lines 63-73 Link Here
63
  <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
63
  <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
64
[% ELSE %]
64
[% ELSE %]
65
65
66
[%
66
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
67
    IntranetCoce    = Koha.Preference('IntranetCoce')
67
[% CoceProviders   = Koha.Preference('CoceProviders') %]
68
    CoceProviders   = Koha.Preference('CoceProviders')
68
[% CoceHost        = Koha.Preference('CoceHost') %]
69
    CoceHost        = Koha.Preference('CoceHost')
70
%]
71
69
72
[% INCLUDE 'cat-toolbar.inc' %]
70
[% INCLUDE 'cat-toolbar.inc' %]
73
    [% IF ( ocoins ) %]
71
    [% IF ( ocoins ) %]
Lines 770-776 Link Here
770
    [% INCLUDE 'catalog-strings.inc' %]
768
    [% INCLUDE 'catalog-strings.inc' %]
771
    [% Asset.js("js/catalog.js") | $raw %]
769
    [% Asset.js("js/catalog.js") | $raw %]
772
    [% INCLUDE 'greybox.inc' %]
770
    [% INCLUDE 'greybox.inc' %]
773
    <script type="text/javascript" src="[% interface %]/prog/js/coce_[% KOHA_VERSION %].js"></script>
771
    [% Asset.js("js/coce.js") %]
774
    <script>
772
    <script>
775
        var interface = "[% interface | html %]";
773
        var interface = "[% interface | html %]";
776
        var theme = "[% theme | html %]";
774
        var theme = "[% theme | html %]";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-7 / +4 lines)
Lines 27-37 Link Here
27
[% INCLUDE 'header.inc' %]
27
[% INCLUDE 'header.inc' %]
28
[% INCLUDE 'cat-search.inc' %]
28
[% INCLUDE 'cat-search.inc' %]
29
29
30
[%
30
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
31
    IntranetCoce    = Koha.Preference('IntranetCoce')
31
[% CoceProviders   = Koha.Preference('CoceProviders') %]
32
    CoceProviders   = Koha.Preference('CoceProviders')
32
[% CoceHost        = Koha.Preference('CoceHost') %]
33
    CoceHost        = Koha.Preference('CoceHost')
34
%]
35
33
36
<div id="breadcrumbs">
34
<div id="breadcrumbs">
37
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
35
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
Lines 666-672 Link Here
666
    [% Asset.js("js/browser.js") | $raw %]
664
    [% Asset.js("js/browser.js") | $raw %]
667
    [% Asset.js("lib/hc-sticky.js") | $raw %]
665
    [% Asset.js("lib/hc-sticky.js") | $raw %]
668
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
666
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
669
    [% Asset.js("prog/js/coce.js") %]
667
    [% Asset.js("js/coce.js") %]
670
    <script>
668
    <script>
671
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
669
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
672
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
670
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
673
- 

Return to bug 18421