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 218-224 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
218
('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'),
218
('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'),
219
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
219
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
220
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
220
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
221
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff intranet', 'YesNo'),
221
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'),
222
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
222
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
223
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
223
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
224
('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'),
224
('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 390-396 Enhanced Content: Link Here
390
              choices:
390
              choices:
391
                  yes: Enable
391
                  yes: Enable
392
                  no: "Don't enable"
392
                  no: "Don't enable"
393
            - a Coce image cache service in the staff intranet.
393
            - a Coce image cache service in the staff client.
394
        -
394
        -
395
            - Coce server URL
395
            - Coce server URL
396
            - pref: CoceHost
396
            - pref: CoceHost
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-6 / +4 lines)
Lines 59-69 Link Here
59
    <div id="yui-main">
59
    <div id="yui-main">
60
    <div class="yui-b">
60
    <div class="yui-b">
61
61
62
[%
62
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
63
    IntranetCoce    = Koha.Preference('IntranetCoce')
63
[% CoceProviders   = Koha.Preference('CoceProviders') %]
64
    CoceProviders   = Koha.Preference('CoceProviders')
64
[% CoceHost        = Koha.Preference('CoceHost') %]
65
    CoceHost        = Koha.Preference('CoceHost')
66
%]
67
65
68
[% INCLUDE 'cat-toolbar.inc' %]
66
[% INCLUDE 'cat-toolbar.inc' %]
69
    [% IF ( ocoins ) %]
67
    [% IF ( ocoins ) %]
Lines 903-909 Link Here
903
    [% INCLUDE 'catalog-strings.inc' %]
901
    [% INCLUDE 'catalog-strings.inc' %]
904
    [% Asset.js("js/catalog.js") %]
902
    [% Asset.js("js/catalog.js") %]
905
    [% INCLUDE 'greybox.inc' %]
903
    [% INCLUDE 'greybox.inc' %]
906
    <script type="text/javascript" src="[% interface %]/prog/js/coce_[% KOHA_VERSION %].js"></script>
904
    [% Asset.js("js/coce.js") %]
907
    <script type="text/javascript">
905
    <script type="text/javascript">
908
        // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
906
        // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
909
        function verify_images() {
907
        function verify_images() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-7 / +4 lines)
Lines 22-32 Link Here
22
[% INCLUDE 'header.inc' %]
22
[% INCLUDE 'header.inc' %]
23
[% INCLUDE 'cat-search.inc' %]
23
[% INCLUDE 'cat-search.inc' %]
24
24
25
[%
25
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
26
    IntranetCoce    = Koha.Preference('IntranetCoce')
26
[% CoceProviders   = Koha.Preference('CoceProviders') %]
27
    CoceProviders   = Koha.Preference('CoceProviders')
27
[% CoceHost        = Koha.Preference('CoceHost') %]
28
    CoceHost        = Koha.Preference('CoceHost')
29
%]
30
28
31
<div id="breadcrumbs">
29
<div id="breadcrumbs">
32
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
30
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
Lines 644-650 Link Here
644
    [% Asset.js("js/browser.js") %]
642
    [% Asset.js("js/browser.js") %]
645
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %]
643
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %]
646
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
644
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
647
    [% Asset.js("prog/js/coce.js") %]
645
    [% Asset.js("js/coce.js") %]
648
    <script type="text/javascript">
646
    <script type="text/javascript">
649
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
647
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
650
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
648
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
651
- 

Return to bug 18421