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

(-)a/C4/Templates.pm (-7 lines)
Lines 100-109 sub output { Link Here
100
    }
100
    }
101
    $vars->{lang} = $self->lang;
101
    $vars->{lang} = $self->lang;
102
    $vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang;
102
    $vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang;
103
    $vars->{yuipath} =
104
      ( C4::Context->preference("yuipath") eq "local"
105
        ? ( $self->interface eq 'intranet' ? $vars->{themelang} . "/lib/yui" : "/opac-tmpl/lib/yui" )
106
        : C4::Context->preference("yuipath") );
107
    $vars->{interface} =
103
    $vars->{interface} =
108
      ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
104
      ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' );
109
    $vars->{theme} = $self->theme;
105
    $vars->{theme} = $self->theme;
Lines 245-253 sub gettemplate { Link Here
245
#        "/$theme/$lang";
241
#        "/$theme/$lang";
246
#    $template->param(
242
#    $template->param(
247
#        themelang => $themelang,
243
#        themelang => $themelang,
248
#        yuipath   => C4::Context->preference("yuipath") eq "local"
249
#                     ? "$themelang/lib/yui"
250
#                     : C4::Context->preference("yuipath"),
251
#        interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl',
244
#        interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl',
252
#        theme     => $theme,
245
#        theme     => $theme,
253
#        lang      => $lang
246
#        lang      => $lang
(-)a/installer/data/mysql/sysprefs.sql (-1 lines)
Lines 442-448 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
442
('XISBNDailyLimit','999','','The xISBN Web service is free for non-commercial use when usage does not exceed 1000 requests per day','Integer'),
442
('XISBNDailyLimit','999','','The xISBN Web service is free for non-commercial use when usage does not exceed 1000 requests per day','Integer'),
443
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
443
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
444
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
444
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
445
('yuipath','local','local|http://yui.yahooapis.com/2.5.1/build','Insert the path to YUI libraries, choose local if you use koha offline','Choice'),
446
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
445
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
447
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
446
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
448
;
447
;
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 8560-8565 if ( CheckVersion($DBversion) ) { Link Here
8560
    SetVersion($DBversion);
8560
    SetVersion($DBversion);
8561
}
8561
}
8562
8562
8563
$DBversion = "3.17.00.XXX";
8564
if ( CheckVersion($DBversion) ) {
8565
    $dbh->do("DELETE FROM systempreferences WHERE variable='yuipath'");
8566
    print "Upgrade to $DBversion done ( Bug 12494 - Remove yuipath system preference )\n";
8567
    SetVersion ($DBversion);
8568
}
8569
8563
=head1 FUNCTIONS
8570
=head1 FUNCTIONS
8564
8571
8565
=head2 TableExists($table)
8572
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc (-6 / +1 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Online Help</title>
2
<title>Online help</title>
3
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
4
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
5
<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" />
5
<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" />
Lines 11-21 Link Here
11
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
11
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
12
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui.js"></script>
12
<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui.js"></script>
13
<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
13
<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
14
<!-- yui js --> 
15
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
16
<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script> 
17
<script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script> 
18
<script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script> 
19
<!-- koha core js -->
14
<!-- koha core js -->
20
<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
15
<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
21
16
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-8 / +8 lines)
Lines 4-19 Link Here
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'datatables.inc' %]
6
[% INCLUDE 'datatables.inc' %]
7
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
7
<script type="text/javascript" src="[% themelang %]/lib/yui/utilities/utilities.js"></script>
8
<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
8
<script type="text/javascript" src="[% themelang %]/lib/yui/button/button-min.js"></script>
9
<script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>
9
<script type="text/javascript" src="[% themelang %]/lib/yui/container/container_core-min.js"></script>
10
<script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script>
10
<script type="text/javascript" src="[% themelang %]/lib/yui/menu/menu-min.js"></script>
11
<script type="text/javascript" src="[% themelang %]/js/basketgroup.js"></script>
11
<script type="text/javascript" src="[% themelang %]/js/basketgroup.js"></script>
12
[% IF ( grouping ) %]
12
[% IF ( grouping ) %]
13
<script type="text/javascript" src="[% yuipath %]/yahoo-dom-event/yahoo-dom-event.js"></script>
13
<script type="text/javascript" src="[% themelang %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
14
<script type="text/javascript" src="[% yuipath %]/animation/animation-min.js"></script>
14
<script type="text/javascript" src="[% themelang %]/lib/yui/animation/animation-min.js"></script>
15
<script type="text/javascript" src="[% yuipath %]/dragdrop/dragdrop-min.js"></script>
15
<script type="text/javascript" src="[% themelang %]/lib/yui/dragdrop/dragdrop-min.js"></script>
16
<script type="text/javascript" src="[% yuipath %]/element/element-min.js"></script>
16
<script type="text/javascript" src="[% themelang %]/lib/yui/element/element-min.js"></script>
17
<style type="text/css">
17
<style type="text/css">
18
/*margin and padding on body element
18
/*margin and padding on body element
19
  can introduce errors in determining
19
  can introduce errors in determining
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (-7 lines)
Lines 72-83 Staff Client: Link Here
72
                  no: "Don't show"
72
                  no: "Don't show"
73
            - the format, audience, and material type icons in XSLT MARC21 results and detail pages in the staff client.
73
            - the format, audience, and material type icons in XSLT MARC21 results and detail pages in the staff client.
74
        -
74
        -
75
            - Use the Yahoo UI libraries
76
            - pref: yuipath
77
              choices:
78
                  local: "included with Koha (faster, will work if internet goes down)."
79
                  "http://yui.yahooapis.com/2.5.1/build": "from Yahoo's own servers (less demand on your servers)."
80
        -
81
            - pref: StaffAuthorisedValueImages
75
            - pref: StaffAuthorisedValueImages
82
              choices:
76
              choices:
83
                  yes: Show
77
                  yes: Show
84
- 

Return to bug 12494