Twig paths @ syntax

Seb33300 · Seb33300 · commit e0a31ea35894 · 2017-12-21T18:25:54.000+01:00
diff --git a/Datatable/Column/AbstractColumn.php b/Datatable/Column/AbstractColumn.php
@@ -412,7 +412,7 @@ public function isSelectColumn()
      */
     public function getOptionsTemplate()
     {
-        return 'SgDatatablesBundle:column:column.html.twig';
+        return '@SgDatatables/column/column.html.twig';
     }
 
     /**
diff --git a/Datatable/Column/ActionColumn.php b/Datatable/Column/ActionColumn.php
@@ -165,7 +165,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:action.html.twig';
+        return '@SgDatatables/render/action.html.twig';
     }
 
     /**
diff --git a/Datatable/Column/BooleanColumn.php b/Datatable/Column/BooleanColumn.php
@@ -138,7 +138,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:boolean.html.twig';
+        return '@SgDatatables/render/boolean.html.twig';
     }
 
     /**
@@ -148,7 +148,7 @@ public function renderPostCreateDatatableJsContent()
     {
         if ($this->editable instanceof EditableInterface) {
             return $this->twig->render(
-                'SgDatatablesBundle:column:column_post_create_dt.js.twig',
+                '@SgDatatables/column/column_post_create_dt.js.twig',
                 array(
                     'column_class_editable_selector' => $this->getColumnClassEditableSelector(),
                     'editable_options' => $this->editable,
diff --git a/Datatable/Column/Column.php b/Datatable/Column/Column.php
@@ -94,7 +94,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:column.html.twig';
+        return '@SgDatatables/render/column.html.twig';
     }
 
     /**
@@ -104,7 +104,7 @@ public function renderPostCreateDatatableJsContent()
     {
         if ($this->editable instanceof EditableInterface) {
             return $this->twig->render(
-                'SgDatatablesBundle:column:column_post_create_dt.js.twig',
+                '@SgDatatables/column/column_post_create_dt.js.twig',
                 array(
                     'column_class_editable_selector' => $this->getColumnClassEditableSelector(),
                     'editable_options' => $this->editable,
diff --git a/Datatable/Column/DateTimeColumn.php b/Datatable/Column/DateTimeColumn.php
@@ -114,7 +114,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:datetime.html.twig';
+        return '@SgDatatables/render/datetime.html.twig';
     }
 
     /**
@@ -124,7 +124,7 @@ public function renderPostCreateDatatableJsContent()
     {
         if ($this->editable instanceof EditableInterface) {
             return $this->twig->render(
-                'SgDatatablesBundle:column:column_post_create_dt.js.twig',
+                '@SgDatatables/column/column_post_create_dt.js.twig',
                 array(
                     'column_class_editable_selector' => $this->getColumnClassEditableSelector(),
                     'editable_options' => $this->editable,
diff --git a/Datatable/Column/ImageColumn.php b/Datatable/Column/ImageColumn.php
@@ -145,7 +145,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:thumb.html.twig';
+        return '@SgDatatables/render/thumb.html.twig';
     }
 
     //-------------------------------------------------
diff --git a/Datatable/Column/MultiselectColumn.php b/Datatable/Column/MultiselectColumn.php
@@ -78,7 +78,7 @@ public function isUnique()
      */
     public function getOptionsTemplate()
     {
-        return 'SgDatatablesBundle:column:multiselect.html.twig';
+        return '@SgDatatables/column/multiselect.html.twig';
     }
 
     /**
@@ -121,7 +121,7 @@ public function renderSingleField(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:multiselect.html.twig';
+        return '@SgDatatables/render/multiselect.html.twig';
     }
 
     /**
diff --git a/Datatable/Filter/DateRangeFilter.php b/Datatable/Filter/DateRangeFilter.php
@@ -32,7 +32,7 @@ class DateRangeFilter extends AbstractFilter
      */
     public function getTemplate()
     {
-        return 'SgDatatablesBundle:filter:daterange.html.twig';
+        return '@SgDatatables/filter/daterange.html.twig';
     }
 
     /**
diff --git a/Datatable/Filter/Select2Filter.php b/Datatable/Filter/Select2Filter.php
@@ -87,7 +87,7 @@ class Select2Filter extends SelectFilter
      */
     public function getTemplate()
     {
-        return 'SgDatatablesBundle:filter:select2.html.twig';
+        return '@SgDatatables/filter/select2.html.twig';
     }
 
     //-------------------------------------------------
diff --git a/Datatable/Filter/SelectFilter.php b/Datatable/Filter/SelectFilter.php
@@ -56,7 +56,7 @@ class SelectFilter extends AbstractFilter
      */
     public function getTemplate()
     {
-        return 'SgDatatablesBundle:filter:select.html.twig';
+        return '@SgDatatables/filter/select.html.twig';
     }
 
     /**
diff --git a/Datatable/Filter/TextFilter.php b/Datatable/Filter/TextFilter.php
@@ -30,7 +30,7 @@ class TextFilter extends AbstractFilter
      */
     public function getTemplate()
     {
-        return 'SgDatatablesBundle:filter:input.html.twig';
+        return '@SgDatatables/filter/input.html.twig';
     }
 
     /**
diff --git a/Resources/doc/columns.md b/Resources/doc/columns.md
@@ -15,11 +15,11 @@ Represents the most basic column.
 
 ### Options template
 
-SgDatatablesBundle:column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Cell content template
 
-SgDatatablesBundle:render:column.html.twig
+@SgDatatables/render/column.html.twig
 
 ### Options
 
@@ -159,11 +159,11 @@ Represents a column, optimized for boolean values.
 
 ### Options template
 
-SgDatatablesBundle:column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Cell content template
 
-SgDatatablesBundle:render:boolean.html.twig
+@SgDatatables/render/boolean.html.twig
 
 ### Options
 
@@ -228,11 +228,11 @@ Represents a column, optimized for date time values.
 
 ### Options template
 
-SgDatatablesBundle:column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Cell content template
 
-SgDatatablesBundle:render:datetime.html.twig
+@SgDatatables/render/datetime.html.twig
 
 ### Options
 
@@ -281,11 +281,11 @@ A complete example of an ImageColumn can be found in the [demo bundle](https://g
 
 ### Options template
 
-SgDatatablesBundle:column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Cell content template
 
-SgDatatablesBundle:render:thumb.html.twig
+@SgDatatables/render/thumb.html.twig
 
 ### Options
 
@@ -343,7 +343,7 @@ Represents a virtual column.
 
 ### Options template
 
-SgDatatablesBundle:Column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Options
 
@@ -408,11 +408,11 @@ A Column to display CRUD action labels or buttons.
 
 ### Options template
 
-SgDatatablesBundle:Column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Cell content template
 
-SgDatatablesBundle:render:action.html.twig
+@SgDatatables/render/action.html.twig
 
 ### Action column options
 
@@ -545,11 +545,11 @@ Support for Bulk Actions.
 
 ### Options template
 
-SgDatatablesBundle:Column:multiselect.html.twig
+@SgDatatables/column/multiselect.html.twig
 
 ### Cell content template
 
-SgDatatablesBundle:render:multiselect.html.twig
+@SgDatatables/render/multiselect.html.twig
 
 ### Options
 
@@ -666,7 +666,7 @@ Represents a column, optimized for numbers.
 
 ### Options template
 
-SgDatatablesBundle:Column:column.html.twig
+@SgDatatables/column/column.html.twig
 
 ### Options
 
diff --git a/Resources/doc/editable.md b/Resources/doc/editable.md
@@ -55,7 +55,7 @@ __
 
 ### Template
 
-SgDatatablesBundle:column:column_post_create_dt.js.twig
+@SgDatatables/column/column_post_create_dt.js.twig
 
 ### Options
 
@@ -96,7 +96,7 @@ __
 
 ### Template
 
-SgDatatablesBundle:column:column_post_create_dt.js.twig
+@SgDatatables/column/column_post_create_dt.js.twig
 
 ### Options
 
@@ -127,7 +127,7 @@ __
 
 ### Template
 
-SgDatatablesBundle:column:column_post_create_dt.js.twig
+@SgDatatables/column/column_post_create_dt.js.twig
 
 ### Options
 
@@ -187,7 +187,7 @@ __
 
 ### Template
 
-SgDatatablesBundle:column:column_post_create_dt.js.twig
+@SgDatatables/column/column_post_create_dt.js.twig
 
 ### Options
 
diff --git a/Resources/doc/extensions.md b/Resources/doc/extensions.md
@@ -10,7 +10,7 @@
 
 ### Template
 
-SgDatatablesBundle:datatable:extensions.html.twig
+@SgDatatables/datatable/extensions.html.twig
 
 ### Initialisation
 
@@ -130,7 +130,7 @@ ___
 
 ### Template
 
-SgDatatablesBundle:datatable:extensions.html.twig
+@SgDatatables/datatable/extensions.html.twig
 
 ### Initialisation
 
@@ -226,7 +226,7 @@ ___
 
 ### Template
 
-SgDatatablesBundle:datatable:extensions.html.twig
+@SgDatatables/datatable/extensions.html.twig
 
 ### Initialisation
 
diff --git a/Resources/doc/filters.md b/Resources/doc/filters.md
@@ -28,7 +28,7 @@ __
 
 ### Default template
 
-SgDatatablesBundle:filter:input.html.twig
+@SgDatatables/filter/input.html.twig
 
 ### Options
 
@@ -64,7 +64,7 @@ __
 
 ### Default template
 
-SgDatatablesBundle:filter:input.html.twig
+@SgDatatables/filter/input.html.twig
 
 ### Options
 
@@ -109,7 +109,7 @@ __
 
 ### Default template
 
-SgDatatablesBundle:filter:select.html.twig
+@SgDatatables/filter/select.html.twig
 
 ### Options
 
@@ -184,7 +184,7 @@ __
 
 ### Default template
 
-SgDatatablesBundle:filter:select2.html.twig
+@SgDatatables/filter/select2.html.twig
 
 ### Options
 
@@ -271,7 +271,7 @@ __
 
 ### Default template
 
-SgDatatablesBundle:filter:daterange.html.twig
+@SgDatatables/filter/daterange.html.twig
 
 ### Options
 
diff --git a/Resources/views/column/multiselect.html.twig b/Resources/views/column/multiselect.html.twig
@@ -6,7 +6,7 @@
  # For the full copyright and license information, please view the LICENSE
  # file that was distributed with this source code.
  #}
-{% extends 'SgDatatablesBundle:column:column.html.twig' %}
+{% extends '@SgDatatables/column/column.html.twig' %}
 
 {% block title %}
     "title": "<input type='checkbox' name='sg-datatables-{{ sg_datatables_view.name }}-multiselect-checkall' class='sg-datatables-{{ sg_datatables_view.name }}-multiselect-checkall' />",
diff --git a/Resources/views/datatable/datatable.html.twig b/Resources/views/datatable/datatable.html.twig
@@ -10,13 +10,13 @@
 
     {% block sg_datatables_html %}
 
-        {% include 'SgDatatablesBundle:datatable:datatable_html.html.twig' %}
+        {% include '@SgDatatables/datatable/datatable_html.html.twig' %}
 
     {% endblock %}
 
     {% block sg_datatables_js %}
 
-        {% include 'SgDatatablesBundle:datatable:datatable_js.html.twig' %}
+        {% include '@SgDatatables/datatable/datatable_js.html.twig' %}
 
     {% endblock %}
 
diff --git a/Resources/views/datatable/datatable_js.html.twig b/Resources/views/datatable/datatable_js.html.twig
diff --git a/Resources/views/datatable/extensions.html.twig b/Resources/views/datatable/extensions.html.twig
diff --git a/Resources/views/datatable/language.html.twig b/Resources/views/datatable/language.html.twig
diff --git a/Resources/views/filter/select2.html.twig b/Resources/views/filter/select2.html.twig
diff --git a/Twig/DatatableTwigExtension.php b/Twig/DatatableTwigExtension.php

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public function isSelectColumn()`
`412`	`412`	`*/`
`413`	`413`	`public function getOptionsTemplate()`
`414`	`414`	`{`
`415`		`- return 'SgDatatablesBundle:column:column.html.twig';`
	`415`	`+ return '@SgDatatables/column/column.html.twig';`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function renderToMany(array &$row)`
`165`	`165`	`*/`
`166`	`166`	`public function getCellContentTemplate()`
`167`	`167`	`{`
`168`		`- return 'SgDatatablesBundle:render:action.html.twig';`
	`168`	`+ return '@SgDatatables/render/action.html.twig';`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function renderToMany(array &$row)`
`138`	`138`	`*/`
`139`	`139`	`public function getCellContentTemplate()`
`140`	`140`	`{`
`141`		`- return 'SgDatatablesBundle:render:boolean.html.twig';`
	`141`	`+ return '@SgDatatables/render/boolean.html.twig';`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`/**`
`@@ -148,7 +148,7 @@ public function renderPostCreateDatatableJsContent()`
`148`	`148`	`{`
`149`	`149`	`if ($this->editable instanceof EditableInterface) {`
`150`	`150`	`return $this->twig->render(`
`151`		`- 'SgDatatablesBundle:column:column_post_create_dt.js.twig',`
	`151`	`+ '@SgDatatables/column/column_post_create_dt.js.twig',`
`152`	`152`	`array(`
`153`	`153`	`'column_class_editable_selector' => $this->getColumnClassEditableSelector(),`
`154`	`154`	`'editable_options' => $this->editable,`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function renderToMany(array &$row)`
`94`	`94`	`*/`
`95`	`95`	`public function getCellContentTemplate()`
`96`	`96`	`{`
`97`		`- return 'SgDatatablesBundle:render:column.html.twig';`
	`97`	`+ return '@SgDatatables/render/column.html.twig';`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/**`
`@@ -104,7 +104,7 @@ public function renderPostCreateDatatableJsContent()`
`104`	`104`	`{`
`105`	`105`	`if ($this->editable instanceof EditableInterface) {`
`106`	`106`	`return $this->twig->render(`
`107`		`- 'SgDatatablesBundle:column:column_post_create_dt.js.twig',`
	`107`	`+ '@SgDatatables/column/column_post_create_dt.js.twig',`
`108`	`108`	`array(`
`109`	`109`	`'column_class_editable_selector' => $this->getColumnClassEditableSelector(),`
`110`	`110`	`'editable_options' => $this->editable,`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public function renderToMany(array &$row)`
`114`	`114`	`*/`
`115`	`115`	`public function getCellContentTemplate()`
`116`	`116`	`{`
`117`		`- return 'SgDatatablesBundle:render:datetime.html.twig';`
	`117`	`+ return '@SgDatatables/render/datetime.html.twig';`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/**`
`@@ -124,7 +124,7 @@ public function renderPostCreateDatatableJsContent()`
`124`	`124`	`{`
`125`	`125`	`if ($this->editable instanceof EditableInterface) {`
`126`	`126`	`return $this->twig->render(`
`127`		`- 'SgDatatablesBundle:column:column_post_create_dt.js.twig',`
	`127`	`+ '@SgDatatables/column/column_post_create_dt.js.twig',`
`128`	`128`	`array(`
`129`	`129`	`'column_class_editable_selector' => $this->getColumnClassEditableSelector(),`
`130`	`130`	`'editable_options' => $this->editable,`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function renderToMany(array &$row)`
`145`	`145`	`*/`
`146`	`146`	`public function getCellContentTemplate()`
`147`	`147`	`{`
`148`		`- return 'SgDatatablesBundle:render:thumb.html.twig';`
	`148`	`+ return '@SgDatatables/render/thumb.html.twig';`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`//-------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function isUnique()`
`78`	`78`	`*/`
`79`	`79`	`public function getOptionsTemplate()`
`80`	`80`	`{`
`81`		`- return 'SgDatatablesBundle:column:multiselect.html.twig';`
	`81`	`+ return '@SgDatatables/column/multiselect.html.twig';`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`
`@@ -121,7 +121,7 @@ public function renderSingleField(array &$row)`
`121`	`121`	`*/`
`122`	`122`	`public function getCellContentTemplate()`
`123`	`123`	`{`
`124`		`- return 'SgDatatablesBundle:render:multiselect.html.twig';`
	`124`	`+ return '@SgDatatables/render/multiselect.html.twig';`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class DateRangeFilter extends AbstractFilter`
`32`	`32`	`*/`
`33`	`33`	`public function getTemplate()`
`34`	`34`	`{`
`35`		`- return 'SgDatatablesBundle:filter:daterange.html.twig';`
	`35`	`+ return '@SgDatatables/filter/daterange.html.twig';`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class Select2Filter extends SelectFilter`
`87`	`87`	`*/`
`88`	`88`	`public function getTemplate()`
`89`	`89`	`{`
`90`		`- return 'SgDatatablesBundle:filter:select2.html.twig';`
	`90`	`+ return '@SgDatatables/filter/select2.html.twig';`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`//-------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class SelectFilter extends AbstractFilter`
`56`	`56`	`*/`
`57`	`57`	`public function getTemplate()`
`58`	`58`	`{`
`59`		`- return 'SgDatatablesBundle:filter:select.html.twig';`
	`59`	`+ return '@SgDatatables/filter/select.html.twig';`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`