Template rename fix files

symfony · Jan 21, 2011 · 5e9c9f4 · 5e9c9f4
1 parent a5007fe
commit 5e9c9f4
Show file tree

Hide file tree

Showing 25 changed files with 47 additions and 47 deletions.
diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.html.twig b/src/Symfony/Bundle/DoctrineBundle/Resources/views/Collector/db.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block toolbar %}
 <img style="margin: 0 5px 0 10px; vertical-align: middle; height: 24px" width="24" height="24" alt="Database" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAASxJREFUeNrsV00KhCAYzaGDzLZbONcIghadoDZtiqJNbVq0Ctq06xjNCTrDnKMfGoVpsFBRqNz4QD7NR77vmZ8E1nU1VOJhKIYWoAUoF2CSAwBAf9E6L3JAHn1ADrquu6Qo2LYNWAJ2DizLYjiOg8lnO9HTnKAKwGjbFl7hhOu6/G9gnud/9DzvFieYAjDquoa3noJpmqhRuQDf99+8l5RlCWV40gKKouBuhSyPKWAcR2qMooibWZZlUIYn7UAcx0KZifKkHcjznJpZGIa7BVk8Fl/YgSAIoEhGLJ6wA4iQ3H0Md9dxVVXpUcCxDcPwQRHg9utLzR+TMmmqUCVMyIpIwrKs5/ac7IvOc7dgQ9M0KUvApZXwCHQ7YieSk9fcvQ/oHxMtQAtQLeArwABN1BHcHlpLnQAAAABJRU5ErkJggg==" />

diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.html.twig b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/views/Collector/mongodb.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block toolbar %}
 <img style="margin: 0 5px 0 10px; vertical-align: middle; height: 24px" width="24" height="24" alt="Mongo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAASxJREFUeNrsV00KhCAYzaGDzLZbONcIghadoDZtiqJNbVq0Ctq06xjNCTrDnKMfGoVpsFBRqNz4QD7NR77vmZ8E1nU1VOJhKIYWoAUoF2CSAwBAf9E6L3JAHn1ADrquu6Qo2LYNWAJ2DizLYjiOg8lnO9HTnKAKwGjbFl7hhOu6/G9gnud/9DzvFieYAjDquoa3noJpmqhRuQDf99+8l5RlCWV40gKKouBuhSyPKWAcR2qMooibWZZlUIYn7UAcx0KZifKkHcjznJpZGIa7BVk8Fl/YgSAIoEhGLJ6wA4iQ3H0Md9dxVVXpUcCxDcPwQRHg9utLzR+TMmmqUCVMyIpIwrKs5/ac7IvOc7dgQ9M0KUvApZXwCHQ7YieSk9fcvQ/oHxMtQAtQLeArwABN1BHcHlpLnQAAAABJRU5ErkJggg==" />

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/DefaultController.php
@@ -28,6 +28,6 @@ class DefaultController extends ContainerAware
      */
     public function indexAction()
     {
-        return $this->container->get('templating')->renderResponse('FrameworkBundle:Default:index.twig.html');
+        return $this->container->get('templating')->renderResponse('FrameworkBundle:Default:index.html.twig');
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
@@ -47,12 +47,12 @@ public function showAction(FlattenException $exception, DebugLoggerInterface $lo
         if ($this->container->get('kernel')->isDebug() && 'html' == $format) {
             $name = 'exception_full';
         }
-        $template = 'FrameworkBundle:Exception:'.$name.'.twig.'.$format;
+        $template = 'FrameworkBundle:Exception:'.$name.$format.'.twig';
 
         $templating = $this->container->get('templating');
         if (!$templating->exists($template)) {
             $this->container->get('request')->setRequestFormat('html');
-            $template = 'FrameworkBundle:Exception:'.$name.'.twig.html';
+            $template = 'FrameworkBundle:Exception:'.$name.'.html.twig';
         }
 
         $response = $templating->renderResponse(

diff --git a/...Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Controller/DefaultController.php b/...Symfony/Bundle/FrameworkBundle/Resources/skeleton/bundle/Controller/DefaultController.php
@@ -8,6 +8,6 @@ class DefaultController extends Controller
 {
     public function indexAction()
     {
-        return $this->render('{{ bundle }}:Default:index.twig.html');
+        return $this->render('{{ bundle }}:Default:index.html.twig');
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig
@@ -25,7 +25,7 @@
     </div>
 
     {% for position, e in exception.toarray %}
-        {% include 'FrameworkBundle:Exception:traces.twig.html' with { 'exception': e, 'position': position, 'count': previous_count } only %}
+        {% include 'FrameworkBundle:Exception:traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %}
     {% endfor %}
 
     {% if logger %}
@@ -38,7 +38,7 @@
             </h3>
 
             <div id="logs" style="display: none">
-                {% include 'FrameworkBundle:Exception:logs.twig.html' with { 'logs': logger.logs } only %}
+                {% include 'FrameworkBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %}
             </div>
 
         </div>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig
@@ -1,5 +1,5 @@
-{% extends 'FrameworkBundle:Exception:layout.twig.html' %}
+{% extends 'FrameworkBundle:Exception:layout.html.twig' %}
 
 {% block body %}
-    {% include 'FrameworkBundle:Exception:exception.twig.html' %}
+    {% include 'FrameworkBundle:Exception:exception.html.twig' %}
 {% endblock %}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.html.twig
@@ -13,7 +13,7 @@
     <ol class="traces" id="traces_{{ position }}" style="display: {{ 0 == position ? 'block' : 'none' }}">
         {% for i, trace in exception.trace %}
             <li>
-                {% include 'FrameworkBundle:Exception:trace.twig.html' with { 'prefix': position, 'i': i, 'trace': trace } only %}
+                {% include 'FrameworkBundle:Exception:trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %}
             </li>
         {% endfor %}
     </ol>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
@@ -1,4 +1,4 @@
 <?php echo str_replace('{{ widget }}',
-    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html'),
+    $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.html.php'),
     $field->getPattern()
 ) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
@@ -1 +1 @@
-<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.php.html') ?> %
+<?php echo $view['form']->render($field, array(), array(), 'FrameworkBundle:Form:number_field.html.php') ?> %
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -115,7 +115,7 @@ public function render(/*FieldInterface */$field, array $attributes = array(), a
     public function row(/*FieldInterface*/ $field, $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:field_row.php.html';
+            $template = 'FrameworkBundle:Form:field_row.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -126,7 +126,7 @@ public function row(/*FieldInterface*/ $field, $template = null)
     public function label(/*FieldInterface */$field, $label = false, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:label.php.html';
+            $template = 'FrameworkBundle:Form:label.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -139,7 +139,7 @@ public function label(/*FieldInterface */$field, $label = false, array $paramete
     public function errors(/*FieldInterface */$field, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:errors.php.html';
+            $template = 'FrameworkBundle:Form:errors.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -151,7 +151,7 @@ public function errors(/*FieldInterface */$field, array $parameters = array(), $
     public function hidden(/*FieldGroupInterface */$group, array $parameters = array(), $template = null)
     {
         if (null === $template) {
-            $template = 'FrameworkBundle:Form:hidden.php.html';
+            $template = 'FrameworkBundle:Form:hidden.html.php';
         }
 
         return $this->engine->render($template, array(
@@ -178,15 +178,15 @@ protected function lookupTemplate(/*FieldInterface */$field)
 
             $underscoredName = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($className, '_', '.')));
 
-            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.php.html')) {
+            if ($this->engine->exists($guess = 'FrameworkBundle:Form:'.$underscoredName.'.html.php')) {
                 $template = $guess;
             }
 
             $currentFqClassName = get_parent_class($currentFqClassName);
         } while (null === $template && false !== $currentFqClassName);
 
         if (null === $template && $field instanceof FieldGroupInterface) {
-            $template = 'FrameworkBundle:Form:field_group.php.html';
+            $template = 'FrameworkBundle:Form:field_group.html.php';
         }
 
         self::$cache[$fqClassName] = $template;

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -14,7 +14,7 @@
         <parameter key="twig.loader.class">Symfony\Bundle\TwigBundle\Loader\FilesystemLoader</parameter>
         <parameter key="twig.globals.class">Symfony\Bundle\TwigBundle\GlobalVariables</parameter>
         <parameter key="twig.form.resources" type="collection">
-            <parameter>TwigBundle::form.twig.html</parameter>
+            <parameter>TwigBundle::form.html.twig</parameter>
         </parameter>
         <parameter key="templating.engine.twig.class">Symfony\Bundle\TwigBundle\TwigEngine</parameter>
     </parameters>

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
@@ -33,7 +33,7 @@ public function showAction(FlattenException $exception, DebugLoggerInterface $lo
         $code = $this->getStatusCode($exception);
 
         return $this->container->get('templating')->renderResponse(
-            'FrameworkBundle:Exception:'.$template.'.twig.html',
+            'FrameworkBundle:Exception:'.$template.'.html.twig',
             array(
                 'status_code'    => $code,
                 'status_text'    => Response::$statusTexts[$code],

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -36,7 +36,7 @@ public function panelAction($token, $panel = 'request')
         $profiler = $this->container->get('profiler')->loadFromToken($token);
 
         if ($profiler->isEmpty()) {
-            return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.twig.html', array('token' => $token));
+            return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:notfound.html.twig', array('token' => $token));
         }
 
         if (!$profiler->has($panel)) {
@@ -146,7 +146,7 @@ public function toolbarAction($token = null, $position = null)
             $position = false === strpos($this->container->get('request')->headers->get('user-agent'), 'Mobile') ? 'fixed' : 'absolute';
         }
 
-        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.twig.html', array(
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.html.twig', array(
             'position'  => $position,
             'profiler'  => $profiler,
             'templates' => $this->getTemplates($profiler),
@@ -168,7 +168,7 @@ public function searchBarAction($token)
         $url = $session->get('_profiler_search_url');
         $limit = $session->get('_profiler_search_limit');
 
-        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:search.twig.html', array(
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:search.html.twig', array(
             'token'    => $token,
             'profiler' => $profiler,
             'tokens'   => $profiler->find($ip, $url, $limit),
@@ -193,7 +193,7 @@ public function searchResultsAction($token)
         $url = $session->get('_profiler_search_url');
         $limit = $session->get('_profiler_search_limit');
 
-        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:results.twig.html', array(
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:results.html.twig', array(
             'token'    => $token,
             'profiler' => $this->container->get('profiler')->loadFromToken($token),
             'tokens'   => $profiler->find($ip, $url, $limit),
@@ -247,11 +247,11 @@ protected function getTemplateNames($profiler)
             }
 
             list($name, $template) = $arguments;
-            if (!$profiler->has($name) || !$this->container->get('templating')->exists($template.'.twig.html')) {
+            if (!$profiler->has($name) || !$this->container->get('templating')->exists($template.'.html.twig')) {
                 continue;
             }
 
-            $templates[$name] = $template.'.twig.html';
+            $templates[$name] = $template.'.html.twig';
         }
 
         return $templates;

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block toolbar %}
 <img style="margin: 0 5px 0 10px; vertical-align: middle" width="59" height="17" alt="Symfony" src="data:image/png;base64,R0lGODlhOwARAMQdAIZ1X9rVz0owD/Lx78K6r2JML3pnT+bj37asn6qej1Y+H+jk4JKDb0oxEJOEcId2YGJMMPTy8KufkLetoJ+RgNvW0M7Iv56Rf25aP8/JwG5aQP///z4jAP///wAAAAAAACH5BAEAAB0ALAAAAAA7ABEAAAX/YLc8WmmeaKqu7OosYsPNdG3fuCDgfM81C4dvyAsEiEgORZNMGjaI5rBEEzAugBmWBshiOICtAbu7QL+Ky8UwExQw6i8HTqPPqJzCYMMPCDYWNBYWBRsHfIaIgWYbWIiAHAF7iAkcZjSXd0wchwQYCBZ/gTODHAQbngEbARincBsYGAMDAK2NAKsGBodpG5i+mjMGewg7HJCki7AcT18YG1e+DBtZMweBjTO4r780eHmqAQXHoxylZs7Lz2q+6IIDxxczz6/GmRzfBQKnAxgWG+MiKUuXjh0zVDMKEYg3DxYueRwSAMO3SSKBfwMEPBtA4NDAOeoaZQp3alk2kBgEVJDk421TgX+AAu5SZClkwUwCEPA5wIYhSg4KYO5pieRZFClIrcELNkTAHgVJkUqEyOGBBCRdoiItUInGhAgQtIpNoqGD2Qxo06pdy7at27dvK5gNAQA7" />

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block menu %}
 <img style="margin: 0 5px 0 0; vertical-align: middle; width: 32px" width="32" height="32" alt="Events" src="{{ asset('bundles/webprofiler/images/events.png') }}" />

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block head %}
     <link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="screen" />

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block toolbar %}
 <img style="margin: 0 5px 0 10px; vertical-align: middle; height: 24px" width="24" height="24" alt="Logs" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAApBJREFUeNrsl19oUlEcx+91dp24hgMXhmvYZokaC5Uon+ollk/14JMIw8c9zpfwJeglqMfoVXQw9KknAyNFfagRyNaiB7Mw3VDxz9iG/xH/9D10HSJxJ9oSyh98OOd47u+c7/2ec/AeutPpUOMMHjXm4HN10jTdrc6Ax+AOOATvwWe2PDO4XKY5O38JUIjF4uc2m023vLwsa7Va+XQ6Hdne3m56vV4BK+QD2HO73dn+Mcxm80gCHqhUKvvGxsYNhmEyHo/nVbvdvryysiJUKpW3hEKhtlwuf4pEIgfBYJBJJpMVIoQI2traIiVlsViGF2A0GqMmk+lqvV5/HQqFnAsLC/cFAsFSLpc7TKVSBfzekEqlfIPBcAUu3YZgXjab/er3+8vhcHgKQ/wgYjDH26EEbG5udjBR0eVyxWZnZ79ptdoThULRgohOtVoVgZlisdiOx+P7tVqtgZSGTqebxjMGPHMN7uz7fL5LQDWUAKfTedqZSCSOo9HoUSwWK2KyI41GE1Wr1VWJRMI0m80LlUrlYqlUYrA/8ohjtBvr6+tkf7yxWq30UKcAG+60vri4OEdYXV2l8OaN3d3d64FA4LhQKNTn5+e/6PX6A7lcPiWTyaYzmcxN7BUa+c9GOoa9AnoD9jJk3QmkDVeWdnZ28rC6bLfbLXDkBVf+yAL6A2suIbA538nb/1UB/QEB1L8hAGs5lIDuxIPkTxyYODBZgokD5yKgmzf5L/gTAqwo7oJHQHweAjgvJg6Hw4XBrGAOaMFTsEcm4ILMLRKJ0mzbxXn3OOtesLa29rsuObgHHrJlrzs0jt8TPp//DvWP+LDl/CznD2pnXySBi4XqE0PxeLyXyDsZZLno//5yOnYBPwUYACFn5hv7UNkXAAAAAElFTkSuQmCC" />

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block toolbar %}
 <img style="margin: 0 5px 0 10px; vertical-align: middle; height: 24px" width="24" height="24" alt="Memory Usage" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVZJREFUeNrsl82qRVAUx7mdB5AkZmbKxMjEyHkMZXDuk9zOkyjJ/D7Bva9gQhQRJUkewNdl19bpDnyc42wTq7SyWNvP+u+VBe/7HjvSPrCD7QS4zF3Ecfzn4fS6ce0pd9hn16cALMtSXni5Vbn4XBcMFcBM0wQ3aJr2C+NDbE01YN7sMy5Lq3RdB7xhGMr/2Nv3wGht2wL/OdhD+LaUp+v6vgCqqn6NnmEYe83CMG83AEVRuNE7joMWoGka4F3X/d6iLczbDSDLMhHGaJq2kQPIsszBmOd56AF83z9WgjzPgQQURdmHAEiSBCQIggAtQF3XwIdhuEkCmLdbBYqimLqAJEn0m1AUxakLoihCDxDH8bFdUJYlkIAgiGO6QBAEIEGSJGgB4EclTdNNEuz+NayqStwCwLLsvgA8z3PvqMDiWD6MX/dxBHvyuL80lJ5/RicACvsTYABfiPlU6mFY2gAAAABJRU5ErkJggg==" />

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.twig.html' %}
+{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
 {% block toolbar %}
 <img style="margin: 0 5px 0 10px; vertical-align: middle; height: 24px" width="24" height="24" alt="Request" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABJ5JREFUeNrEV1tIo0cUTuJqFH9iTBSjyUq8BVtLV2tLdV/6IiIFwe1LxQuu4mVBiwYfrCiI4KUv4oNdVKS64KX0qQUfKoKwT7WlTatS2sVdbXBXjVhtDPEetd9JZ2TWXExsiwOH/8y5zZmZM+ecX35xcSG7zSEXHZDL5dfJ9wMyGb4AMN9k0dfW9OOARDA1NWXjhI2NjZcJCQkGhr8CfpfzSkpKdPg4Ie8UjYDu1wGFDycltVr92GAwTMJAKinQ9/T0NIxwAsJFHsmSDnCJywRyvXd8Ld7W1vYRvuF9fX1flJaWLptMpkxJklTn5+f/CAEH7UvwFtLT003Nzc337Xb7UXd3twy0+vHxceeNYiAvL8+Un5//Y1xcnIpoR0dHLjKs0+kkbwZsNpuTHMVwb2Zra8sxOzv7Xnl5+TLNKyoqgouBsbExI2iLwFU3DDAHdO8BtdK8srIyuBiAghXH/MHh4eHJ2dmZzAssMPDgkQ7pArdy2nXDaxBWV1c7d3Z2yJhMgG8ASYAsBkmMdilDOqQr0oINQnrnMgTVGzExMRLfwfHx8YxSqXxwRZaO+AF434JXQATSge7ntbW1v9N8cHDQHFQQtrS0/EXfqKiocAJBLonfqZdhBPzBJ3t7e0cEhCcmJkY3NDT4jYHXTkCv16s5zne/u7u7o9ForH42YWUyWvY8wwlEGwHHgLfAOjk5UTY2Nup8BKSMeCTjix9UDLhcrqfMkbSQkBA94dHR0RKOsg28T7wZIB7JgM83sQ7d5/+qGPX29lLB+YXTV1dX/xwZGRkC+hg8d21obW2l3F9fU1PzKDk5OUawmcUKlYzJ3agYpZrNZotWq1WJTkxPT7/Y3t7+leaxsbFvFRYWpoqL4xk6+vv7s7u6ul5wWnt7e9AO6IxG41fI5/fDwsI8agUWced4OOeRmhELrsnJye+sVuvHnZ2d7pPq6OgI/BWw3K2Jj4/PUSgUd/i9igPPU2Lx4hnR0CkuLs7Z3NzUgG8LJAY8HMBT3ICHzxBMbwu5fVVoRK6OBcgk89qB7zOyQS+gp6dHbF4CS8VQslM+xw6WAA6W27MInE6ngz8vhrvpTN5BOhaL5UPYcJFMWlraGIHY4ATckqG+q1mWu/QeCeclEo6B4a+A3xVsZS4uLm7Pz8/30GR/f/832PiMcPQUn0ZGRr7J6PVY0xlwT9jU1HSJowv6PjQ09H2G/wA8R5RdWlrSI4AXsXslHHSmpKTQU5WtrKzY4KyE/HCMAL03Nze37q8jkl3NjkKQPcJczXD71UyXkZGxf3BwcKxSqbSAy2IGp9yOgOcgmWvLsZ/0TH3AUwYePcHAwMDXaFYVAu0JA/eceCQTVFteV1cXVEPEEbRmFrR17w4PD8uKiop+Ap7NeUNDQ/KAryCQpsLbwHHrsXgLx33ZufYEqqqqAl50dHRUKigosOB/wUTztbU1GytYOvYvsTwzM5MtvoL/9ARyc3Oj0AtouQ7+FXSiDeKRDP3A/C8OIOnsY3frVJJxmj+D9JCxnoD+TkREhFsmqCsoKysL9vp5V2XnQTkxMSGHHTXD7T6r4a3/Hd/G+FuAAQDV6k9Ni4q8owAAAABJRU5ErkJggg==" />
@@ -14,46 +14,46 @@ Request
     <h2>Request GET Parameters</h2>
 
     {% if collector.requestquery.all|length %}
-        {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestquery } only %}
+        {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestquery } only %}
     {% else %}
         <em>No GET parameters</em>
     {% endif %}
 
     <h2>Request POST Parameters</h2>
 
     {% if collector.requestrequest.all|length %}
-        {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestrequest } only %}
+        {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestrequest } only %}
     {% else %}
         <em>No POST parameters</em>
     {% endif %}
 
     <h2>Request Attributes</h2>
 
     {% if collector.requestattributes.all|length %}
-        {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestattributes } only %}
+        {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestattributes } only %}
     {% else %}
         <em>No attributes</em>
     {% endif %}
 
     <h2>Request Cookies</h2>
 
     {% if collector.requestcookies.all|length %}
-        {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestcookies } only %}
+        {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestcookies } only %}
     {% else %}
         <em>No cookies</em>
     {% endif %}
 
     <h2>Requests Headers</h2>
 
-    {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestheaders } only %}
+    {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestheaders } only %}
 
     <h2>Requests Server Parameters</h2>
 
-    {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.requestserver } only %}
+    {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.requestserver } only %}
 
     <h2>Response Headers</h2>
 
-    {% include 'WebProfilerBundle:Profiler:bag.twig.html' with { 'bag': collector.responseheaders } only %}
+    {% include 'WebProfilerBundle:Profiler:bag.html.twig' with { 'bag': collector.responseheaders } only %}
 
     <h2>Response Session Attributes</h2>