X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2Ftemplates%2Fscheduler.html;h=7c298773df248fd384bb2f5ef42a238b2b1d65db;hb=2696c755ef27a62406f190412eb8736393682bac;hp=9d01851f62d9e37b6a13688928b1b5be61850f25;hpb=55697a9aacdf843cc04409bf52b326b6b6f1574b;p=unfold.git

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 9d01851f..7c298773 100755
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -8,24 +8,25 @@
 </div>
 <div id="plugin-{{ domid }}" class="">
     <div class="row m-b">
-        <div class="col-md-1">
-            <label for="inputEmail3" class="col-sm-2 control-label">Date</label>
+        <div class="col-md-2">
+            <label for="inputEmail3" class="col-sm-2 control-label">Day:</label>
         </div>
-        <div class="col-md-9">
-        	<div class="row">
-        		<div class="col-md-5">
-	            <input id="DateToRes" type="text" placeholder="Reservation Date">
-	            <!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->
-	            <span class="glyphicon glyphicon-calendar"></span>
-				</div>
-				<div class="col-md-4">
-					<div class="sliderContainer">
-						<div id="tblSlider"></div>
-					</div>
-				</div>
-			</div>
+        <div class="col-md-10">
+            <label for="inputEmail3" class="col-sm-2 control-label">Time of day:</label>
         </div>
     </div>
+    <div class="row m-b">
+		<div class="col-md-2">
+		<input id="DateToRes" type="text" placeholder="Reservation Date">
+		<!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->
+		<span class="glyphicon glyphicon-calendar"></span>
+		</div>
+		<div class="col-md-10">
+			<div class="sliderContainer">
+				<div id="tblSlider"></div>
+			</div>
+		</div>
+    </div>
     <div id="SchedulerCtrl" ng-controller="SchedulerCtrl" class='query-editor-spacer'>
         <div class="table-responsive">
 
@@ -48,11 +49,12 @@
 							style="word-wrap: break-word; word-break: break-all; ">
 							{[{ resource.hostname }]}
 						</th>
-                        <td ng-repeat="lease in resource.leases | offset: from / lcm_colspan  | limitTo: num_visible_cells / lcm_colspan"
+                        <td ng-repeat="lease in resource.leases | offset: from / (resource.granularity / slot_length)  | limitTo: num_visible_cells / (resource.granularity / slot_length)"
 							data-slotid="{[{ lease.id }]}" 
 							data-groupid="{[{ lease.groupid }]}" 
 							ng-class="{{ 'lease.status' }}"
-							colspan="{[{resource.granularity / granularity}]}"
+							ng-class="{{ 'lease.success' }}"
+							colspan="{[{resource.granularity / slot_length}]}"
 							ng-click="select(from+$index, lease, $parent.resource)">
 						</td>
                     </tr>
@@ -116,10 +118,11 @@
             <div class="legend">
                 <ol>
                     <li class="free">Free</li>
-                    <li class="pendingin">Pending selected</li>
-                    <li class="pendingout">Pending deselected</li>
-                    <li class="selected">Selected</li>
-                    <li class="closed">Reserved</li>
+                    <li class="selected">Reserved</li>
+                    <li class="pendingin">Reservation pending</li>
+                    <li class="pendingout">Reservation cancellation pending</li>
+                    <li class="closed">Unavailable</li>
+					<li class="disabled">Forbidden</li>
                     <li class="maintenance">Maintenance</li>
                 </ol>
             </div>