[wip] composer nsd
Change-Id: Iba2924273ab065c90ce85c5d41de90ff15f915d1
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/descriptorhandler/template/composer.html b/descriptorhandler/template/composer.html
index 2de4ae8..7647151 100644
--- a/descriptorhandler/template/composer.html
+++ b/descriptorhandler/template/composer.html
@@ -15,6 +15,7 @@
{% endblock %}
{% block title_header_big %}
{{ block.super }}
+ {{ type|upper }} Composer
{% endblock %}
{% block left_sidebar %}
{% include 'osm/osm_project_left_sidebar.html' %}
@@ -23,8 +24,8 @@
{% 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="{% url 'projects:descriptors:list_descriptors' descriptor_type=type %}">{{ type|upper }} Descriptors</a></li>
+ <li><a href="#"><i class="fa fa-sitemap"></i> {{ type|upper }} Composer</a></li>
{% endblock %}
{% block content_body %}
@@ -38,22 +39,7 @@
<span style="font-weight: 500;">Select Element</span>
</div>
<div id="palette">
- <div class="node" draggable="true">
- <div class="icon" style="background-color: #cf1c24" ></div>
- <div class="name">VDU</div>
- </div>
- <div class="node" draggable="true">
- <div class="icon" style="background-color: #f8a800" ></div>
- <div class="name">VL</div>
- </div>
- <div class="node" draggable="true">
- <div class="icon" style="background-color: #e3bfad" ></div>
- <div class="name">intCP</div>
- </div>
- <div class="node" draggable="true">
- <div class="icon" style="background-color: #c6b63f" ></div>
- <div class="name">extCp</div>
- </div>
+
</div>
@@ -63,25 +49,27 @@
<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/bower_components/moment/moment.js"></script>
@@ -93,10 +81,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/descriptorhandler/controller.js"></script>
<script src="/static/src/descriptorhandler/composer.js"></script>
-{# <script src="/static/src/instancehandler/instance_topology_view.js"></script>#}
{% endblock %}
diff --git a/descriptorhandler/template/descriptorlist.html b/descriptorhandler/template/descriptorlist.html
index df7bda2..5285125 100644
--- a/descriptorhandler/template/descriptorlist.html
+++ b/descriptorhandler/template/descriptorlist.html
@@ -20,7 +20,7 @@
role="grid">
<thead>
<tr role="row">
- <th>Name</th>
+ <th>Short Name</th>
<th>Identified</th>
<th>Description</th>
<th style="width:10%">Vendor</th>
diff --git a/descriptorhandler/template/modal/modal_keyboard_info_base.html b/descriptorhandler/template/modal/modal_keyboard_info_base.html
new file mode 100644
index 0000000..2be28a9
--- /dev/null
+++ b/descriptorhandler/template/modal/modal_keyboard_info_base.html
@@ -0,0 +1,35 @@
+<div id="modalTopologyInfoButton" class="modal fade" tabindex="-1" role="dialog">
+ <div class="modal-dialog ">
+ <div class="modal-content">
+ <div class="modal-header">
+
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ <h4 class="modal-title">Keyboard shortcuts</h4>
+ </div>
+ <div class="modal-body">
+ <ul>
+
+ <li>
+ <p>Create edge: Select the first vertex by clicking on it. <span class="help-key">Shift</span> + <span class="help-key">left-click</span> on another vertex (different than the selected one).</p>
+ </li>
+ <li>
+ <p> <span class="help-key">Delete</span> Delete selected nodes or link.</p>
+ </li>
+
+
+ {% block left_sidebar %}
+
+ {% endblock %}
+ </ul>
+ </div>
+ <div class="modal-footer">
+
+ </div>
+ </div>
+ <!-- /.modal-content -->
+ </div>
+ <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
\ No newline at end of file