[TwigBundle] renamed default widget files

fabpot · fabpot · commit 44edd8fe9644 · 2011-04-14T16:47:44.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -55,7 +55,7 @@
         <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
             <tag name="twig.extension" />
             <argument type="collection">
-                <argument>TwigBundle::table_layout.html.twig</argument>
+                <argument>TwigBundle:Form:div_layout.html.twig</argument>
             </argument>
         </service>
 
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/table_layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/table_layout.html.twig
@@ -1,4 +1,4 @@
-{% extends "TwigBundle::div_layout.html.twig" %}
+{% extends "TwigBundle:Form:div_layout.html.twig" %}
 
 {% block field__row %}
 {% spaceless %}
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php
@@ -28,7 +28,7 @@ protected function setUp()
         parent::setUp();
 
         $loader = new StubFilesystemLoader(array(
-            __DIR__.'/../../../../../../src/Symfony/Bundle/TwigBundle/Resources/views',
+            __DIR__.'/../../../../../../src/Symfony/Bundle/TwigBundle/Resources/views/Form',
         ));
 
         $this->extension = new FormExtension(array('div_layout.html.twig'));
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php
@@ -28,7 +28,7 @@ protected function setUp()
         parent::setUp();
 
         $loader = new StubFilesystemLoader(array(
-            __DIR__.'/../../../../../../src/Symfony/Bundle/TwigBundle/Resources/views',
+            __DIR__.'/../../../../../../src/Symfony/Bundle/TwigBundle/Resources/views/Form',
         ));
 
         $this->extension = new FormExtension(array('table_layout.html.twig'));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends "TwigBundle::div_layout.html.twig" %}`
	`1`	`+{% extends "TwigBundle:Form:div_layout.html.twig" %}`
`2`	`2`
`3`	`3`	`{% block field__row %}`
`4`	`4`	`{% spaceless %}`