rename template and controller (update last symfony changes)

Admin/Admin.php

@@ -109,7 +109,7 @@ abstract class Admin extends ContainerAware
 
                 $this->baseRoutePattern = sprintf('/%s/%s/%s',
                     $this->urlize($matches[2], '-'),
-                    $this->urlize($matches[4], '-'),
+                    $this->urlize($matches[3], '-'),
                     $this->urlize($matches[5], '-')
                 );
             } else {
@@ -133,7 +133,7 @@ abstract class Admin extends ContainerAware
 
                 $this->baseRouteName = sprintf('admin_%s_%s_%s',
                     $this->urlize($matches[2]),
-                    $this->urlize($matches[4]),
+                    $this->urlize($matches[3]),
                     $this->urlize($matches[5])
                 );
             } else {
@@ -311,7 +311,7 @@ abstract class Admin extends ContainerAware
      */
     public function getListTemplate()
     {
-        return 'Sonata\BaseApplicationBundle:CRUD:list.twig';
+        return 'SonataBaseApplicationBundle:CRUD:list.twig.html';
     }
 
     /**
@@ -321,7 +321,7 @@ abstract class Admin extends ContainerAware
      */
     public function getEditTemplate()
     {
-        return 'Sonata\BaseApplicationBundle:CRUD:edit.twig';
+        return 'SonataBaseApplicationBundle:CRUD:edit.twig.html';
     }
 
     public function getReflectionFields()

Admin/EntityAdmin.php

@@ -119,22 +119,22 @@ abstract class EntityAdmin extends Admin
             // fix template value for doctrine association fields
             if(!$formDescription->getTemplate()) {
 
-                $formDescription->setTemplate(sprintf('Sonata\BaseApplicationBundle:CRUD:edit_%s.twig', $formDescription->getType()));
+                $formDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:edit_%s.twig.html', $formDescription->getType()));
                 
                 if($formDescription->getType() == ClassMetadataInfo::ONE_TO_ONE) {
-                    $formDescription->setTemplate('Sonata\BaseApplicationBundle:CRUD:edit_one_to_one.twig');
+                    $formDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_one_to_one.twig.html');
                 }
 
                 if($formDescription->getType() == ClassMetadataInfo::MANY_TO_ONE) {
-                    $formDescription->setTemplate('Sonata\BaseApplicationBundle:CRUD:edit_many_to_one.twig');
+                    $formDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_many_to_one.twig.html');
                 }
 
                 if($formDescription->getType() == ClassMetadataInfo::MANY_TO_MANY) {
-                    $formDescription->setTemplate('Sonata\BaseApplicationBundle:CRUD:edit_many_to_many.twig');
+                    $formDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_many_to_many.twig.html');
                 }
 
                 if($formDescription->getType() == ClassMetadataInfo::ONE_TO_MANY) {
-                    $formDescription->setTemplate('Sonata\BaseApplicationBundle:CRUD:edit_one_to_many.twig');
+                    $formDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_one_to_many.twig.html');
                 }
 
             }
@@ -197,22 +197,22 @@ abstract class EntityAdmin extends Admin
 
             if(!$fieldDescription->getTemplate()) {
 
-                $fieldDescription->setTemplate(sprintf('Sonata/BaseApplicationBundle:CRUD:list_%s.twig', $fieldDescription->getType()));
+                $fieldDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:list_%s.twig.html', $fieldDescription->getType()));
 
                 if($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_ONE) {
-                    $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:list_many_to_one.twig');
+                    $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_many_to_one.twig.html');
                 }
 
                 if($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_ONE) {
-                    $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:list_one_to_one.twig');
+                    $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_one_to_one.twig.html');
                 }
 
                 if($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_MANY) {
-                    $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:list_one_to_many.twig');
+                    $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_one_to_many.twig.html');
                 }
 
                 if($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_MANY) {
-                    $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:list_many_to_many.twig');
+                    $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_many_to_many.twig.html');
                 }
             }
 
@@ -230,7 +230,7 @@ abstract class EntityAdmin extends Admin
                 'label' => 'batch',
                 'code'  => '_batch'
             ));
-            $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:list__batch.twig');
+            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list__batch.twig.html');
             $this->listFields = array( '_batch' => $fieldDescription ) + $this->listFields;
         }
 

Controller/CoreController.php

@@ -72,7 +72,7 @@ class CoreController extends Controller
     public function dashboardAction()
     {
 
-        return $this->render('Sonata/BaseApplicationBundle:Core:dashboard.twig', array(
+        return $this->render('SonataBaseApplicationBundle:Core:dashboard.twig.html', array(
             'groups' => $this->get('base_application.admin.pool')->getGroups()
         ));
     }

Resources/config/routing/base_application.xml

@@ -5,11 +5,11 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/routing http://www.symfony-project.org/schema/routing/routing-1.0.xsd">
 
     <route id="sonata_base_application_dashboard" pattern="/dashboard">
-        <default key="_controller">Sonata\BaseApplicationBundle:Core:dashboard</default>
+        <default key="_controller">SonataBaseApplicationBundle:Core:dashboard</default>
     </route>
 
     <route id="sonata_base_application_retrieve_form_element" pattern="/core/{code}/get-form-field-element/{element_id}">
-        <default key="_controller">Sonata\BaseApplicationBundle:Core:retrieveFormFieldElement</default>
+        <default key="_controller">SonataBaseApplicationBundle:Core:retrieveFormFieldElement</default>
     </route>
 
 </routes>

Resources/config/templates.xml

@@ -5,8 +5,8 @@
            xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="base_application.templates.layout">Sonata\BaseApplicationBundle::standard_layout.twig</parameter>
-        <parameter key="base_application.templates.ajax">Sonata\BaseApplicationBundle::ajax_layout.twig</parameter>
+        <parameter key="base_application.templates.layout">SonataBaseApplicationBundle::standard_layout.twig.html</parameter>
+        <parameter key="base_application.templates.ajax">SonataBaseApplicationBundle::ajax_layout.twig.html</parameter>
     </parameters>
 
 </container>

Resources/views/CRUD/edit.twig

@@ -9,5 +9,5 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit.twig.html' %}
 

Resources/views/CRUD/edit_array.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}
     <span class="edit">

Resources/views/CRUD/edit_choice.twig

@@ -9,4 +9,4 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}

Resources/views/CRUD/edit_datetime.twig.html

@@ -0,0 +1,12 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}

Resources/views/CRUD/edit_integer.twig

@@ -9,6 +9,6 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}{{ form_field(field_element, {'class' : 'title'}) }}{% endblock %}

Resources/views/CRUD/edit_string.twig

@@ -9,6 +9,6 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}{{ form_field(field_element, {'class' : 'title'}) }}{% endblock %}

Resources/views/CRUD/edit_many_to_many.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}
     <div id="field_container_{{ admin.code }}_{{ field_element.id}}">
@@ -26,5 +26,5 @@ file that was distributed with this source code.
         </div>
     </div>
 
-    {% include 'Sonata/BaseApplicationBundle:CRUD:edit_many_association_script.twig' %}
+    {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
 {% endblock %}

Resources/views/CRUD/edit_many_to_one.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}
     <div id="field_container_{{ admin.code }}_{{ field_element.id}}">
@@ -26,5 +26,5 @@ file that was distributed with this source code.
         </div>
     </div>
 
-    {% include 'Sonata/BaseApplicationBundle:CRUD:edit_many_association_script.twig' %}
+    {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
 {% endblock %}

Resources/views/CRUD/edit_one_to_many.twig

@@ -9,4 +9,4 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}

Resources/views/CRUD/edit_one_to_one.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}
     {% if field_description.options.edit == 'inline' %}
@@ -32,6 +32,6 @@ file that was distributed with this source code.
             </div>
         </div>
 
-        {% include 'Sonata/BaseApplicationBundle:CRUD:edit_many_association_script.twig' %}
+        {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
     {% endif %}
 {% endblock %}

Resources/views/CRUD/edit_text.twig

@@ -9,6 +9,6 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}{{ form_field(field_element, {'class' : 'title'}) }}{% endblock %}

Resources/views/CRUD/edit_decimal.twig

@@ -9,6 +9,6 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_edit_field.twig.html' %}
 
 {% block field %}{{ form_field(field_element, {'class' : 'title'}) }}{% endblock %}

Resources/views/CRUD/filter_boolean.twig

@@ -1,12 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}

Resources/views/CRUD/filter_boolean.twig.html

@@ -0,0 +1,12 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}

Resources/views/CRUD/filter_callback.twig

@@ -1,12 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}

Resources/views/CRUD/filter_callback.twig.html

@@ -0,0 +1,12 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}

Resources/views/CRUD/filter_many_to_many.twig

@@ -9,5 +9,5 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
 

Resources/views/CRUD/filter_integer.twig

@@ -9,5 +9,5 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
 

Resources/views/CRUD/filter_identifier.twig

@@ -9,5 +9,5 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
 

Resources/views/CRUD/filter_string.twig

@@ -1,13 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}
-

Resources/views/CRUD/filter_string.twig.html

@@ -0,0 +1,13 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
+

Resources/views/CRUD/filter_text.twig

@@ -1,13 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_filter_field.twig' %}
-

Resources/views/CRUD/filter_text.twig.html

@@ -0,0 +1,13 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+
+{% extends 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
+

Resources/views/CRUD/list.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list.twig.html' %}
 
 {% block table_body %}
     {% for element in datagrid.results %}

Resources/views/CRUD/list__batch.twig

@@ -9,6 +9,6 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
 {% block field%}<input type="checkbox" name="idx[]" value="{{ object.id }}" />{% endblock %}

Resources/views/CRUD/list_array.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
 {% block field%}
     {% for key, val in value %}

Resources/views/CRUD/list_bigint.twig

@@ -8,4 +8,4 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 
 #}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:list_integer.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:list_integer.twig.html' %}

Resources/views/CRUD/list_boolean.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
 {% block field%}<img src="/bundles/baseapplication/famfamfam/{% if value %}accept{% else %}exclamation{% endif %}.png" />{% endblock %}
 

Resources/views/CRUD/list_datetime.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
 {% block field%}{{ value|date }}{% endblock %}
 

Resources/views/CRUD/list_decimal.twig

@@ -1,14 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
-
-{% block field%}{{ value }}{% endblock %}

Resources/views/CRUD/list_decimal.twig.html

@@ -0,0 +1,14 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
+
+{% block field%}{{ value }}{% endblock %}

Resources/views/CRUD/list_identifier.twig.html

@@ -0,0 +1,11 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

Resources/views/CRUD/edit_datetime.twig

@@ -8,5 +8,4 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 
 #}
-
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_edit_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

Resources/views/CRUD/list_many_to_one.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
 {% block field%}
     {% if value %}

Resources/views/CRUD/list_mediumint.twig

@@ -1,11 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:list_integer.twig' %}

Resources/views/CRUD/list_identifier.twig

@@ -8,4 +8,4 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 
 #}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:list_integer.twig.html' %}

Resources/views/CRUD/list_one_to_one.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
 
 {% block field%}
 

Resources/views/CRUD/list_smallint.twig

@@ -1,11 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:list_integer.twig' %}

Resources/views/CRUD/list_smallint.twig.html

@@ -0,0 +1,11 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+{% extends 'SonataBaseApplicationBundle:CRUD:list_integer.twig.html' %}

Resources/views/CRUD/list_string.twig

@@ -1,11 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}

Resources/views/CRUD/list_string.twig.html

@@ -0,0 +1,11 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

Resources/views/CRUD/list_text.twig

@@ -1,11 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}

Resources/views/CRUD/list_text.twig.html

@@ -0,0 +1,11 @@
+{#
+
+This file is part of the Sonata package.
+
+(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+
+#}
+{% extends 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

Resources/views/CRUD/list_tinyint.twig

@@ -1,11 +0,0 @@
-{#
-
-This file is part of the Sonata package.
-
-(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-
-#}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:list_integer.twig' %}

Resources/views/CRUD/list_integer.twig

@@ -8,4 +8,4 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 
 #}
-{% extends 'Sonata/BaseApplicationBundle:CRUD:base_list_field.twig' %}
+{% extends 'SonataBaseApplicationBundle:CRUD:list_integer.twig.html' %}

Resources/views/Core/dashboard.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'Sonata/BaseApplicationBundle::standard_layout.twig' %}
+{% extends 'SonataBaseApplicationBundle::standard_layout.twig.html' %}
 
 {% block title %}{% trans 'title_dashboard' from 'BaseApplicationBundle' %}{% endblock%}
 {% block content %}

Tool/Datagrid.php

@@ -162,14 +162,14 @@ class Datagrid
             }
 
             if(!$fieldDescription->getTemplate()) {
-                $fieldDescription->setTemplate(sprintf('Sonata/BaseApplicationBundle:CRUD:filter_%s.twig', $fieldDescription->getType()));
+                $fieldDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:filter_%s.twig.html', $fieldDescription->getType()));
 
                 if($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_ONE) {
-                    $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:filter_many_to_one.twig');
+                    $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:filter_many_to_one.twig.html');
                 }
 
                 if($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_MANY) {
-                    $fieldDescription->setTemplate('Sonata/BaseApplicationBundle:CRUD:filter_many_to_many.twig');
+                    $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:filter_many_to_many.twig.html');
                 }
             }
         }