X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptorhandler%2Ftemplate%2Fcomposer.html;h=690ce209dfca865ee9888442a8f9bf0cffe79cf7;hb=027523b50fdc082f2782b4ca1375fb2a3d9bb33d;hp=cad68fac2a2b6ad92e027adac1cb1f55abd493bc;hpb=3218b2b802b040b6110780eb95cf84a9f3101505;p=osm%2FLW-UI.git

diff --git a/descriptorhandler/template/composer.html b/descriptorhandler/template/composer.html
index cad68fa..690ce20 100644
--- a/descriptorhandler/template/composer.html
+++ b/descriptorhandler/template/composer.html
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -15,6 +30,7 @@
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
+    {{ type|upper }} Composer
 {% endblock %}
 {% block left_sidebar %}
     {% include 'osm/osm_project_left_sidebar.html' %}
@@ -23,16 +39,23 @@
 
 {% block breadcrumb_body %}
     {{ block.super }}
-    {% comment %}<li><a href="{% url 'projects:descriptors:list_descriptors'  type=type %}">{{ type|upper }} Descriptors</a></li>
-    <li><a href="#"><i class="fa fa-sitemap"></i> {{ type|upper }} Topology</a></li>{% endcomment %}
+    <li><a href="#"><i class="fa fa-sitemap"></i> {{ type|upper }} Composer</a></li>
 {% endblock %}
 
 {% block content_body %}
     {{ block.super }}
     {% csrf_token %}
+
     <div class="container-fluid">
         <div id="main" class="row">
             <div id="leftside">
+                <div class="section">
+                    <span style="font-weight: 500;">Select Element</span>
+                </div>
+                <div id="palette">
+
+
+                </div>
 
             </div>
             <div id="graph_editor_container" class="col">
@@ -40,27 +63,30 @@
                     <button id="topology_force" type="button" class="btn btn btn-default" onclick="handleForce(this)"
                             data-toggle="button" aria-pressed="false" autocomplete="off"><i
                             class="fas fa-thumbtack"></i></button>
-                    <button id="reset_filter" type="button" class="btn btn btn-default" onclick="resetFilters(this)"><i
-                            class="fa fa-backward"></i></button>
+                    <button id="reset_filter" type="button" data-container="body" data-toggle="tooltip" data-placement="top" title="Text view"  class="btn btn btn-default" onclick="openTextedit(this)"><i
+                            class="fa fa-edit"></i></button>
+                    <button id="info_button" type="button" data-container="body" data-toggle="tooltip" data-placement="top" title="Help"  class="btn btn btn-default "onclick="openHelp(this)" ><i class="fa fa-info"></i></button>
                 </div>
                 <div id="legenda">
                 </div>
             </div>
             <div id="side">
-
+                <form id="side_form" method="post" enctype="multipart/form-data" action="">
+                    {% csrf_token %}
+                </form>
             </div>
         </div>
     </div>
 
+    {% include 'modal/modal_keyboard_info_base.html' %}
 {% endblock %}
 
 {% block resource_block %}
     {{ block.super }}
-    <script>
-        var topology_data = {};//{{topology_data|safe }};
-    </script>
+
     <!-- d3.js -->
-    <script src="/static/bower_components/d3/d3.js"></script>
+    <script src="/static/node_modules/d3/build/d3.js"></script>
+    <script src="/static/node_modules/moment/moment.js"></script>
 
     <!-- TopologyComposer D3 -->
     <script src="/static/TopologyComposer/js/event.js"></script>
@@ -69,9 +95,9 @@
     <script src="/static/TopologyComposer/js/model_graph_editor.js"></script>
     <script src="/static/TopologyComposer/js/d3-context-menu.js"></script>
 
-
     <script src="/static/src/osm_gui_properties.js"></script>
-{#    <script src="/static/src/instancehandler/instance_topology_view.js"></script>#}
+    <script src="/static/src/descriptorhandler/controller.js"></script>
+    <script src="/static/src/descriptorhandler/composer.js"></script>
 
 {% endblock %}