Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[myslice.git] / portal / templates / slice-resource-view.html

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index 1875e0b..42c769d 100644 (file)
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -10,22 +10,15 @@
 {% endblock %}
 
 {% block content %}
+               <div class="row">
+                       {% widget '_widget-slice-sections.html' %}
+               </div>
        <div class="col-md-2">
+               
                <!-- <div id="select-platform" class="list-group"></div> -->
-        {{filter_testbeds}}
-
-               <div class="list-group-item list-resources">
-                       <span class="list-group-item-heading">Resources</span>
-                       <a class="list-group-item" data-panel="resources" href="#">All</a>
-                       <a class="list-group-item" data-panel="reserved" href="#">Reserved</a>
-                       <a class="list-group-item" data-panel="pending" href="#">Pending <span class="badge" id="badge-pending" data-number="0"></span></a>
-               </div>
-       
+               {{filter_testbeds}}
        </div>
        <div class="col-md-10" style="height:100%;">
-               <div class="row">
-                       {% widget '_widget-slice-sections.html' %}
-               </div>
                <!-- <div class="row slice-pending">
                        <ul class="nav nav-pills">
                                <li><a href="">Unreserved</a></li>
@@ -45,9 +38,16 @@
                        <div class="col-md-12"><p class="alert-success">{{ msg }}</p></div>
                        {% endif %}
                </div>
+               <div class="list-group-item list-resources">
+                       <span class="list-group-item-heading" style="padding-left: 0;">Resource status:</span>
+                       <a class="list-group-item active" data-panel="resources" href="#" style='display: inline-block !important;'>All</a>
+                       <a class="list-group-item" data-panel="reserved" href="#" style='display: inline-block !important;'>Reserved</a>
+                       <a class="list-group-item" data-panel="pending" href="#" style='display: inline-block !important;'>Pending <span class="badge" id="badge-pending" data-number="0"></span></a>
+               </div>
+               
                <div class="row">
                        <ul class="nav nav-pills nav-resources">
-                         <li class="active"><a data-panel="resources" href="#">Resources</a></li>
+                         <li class="active"><a data-panel="resources" href="#">Table</a></li>
                          <li id="GoogleMap"><a data-panel="map" href="#">Map</a></li>
                          <li id="Scheduler"><a data-panel="scheduler-tab" href="#">Scheduler</a></li>
                        </ul>
@@ -79,16 +79,25 @@
                                <!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
                        </div>
                        <div id="reserved" class="panel" style="height:370px;display:none;">
-                {{list_reserved_resources}}
+                <table width="80%">
+                    <tr><th width="50%" style="text-align:center;">resources</th><th width="50%" style="text-align:center;">leases</th></tr>
+                    <tr>
+                        <td style="text-align:center">{{list_reserved_resources}}</td>
+                        <td style="text-align:center">{{list_reserved_leases}}</td>
+                    </tr>
+                </table>
+                       </div>
+                       <div id="pending" class="panel" style="height:370px;display:none;">
+                {{pending_resources}}
+                       </div>
+                       <div id="sla_dialog" class="panel" style="height:370px;display:none;">
+                {{sla_dialog}}
                        </div>
                        <div id="map" class="panel" style="height:370px;display:none;">
                 {{map_resources}}
                        </div>
                        <div id="scheduler-tab" class="panel" style="height:370px;display:none;">
-                {#scheduler#}
-                       </div>
-                       <div id="pending" class="panel" style="height:370px;display:none;">
-                {{pending_resources}}
+                {{scheduler}}
                        </div>
                </div>
        </div>