resources all/reserved/pending side menu with pending number

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index b182a1a..375aa8f 100644 (file)
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -403,10 +403,15 @@
             switch(data.request) {
                 case FIELD_REQUEST_ADD:
                 case FIELD_REQUEST_ADD_RESET:
+                       // update pending number
+                       $("#badge-pending").data('number', $("#badge-pending").data('number') + 1 );
+                       $("#badge-pending").text($("#badge-pending").data('number'));
                     this.set_checkbox_from_data(data.value, true);
                     break;
                 case FIELD_REQUEST_REMOVE:
                 case FIELD_REQUEST_REMOVE_RESET:
+                       $("#badge-pending").data('number', $("#badge-pending").data('number') - 1 );
+                       $("#badge-pending").text($("#badge-pending").data('number'));
                     this.set_checkbox_from_data(data.value, false);
                     break;
                 default:
@@ -451,18 +456,18 @@
 
         on_all_query_done: function()
         {
-           if (debug) messages.debug("1-shot initializing dataTables content with " + this.buffered_lines.length + " lines");
-           this.table.fnAddData (this.buffered_lines);
-           this.buffered_lines=[];
+               if (debug) messages.debug("1-shot initializing dataTables content with " + this.buffered_lines.length + " lines");
+               this.table.fnAddData (this.buffered_lines);
+               this.buffered_lines=[];
            
             var self = this;
            // if we've already received the slice query, we have not been able to set 
            // checkboxes on the fly at that time (dom not yet created)
             $.each(this.buffered_records_to_check, function(i, record) {
-               if (debug) messages.debug ("querytable delayed turning on checkbox " + i + " record= " + record);
+                               if (debug) messages.debug ("querytable delayed turning on checkbox " + i + " record= " + record);
                 self.set_checkbox_from_record(record, true);
             });
-           this.buffered_records_to_check = [];
+               this.buffered_records_to_check = [];
 
             this.received_all_query = true;
            // unspin once we have received both

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 469a215..e5fdda5 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -353,7 +353,6 @@ ul.nav-resources a {
     padding: 4px 10px 5px 10px;
 }
 
-
 /* SLICE VIEW */
 
 
@@ -369,18 +368,16 @@ div.list-group-item {
 a.list-group-item {
     border:0;
     background-color:white;
-    padding:3px 0 3px 10px;
+    padding:3px 2px 3px 10px;
     border-left:2pt white solid;
 }
-a.list-group-item.active, a.list-group-item.active:hover {
+a.list-group-item.active, a.list-group-item.active:hover, a.list-group-item.active:focus {
     font-weight: bold;
     color:black;
-    background-color:transparent;
+    background-color:#F5F5F5;
     border-left:2pt blue solid;
 }
-a.list-group-item.active:hover {
-    background-color:#dddddd;
-}
+
 a.list-group-item:hover {
     border-left:2pt blue solid;
 }

diff --git a/portal/static/js/onelab_slice-resource-view.js b/portal/static/js/onelab_slice-resource-view.js
index 93e6866..1f997d0 100644 (file)
--- a/portal/static/js/onelab_slice-resource-view.js
+++ b/portal/static/js/onelab_slice-resource-view.js
@@ -19,6 +19,13 @@ $(document).ready(function() {
         }
         */
     });
+    $('div.list-resources a').click(function() {
+        $('div.list-resources a').removeClass('active');
+        $(this).addClass('active');
+        $('div.panel').hide();
+        $('div#'+$(this).data('panel')).show();
+       
+    });
     
     $.get("/rest/network", function(data) {
                var list = '<div class="list-group-item sl-platform"><span class="list-group-item-heading">Testbeds</span></div>';

diff --git a/portal/templates/base.html b/portal/templates/base.html
index 6dc48e7..29d1b3f 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -9,7 +9,7 @@
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
 <script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
-<script src="{{ STATIC_URL }}js/stash.min.js"></script>
+<!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>

diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html
deleted file mode 100644 (file)
index 8cb357b..0000000
--- a/portal/templates/onelab/onelab_slice-resource-view.html
+++ /dev/null
@@ -1,73 +0,0 @@
-{% extends "layout_wide.html" %}
-
-{% block head %}
-<!-- <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyC1RUj824JAiHRVqgc2CSIg4CpKHhh84Lw&sensor=false"></script> -->
-<script src="{{ STATIC_URL }}js/onelab_slice-resource-view.js"></script>
-<script>
-       //myslice.slice = "{{ slice }}";
-</script>
-{% endblock %}
-
-{% block content %}
-       <div class="col-md-2">
-               <div id="select-platform" class="list-group">
-               </div>
-                       
-               <!-- <ul class="list-group">
-                 <li class="list-group-item">Filter: CPU</li>
-                 <li class="list-group-item">Filter: Interface</li>
-                 <li class="list-group-item">...</li>
-                 <li class="list-group-item">...</li>
-                 <li class="list-group-item">...</li>
-               </ul> -->
-       
-       </div>
-       <div class="col-md-10" style="height:100%;">
-               <div class="row">
-                       {% include theme|add:"_widget-slice-sections.html" %}
-               </div>
-               <!-- <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>
-               <div class="row">
-                       <ul class="nav nav-pills nav-resources">
-                         <li class="active"><a data-panel="resources" href="#">Resources</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>
-                         <li><a data-panel="pending" href="#">Pending</a></li>
-                         <li><a href="#"></a></li>
-                       </ul>
-               </div>
-               <div class="row" style="height:100%;">
-                       <div id="resources" class="panel">
-                {{list_resources}}
-                               <!-- <table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table> -->
-                       </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_leases}}
-                       </div>
-                       <div id="pending" class="panel" style="height:370px;display:none;">
-                {{pending_resources}}
-                       </div>
-               </div>
-       </div>
-{% endblock %}

diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html
index 3831a5e..11a2017 100644 (file)
--- a/portal/templates/slice-resource-view.html
+++ b/portal/templates/slice-resource-view.html
@@ -14,13 +14,12 @@
                <!-- <div id="select-platform" class="list-group"></div> -->
         {{filter_testbeds}}
 
-               <!-- <ul class="list-group">
-                 <li class="list-group-item">Filter: CPU</li>
-                 <li class="list-group-item">Filter: Interface</li>
-                 <li class="list-group-item">...</li>
-                 <li class="list-group-item">...</li>
-                 <li class="list-group-item">...</li>
-               </ul> -->
+               <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="resources" 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>
        
        </div>
        <div class="col-md-10" style="height:100%;">
@@ -51,8 +50,6 @@
                          <li class="active"><a data-panel="resources" href="#">Resources</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>
-                         <li><a data-panel="pending" href="#">Pending</a></li>
-                         <li><a href="#"></a></li>
                        </ul>
                </div>
                <div class="row" style="height:100%;">
@@ -64,7 +61,7 @@
                 {{map_resources}}
                        </div>
                        <div id="scheduler-tab" class="panel" style="height:370px;display:none;">
-                {{scheduler}}
+                {#scheduler#}
                        </div>
                        <div id="pending" class="panel" style="height:370px;display:none;">
                 {{pending_resources}}