Filter status: All, Available, Unavailable, Unconfigured, Pending, Reserved

[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 4ecf483..cbd8d1b 100644 (file)
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -18,36 +18,28 @@ $(document).ready(function() {
 {% endblock %}
 
 {% block content %}
-               <div class="row">
-                       {% widget '_widget-slice-sections.html' %}
-               </div>
+{% widget '_widget-slice-sections.html' %}
+<div class="container-fluid container-resource">
+       <div class="row">
        <div class="col-md-2">
-               
                <!-- <div id="select-platform" class="list-group"></div> -->
                {{filter_testbeds}}
        </div>
        <div class="col-md-10" style="height:100%;">
-               <!-- <div class="row slice-pending">
-                       <ul class="nav nav-pills">
-                               <li><a href="">Unreserved</a></li>
-                               <li><a href="">Reserved</a></li>
-                               <li><a href="">Pending<span class="badge" id="badge-pending" style="display:none;"></span></a></li>
-                               <li>
-                                       <button type="button" class="btn btn-primary apply" id="ApplyPendind">Apply</button>
-                                       <button type="button" class="btn btn-default clear">Clear</button>
-                               </li>
-                               <li>
-                                       <div id="loading" style="display:none;"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading" /></div>
-                               </li>
-                       </ul>
-               </div> -->
                <div class="row">
                        {% if msg %}
                        <div class="col-md-12"><p class="alert-success">{{ msg }}</p></div>
                        {% endif %}
                </div>
-
-               {{ filter_status }}{{ apply }}
+       
+               <div class="row">
+                       <div class="col-md-8">
+                               {{ filter_status }}
+                       </div>
+                       <div class="col-md-1">
+                               {{ apply }}
+                       </div>
+               </div>
                <!--
                <div class="list-group-item list-resources">
                        <span class="list-group-item-heading" style="padding-left: 0;">Resource status:</span>
@@ -58,13 +50,16 @@ $(document).ready(function() {
                -->
 
                <div class="row">
+                       <div class="col-md-12">
                        <ul class="nav nav-tabs">
                          <li class="active"><a href="#resourcelist" role="tab" data-toggle="tab">Table</a></li>
                          <li> <a href="#resourcemap" role="tab" data-toggle="tab">Map</a></li>
                          <li> <a href="#resourcescheduler" role="tab" data-toggle="tab">Scheduler</a></li>
+                         <!--<li> <a href="#resourcesasap" role="tab" data-toggle="tab">ASAP</a></li> -->
                        </ul>
+                       </div>
                </div>
-
+               
                <!-- Modal - columns selector -->
                <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                        <div class="modal-dialog">
@@ -83,38 +78,48 @@ $(document).ready(function() {
                        </div>
                </div>
                
-               <div class="tab-content" style="height:100%;">
-                       <div class="tab-pane active" id="resourcelist">
-                                <!-- Button trigger modal - columns selector -->
-                               <button class="btn btn-primary btn-sm" style="float:right;" data-toggle="modal" data-target="#myModal">...</button>
-                {{list_resources}}
-                               <!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
-                       </div>
-                       <div class="tab-pane" id="resourcemap">
-                {{map_resources}}
-                       </div>
-                       <div class="tab-pane" id="resourcescheduler">
-                {{scheduler}}
-                       </div>
+               
+               <div class="row">
+                       <div class="col-md-12">
+                       <div class="tab-content" style="height:100%;">
+                               <div class="tab-pane active" id="resourcelist">
+                                        <!-- Button trigger modal - columns selector -->
+                                       <button class="btn btn-default btn-sm" style="float:right;" data-toggle="modal" data-target="#myModal">...</button>
+                       {{list_resources}}
+                                       <!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
+                               </div>
+                               <div class="tab-pane" id="resourcemap">
+                       {{map_resources}}
+                               </div>
+                               <div class="tab-pane" id="resourcescheduler">
+                       {{scheduler}}
+                               </div>
+                                       <!-- <div class="tab-pane" id="resourcesasap">
+                       {{asap}}
+                               </div> -->
 
-                       <!--
-                       <div id="reserved" class="tab-pane" style="height:370px;display:none;">
-                <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 id="reserved" class="tab-pane" style="height:370px;display:none;">
+                       <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="tab-pane" style="height:370px;display:none;">
+                       {{pending_resources}}
+                               </div>
+                               <div id="sla_dialog" class="tab-pane" style="height:370px;display:none;">
+                       {{sla_dialog}}
+                               </div>
+       -->
+       
                        </div>
-                       <div id="pending" class="tab-pane" style="height:370px;display:none;">
-                {{pending_resources}}
-                       </div>
-                       <div id="sla_dialog" class="tab-pane" style="height:370px;display:none;">
-                {{sla_dialog}}
-                       </div>
--->
-
                </div>
        </div>
+       </div>
+       </div>
+</div>
 {% endblock %}