tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php (from r100530)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111626 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-04 05:53:25 +00:00
parent 00a5a5bd5b
commit f04470ddf0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/LeftAndMain.php
View File

@ -271,7 +271,7 @@ class LeftAndMain extends Controller {
// Javascript combined files // Javascript combined files
Requirements::combine_files( Requirements::combine_files(
'assets/_base.js', '_base.js',
array( array(
'sapphire/thirdparty/prototype/prototype.js', 'sapphire/thirdparty/prototype/prototype.js',
'sapphire/thirdparty/behaviour/behaviour.js', 'sapphire/thirdparty/behaviour/behaviour.js',
@ -285,7 +285,7 @@ class LeftAndMain extends Controller {
); );
Requirements::combine_files( Requirements::combine_files(
'assets/_leftandmain.js', '_leftandmain.js',
array( array(
'sapphire/thirdparty/scriptaculous/effects.js', 'sapphire/thirdparty/scriptaculous/effects.js',
'sapphire/thirdparty/scriptaculous/dragdrop.js', 'sapphire/thirdparty/scriptaculous/dragdrop.js',
@ -298,7 +298,7 @@ class LeftAndMain extends Controller {
); );
Requirements::combine_files( Requirements::combine_files(
'assets/_cmsmain.js', '_cmsmain.js',
array( array(
'cms/javascript/CMSMain_left.js', 'cms/javascript/CMSMain_left.js',
'cms/javascript/CMSMain_right.js', 'cms/javascript/CMSMain_right.js',