fixed various issues in scheduler and apply

[unfold.git] / plugins / scheduler2 / templates / scheduler.html

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 95c6ba7..231a1d2 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -6,55 +6,34 @@
     <img src="../../static/img/no-data.png" alt="no data found" style="width:100px;" />\r
     <h3>no data found...</h3>\r
 </div>\r
-<div id="plugin-{{ domid }}" class="" ng-app="myApp" style="display:none;">\r
+<div id="plugin-{{ domid }}" class="">\r
     <div class="row m-b">\r
-        <div class="col-md-1">\r
-            <label for="inputEmail3" class="col-sm-2 control-label">Date</label>\r
-        </div>\r
-        <div class="col-md-9">\r
-            <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date">\r
-            <span class="glyphicon glyphicon-calendar"></span>\r
+        <div class="col-md-2">\r
+            <label for="inputEmail3" class="col-sm-2 control-label">Day:</label>\r
         </div>\r
-        <div class="col-md-2 text-center">\r
-            {% comment %}\r
-            <div id="TopologyModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">\r
-                <div class="modal-dialog">\r
-                    <div class="modal-header">\r
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\r
-                        <h4 class="modal-title" id="myModalLabel">Topology</h4>\r
-                    </div>\r
-                    <div class="modal-body">\r
-                        <img src="../../static/img/nitos_topo.png" alt="nitos topology" style="width:100%;" />\r
-                    </div>\r
-                </div><!-- /.modal-dialog -->\r
-            </div><!-- /.modal TopologyModal -->\r
-            <button type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#TopologyModal">Topology</button>\r
-            {% endcomment  %}\r
-            <button id="btnSchedulerSubmit" type="button" class="btn btn-primary btn-md">Submit Leases</button>\r
-\r
+        <div class="col-md-10">\r
+            <label for="inputEmail3" class="col-sm-2 control-label">Time of day:</label>\r
         </div>\r
     </div>\r
-    <!--<div class="row m-b">\r
-        <div class="col-md-1">\r
-            <label for="inputEmail3" class="col-sm-1 control-label">Time</label>\r
-        </div>\r
-        <div class="col-md-9">\r
-            <div id="time-range"></div>\r
-        </div>\r
-        <div class="col-md-2">\r
-            <span id="lbltime" class="label label-primary"></span>\r
-        </div>\r
-    </div>-->\r
+    <div class="row m-b">\r
+               <div class="col-md-2">\r
+               <input id="DateToRes" type="text" placeholder="Reservation Date">\r
+               <!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->\r
+               <span class="glyphicon glyphicon-calendar"></span>\r
+               </div>\r
+               <div class="col-md-10">\r
+                       <div class="sliderContainer">\r
+                               <div id="tblSlider"></div>\r
+                       </div>\r
+               </div>\r
+    </div>\r
     <div id="SchedulerCtrl" ng-controller="SchedulerCtrl" class='query-editor-spacer'>\r
-        <div class="sliderContainer">\r
-            <div id="tblSlider"></div>\r
-        </div>\r
         <div class="table-responsive">\r
 \r
             <table id="scheduler-reservation-table" class="table table-bordered table-condensed">\r
                 <thead>\r
                     <tr>\r
-                        <th>#</th>\r
+                        <th>Resource name</th>\r
                         <th ng-repeat="slot in slots | offset: from | limitTo: num_visible_cells ">\r
                             {[{ slot.time }]}\r
                         </th>\r
@@ -74,6 +53,7 @@
                                                        data-slotid="{[{ lease.id }]}" \r
                                                        data-groupid="{[{ lease.groupid }]}" \r
                                                        ng-class="{{ 'lease.status' }}"\r
+                                                       ng-class="{{ 'lease.success' }}"\r
                                                        colspan="{[{resource.granularity / granularity}]}"\r
                                                        ng-click="select(from+$index, lease, $parent.resource)">\r
                                                </td>\r
@@ -137,10 +117,12 @@
 \r
             <div class="legend">\r
                 <ol>\r
-                    <li class="free">free</li>\r
-                    <li class="selected">selected</li>\r
-                    <li class="closed">reserved</li>\r
-                    <li class="maintenance">maintenance</li>\r
+                    <li class="free">Free</li>\r
+                    <li class="pendingin">Pending selected</li>\r
+                    <li class="pendingout">Pending deselected</li>\r
+                    <li class="selected">Selected</li>\r
+                    <li class="closed">Reserved</li>\r
+                    <li class="maintenance">Maintenance</li>\r
                 </ol>\r
             </div>\r
         </div><!-- / scheduler plugin -->\r