reorganized assets

jfsimon · jfsimon · commit efb9bb0c49d2 · 2011-10-31T14:56:51.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 /app/config/parameters.yml
 /vendor
 /web/*_dev.php
+/web/media/puyo
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -31,13 +31,7 @@ public function registerBundles()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-    }
-
-    protected function getKernelParameters()
-    {
-        return array_merge(parent::getKernelParameters(), array(
-            'kernel.config_dir' => realpath(__DIR__.'/../src/Gamz/'.ucfirst(GAME).'Bundle/Resources/config'),
-        ));
+        $loader->load(__DIR__.'/../src/Gamz/'.ucfirst(GAME).'Bundle/Resources/config/config.yml');
     }
 
     public function getCacheDir()
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -23,7 +23,6 @@ twig:
 assetic:
     debug:          %kernel.debug%
     use_controller: false
-    read_from:      %kernel.root_dir%/../web/assets
     filters:
         compass:
             bin:    %assetic_compass%
diff --git a/src/Gamz/PuyoBundle b/src/Gamz/PuyoBundle
@@ -1 +1 @@
-Subproject commit d477c4be7cf343856a930bd3a7a5c4d81f820d66
+Subproject commit 8d55c1ca57aadd68bf2a0a8dc71025ff57efed7e
diff --git a/web/media/common/raphael.js b/web/media/common/raphael.js

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,7 @@ public function registerBundles()`
`31`	`31`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`32`	`32`	`{`
`33`	`33`	`$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');`
`34`		`- }`
`35`		`-`
`36`		`- protected function getKernelParameters()`
`37`		`- {`
`38`		`- return array_merge(parent::getKernelParameters(), array(`
`39`		`- 'kernel.config_dir' => realpath(__DIR__.'/../src/Gamz/'.ucfirst(GAME).'Bundle/Resources/config'),`
`40`		`- ));`
	`34`	`+ $loader->load(__DIR__.'/../src/Gamz/'.ucfirst(GAME).'Bundle/Resources/config/config.yml');`
`41`	`35`	`}`
`42`	`36`
`43`	`37`	`public function getCacheDir()`