X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=netslicehandler%2Ftemplate%2Fnst_list.html;h=81c82d554148b99c88a84300b8cdd7c10c1844af;hb=refs%2Fchanges%2F21%2F7821%2F2;hp=dadde87d29a18cdf835b395376b953208e8ba5a0;hpb=6060dd65260d576fcb67731544debbe87c3a8782;p=osm%2FLW-UI.git

diff --git a/netslicehandler/template/nst_list.html b/netslicehandler/template/nst_list.html
index dadde87..81c82d5 100644
--- a/netslicehandler/template/nst_list.html
+++ b/netslicehandler/template/nst_list.html
@@ -5,13 +5,13 @@
 
 {% block head_block %}
 {{ block.super }}
-<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 %}
 {{ block.super }}
@@ -78,22 +78,22 @@ Network Slices Templates
 
 {% block resource_block %}
 {{ block.super }}
-<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/drop_zone.js"></script>
 <script src="/static/src/netslicehandler/onboard_template.js"></script>
 <script src="/static/src/netslicehandler/templates_list.js"></script>
@@ -149,13 +149,10 @@ Network Slices Templates
                 {
                     "render": function (data, type, row) {
                         return '<div class="btn-group">' +
-<<<<<<< Updated upstream
                             '   <button type="button" class="btn btn-default" data-container="body"\n' +
-                               'data-toggle="tooltip" data-placement="top" title="Instantiate NS"\n' +
-                               'onclick="javascript:openModalCreateNSI({\'template_name\':\''+row["name"]+'\', \'template_id\':\''+row["_id"]+'\', \'project_id\':\'{{ project_id }}\',\'vim_list_url\': \'{% url "vims:list"  %}\', \'nst_list_url\': \'{% url "netslices:list_templates" %}\'})">\n' +
-                               '<i class="fa fa-paper-plane"></i></button>\n'+
-=======
->>>>>>> Stashed changes
+                            '   data-toggle="tooltip" data-placement="top" title="Instantiate NS"\n' +
+                            '   onclick="javascript:openModalCreateNSI({\'template_name\':\''+row["name"]+'\', \'template_id\':\''+row["_id"]+'\', \'project_id\':\'{{ project_id }}\',\'vim_list_url\': \'{% url "vims:list"  %}\', \'nst_list_url\': \'{% url "netslices:list_templates" %}\'})">\n' +
+                            '   <i class="fa fa-paper-plane"></i></button>\n'+
                             '     <button type="button" class="btn btn-default"' +
                             '             onclick="javascript:showNstDetails(\'' + row["_id"] + '\')"' +
                             '             data-toggle="tooltip" data-placement="top" data-container="body" title="Open">' +
@@ -217,4 +214,4 @@ Network Slices Templates
     }
 </script>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}