Misc. tweaks and improvements

javiereguiluz · javiereguiluz · commit 972a92e778e0 · 2015-07-30T09:29:45.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -145,7 +145,7 @@ protected function templateExists($template)
      *
      * @return array
      */
-    protected function reorderTemplates($templates)
+    private function reorderTemplates($templates)
     {
         $templates = $this->moveArrayElementToFirstPosition($templates, 'twig');
         $templates = $this->moveArrayElementToFirstPosition($templates, 'memory');
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -37,12 +37,12 @@
                 <span>{{ collector.statuscode }} {{ collector.statustext }}</span>
             </div>
             <div class="sf-toolbar-info-piece">
-                <b>Controller method</b>
+                <b>Controller</b>
                 <span>{{ request_handler }}</span>
             </div>
             {% if collector.controller.class is defined %}
                 <div class="sf-toolbar-info-piece">
-                    <b>Controller file</b>
+                    <b>Controller class</b>
                     <span>{{ collector.controller.class }}</span>
                 </div>
             {% endif %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -18,7 +18,7 @@
 {% block toolbar %}
     {% set total_time = collector.events|length ? '%.0f'|format(collector.duration) : 'n/a' %}
     {% set initialization_time = collector.events|length ? '%.0f'|format(collector.inittime) : 'n/a' %}
-    {% set status_color = collector.events|length ? collector.duration > 1000 ? 'yellow' : '' %}
+    {% set status_color = collector.events|length and collector.duration > 1000 ? 'yellow' : '' %}
 
     {% set icon %}
         {{ include('@WebProfiler/Icon/time.svg.twig') }}

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ protected function templateExists($template)`
`145`	`145`	`*`
`146`	`146`	`* @return array`
`147`	`147`	`*/`
`148`		`- protected function reorderTemplates($templates)`
	`148`	`+ private function reorderTemplates($templates)`
`149`	`149`	`{`
`150`	`150`	`$templates = $this->moveArrayElementToFirstPosition($templates, 'twig');`
`151`	`151`	`$templates = $this->moveArrayElementToFirstPosition($templates, 'memory');`