X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Ftemplate%2Finstance_list.html;h=9baae4c13fafbec4aa8a7c913e6d708b656ce736;hb=99624b5f5ae95b0674f7f5005da04281e49ac5aa;hp=1b0868d6bc55f8250fdcfdf95f1bdd73250c47a2;hpb=fb37bca4b7e8178c65df2f1496afe372c1d55e78;p=osm%2FLW-UI.git

diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html
index 1b0868d..9baae4c 100644
--- a/instancehandler/template/instance_list.html
+++ b/instancehandler/template/instance_list.html
@@ -12,6 +12,8 @@
     <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
     <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
     <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
+    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
+    <link rel="stylesheet" href="/static/css/lwuitable.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -23,7 +25,7 @@
 
 {% block breadcrumb_body %}
     {{ block.super }}
-    <li><a href="{% url 'projects:instances:list' project_id=project_id type=type %}">Instances</a></li>
+    <li><a href="{% url 'projects:instances:list' project_id=project_id type=type %}">{{ type|upper }} Instances</a></li>
 {% endblock %}
 
 {% block content_body %}
@@ -33,103 +35,26 @@
     <div class="row">
         <div class="col-md-12">
 
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">Instances</h3>
-                    <!--
-                    <div class="box-tools">
-                        <a href="javascript:newVimModal()" class="btn btn-block btn-primary btn-sm"><i
-                                class="fa fa-plus"></i><span> New VIM</span></a>
-                    </div>
-                    -->
-                </div>
-                <div class="box-body">
-                    <table id="instances_table" class="table table-bordered table-striped">
-                        <thead>
-                        <tr>
-                            <th>Id</th>
-                            <th>Name</th>
-                            <th>Nsd name</th>
-                            <th style="width:5%">Operational Status</th>
-                            <th style="width:5%">Config Status</th>
-                            <th>Detailed Status</th>
-                            <th >Actions</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {% for i in instances %}
-                            <tr>
+            {% if type == 'ns' %}
+                {% include 'instance_list_ns.html' %}
+            {% elif type == 'vnf' %}
+                {% include 'instance_list_vnf.html' %}
+            {% endif %}
 
-                                <td>{{ i|get:"_id" }}</td>
-                                <td>{{ i|get:"short-name" }}</td>
-                                <td>{{ i|get:"nsd-name-ref" }}</td>
-
-                                {% if i|get:"operational-status" == 'failed' %}
-                                    <td><span class="label label-danger">{{ i|get:"operational-status"  }}</span> </td>
-                                {% elif i|get:"operational-status" == 'init' %}
-                                     <td><span class="label label-warning">{{ i|get:"operational-status"  }}</span> </td>
-                                {% elif i|get:"operational-status" == 'running' %}
-                                     <td><span class="label label-success">{{ i|get:"operational-status"  }}</span> </td>
-                                {% else  %}
-                                    <td>{{ i|get:"operational-status"  }}</td>
-                                {% endif %}
-                                {% if i|get:"config-status" == 'failed' %}
-                                    <td><span class="label label-danger">{{ i|get:"config-status"  }}</span> </td>
-                                {% elif i|get:"config-status" == 'init' %}
-                                     <td><span class="label label-warning">{{ i|get:"config-status"  }}</span> </td>
-                                {% elif i|get:"config-status" == 'running' %}
-                                     <td><span class="label label-success">{{ i|get:"config-status"  }}</span> </td>
-                                {% elif i|get:"config-status" == 'configured' %}
-                                    <td><span class="label label-success">{{ i|get:"config-status"  }}</span> </td>
-                                {% else  %}
-                                    <td>{{ i|get:"config-status"  }}</td>
-                                {% endif %}
-                                <td style=" max-width:1px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{ i|get:"detailed-status" }}</td>
-                                <td>
-                                    <div class="btn-group">
-                                        <button type="button" class="btn btn-default"
-                                                onclick="javascript:showInstanceDetails('{% url 'projects:instances:show' instance_id=i|get:'_id' project_id=project_id type=type %}')"
-                                                data-toggle="tooltip" data-placement="top" data-container="body" title="Show Info"><i
-                                                class="fa fa-info"></i>
-                                        </button>
-
-                                        <button type="button" class="btn btn-default"
-                                                onclick="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' project_id=project_id type=type %}')"
-                                                data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i
-                                                class="fa fa-trash-o"></i></button>
-
-                                            <button type="button" class="btn btn-default dropdown-toggle"
-                                                    data-toggle="dropdown" aria-expanded="false">Actions
-                                                <span class="fa fa-caret-down"></span></button>
-                                            <ul class="dropdown-menu">
-                                                <li><a href="#" onclick="javascript:performAction('{% url 'projects:instances:action' instance_id=i|get:'_id' project_id=project_id type=type %}')">
-                                                    <i class="fa fa-magic"></i>Exec NS Primitive</a></li>
-                                                <li><a href="#"> <i class="fa fa-list"></i>Active operations</a></li>
-                                            </ul>
-
-
-                                    </div>
-
-                                </td>
-
-
-                            </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
         </div>
 
     </div>
-{% include 'modal/instance_show.html' %}
-{% include 'modal/instance_new_action.html' %}
+    {% include 'modal/instance_create.html' %}
+    {% include 'modal/instance_show.html' %}
+    {% include 'modal/instance_new_action.html' %}
+    {% include 'modal/instance_new_alarm.html' %}
+    {% include 'modal/instance_export_metric.html' %}
 {% endblock %}
 
 {% block resource_block %}
     {{ block.super }}
     <!-- Utility JS -->
-
+    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
     <script src="/static/bower_components/codemirror/lib/codemirror.js"></script>
     <script src="/static/bower_components/codemirror/addon/fold/foldcode.js"></script>
     <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js"></script>
@@ -144,6 +69,7 @@
     <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
     <script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
     <script src="/static/src/instancehandler/instance_list.js"></script>
+    <script src="/static/src/instancehandler/instance_create.js"></script>
 
 {% endblock %}