Merge branch 'master' of github.com:thelia/thelia

2013-09-11 08:16:39 +02:00
parent 66d6f86b9a 08a6b0d195
commit 8fa3ed287b
19 changed files with 446 additions and 289 deletions
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -30,7 +30,7 @@ URL: http://www.thelia.net
    {stylesheets file='assets/less/styles.less' filters='less,cssembed'}
        <link rel="stylesheet" href="{$asset_url}">
    {/stylesheets}
-
+    {debugbar_rendercss}
    {block name="stylesheet"}{/block}
 </head>

@@ -397,6 +397,9 @@ URL: http://www.thelia.net
    <script src="{$asset_url}"></script>
 {/javascripts}

+{debugbar_renderjs}
+{debugbar_renderresult}
+
 <!--[if lt IE 9]>
 <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->