From 45e33ee184cb787b19549e23121efad559497007 Mon Sep 17 00:00:00 2001 From: lombardofr Date: Wed, 18 Jul 2018 19:22:37 +0200 Subject: [PATCH] enhanced datatables Change-Id: I06744028ce50c3683481a3a26c5c0c63561581d4 Signed-off-by: lombardofr --- instancehandler/template/instance_list.html | 9 ++++++++ .../template/instance_list_ns.html | 6 ++--- .../template/instance_list_vnf.html | 2 +- .../osm/descriptor/descriptorlist.html | 4 ++-- .../project/osm/osm_project_descriptors.html | 4 ++++ .../template/project/projectlist.html | 9 ++++++++ sdnctrlhandler/template/sdn_list.html | 16 +++++++++----- userhandler/templates/user_list.html | 9 +++++++- vimhandler/template/vim_list.html | 22 +++++++++---------- 9 files changed, 58 insertions(+), 23 deletions(-) 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 @@ + {% endblock %} {% block title_header_big %} {{ block.super }} @@ -70,6 +71,14 @@ + + + + {% endblock %} 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 @@ - + @@ -29,9 +29,9 @@ {% for i in instances %} - - + + {% if i|get:"operational-status" == 'failed' %} 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 @@
Id NameIdentifier Nsd name Operational Status Config Status
{{ i|get:"_id" }} {{ i|get:"short-name" }}{{ i|get:"_id" }}{{ i|get:"nsd-name-ref" }}
- + diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html index ee3eaa7..734259f 100644 --- a/projecthandler/template/project/osm/descriptor/descriptorlist.html +++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html @@ -21,8 +21,8 @@ role="grid"> - + @@ -32,8 +32,8 @@ {% for k in descriptors %} - + diff --git a/projecthandler/template/project/osm/osm_project_descriptors.html b/projecthandler/template/project/osm/osm_project_descriptors.html index 10df788..f877ea8 100644 --- a/projecthandler/template/project/osm/osm_project_descriptors.html +++ b/projecthandler/template/project/osm/osm_project_descriptors.html @@ -49,6 +49,10 @@ var csrf_token = '{{csrf_token}}'; var descr_list_url = '{% url "projects:list_descriptors" descriptor_type=descriptor_type%}'; var new_desc_url ="{% url 'projects:new_descriptor' descriptor_type=descriptor_type %}" + $(document).ready( function () { + $('#descriptors_table').DataTable(); + } ); + diff --git a/projecthandler/template/project/projectlist.html b/projecthandler/template/project/projectlist.html index ed8b583..213c5b0 100644 --- a/projecthandler/template/project/projectlist.html +++ b/projecthandler/template/project/projectlist.html @@ -5,6 +5,7 @@ {% block head_block %} {{ block.super }} + {% endblock %} {% block title_header_big %} @@ -92,6 +93,14 @@ {% block resource_block %} {{ block.super }} + + + + - + + - + {% endblock %} {% block footer %} diff --git a/userhandler/templates/user_list.html b/userhandler/templates/user_list.html index f8fa6ac..8d7e84a 100644 --- a/userhandler/templates/user_list.html +++ b/userhandler/templates/user_list.html @@ -7,6 +7,7 @@ {% block head_block %} {{ block.super }} + {% endblock %} {% block title_header_big %} {{ block.super }} @@ -94,9 +95,15 @@ {% block resource_block %} {{ block.super }} - + + + {% endblock %} diff --git a/vimhandler/template/vim_list.html b/vimhandler/template/vim_list.html index d1b9545..6823c72 100644 --- a/vimhandler/template/vim_list.html +++ b/vimhandler/template/vim_list.html @@ -5,7 +5,7 @@ {% block head_block %} {{ block.super }} - + {% endblock %} {% block title_header_big %} {{ block.super }} @@ -38,11 +38,11 @@
-
IdIdentifier VNFD Member Index NS
Id NameIdentified Description Vendor Version
{{ k|get:"_id" }} {{ k|get:"short-name" }} {{ k|get:"_id" }} {{ k|get:"description" }} {{ k|get:"vendor" }} {{ k|get:"version" }}
+
- + @@ -53,9 +53,8 @@ {% for p in datacenters %} - - + @@ -85,8 +84,13 @@ {% block resource_block %} {{ block.super }} - - + + + {% endblock %} - -{% block footer %} - {% include "footer.html" %} -{% endblock %} \ No newline at end of file -- 2.25.1
Id NameIdentifier Type Operational State Description
{{ p|get:"_id" }} {{ p|get:"name" }}{{ p|get:"_id" }} {{ p|get:"vim_type" }} {{ p|get_sub:"_admin,operationalState"}} {{ p|get_sub:"_admin,description" }}