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

Return to bug 18421