فهرست منبع

rename template twig.html => html.twig

Thomas 14 سال پیش
والد
کامیت
cb99f782f3
73فایلهای تغییر یافته به همراه205 افزوده شده و 205 حذف شده
  1. 3 3
      Admin/Admin.php
  2. 3 3
      Builder/DatagridBuilder.php
  3. 5 5
      Builder/FormBuilder.php
  4. 5 5
      Builder/ListBuilder.php
  5. 1 1
      Controller/CoreController.php
  6. 2 2
      Resources/config/templates.xml
  7. 1 1
      Resources/doc/reference/filter_field_definition.rst
  8. 0 0
      Resources/views/CRUD/base_edit.html.twig
  9. 0 0
      Resources/views/CRUD/base_filter_field.html.twig
  10. 0 0
      Resources/views/CRUD/base_inline_edit_field.html.twig
  11. 0 0
      Resources/views/CRUD/base_list.html.twig
  12. 0 0
      Resources/views/CRUD/base_list_field.html.twig
  13. 0 0
      Resources/views/CRUD/base_standard_edit_field.html.twig
  14. 1 1
      Resources/views/CRUD/edit.twig.html
  15. 0 0
      Resources/views/CRUD/edit_array.html.twig
  16. 12 0
      Resources/views/CRUD/edit_bigint.html.twig
  17. 0 0
      Resources/views/CRUD/edit_boolean.html.twig
  18. 0 0
      Resources/views/CRUD/edit_choice.html.twig
  19. 0 0
      Resources/views/CRUD/edit_country.html.twig
  20. 0 0
      Resources/views/CRUD/edit_datetime.html.twig
  21. 0 0
      Resources/views/CRUD/edit_decimal.html.twig
  22. 0 0
      Resources/views/CRUD/edit_integer.html.twig
  23. 0 0
      Resources/views/CRUD/edit_many_association_script.html.twig
  24. 1 1
      Resources/views/CRUD/edit_many_to_many.twig.html
  25. 1 1
      Resources/views/CRUD/edit_many_to_one.twig.html
  26. 0 0
      Resources/views/CRUD/edit_one_association_script.html.twig
  27. 2 2
      Resources/views/CRUD/edit_one_to_many.twig.html
  28. 1 1
      Resources/views/CRUD/edit_one_to_one.twig.html
  29. 1 1
      Resources/views/CRUD/edit_bigint.twig.html
  30. 0 12
      Resources/views/CRUD/edit_smallint.twig.html
  31. 0 0
      Resources/views/CRUD/edit_string.html.twig
  32. 0 0
      Resources/views/CRUD/edit_text.html.twig
  33. 12 0
      Resources/views/CRUD/filter_boolean.html.twig
  34. 0 12
      Resources/views/CRUD/filter_boolean.twig.html
  35. 12 0
      Resources/views/CRUD/filter_callback.html.twig
  36. 0 12
      Resources/views/CRUD/filter_callback.twig.html
  37. 13 0
      Resources/views/CRUD/filter_identifier.html.twig
  38. 13 0
      Resources/views/CRUD/filter_integer.html.twig
  39. 13 0
      Resources/views/CRUD/filter_many_to_many.html.twig
  40. 0 13
      Resources/views/CRUD/filter_many_to_many.twig.html
  41. 1 1
      Resources/views/CRUD/filter_identifier.twig.html
  42. 0 13
      Resources/views/CRUD/filter_many_to_one.twig.html
  43. 1 1
      Resources/views/CRUD/filter_integer.twig.html
  44. 0 13
      Resources/views/CRUD/filter_string.twig.html
  45. 13 0
      Resources/views/CRUD/filter_text.html.twig
  46. 0 13
      Resources/views/CRUD/filter_text.twig.html
  47. 1 1
      Resources/views/CRUD/list.twig.html
  48. 0 0
      Resources/views/CRUD/list__batch.html.twig
  49. 1 1
      Resources/views/CRUD/list_array.twig.html
  50. 11 0
      Resources/views/CRUD/list_bigint.html.twig
  51. 0 11
      Resources/views/CRUD/list_bigint.twig.html
  52. 1 1
      Resources/views/CRUD/list_boolean.twig.html
  53. 1 1
      Resources/views/CRUD/list_datetime.twig.html
  54. 14 0
      Resources/views/CRUD/list_decimal.html.twig
  55. 0 14
      Resources/views/CRUD/list_decimal.twig.html
  56. 11 0
      Resources/views/CRUD/list_identifier.html.twig
  57. 0 11
      Resources/views/CRUD/list_identifier.twig.html
  58. 11 0
      Resources/views/CRUD/list_integer.html.twig
  59. 0 11
      Resources/views/CRUD/list_integer.twig.html
  60. 0 0
      Resources/views/CRUD/list_many_to_many.html.twig
  61. 1 1
      Resources/views/CRUD/list_many_to_one.twig.html
  62. 0 0
      Resources/views/CRUD/list_one_to_many.html.twig
  63. 1 1
      Resources/views/CRUD/list_one_to_one.twig.html
  64. 11 0
      Resources/views/CRUD/list_smallint.html.twig
  65. 0 11
      Resources/views/CRUD/list_smallint.twig.html
  66. 11 0
      Resources/views/CRUD/list_string.html.twig
  67. 0 11
      Resources/views/CRUD/list_string.twig.html
  68. 11 0
      Resources/views/CRUD/list_text.html.twig
  69. 0 11
      Resources/views/CRUD/list_text.twig.html
  70. 0 0
      Resources/views/Core/dashboard.html.twig
  71. 0 0
      Resources/views/ajax_layout.html.twig
  72. 0 0
      Resources/views/standard_layout.html.twig
  73. 2 2
      Twig/Extension/BaseApplicationExtension.php

+ 3 - 3
Admin/Admin.php

@@ -262,7 +262,7 @@ abstract class Admin extends ContainerAware
                 'code'  => '_batch',
                 'type'  => 'batch',
             ));
-            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list__batch.twig.html');
+            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list__batch.html.twig');
             $this->listFieldDescriptions = array( '_batch' => $fieldDescription ) + $this->listFieldDescriptions;
         }
 
@@ -654,7 +654,7 @@ abstract class Admin extends ContainerAware
      */
     public function getListTemplate()
     {
-        return 'SonataBaseApplicationBundle:CRUD:list.twig.html';
+        return 'SonataBaseApplicationBundle:CRUD:list.html.twig';
     }
 
     /**
@@ -664,7 +664,7 @@ abstract class Admin extends ContainerAware
      */
     public function getEditTemplate()
     {
-        return 'SonataBaseApplicationBundle:CRUD:edit.twig.html';
+        return 'SonataBaseApplicationBundle:CRUD:edit.html.twig';
     }
 
     /**

+ 3 - 3
Builder/DatagridBuilder.php

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

+ 5 - 5
Builder/FormBuilder.php

@@ -398,26 +398,26 @@ class FormBuilder implements FormBuilderInterface
 
         // fix template value for doctrine association fields
         if (!$fieldDescription->getTemplate()) {
-             $fieldDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:edit_%s.twig.html', $fieldDescription->getType()));
+             $fieldDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:edit_%s.html.twig', $fieldDescription->getType()));
         }
 
         if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_ONE) {
-            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_one_to_one.twig.html');
+            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_one_to_one.html.twig');
             $admin->attachAdminClass($fieldDescription);
         }
 
         if ($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_ONE) {
-            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_many_to_one.twig.html');
+            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_many_to_one.html.twig');
             $admin->attachAdminClass($fieldDescription);
         }
 
         if ($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_MANY) {
-            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_many_to_many.twig.html');
+            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_many_to_many.html.twig');
             $admin->attachAdminClass($fieldDescription);
         }
 
         if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_MANY) {
-            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_one_to_many.twig.html');
+            $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:edit_one_to_many.html.twig');
 
             if($fieldDescription->getOption('edit') == 'inline' && !$fieldDescription->getOption('widget_form_field')) {
                 $fieldDescription->setOption('widget_form_field', 'Bundle\\Sonata\\BaseApplicationBundle\\Form\\EditableFieldGroup');

+ 5 - 5
Builder/ListBuilder.php

@@ -63,22 +63,22 @@ class ListBuilder implements ListBuilderInterface
 
         if (!$fieldDescription->getTemplate()) {
 
-            $fieldDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:list_%s.twig.html', $fieldDescription->getType()));
+            $fieldDescription->setTemplate(sprintf('SonataBaseApplicationBundle:CRUD:list_%s.html.twig', $fieldDescription->getType()));
 
             if ($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_ONE) {
-                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_many_to_one.twig.html');
+                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_many_to_one.html.twig');
             }
 
             if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_ONE) {
-                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_one_to_one.twig.html');
+                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_one_to_one.html.twig');
             }
 
             if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_MANY) {
-                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_one_to_many.twig.html');
+                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_one_to_many.html.twig');
             }
 
             if ($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_MANY) {
-                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_many_to_many.twig.html');
+                $fieldDescription->setTemplate('SonataBaseApplicationBundle:CRUD:list_many_to_many.html.twig');
             }
         }
 

+ 1 - 1
Controller/CoreController.php

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

+ 2 - 2
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">SonataBaseApplicationBundle::standard_layout.twig.html</parameter>
-        <parameter key="base_application.templates.ajax">SonataBaseApplicationBundle::ajax_layout.twig.html</parameter>
+        <parameter key="base_application.templates.layout">SonataBaseApplicationBundle::standard_layout.html.twig</parameter>
+        <parameter key="base_application.templates.ajax">SonataBaseApplicationBundle::ajax_layout.html.twig</parameter>
     </parameters>
 
 </container>

+ 1 - 1
Resources/doc/reference/filter_field_definition.rst

@@ -30,7 +30,7 @@ Example
         {
 
             $datagrid->add('with_open_comments', array(
-                'template' => 'SonataBaseApplicationBundle:CRUD:filter_callback.twig.html',
+                'template' => 'SonataBaseApplicationBundle:CRUD:filter_callback.html.twig',
                 'type' => 'callback',
                 'filter_options' => array(
                     'filter' => array($this, 'getWithOpenCommentFilter'),

Resources/views/CRUD/base_edit.twig.html → Resources/views/CRUD/base_edit.html.twig


Resources/views/CRUD/base_filter_field.twig.html → Resources/views/CRUD/base_filter_field.html.twig


Resources/views/CRUD/base_inline_edit_field.twig.html → Resources/views/CRUD/base_inline_edit_field.html.twig


Resources/views/CRUD/base_list.twig.html → Resources/views/CRUD/base_list.html.twig


Resources/views/CRUD/base_list_field.twig.html → Resources/views/CRUD/base_list_field.html.twig


Resources/views/CRUD/base_standard_edit_field.twig.html → Resources/views/CRUD/base_standard_edit_field.html.twig


+ 1 - 1
Resources/views/CRUD/edit.twig.html

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

Resources/views/CRUD/edit_array.twig.html → Resources/views/CRUD/edit_array.html.twig


+ 12 - 0
Resources/views/CRUD/edit_bigint.html.twig

@@ -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:edit_integer.html.twig' %}

Resources/views/CRUD/edit_boolean.twig.html → Resources/views/CRUD/edit_boolean.html.twig


Resources/views/CRUD/edit_choice.twig.html → Resources/views/CRUD/edit_choice.html.twig


Resources/views/CRUD/edit_country.twig.html → Resources/views/CRUD/edit_country.html.twig


Resources/views/CRUD/edit_datetime.twig.html → Resources/views/CRUD/edit_datetime.html.twig


Resources/views/CRUD/edit_decimal.twig.html → Resources/views/CRUD/edit_decimal.html.twig


Resources/views/CRUD/edit_integer.twig.html → Resources/views/CRUD/edit_integer.html.twig


Resources/views/CRUD/edit_many_association_script.twig.html → Resources/views/CRUD/edit_many_association_script.html.twig


+ 1 - 1
Resources/views/CRUD/edit_many_to_many.twig.html

@@ -31,5 +31,5 @@ file that was distributed with this source code.
         </div>
     </div>
 
-    {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
+    {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.html.twig' %}
 {% endblock %}

+ 1 - 1
Resources/views/CRUD/edit_many_to_one.twig.html

@@ -54,6 +54,6 @@ file that was distributed with this source code.
             </div>
         </div>
 
-        {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
+        {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.html.twig' %}
     {% endif %}
 {% endblock %}

Resources/views/CRUD/edit_one_association_script.twig.html → Resources/views/CRUD/edit_one_association_script.html.twig


+ 2 - 2
Resources/views/CRUD/edit_one_to_many.twig.html

@@ -72,7 +72,7 @@ file that was distributed with this source code.
                 </a>
             </span>
         
-            {% include 'SonataBaseApplicationBundle:CRUD:edit_one_association_script.twig.html' %}
+            {% include 'SonataBaseApplicationBundle:CRUD:edit_one_association_script.html.twig' %}
         {% else %}
             <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id}}" >
                 <a
@@ -90,7 +90,7 @@ file that was distributed with this source code.
 
             </div>
         
-            {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
+            {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.html.twig' %}
         {% endif %}
     </div>
 {% endblock %}

+ 1 - 1
Resources/views/CRUD/edit_one_to_one.twig.html

@@ -53,6 +53,6 @@ file that was distributed with this source code.
             </div>
         </div>
 
-        {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.twig.html' %}
+        {% include 'SonataBaseApplicationBundle:CRUD:edit_many_association_script.html.twig' %}
     {% endif %}
 {% endblock %}

+ 1 - 1
Resources/views/CRUD/edit_bigint.twig.html

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

+ 0 - 12
Resources/views/CRUD/edit_smallint.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:edit_integer.twig.html' %}

Resources/views/CRUD/edit_string.twig.html → Resources/views/CRUD/edit_string.html.twig


Resources/views/CRUD/edit_text.twig.html → Resources/views/CRUD/edit_text.html.twig


+ 12 - 0
Resources/views/CRUD/filter_boolean.html.twig

@@ -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.html.twig' %}

+ 0 - 12
Resources/views/CRUD/filter_boolean.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}

+ 12 - 0
Resources/views/CRUD/filter_callback.html.twig

@@ -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.html.twig' %}

+ 0 - 12
Resources/views/CRUD/filter_callback.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}

+ 13 - 0
Resources/views/CRUD/filter_identifier.html.twig

@@ -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.html.twig' %}
+

+ 13 - 0
Resources/views/CRUD/filter_integer.html.twig

@@ -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.html.twig' %}
+

+ 13 - 0
Resources/views/CRUD/filter_many_to_many.html.twig

@@ -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.html.twig' %}
+

+ 0 - 13
Resources/views/CRUD/filter_many_to_many.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
-

+ 1 - 1
Resources/views/CRUD/filter_identifier.twig.html

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

+ 0 - 13
Resources/views/CRUD/filter_many_to_one.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
-

+ 1 - 1
Resources/views/CRUD/filter_integer.twig.html

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

+ 0 - 13
Resources/views/CRUD/filter_string.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
-

+ 13 - 0
Resources/views/CRUD/filter_text.html.twig

@@ -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.html.twig' %}
+

+ 0 - 13
Resources/views/CRUD/filter_text.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_filter_field.twig.html' %}
-

+ 1 - 1
Resources/views/CRUD/list.twig.html

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

Resources/views/CRUD/list__batch.twig.html → Resources/views/CRUD/list__batch.html.twig


+ 1 - 1
Resources/views/CRUD/list_array.twig.html

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

+ 11 - 0
Resources/views/CRUD/list_bigint.html.twig

@@ -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.html.twig' %}

+ 0 - 11
Resources/views/CRUD/list_bigint.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:list_integer.twig.html' %}

+ 1 - 1
Resources/views/CRUD/list_boolean.twig.html

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

+ 1 - 1
Resources/views/CRUD/list_datetime.twig.html

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

+ 14 - 0
Resources/views/CRUD/list_decimal.html.twig

@@ -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.html.twig' %}
+
+{% block field%}{{ value }}{% endblock %}

+ 0 - 14
Resources/views/CRUD/list_decimal.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}
-
-{% block field%}{{ value }}{% endblock %}

+ 11 - 0
Resources/views/CRUD/list_identifier.html.twig

@@ -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.html.twig' %}

+ 0 - 11
Resources/views/CRUD/list_identifier.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

+ 11 - 0
Resources/views/CRUD/list_integer.html.twig

@@ -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.html.twig' %}

+ 0 - 11
Resources/views/CRUD/list_integer.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

Resources/views/CRUD/list_many_to_many.twig.html → Resources/views/CRUD/list_many_to_many.html.twig


+ 1 - 1
Resources/views/CRUD/list_many_to_one.twig.html

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

Resources/views/CRUD/list_one_to_many.twig.html → Resources/views/CRUD/list_one_to_many.html.twig


+ 1 - 1
Resources/views/CRUD/list_one_to_one.twig.html

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

+ 11 - 0
Resources/views/CRUD/list_smallint.html.twig

@@ -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.html.twig' %}

+ 0 - 11
Resources/views/CRUD/list_smallint.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:list_integer.twig.html' %}

+ 11 - 0
Resources/views/CRUD/list_string.html.twig

@@ -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.html.twig' %}

+ 0 - 11
Resources/views/CRUD/list_string.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

+ 11 - 0
Resources/views/CRUD/list_text.html.twig

@@ -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.html.twig' %}

+ 0 - 11
Resources/views/CRUD/list_text.twig.html

@@ -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 'SonataBaseApplicationBundle:CRUD:base_list_field.twig.html' %}

Resources/views/Core/dashboard.twig.html → Resources/views/Core/dashboard.html.twig


Resources/views/ajax_layout.twig.html → Resources/views/ajax_layout.html.twig


Resources/views/standard_layout.twig.html → Resources/views/standard_layout.html.twig


+ 2 - 2
Twig/Extension/BaseApplicationExtension.php

@@ -168,12 +168,12 @@ class BaseApplicationExtension extends \Twig_Extension
             $params['edit']          = $fieldDescription->getOption('edit', 'standard');
             $params['inline']        = $fieldDescription->getOption('inline', 'natural');
 
-            $base_template = sprintf('SonataBaseApplicationBundle:CRUD:base_%s_edit_field.twig.html', 'standard');
+            $base_template = sprintf('SonataBaseApplicationBundle:CRUD:base_%s_edit_field.html.twig', 'standard');
         } else {
             $params['edit']          = $parentFieldDescription->getOption('edit', 'standard');
             $params['inline']        = $parentFieldDescription->getOption('inline', 'natural');
 
-            $base_template = sprintf('SonataBaseApplicationBundle:CRUD:base_%s_edit_field.twig.html', $params['edit']);
+            $base_template = sprintf('SonataBaseApplicationBundle:CRUD:base_%s_edit_field.html.twig', $params['edit']);
         }
 
         $template = $this->environment->loadTemplate($fieldDescription->getTemplate());