Skip to content

Commit

Permalink
Merge pull request #6 from kejwmen/fix/twig-aliases
Browse files Browse the repository at this point in the history
New twig template aliasing
  • Loading branch information
ojrzenski authored Feb 25, 2018
2 parents 5b3f1d2 + 7d5bd3e commit 31038fa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Resources/config/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<factory class="Pixers\DoctrineProfilerBundle\ORM\EntityManager" method="create"/>
</service>
<service id="pixers_doctrine_profiler.data_collector" class="Pixers\DoctrineProfilerBundle\DataCollector\QueryCollector" public="false">
<tag name="data_collector" template="PixersDoctrineProfilerBundle:Collector:profiler.html.twig" id="doctrine_profiler"/>
<tag name="data_collector" template="@PixersDoctrineProfiler/Collector/profiler.html.twig" id="doctrine_profiler"/>
<argument type="service" id="pixers_doctrine_profiler.logger"/>
<argument type="service" id="debug.stopwatch"/>
</service>
Expand Down
10 changes: 5 additions & 5 deletions Resources/views/Collector/profiler.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
{% block head %}
{{ parent() }}
<style type="text/css">
{{ include('PixersDoctrineProfilerBundle:Collector:styles.css.twig') }}
{{ include('@PixersDoctrineProfiler/Collector/styles.css.twig') }}
</style>
<script type="text/javascript">
{{ include('PixersDoctrineProfilerBundle:Collector:scripts.js.twig') }}
{{ include('@PixersDoctrineProfiler/Collector/scripts.js.twig') }}
</script>
{% endblock head %}

{% block toolbar %}
{% if collector.count > 0 %}
{% set icon %}
<span class="icon">{{ include('PixersDoctrineProfilerBundle:Collector:icon.svg.twig') }}</span>
<span class="icon">{{ include('@PixersDoctrineProfiler/Collector/icon.svg.twig') }}</span>
{% endset %}

{% set text %}
Expand Down Expand Up @@ -41,7 +41,7 @@

{% block menu %}
<span class="label {{ collector.count==0 ? 'disabled' : '' }}">
<span class="icon">{{ include('PixersDoctrineProfilerBundle:Collector:icon.svg.twig') }}</span>
<span class="icon">{{ include('@PixersDoctrineProfiler/Collector/icon.svg.twig') }}</span>
<strong>Doctrine profiler</strong>
</span>
{% endblock %}
Expand Down Expand Up @@ -94,7 +94,7 @@
{% set nodes = collector.flattenCallGraph.children %}
{% set valueAccessor = collector.nodeValueAccessor %}
<div class="tree-wrapper">
{% include 'PixersDoctrineProfilerBundle:Collector:tree.html.twig' with {
{% include '@PixersDoctrineProfiler/Collector/tree.html.twig' with {
nodes: nodes,
valueAccessor: valueAccessor,
} %}
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/Collector/styles.css.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% include 'PixersDoctrineProfilerBundle:Collector:tree.css.twig' %}
{% include '@PixersDoctrineProfiler/Collector/tree.css.twig' %}

.sf-reset .traces {
padding: 0 0 1em 1.5em;
Expand Down

0 comments on commit 31038fa

Please sign in to comment.