From: lombardofr Date: Mon, 29 Oct 2018 12:41:08 +0000 (+0100) Subject: new django app descriptionhandler X-Git-Tag: v5.0.0~19 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3218b2b802b040b6110780eb95cf84a9f3101505;p=osm%2FLW-UI.git new django app descriptionhandler Change-Id: I0d7bdece62413ad1a9aa30c64fbd9f785705dc8e Signed-off-by: lombardofr --- diff --git a/.gitignore b/.gitignore index da69467..6672790 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ static/bower_components #migrations projecthandler/migrations/ +descriptorhandler/migrations/ instancehandler/migrations sdnctrlhandler/migrations authosm/migrations diff --git a/descriptorhandler/__init__.py b/descriptorhandler/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/descriptorhandler/apps.py b/descriptorhandler/apps.py new file mode 100644 index 0000000..9d952fc --- /dev/null +++ b/descriptorhandler/apps.py @@ -0,0 +1,23 @@ +# +# Copyright 2018 EveryUP Srl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class DescriptorhandlerConfig(AppConfig): + name = 'descriptorhandler' diff --git a/descriptorhandler/models.py b/descriptorhandler/models.py new file mode 100644 index 0000000..ed2a5ae --- /dev/null +++ b/descriptorhandler/models.py @@ -0,0 +1,21 @@ +# +# Copyright 2018 EveryUP Srl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. diff --git a/descriptorhandler/template/composer.html b/descriptorhandler/template/composer.html new file mode 100644 index 0000000..cad68fa --- /dev/null +++ b/descriptorhandler/template/composer.html @@ -0,0 +1,80 @@ +{% extends "base.html" %} +{% load get %} +{% load staticfiles %} + + + +{% block head_block %} + {{ block.super }} + + + + + + +{% endblock %} +{% block title_header_big %} + {{ block.super }} +{% endblock %} +{% block left_sidebar %} + {% include 'osm/osm_project_left_sidebar.html' %} +{% endblock %} + + +{% block breadcrumb_body %} + {{ block.super }} + {% comment %}
  • {{ type|upper }} Descriptors
    • +
  • {{ type|upper }} Topology
    • {% endcomment %} +{% endblock %} + +{% block content_body %} + {{ block.super }} + {% csrf_token %} +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    + +{% endblock %} + +{% block resource_block %} + {{ block.super }} + + + + + + + + + + + + + +{# #} + +{% endblock %} + +{% block footer %} + {% include "footer.html" %} +{% endblock %} diff --git a/descriptorhandler/template/descriptor_new.html b/descriptorhandler/template/descriptor_new.html new file mode 100644 index 0000000..2551f30 --- /dev/null +++ b/descriptorhandler/template/descriptor_new.html @@ -0,0 +1,67 @@ +{% extends "/descriptor_view_base.html" %} + +{% load staticfiles %} + + +{% block title_header_big %} +{{ block.super }} +Onboard new {{ descriptor_type }} package +{% endblock %} + +{% block left_sidebar %} +{% include 'osm/osm_project_left_sidebar.html' %} +{% endblock %} + +{% block breadcrumb_body %} +{{ block.super }} +
  • {{project_id}}
    • +
  • {{ descriptor_type }} Descriptors
    • +
  • Create Descriptor
    • +{% endblock %} + +{% block tab_pane_button_list %} +{{ block.super }} +
  • Onboard Package
    • +{% endblock %} + +{% block nav_buttons_list %} +{{ block.super }} +
  • + +
    • +{% endblock %} + +{% block tab_pane_list %} +{{ block.super }} + +
    + +

    Drag and drop file below

    +
    + Just drag and drop files here +
    +
    +{% endblock %} + + +{% block resource_block %} +{{ block.super }} + + + +{% endblock %} + +{% block footer %} + {% include "footer.html" %} +{% endblock %} diff --git a/descriptorhandler/template/descriptor_view.html b/descriptorhandler/template/descriptor_view.html new file mode 100644 index 0000000..2a18666 --- /dev/null +++ b/descriptorhandler/template/descriptor_view.html @@ -0,0 +1,132 @@ +{% extends "descriptor_view_base.html" %} + +{% load staticfiles %} + + +{% block title_header_big %} +{{ block.super }} +Edit {{ descriptor_type|upper }} Descriptor +{% endblock %} + + +{% block left_sidebar %} +{% include 'osm/osm_project_left_sidebar.html' %} +{% endblock %} + +{% block breadcrumb_body %} +{{ block.super }} +
  • {{project_id}}
    • +
  • {{ descriptor_type }} Descriptors
    • +
  • {{descriptor_id}}
    • +{% endblock %} + +{% block tab_pane_button_list %} +{{ block.super }} +
  • YAML
    • +
  • JSON
    • +{% endblock %} + +{% block nav_buttons_list %} + {{ block.super }} +
    • +
    • +
    • + +{% endblock %} + +{% block tab_pane_list %} +{{ block.super }} + + +
    + +
    + + +
    + +
    + +{% endblock %} + +{% block resource_block %} +{{ block.super }} + + + +{% endblock %} + + +{% block footer %} + {% include "footer.html" %} +{% endblock %} diff --git a/descriptorhandler/template/descriptor_view_base.html b/descriptorhandler/template/descriptor_view_base.html new file mode 100644 index 0000000..918e810 --- /dev/null +++ b/descriptorhandler/template/descriptor_view_base.html @@ -0,0 +1,141 @@ +{% extends "base.html" %} + +{% load staticfiles %} + +{% block head_block %} + {{ block.super }} + + + + + + + + + +{% endblock %} + + + + +{% block content_body %} + {{ block.super }} +
    +
    +
    +
      + {% block tab_pane_button_list %} + + {% endblock %} + + {% block nav_buttons_list %} + + {% endblock %} + +
    + +
    + {% block tab_pane_list %} + + {% endblock %} +
    + + + + + +
    + +
    +
    +{% endblock %} + +{% block resource_block %} + {{ block.super }} + + + + + + + + + + + + + + + + + + + + +{% endblock %} diff --git a/descriptorhandler/template/descriptorlist.html b/descriptorhandler/template/descriptorlist.html new file mode 100644 index 0000000..9d86624 --- /dev/null +++ b/descriptorhandler/template/descriptorlist.html @@ -0,0 +1,47 @@ +{% load staticfiles %} +{% load get %} +
    + +
    +
    +

    +

    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + +
    NameIdentifiedDescriptionVendorVersionActions
    +
    +
    +
    + +
    +
    +
    + +
    + Just drag and drop files here +
    +
    +
    +
    + diff --git a/descriptorhandler/template/modal/choose_node_id.html b/descriptorhandler/template/modal/choose_node_id.html new file mode 100644 index 0000000..91c4d20 --- /dev/null +++ b/descriptorhandler/template/modal/choose_node_id.html @@ -0,0 +1 @@ +{% extends "descriptor/modal/choose_node_id.html" %} \ No newline at end of file diff --git a/descriptorhandler/template/modal/create_link_chooser.html b/descriptorhandler/template/modal/create_link_chooser.html new file mode 100644 index 0000000..ed9a4a5 --- /dev/null +++ b/descriptorhandler/template/modal/create_link_chooser.html @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/descriptorhandler/urls.py b/descriptorhandler/urls.py new file mode 100644 index 0000000..c6e987e --- /dev/null +++ b/descriptorhandler/urls.py @@ -0,0 +1,30 @@ +# +# Copyright 2018 EveryUP Srl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from django.conf.urls import url +from descriptorhandler import views + +urlpatterns = [ + url(r'(?P\w+)/list$', views.show_descriptors, name='list_descriptors'), + url(r'(?P\w+)/(?P[-\w]+)(/$)', views.edit_descriptor, name='edit_descriptor'), + url(r'(?P\w+)/(?P[-\w]+)/delete$', views.delete_descriptor, name='delete_descriptor'), + url(r'(?P\w+)/(?P[-\w]+)/clone', views.clone_descriptor, name='clone_descriptor'), + url(r'(?P\w+)/(?P[-\w]+)/action/(?P[-\w]+)',views.custom_action, + name='custom_action'), + url(r'(?P\w+)/new$', views.new_descriptor, name='new_descriptor'), + url(r'composer$', views.open_composer, name='open_composer'), + url(r'availablenodes', views.get_available_nodes, name='get_available_nodes'), +] diff --git a/descriptorhandler/views.py b/descriptorhandler/views.py new file mode 100644 index 0000000..8b902af --- /dev/null +++ b/descriptorhandler/views.py @@ -0,0 +1,458 @@ +# +# Copyright 2018 EveryUP Srl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import json +import logging + +import yaml +from sf_t3d.decorators import login_required +from django.http import HttpResponse +from django.shortcuts import render, redirect + + +from lib.util import Util +from lib.osm.osmclient.clientv2 import Client +import authosm.utils as osmutils + +logging.basicConfig(level=logging.DEBUG) +log = logging.getLogger('descriptorhandler/view.py') + + +@login_required +def show_descriptors(request, descriptor_type=None): + user = osmutils.get_user(request) + project_id = user.project_id + client = Client() + print descriptor_type + try: + if descriptor_type == 'nsd': + descriptors = client.nsd_list(user.get_token()) + elif descriptor_type == 'vnfd': + descriptors = client.vnfd_list(user.get_token()) + except Exception as e: + log.exception(e) + descriptors = [] + + url = 'osm/osm_project_descriptors.html' + return __response_handler(request, { + 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [], + 'project_id': project_id, + 'project_type': 'osm', + 'descriptor_type': descriptor_type + }, url) + + +@login_required +def delete_descriptor(request, descriptor_type=None, descriptor_id=None): + user = osmutils.get_user(request) + project_id = user.project_id + try: + client = Client() + if descriptor_type == 'nsd': + result = client.nsd_delete(user.get_token(), descriptor_id) + elif descriptor_type == 'vnfd': + result = client.vnfd_delete(user.get_token(), descriptor_id) + except Exception as e: + log.exception(e) + result = {'error': True, 'data': str(e)} + + url = 'osm/osm_project_descriptors.html' + descriptors = {} + try: + if descriptor_type == 'nsd': + descriptors = client.nsd_list(user.get_token()) + elif descriptor_type == 'vnfd': + descriptors = client.vnfd_list(user.get_token()) + except Exception as e: + log.exception(e) + + return __response_handler(request, { + 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [], + 'project_id': project_id, + 'project_type': 'osm', + 'descriptor_type': descriptor_type, + 'alert_message': { + 'success': False if result['error'] is True else True, + 'message': 'An error occurred while processing your request.' if result and result['error'] is True else "Record deleted successfully"} + }, url) + + +@login_required +def clone_descriptor(request, descriptor_type=None, descriptor_id=None): + user = osmutils.get_user(request) + project_id = user.project_id + + try: + client = Client() + if descriptor_type == 'nsd': + result = client.nsd_clone(user.get_token(), descriptor_id) + elif descriptor_type == 'vnfd': + result = client.vnfd_clone(user.get_token(), descriptor_id) + else: + log.debug('Update descriptor: Unknown data type') + result = {'error': True, 'data': 'Update descriptor: Unknown data type'} + except Exception as e: + log.exception(e) + result = {'error': True, 'data': str(e)} + if result['error'] == True: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) + + else: + return __response_handler(request, {}, url=None, status=200) + + +@login_required +def new_descriptor(request, descriptor_type=None): + user = osmutils.get_user(request) + project_id = user.project_id + page = 'descriptor_new.html' + if request.method == 'GET': + request_id = request.GET.get('id', '') + + return __response_handler(request, { + 'project_id': project_id, + 'descriptor_type': descriptor_type, + 'descriptor_id': request_id, + }, page) + elif request.method == 'POST': + data_type = request.POST.get('type') + if data_type == "file": + file_uploaded = request.FILES['file'] + + try: + client = Client() + if descriptor_type == 'nsd': + result = client.nsd_onboard(user.get_token(), file_uploaded) + elif descriptor_type == 'vnfd': + result = client.vnfd_onboard(user.get_token(), file_uploaded) + else: + log.debug('Create descriptor: Unknown data type') + result = {'error': True, 'data': 'Create descriptor: Unknown data type'} + + except Exception as e: + log.exception(e) + result = {'error': True, 'data': str(e)} + else: + result = {'error': True, 'data': 'Create descriptor: Unknown data type'} + + if result['error']: + return __response_handler(request, result['data'], url=None, status=result['data']['status'] if 'status' in result['data'] else 500) + else: + return __response_handler(request, {}, url=None, status=200) + + +@login_required +def edit_descriptor(request, descriptor_id=None, descriptor_type=None): + user = osmutils.get_user(request) + project_id = user.project_id + if request.method == 'POST': + new_data = request.POST.get('text'), + data_type = request.POST.get('type') + #print new_data + try: + client = Client() + if descriptor_type == 'nsd': + if data_type == 'yaml': + new_data = yaml.load(request.POST.get('text')) + elif data_type == 'json': + new_data = json.loads(request.POST.get('text')) + result = client.nsd_update(user.get_token(), descriptor_id, new_data) + elif descriptor_type == 'vnfd': + if data_type == 'yaml': + new_data = yaml.load(request.POST.get('text')) + elif data_type == 'json': + new_data = json.loads(request.POST.get('text')) + result = client.vnfd_update(user.get_token(), descriptor_id, new_data) + + else: + log.debug('Update descriptor: Unknown data type') + result = {'error': True, 'data': 'Update descriptor: Unknown data type'} + except Exception as e: + log.exception(e) + result = {'error': True, 'data': str(e)} + if result['error'] == True: + return __response_handler(request, result['data'], url=None, status=result['data']['status'] if 'status' in result['data'] else 500) + + else: + return __response_handler(request, {}, url=None, status=200) + + elif request.method == 'GET': + + page = 'descriptor_view.html' + try: + client = Client() + if descriptor_type == 'nsd': + result = client.nsd_get(user.get_token(), descriptor_id) + elif descriptor_type == 'vnfd': + result = client.vnfd_get(user.get_token(), descriptor_id) + + except Exception as e: + log.exception(e) + result = {'error': True, 'data': str(e)} + + if isinstance(result, dict) and 'error' in result and result['error']: + return render(request, 'error.html') + + descriptor_string_json = json.dumps(result, indent=2) + descriptor_string_yaml = Util.json2yaml(result) + # print descriptor + return render(request, page, { + 'project_id': project_id, + 'descriptor_id': descriptor_id, + 'descriptor_type': descriptor_type, + 'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml, + 'descriptor_string_json': descriptor_string_json}}) + + +@login_required +def get_package_files_list(request, descriptor_id, descriptor_type): + user = osmutils.get_user(request) + try: + client = Client() + if descriptor_type == 'nsd': + artifacts_res = client.nsd_artifacts(user.get_token(), descriptor_id) + elif descriptor_type == 'vnfd': + artifacts_res = client.vnf_packages_artifacts(user.get_token(), descriptor_id) + else: + return False + + files_list = yaml.load(artifacts_res['data'] if artifacts_res and artifacts_res['error'] is False else []) + result = {'files': files_list} + except Exception as e: + log.exception(e) + url = 'error.html' + result = {'error_msg': 'Unknown error.'} + return __response_handler(request, result) + + +@login_required +def download_pkg(request, descriptor_id, descriptor_type): + user = osmutils.get_user(request) + file_name = "osm_export.tar.gz" + tar_pkg = None + try: + client = Client() + if descriptor_type == 'nsd': + tar_pkg = client.get_nsd_pkg(user.get_token(), descriptor_id) + elif descriptor_type == 'vnfd': + tar_pkg = client.get_vnfd_pkg(user.get_token(), descriptor_id) + + except Exception as e: + log.exception(e) + + response = HttpResponse(content_type="application/tgz") + response["Content-Disposition"] = "attachment; filename="+ file_name + response.write(tar_pkg.getvalue()) + return response + +@login_required +def open_composer(request): + user = osmutils.get_user(request) + project_id = user.project_id + result = {'project_id': project_id, + 'vertices': [ + {"info": {"type": "vnf", "property": {"custom_label": ""}, + "group": []}, "id": "vm"}, + {"info": {"type": "vnf", "property": {"custom_label": ""}, + "group": []}, "id": "vlan"}, + {"info": {"type": "vnf", "property": {"custom_label": ""}, + "group": []}, "id": "firewall"}, + {"info": {"type": "vnf", "property": {"custom_label": ""}, + "group": []}, "id": "ping"}, + + {"info": {"type": "ns_vl", "property": {"custom_label": ""}, + "group": []}, "id": "vl1"}, + {"info": {"type": "ns_vl", "property": {"custom_label": ""}, + "group": []}, "id": "vl2"}, + {"info": {"type": "ns_vl", "property": {"custom_label": ""}, + "group": []}, "id": "vl3"}, + ], + 'edges': [ + {"source": "vm", "group": [], "target": "vl3", "view": "ns"}, + {"source": "vlan", "group": [], "target": "vl3", "view": "ns"}, + {"source": "vlan", "group": [], "target": "vl1", "view": "ns"}, + {"source": "firewall", "group": [], "target": "vl1", "view": "ns"}, + {"source": "firewall", "group": [], "target": "vl2", "view": "ns"}, + {"source": "ping", "group": [], "target": "vl2", "view": "ns"}, + ], + 'model': { + "layer": { + + "ns": { + "nodes": { + "vnf": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + }, + "expands": "vnf" + }, + "ns_vl": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + } + }, + + }, + "allowed_edges": { + "ns_vl": { + "destination": { + "vnf": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + } + } + }, + "vnf": { + "destination": { + "ns_vl": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + }, + + } + } + + } + }, + "vnf": { + "nodes": { + "vdu": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + } + }, + "cp": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + } + }, + + }, + "allowed_edges": { + "vdu": { + "destination": { + "cp": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + } + } + }, + "cp": { + "destination": { + "vdu": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + } + } + } + } + }, + "name": "OSM", + "version": 1, + "nodes": { + "vnf": { + "label": "vnf" + }, + "ns_vl": { + "label": "vl" + }, + "cp": { + "label": "cp" + }, + "vdu": { + "label": "vdu" + } + }, + "description": "osm", + "callback": { + "addNode": { + "file": "osm_controller.js", + "class": "OsmController" + }, + "removeNode": { + "file": "osm_controller.js", + "class": "OsmController" + }, + "addLink": { + "file": "osm_controller.js", + "class": "OsmController" + }, + "removeLink": { + "file": "osm_controller.js", + "class": "OsmController" + } + } + + } + }} + return __response_handler(request, result, 'composer.html') + + +def get_available_nodes(request): + + params = request.GET.dict() + nodes = { + 'ns': [{"types": [{"name": "Generic", "id": "vnf"}, + {"name": "ping", "id": "vnf"}, + {"name": "pong", "id": "vnf"}, + {"name": "hackfest1-vm", "id": "vnf"}], "category_name": "Vnf"}, + {"types": [{"name": "VL", "id": "ns_vl"}], "category_name": "VirtualLink"}], + 'vnf': [{"types": [{"name": "VDU", "id": "vdu"}], "category_name": "Vdu"}, + {"types": [{"name": "CP", "id": "cp"}], "category_name": "CP"}] + } + + return __response_handler(request, nodes[params['layer']]) + + +@login_required +def custom_action(request, descriptor_id=None, descriptor_type=None, action_name=None): + if request.method == 'GET': + return globals()[action_name](request, descriptor_id, descriptor_type) + + +def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs): + raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') + if 'application/json' in raw_content_types or url is None: + return HttpResponse(json.dumps(data_res), content_type="application/json", *args, **kwargs) + elif to_redirect: + return redirect(url, *args, **kwargs) + else: + return render(request, url, data_res) diff --git a/instancehandler/template/instance_list_ns.html b/instancehandler/template/instance_list_ns.html index 9a50881..e532076 100644 --- a/instancehandler/template/instance_list_ns.html +++ b/instancehandler/template/instance_list_ns.html @@ -7,7 +7,7 @@ diff --git a/projecthandler/template/project/descriptor/descriptor_view_base.html b/projecthandler/template/project/descriptor/descriptor_view_base.html deleted file mode 100644 index 918e810..0000000 --- a/projecthandler/template/project/descriptor/descriptor_view_base.html +++ /dev/null @@ -1,141 +0,0 @@ -{% extends "base.html" %} - -{% load staticfiles %} - -{% block head_block %} - {{ block.super }} - - - - - - - - - -{% endblock %} - - - - -{% block content_body %} - {{ block.super }} -
    -
    -
    -
      - {% block tab_pane_button_list %} - - {% endblock %} - - {% block nav_buttons_list %} - - {% endblock %} - -
    - -
    - {% block tab_pane_list %} - - {% endblock %} -
    - - - - - -
    - -
    -
    -{% endblock %} - -{% block resource_block %} - {{ block.super }} - - - - - - - - - - - - - - - - - - - - -{% endblock %} diff --git a/projecthandler/template/project/descriptor/modal/choose_node_id.html b/projecthandler/template/project/descriptor/modal/choose_node_id.html deleted file mode 100644 index 3bfea9e..0000000 --- a/projecthandler/template/project/descriptor/modal/choose_node_id.html +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/projecthandler/template/project/osm/descriptor/descriptor_new.html b/projecthandler/template/project/osm/descriptor/descriptor_new.html deleted file mode 100644 index 7711b57..0000000 --- a/projecthandler/template/project/osm/descriptor/descriptor_new.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "descriptor/descriptor_view_base.html" %} - -{% load staticfiles %} - - -{% block title_header_big %} -{{ block.super }} -Onboard new {{ descriptor_type }} package -{% endblock %} - -{% block left_sidebar %} -{% include 'osm/osm_project_left_sidebar.html' %} -{% endblock %} - -{% block breadcrumb_body %} -{{ block.super }} -
  • {{project_id}}
    • -
  • {{ descriptor_type }} Descriptors
    • -
  • Create Descriptor
    • -{% endblock %} - -{% block tab_pane_button_list %} -{{ block.super }} -
  • Onboard Package
    • -{% endblock %} - -{% block nav_buttons_list %} -{{ block.super }} -
  • - -
    • -{% endblock %} - -{% block tab_pane_list %} -{{ block.super }} - -
    - -

    Drag and drop file below

    -
    - Just drag and drop files here -
    -
    -{% endblock %} - - -{% block resource_block %} -{{ block.super }} - - - -{% endblock %} - -{% block footer %} - {% include "footer.html" %} -{% endblock %} diff --git a/projecthandler/template/project/osm/descriptor/descriptor_view.html b/projecthandler/template/project/osm/descriptor/descriptor_view.html deleted file mode 100644 index aa43149..0000000 --- a/projecthandler/template/project/osm/descriptor/descriptor_view.html +++ /dev/null @@ -1,132 +0,0 @@ -{% extends "descriptor/descriptor_view_base.html" %} - -{% load staticfiles %} - - -{% block title_header_big %} -{{ block.super }} -Edit {{ descriptor_type|upper }} Descriptor -{% endblock %} - - -{% block left_sidebar %} -{% include 'osm/osm_project_left_sidebar.html' %} -{% endblock %} - -{% block breadcrumb_body %} -{{ block.super }} -
  • {{project_id}}
    • -
  • {{ descriptor_type }} Descriptors
    • -
  • {{descriptor_id}}
    • -{% endblock %} - -{% block tab_pane_button_list %} -{{ block.super }} -
  • YAML
    • -
  • JSON
    • -{% endblock %} - -{% block nav_buttons_list %} - {{ block.super }} -
    • -
    • -
    • - -{% endblock %} - -{% block tab_pane_list %} -{{ block.super }} - - -
    - -
    - - -
    - -
    - -{% endblock %} - -{% block resource_block %} -{{ block.super }} - - - -{% endblock %} - - -{% block footer %} - {% include "footer.html" %} -{% endblock %} diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html deleted file mode 100644 index b2222e2..0000000 --- a/projecthandler/template/project/osm/descriptor/descriptorlist.html +++ /dev/null @@ -1,51 +0,0 @@ -{% load staticfiles %} -{% load get %} -
    - -
    -
    -

    -

    -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - -
    NameIdentifiedDescriptionVendorVersionActions
    -
    -
    -
    - -
    -
    -
    - -
    - Just drag and drop files here -
    -
    -
    -
    - diff --git a/projecthandler/template/project/osm/descriptor/modal/choose_node_id.html b/projecthandler/template/project/osm/descriptor/modal/choose_node_id.html deleted file mode 100644 index 91c4d20..0000000 --- a/projecthandler/template/project/osm/descriptor/modal/choose_node_id.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "descriptor/modal/choose_node_id.html" %} \ No newline at end of file diff --git a/projecthandler/template/project/osm/descriptor/modal/create_link_chooser.html b/projecthandler/template/project/osm/descriptor/modal/create_link_chooser.html deleted file mode 100644 index ed9a4a5..0000000 --- a/projecthandler/template/project/osm/descriptor/modal/create_link_chooser.html +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/projecthandler/template/project/osm/osm_project_descriptors.html b/projecthandler/template/project/osm/osm_project_descriptors.html index 83a8b38..8c1ceb2 100644 --- a/projecthandler/template/project/osm/osm_project_descriptors.html +++ b/projecthandler/template/project/osm/osm_project_descriptors.html @@ -36,7 +36,7 @@ {% include 'osm/modal/files_list.html' %} {% include 'modal/instance_create.html' %}
    - {% include "osm/descriptor/descriptorlist.html" %} + {% include "descriptorlist.html" %}
    {% endblock %} @@ -52,9 +52,9 @@