X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=af265b6e00100a2925f9d2a66e3eb5caccfc3fc8;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=28d714e0490e291fd71451e8191b74c94698ecf3;hpb=46d5ed0785050dace2598da42560be82b3da8fd8;p=plewww.git

diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index 28d714e..af265b6 100644
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -27,11 +27,9 @@ require_once 'columns.php';
 // keep css separate for now
 drupal_set_html_head('
 <link href="/planetlab/css/my_slice.css" rel="stylesheet" type="text/css" />
-<script src="/planetlab/slices/leases.js" type="text/javascript" charset="utf-8"></script>
 ');
 
 // -------------------- admins potentially need to get full list of users
-ini_set('memory_limit','32M');
 //error_reporting(0);
 
 $profiling=false;
@@ -231,18 +229,11 @@ if ($local_peer ) {
 
 
 //////////////////////////////////////////////////////////// tab:details
-// default for opening the details section or not ?
-if ($local_peer) {
-  $default_show_details = true;
- } else {
-  $default_show_details = ! $renew_visible;
- }
-  
 $toggle = 
   new PlekitToggle ('my-slice-details',"Details",
 		    array('bubble'=>
 			  'Display and modify details for that slice',
-			  'visible'=>get_arg('show_details',$default_show_details)));
+			  'visible'=>get_arg('show_details')));
 $toggle->start();
 
 $details=new PlekitDetails($privileges);
@@ -294,7 +285,7 @@ $toggle=
   new PlekitToggle ('my-slice-persons',"$count users",
 		    array('bubble'=>
 			  'Manage accounts attached to this slice',
-			  'visible'=>get_arg('show_persons',false)));
+			  'visible'=>get_arg('show_persons')));
 $toggle->start();
 
 ////////// people currently in
@@ -304,7 +295,7 @@ $toggle->start();
 // show otherwise
 $toggle_persons = new PlekitToggle ('my-slice-persons-current',
 				    "$count people currently in $name",
-				    array('visible'=>get_arg('show_persons_current',!$privileges)));
+				    array('visible'=>get_arg('show_persons_current')));
 $toggle_persons->start();
 
 $headers=array();
@@ -346,7 +337,7 @@ if ($privileges) {
   $count=count($potential_persons);
   $toggle_persons = new PlekitToggle ('my-slice-persons-add',
 				      "$count people may be added to $name",
-				      array('visible'=>get_arg('show_persons_add',false)));
+				      array('visible'=>get_arg('show_persons_add')));
   $toggle_persons->start();
   if ( ! $potential_persons ) {
     // xxx improve style
@@ -565,7 +556,7 @@ if (count($reservable_nodes)) $nodes_message .= " (" . count($reservable_nodes)
 $toggle=new PlekitToggle ('my-slice-nodes',$nodes_message,
 			  array('bubble'=>
 				'Manage nodes attached to this slice',
-				'visible'=>get_arg('show_nodes',false)));
+				'visible'=>get_arg('show_nodes')));
 $toggle->start();
 
 
@@ -581,10 +572,13 @@ This feature is still experimental; feedback is appreciated at <a href='mailto:d
 ";
 $count=count($reservable_nodes);
 if ($count && $privileges) {
+  // include leases.js only if needed
+  drupal_set_html_head('<script src="/planetlab/slices/leases.js" type="text/javascript" charset="utf-8"></script>');
+
   // having reservable nodes in white lists looks a bit off scope for now...
   $toggle_nodes=new PlekitToggle('my-slice-nodes-reserve',
 				 "Leases - " . count($reservable_nodes) . " reservable node(s)",
-				 array('visible'=>get_arg('show_nodes_resa',false), 
+				 array('visible'=>get_arg('show_nodes_resa'), 
 				       'info-text'=>$leases_info,
 				       'info-visible'=>$show_reservable_info));
   $toggle_nodes->start();
@@ -595,10 +589,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();
@@ -626,8 +620,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;
 
@@ -653,8 +647,7 @@ href="http://trac.myslice.info">http://trac.myslice.info</a>.
 ';
 $toggle_nodes=new PlekitToggle('my-slice-nodes-configuration',
                                "Node table layout",
-                               array('visible'=>$column_conf_visible, 
-				     'info-text'=>$layout_info,
+                               array('info-text'=>$layout_info,
 				     'info-visible'=>$show_layout_info));
 $toggle_nodes->start();
 
@@ -698,7 +691,7 @@ foreach ($interfaces as $interface) $interface_hash[$interface['node_id']]=$inte
 //////////////////// nodes currently in
 $toggle_nodes=new PlekitToggle('my-slice-nodes-current',
 			       count_english($slice_nodes,"node") . " currently in $name",
-			       array('visible'=>get_arg('show_nodes_current',!$privileges)));
+			       array('visible'=>get_arg('show_nodes_current')));
 $toggle_nodes->start();
 
 $headers=array();
@@ -794,7 +787,7 @@ if ($privileges) {
   $count=count($potential_nodes);
   $toggle_nodes=new PlekitToggle('my-slice-nodes-add',
 				 count_english($potential_nodes,"more node") . " available",
-				 array('visible'=>get_arg('show_nodes_add',false)));
+				 array('visible'=>get_arg('show_nodes_add')));
   $toggle_nodes->start();
 
   if ( $potential_nodes ) {
@@ -926,7 +919,7 @@ if ($local_peer) {
 
   $toggle = new PlekitToggle('slice-initscripts',$label,
 			     array('bubble'=>'Manage initscript on that slice',
-				   'visible'=>get_arg('show_initscripts',false),
+				   'visible'=>get_arg('show_initscripts'),
 				   'info-text'=>$initscript_info
 				   // not messing with persontags to guess whether this should be displayed or not
 				   // hopefully some day toggle will know how to handle that using web storage
@@ -1001,7 +994,7 @@ $tag_value_threshold=24;
   
   $toggle = new PlekitToggle ('slice-tags',count_english_warning($tags,'tag'),
 			      array('bubble'=>'Inspect and set tags on that slice',
-				    'visible'=>get_arg('show_tags',false)));
+				    'visible'=>get_arg('show_tags')));
   $toggle->start();
   
   $headers=array(
@@ -1067,7 +1060,7 @@ $tag_value_threshold=24;
     function tag_selector ($tag) {
       return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']);
     }
-    $all_tags= $api->GetTagTypes( array ("category"=>"slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
+    $all_tags= $api->GetTagTypes( array ("category"=>"*slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
     if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags));
     $selector_tag=array_map("tag_selector",$all_tags);
     
@@ -1099,7 +1092,7 @@ $tag_value_threshold=24;
 
 //////////////////////////////////////////////////////////// tab:renew
 if ($local_peer ) {
-  if ( ! $renew_visible) renew_area ($slice,$site,false);
+  if ( ! $renew_visible) renew_area ($slice,$site,NULL);
  }
 
 $peers->block_end($peer_id);