From 133e5f3d197edfc31367d67895c5a61f50fa40bd Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 27 Feb 2014 14:22:42 +0100
Subject: [PATCH] Add application to admin

---
 templates/web/admin/fields/index.html.twig | 2 +-
 templates/web/admin/index.html.twig        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/web/admin/fields/index.html.twig b/templates/web/admin/fields/index.html.twig
index 55b3b803c7..9c70018ea7 100644
--- a/templates/web/admin/fields/index.html.twig
+++ b/templates/web/admin/fields/index.html.twig
@@ -21,4 +21,4 @@
 {% include 'admin/fields/templates.html.twig' %}
 
 {# bootstrap admin field backbone application #}
-<script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/requirejs/require.js,/scripts/apps/admin/fields/main.js' }) }}"></script>
+<script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/fields/main.js' }) }}"></script>
diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig
index 03534ce18b..a1cbd08ef7 100644
--- a/templates/web/admin/index.html.twig
+++ b/templates/web/admin/index.html.twig
@@ -194,11 +194,13 @@
   }
 
     </script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : '/assets/requirejs/require.js' }) }}"></script>
+    <script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/main/main.js' }) }}"></script>
 {% endblock %}
 
 
 {% block content %}
-    <div id="left" class="PNB" style="width:250px;right:auto;">
+    <div id="left" class="PNB" style="width:250px;right:auto;" data-websocket="{{ "ws://" ~ app["conf"].get(["main" ,"websocket-server", "host"]) ~ "/" ~ app["conf"].get(["main" ,"websocket-server", "port"]) }}">
         <div class="PNB10" style="right:0">
             <div id="FNDR">
         {% include 'admin/tree.html.twig' %}