X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=projecthandler%2Ftemplate%2Fproject%2Fosm%2Fdescriptor%2Fdescriptorlist.html;h=ee3eaa7625b11bf518df52936a7e5760678e1270;hb=bced6e6778a58c6aba2b8aaa682fda728f39422a;hp=67f4a7574571aa516892ef9551d6cd2a10ac0137;hpb=911c9e41d2b4ab424851ec505733d13b868defd0;p=osm%2FLW-UI.git

diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html
index 67f4a75..ee3eaa7 100644
--- a/projecthandler/template/project/osm/descriptor/descriptorlist.html
+++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html
@@ -7,15 +7,18 @@
             <h3 class="box-title">
             </h3>
             <div class="box-tools">
-
-                <a href="{% url 'projects:new_descriptor' project_id=project_id descriptor_type=descriptor_type %}"
+                <div class="btn-group">
+                    <!--
+                <a href="{% url 'projects:open_composer'%}"
                    class="btn btn-block btn-primary btn-sm"><i
-                        class="fa fa-upload"></i><span> Onboard {{descriptor_type|upper}}</span></a>
+                        class="fa fa-paint-brush" disabled></i><span> Composer</span></a>
+                        -->
+                </div>
             </div>
         </div>
         <div class="box-body">
             <table id="descriptors_table" class="table table-bordered table-striped dataTable"
-                       role="grid">
+                   role="grid">
                 <thead>
                 <tr role="row">
                     <th>Id</th>
@@ -28,26 +31,44 @@
                 </thead>
                 <tbody>
                 {% for k in descriptors %}
-                <tr role="row">
-                    <td>{{ k|get:"_id" }}</td>
-                    <td>{{ k|get:"short-name" }} </td>
-                    <td>{{ k|get:"description" }} </td>
-                    <td>{{ k|get:"vendor" }} </td>
-                    <td>{{ k|get:"version" }} </td>
-                    <td>
-                        <div class="btn-group">
-                            {% if descriptor_type == "nsd" %}
-                            <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Instantiate NS" onclick="javascript:openModalCreateNS({ 'project_id':'{{project_id}}', 'descriptor_type': '{{descriptor_type}}', 'descriptor_name':'{{ k|get:"name" }}', 'descriptor_id':'{{ k|get:"_id" }}','vim_list_url': '{% url "projects:vims:list" project_id=project_id%}',  'nsd_list_url': '{% url "projects:list_descriptors" project_id=project_id descriptor_type=descriptor_type  %}' })"><i class="fa fa-paper-plane"></i></button>
-                            {% endif %}
-                            <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Edit" onclick="javascript:openDescriptorView('{{project_id}}', '{{descriptor_type}}', '{{ k|get:"_id" }}')"><i class="fa fa-edit"></i></button>
-                            <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Show content" onclick="javascript:openPackageContentList('{{project_id}}', '{{descriptor_type}}', '{{ k|get:"_id" }}')"><i class="fa fa-folder-open"></i></button>
-                            <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Show Graph" onclick="location.href='/projects/{{project_id}}/graph?type={{descriptor_type}}&id={{ k|get:"_id" }}'" disabled><i class="fa fa-sitemap fa-fw"></i></button>
-                            <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Download package" onclick="location.href='{% url 'projects:custom_action' project_id=project_id descriptor_type=descriptor_type descriptor_id=k|get:'_id' action_name='download_pkg' %}'"><i class="fa fa-download fa-fw"></i></button>
-                            <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Delete" onclick="javascript:deletePackage('{{project_id}}', '{{descriptor_type}}', '{{ k|get:"_id" }}')"><i class="fa fa-trash-o"></i></button>
-                        </div>
+                    <tr role="row">
+                        <td>{{ k|get:"_id" }}</td>
+                        <td>{{ k|get:"short-name" }} </td>
+                        <td>{{ k|get:"description" }} </td>
+                        <td>{{ k|get:"vendor" }} </td>
+                        <td>{{ k|get:"version" }} </td>
+                        <td>
+                            <div class="btn-group">
+                                {% if descriptor_type == "nsd" %}
+                                    <button type="button" class="btn btn-default" data-container="body"
+                                            data-toggle="tooltip" data-placement="top" title="Instantiate NS"
+                                            onclick="javascript:openModalCreateNS({ 'project_id':'{{ project_id }}', 'descriptor_type': '{{ descriptor_type }}', 'descriptor_name':'{{ k|get:"name" }}', 'descriptor_id':'{{ k|get:"_id" }}','vim_list_url': '{% url "vims:list"  %}',  'nsd_list_url': '{% url "projects:list_descriptors"  descriptor_type=descriptor_type %}' })">
+                                        <i class="fa fa-paper-plane"></i></button>
+                                {% endif %}
+                                <button type="button" class="btn btn-default" data-container="body"
+                                        data-toggle="tooltip" data-placement="top" title="Edit"
+                                        onclick="javascript:openDescriptorView('{{ descriptor_type }}', '{{ k|get:"_id" }}')">
+                                    <i class="fa fa-edit"></i></button>
+                                <button type="button" class="btn btn-default" data-container="body"
+                                        data-toggle="tooltip" data-placement="top" title="Show content"
+                                        onclick="javascript:openPackageContentList('{{ descriptor_type }}', '{{ k|get:"_id" }}')">
+                                    <i class="fa fa-folder-open"></i></button>
+                                <button type="button" class="btn btn-default" data-container="body"
+                                        data-toggle="tooltip" data-placement="top" title="Show Graph"
+                                        onclick="location.href='/projects/graph?type={{ descriptor_type }}&id={{ k|get:"_id" }}'"
+                                        disabled><i class="fa fa-sitemap fa-fw"></i></button>
+                                <button type="button" class="btn btn-default" data-container="body"
+                                        data-toggle="tooltip" data-placement="top" title="Download package"
+                                        onclick="location.href='{% url 'projects:custom_action'  descriptor_type=descriptor_type descriptor_id=k|get:'_id' action_name='download_pkg' %}'">
+                                    <i class="fa fa-download fa-fw"></i></button>
+                                <button type="button" class="btn btn-default" data-container="body"
+                                        data-toggle="tooltip" data-placement="top" title="Delete"
+                                        onclick="javascript:deletePackage( '{{ descriptor_type }}', '{{ k|get:"_id" }}')">
+                                    <i class="far fa-trash-alt"></i></button>
+                            </div>
 
-                    </td>
-                </tr>
+                        </td>
+                    </tr>
                 {% endfor %}
                 </tbody>
 
@@ -55,3 +76,15 @@
         </div>
     </div>
 </div>
+
+<div class="col-sm-12">
+    <div class="box box-solid">
+        <div class="box-body">
+
+            <div class="upload-drop-zone" id="drop-zone">
+               <i class="fa fa-upload"></i> Just drag and drop files here
+            </div>
+        </div>
+    </div>
+</div>
+