fix UUID problem with projects and roles; removed bower
Change-Id: Icd02c3e4a1ec080bdb00ebdffaf65d1eb2708fd5
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html
index 1130e34..bee5116 100644
--- a/instancehandler/template/instance_list.html
+++ b/instancehandler/template/instance_list.html
@@ -7,14 +7,14 @@
{% block head_block %}
{{ block.super }}
<!-- Codemirror core CSS -->
- <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
- <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
- <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/node_modules/codemirror/lib/codemirror.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+ <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+ <link rel="stylesheet" href="/static/node_modules/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">
+ <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
{% endblock %}
{% block title_header_big %}
{{ block.super }}
@@ -59,24 +59,24 @@
{% 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>
- <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
- <script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
- <script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
- <script src="/static/bower_components/codemirror/addon/search/search.js"></script>
- <script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
- <script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
- <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
- <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
- <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
- <script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
+ <script src="/static/node_modules/select2/dist/js/select2.js"></script>
+ <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+ <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+ <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+ <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+ <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+ <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+ <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+ <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+ <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+ <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+ <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+ <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+ <script src="/static/node_modules/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 src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+ <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
<script>
var table;
diff --git a/instancehandler/template/instance_operations_list.html b/instancehandler/template/instance_operations_list.html
index 3f54f1f..de69ee2 100644
--- a/instancehandler/template/instance_operations_list.html
+++ b/instancehandler/template/instance_operations_list.html
@@ -8,13 +8,13 @@
{% block head_block %}
{{ block.super }}
<!-- Codemirror core CSS -->
- <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
- <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
- <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/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+ <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+ <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+ <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+ <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
{% endblock %}
{% block title_header_big %}
@@ -70,22 +70,22 @@
{% 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>
- <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
- <script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
- <script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
- <script src="/static/bower_components/codemirror/addon/search/search.js"></script>
- <script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
- <script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
- <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
- <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
- <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
- <script src="/static/bower_components/codemirror/keymap/sublime.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 src="/static/node_modules/select2/dist/js/select2.js"></script>
+ <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+ <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+ <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+ <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+ <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+ <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+ <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+ <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+ <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+ <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+ <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+ <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+ <script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
+ <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+ <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
<script src="/static/src/instancehandler/instance_operations_list.js"></script>
<script>
diff --git a/instancehandler/template/instance_topology_view.html b/instancehandler/template/instance_topology_view.html
index 5f52d72..1c27584 100644
--- a/instancehandler/template/instance_topology_view.html
+++ b/instancehandler/template/instance_topology_view.html
@@ -56,7 +56,7 @@
{% block resource_block %}
{{ block.super }}
<!-- d3.js -->
- <script src="/static/bower_components/d3/d3.js"></script>
+ <script src="/static/node_modules/d3/build/d3.js"></script>
<!-- TopologyComposer D3 -->
<script src="/static/TopologyComposer/js/event.js"></script>