fixed design issues with scheduler2 and apply

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

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 231a1d2..7c29877 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -49,12 +49,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
                                                        ng-class="{{ 'lease.success' }}"\r
-                                                       colspan="{[{resource.granularity / granularity}]}"\r
+                                                       colspan="{[{resource.granularity / slot_length}]}"\r
                                                        ng-click="select(from+$index, lease, $parent.resource)">\r
                                                </td>\r
                     </tr>\r
@@ -118,10 +118,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