cosmetic fixes

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

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 6edc88e..259723b 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -8,22 +8,28 @@
 </div>\r
 <div id="plugin-{{ domid }}" class="">\r
     <div class="row m-b">\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-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-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 class="col-md-4">\r
+               <div class="row">\r
+                       <div class="col-md-1">\r
+                       <label for="inputEmail3" class="control-label">Date:</label>\r
+                       </div>\r
+                               <div class="col-md-11">\r
+                                       <input id="DateToRes" type="text" placeholder="Reservation Date">\r
+                                       <span class="glyphicon glyphicon-calendar" style="position:absolute;margin-left:-20px;margin-top:4px;"></span>\r
+                                       <!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->\r
+                               </div>\r
+                       </div>\r
                </div>\r
-               <div class="col-md-10">\r
-                       <div class="sliderContainer">\r
-                               <div id="tblSlider"></div>\r
+        <div class="col-md-8">\r
+               <div class="row">\r
+                       <div class="col-md-2">\r
+                       <label for="inputEmail3" class="control-label">Time of day:</label>\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>\r
     </div>\r
@@ -49,11 +55,12 @@
                                                        style="word-wrap: break-word; word-break: break-all; ">\r
                                                        {[{ resource.hostname }]}\r
                                                </th>\r
-                        <td ng-repeat="lease in resource.leases | offset: from / lcm_colspan  | limitTo: num_visible_cells / lcm_colspan"\r
+                        <td ng-repeat="lease in resource.leases | offset: from / (resource.granularity / slot_length)  | limitTo: num_visible_cells / (resource.granularity / slot_length)"\r
                                                        data-slotid="{[{ lease.id }]}" \r
                                                        data-groupid="{[{ lease.groupid }]}" \r
                                                        ng-class="{{ 'lease.status' }}"\r
-                                                       colspan="{[{resource.granularity / granularity}]}"\r
+                                                       ng-class="{{ 'lease.success' }}"\r
+                                                       colspan="{[{resource.granularity / slot_length}]}"\r
                                                        ng-click="select(from+$index, lease, $parent.resource)">\r
                                                </td>\r
                     </tr>\r
@@ -117,10 +124,11 @@
             <div class="legend">\r
                 <ol>\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="selected">Reserved</li>\r
+                    <li class="pendingin">Reservation pending</li>\r
+                    <li class="pendingout">Reservation cancellation pending</li>\r
+                    <li class="closed">Unavailable</li>\r
+                                       <li class="disabled">Forbidden</li>\r
                     <li class="maintenance">Maintenance</li>\r
                 </ol>\r
             </div>\r