@@ -, +, @@ - removes yuipath handling from C4/Templates.pm - removes the preference from sysprefs.sql - deletes the preference via updatedatabase.pl - removes the preference from the staff client preferences file - removes unused references to the YUI assets from the help file header include - adds the local YUI asset path to acqui/basketgroup.tt --- C4/Templates.pm | 7 ------- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 7 +++++++ .../intranet-tmpl/prog/en/includes/help-top.inc | 7 +------ .../prog/en/modules/acqui/basketgroup.tt | 16 ++++++++-------- .../en/modules/admin/preferences/staff_client.pref | 6 ------ 6 files changed, 16 insertions(+), 28 deletions(-) --- a/C4/Templates.pm +++ a/C4/Templates.pm @@ -100,10 +100,6 @@ sub output { } $vars->{lang} = $self->lang; $vars->{themelang} .= '/' . $self->preferredtheme . '/' . $self->lang; - $vars->{yuipath} = - ( C4::Context->preference("yuipath") eq "local" - ? ( $self->interface eq 'intranet' ? $vars->{themelang} . "/lib/yui" : "/opac-tmpl/lib/yui" ) - : C4::Context->preference("yuipath") ); $vars->{interface} = ( $self->{interface} ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' ); $vars->{theme} = $self->theme; @@ -245,9 +241,6 @@ sub gettemplate { # "/$theme/$lang"; # $template->param( # themelang => $themelang, -# yuipath => C4::Context->preference("yuipath") eq "local" -# ? "$themelang/lib/yui" -# : C4::Context->preference("yuipath"), # interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl', # theme => $theme, # lang => $lang --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -442,7 +442,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('XISBNDailyLimit','999','','The xISBN Web service is free for non-commercial use when usage does not exceed 1000 requests per day','Integer'), ('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'), ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), -('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'), ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), ('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') ; --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -8560,6 +8560,13 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("DELETE FROM systempreferences WHERE variable='yuipath'"); + print "Upgrade to $DBversion done ( Bug 12494 - Remove yuipath system preference )\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Online Help +Online help @@ -11,11 +11,6 @@ - - - - - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -4,16 +4,16 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - - - - + + + + [% IF ( grouping ) %] - - - - + + + +