commit 45e33ee184cb787b19549e23121efad559497007
author lombardofr <lombardo@everyup.it> Wed Jul 18 19:22:37 2018 +0200
committer lombardofr <lombardo@everyup.it> Thu Jul 19 14:40:12 2018 +0200
tree 802b8704424bf5289f3a4ceb5f51e754bedf4902
parent bced6e6778a58c6aba2b8aaa682fda728f39422a

enhanced datatables

Change-Id: I06744028ce50c3683481a3a26c5c0c63561581d4
Signed-off-by: lombardofr <lombardo@everyup.it>

instancehandler/template/instance_list.html

diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html
index 5471c19..3b8ffcf 100644
--- a/instancehandler/template/instance_list.html
+++ b/instancehandler/template/instance_list.html
@@ -14,6 +14,7 @@
     <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">
+    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -70,6 +71,14 @@
     <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>
+    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+
+    <script>
+    $(document).ready( function () {
+        $('#instances_table').DataTable();
+    } );
+    </script>
 
 {% endblock %}
 

instancehandler/template/instance_list_ns.html

diff --git a/instancehandler/template/instance_list_ns.html b/instancehandler/template/instance_list_ns.html
index 2481d87..48695cd 100644
--- a/instancehandler/template/instance_list_ns.html
+++ b/instancehandler/template/instance_list_ns.html
@@ -17,8 +17,8 @@
         <table id="instances_table" class="table table-bordered table-striped">
             <thead>
             <tr>
-                <th>Id</th>
                 <th>Name</th>
+                <th>Identifier</th>
                 <th>Nsd name</th>
                 <th style="width:5%">Operational Status</th>
                 <th style="width:5%">Config Status</th>
@@ -29,9 +29,9 @@
             <tbody>
             {% for i in instances %}
                 <tr>
-
-                    <td>{{ i|get:"_id" }}</td>
                     <td>{{ i|get:"short-name" }}</td>
+                    <td>{{ i|get:"_id" }}</td>
+
                     <td>{{ i|get:"nsd-name-ref" }}</td>
 
                     {% if i|get:"operational-status" == 'failed' %}

instancehandler/template/instance_list_vnf.html

diff --git a/instancehandler/template/instance_list_vnf.html b/instancehandler/template/instance_list_vnf.html
index b8fd9cc..5f13f2b 100644
--- a/instancehandler/template/instance_list_vnf.html
+++ b/instancehandler/template/instance_list_vnf.html
@@ -16,7 +16,7 @@
         <table id="instances_table" class="table table-bordered table-striped">
             <thead>
             <tr>
-                <th>Id</th>
+                <th>Identifier</th>
                 <th>VNFD</th>
                 <th>Member Index</th>
                 <th>NS</th>