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 231-237 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
231
('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'),
231
('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'),
232
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
232
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
233
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
233
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
234
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff intranet', 'YesNo'),
234
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'),
235
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
235
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'),
236
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
236
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'),
237
('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'),
237
('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 416-422 Enhanced Content: Link Here
416
              choices:
416
              choices:
417
                  yes: Enable
417
                  yes: Enable
418
                  no: "Don't enable"
418
                  no: "Don't enable"
419
            - a Coce image cache service in the staff intranet.
419
            - a Coce image cache service in the staff client.
420
        -
420
        -
421
            - Coce server URL
421
            - Coce server URL
422
            - pref: CoceHost
422
            - pref: CoceHost
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-6 / +4 lines)
Lines 63-73 Link Here
63
    <div id="yui-main">
63
    <div id="yui-main">
64
    <div class="yui-b">
64
    <div class="yui-b">
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 925-931 Link Here
925
    [% INCLUDE 'catalog-strings.inc' %]
923
    [% INCLUDE 'catalog-strings.inc' %]
926
    [% Asset.js("js/catalog.js") | $raw %]
924
    [% Asset.js("js/catalog.js") | $raw %]
927
    [% INCLUDE 'greybox.inc' %]
925
    [% INCLUDE 'greybox.inc' %]
928
    <script type="text/javascript" src="[% interface %]/prog/js/coce_[% KOHA_VERSION %].js"></script>
926
    [% Asset.js("js/coce.js") %]
929
    <script type="text/javascript">
927
    <script type="text/javascript">
930
        // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
928
        // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
931
        function verify_images() {
929
        function verify_images() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-7 / +4 lines)
Lines 26-36 Link Here
26
[% INCLUDE 'header.inc' %]
26
[% INCLUDE 'header.inc' %]
27
[% INCLUDE 'cat-search.inc' %]
27
[% INCLUDE 'cat-search.inc' %]
28
28
29
[%
29
[% IntranetCoce    = Koha.Preference('IntranetCoce') %]
30
    IntranetCoce    = Koha.Preference('IntranetCoce')
30
[% CoceProviders   = Koha.Preference('CoceProviders') %]
31
    CoceProviders   = Koha.Preference('CoceProviders')
31
[% CoceHost        = Koha.Preference('CoceHost') %]
32
    CoceHost        = Koha.Preference('CoceHost')
33
%]
34
32
35
<div id="breadcrumbs">
33
<div id="breadcrumbs">
36
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
34
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
Lines 651-657 Link Here
651
    [% Asset.js("js/browser.js") | $raw %]
649
    [% Asset.js("js/browser.js") | $raw %]
652
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
650
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
653
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
651
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
654
    [% Asset.js("prog/js/coce.js") | $raw %]
652
    [% Asset.js("js/coce.js") %]
655
    <script type="text/javascript">
653
    <script type="text/javascript">
656
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
654
        var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
657
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
655
        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold.");
658
- 

Return to bug 18421