Merge branch 'master' of ssh://git.onelab.eu/git/plewww

diff --git a/planetlab/css/my_slice.css b/planetlab/css/my_slice.css
index d68fb8e..4d5430b 100644 (file)
--- a/planetlab/css/my_slice.css
+++ b/planetlab/css/my_slice.css
@@ -38,7 +38,7 @@ table#leases_data {
 #leases_modes { padding: 10px; text-align: center; color: #333; }
 
 #leases_buttons { padding: 0px 10px 10px 10px; }
-#leases_clear { position: relative; left: 30%;}
+#leases_refresh { position: relative; left: 30%;}
 #leases_submit { position: relative; left: 60%; }
         
 

diff --git a/planetlab/slices/leases-data.php b/planetlab/slices/leases-data.php
index 148fca3..a39a639 100644 (file)
--- a/planetlab/slices/leases-data.php
+++ b/planetlab/slices/leases-data.php
@@ -23,7 +23,6 @@ $reservable_nodes=$api->GetNodes(array('|slice_ids'=>intval($slice_id), 'node_ty
 
 // where to start from, expressed as an offset in hours from now
 $rough_start=time()+$leases_offset*3600;
-// show the next 36 grains 
 $duration=$leases_slots*$leases_granularity;
 $steps=$duration/$leases_granularity;
 $start=intval($rough_start/$leases_granularity)*$leases_granularity;

diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index 3dbab8b..d29520e 100644 (file)
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -590,10 +590,10 @@ if ($count && $privileges) {
   if ( ! $leases_offset ) $leases_offset=0;
   // how many timeslots to show
   $leases_slots=$_GET['leases_slots'];
-  if ( ! $leases_slots ) $leases_slots = 48;
+  if ( ! $leases_slots ) $leases_slots = 36;
   // offset in hours (in the future) from now 
   $leases_w = $_GET['leases_w'];
-  if ( ! $leases_w) $leases_w=14;
+  if ( ! $leases_w) $leases_w=18;
   // number of timeslots to display
 
   $granularity=$api->GetLeaseGranularity();
@@ -621,8 +621,8 @@ if ($count && $privileges) {
 <div id='leases_area'></div>
 
 <div id='leases_buttons'>
-  <button id='leases_refresh' type='submit'>Refresh</button>
-  <button id='leases_submit' type='submit'>Submit</button>
+    <button id='leases_refresh' type='submit'>Refresh (Pull)</button>
+    <button id='leases_submit' type='submit'>Submit (Push)</button>
 </div>
 EOF;