X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2Ftemplates%2Fscheduler.html;h=89f3419510f603a5d0ba77a767b5a9d730ac546f;hb=6ff6f343105cd2ef19a99126b07e8dabf57d65f4;hp=9d01851f62d9e37b6a13688928b1b5be61850f25;hpb=3a4d4c9c68d6e4fcf6cac26a9d7a78b2bddb89c5;p=unfold.git

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 9d01851f..89f34195 100755
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -8,23 +8,30 @@
 </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>
-        <div class="col-md-9">
+        <div class="col-md-4">
         	<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 class="col-md-1">
+            		<label for="inputEmail3" class="control-label">Date:</label>
+        		</div>
+				<div class="col-md-11">
+					<input id="DateToRes" type="text" placeholder="Reservation Date">
+					<span class="glyphicon glyphicon-calendar" style="position:absolute;margin-left:-20px;margin-top:4px;"></span>
+					<!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->
 				</div>
-				<div class="col-md-4">
+			</div>
+		</div>
+        <div class="col-md-8">
+        	<div class="row">
+        		<div class="col-md-2">
+            		<label for="inputEmail3" class="control-label">Time of day:</label>
+        		</div>
+		        <div class="col-md-10">
 					<div class="sliderContainer">
 						<div id="tblSlider"></div>
 					</div>
 				</div>
 			</div>
-        </div>
+		</div>
     </div>
     <div id="SchedulerCtrl" ng-controller="SchedulerCtrl" class='query-editor-spacer'>
         <div class="table-responsive">
@@ -48,11 +55,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 +124,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>
@@ -128,3 +137,4 @@
             //alert("1");
         </script>
     </div>
+</div>
\ No newline at end of file