X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=3b27b11542526d8ed25b6e0d935bf21694e43f79;hb=4b96dd01a3283a5dbcd6e859e8713102dc685937;hp=28d714e0490e291fd71451e8191b74c94698ecf3;hpb=879ebffbace539d3ee61978336486b3c17314866;p=plewww.git

diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index 28d714e..3b27b11 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;
@@ -57,7 +55,7 @@ if (empty($slices)) {
 
 $slice=$slices[0];
 
-if ($profiling) plc_debug_prof('1: slice',count($slices));
+if ($profiling) plc_debug_prof('01: slice',count($slices));
 // pull all node info to vars
 $name= $slice['name'];
 $expires = date( "d/m/Y", $slice['expires'] );
@@ -70,7 +68,7 @@ $peer_id= $slice['peer_id'];
 $peers=new Peers ($api);
 $local_peer = ! $peer_id;
 
-if ($profiling) plc_debug_prof('2: peers',count($peers));
+if ($profiling) plc_debug_prof('02: peers',count($peers));
 
 // gets site info
 $sites= $api->GetSites( array( $site_id ) );
@@ -78,7 +76,7 @@ $site=$sites[0];
 $site_name= $site['name'];
 $max_slices = $site['max_slices'];
 
-if ($profiling) plc_debug_prof('3: sites',count($sites));
+if ($profiling) plc_debug_prof('03: sites',count($sites));
 //////////////////////////////////////// building blocks for the renew area
 // Constants
 global $DAY;		$DAY = 24*60*60;
@@ -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);
@@ -289,12 +280,12 @@ $potential_persons=
 		   $person_columns);
 $count=count($persons);
 
-if ($profiling) plc_debug_prof('4: persons',count($persons));
+if ($profiling) plc_debug_prof('04: persons',count($persons));
 $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
@@ -557,7 +548,7 @@ foreach ($all_nodes as $node) {
     $potential_nodes[]=$node;
   }
 }
-if ($profiling) plc_debug_prof('5: nodes',count($slice_nodes));
+if ($profiling) plc_debug_prof('05: nodes',count($slice_nodes));
 ////////////////////
 // outline the number of reservable nodes
 $nodes_message=count_english($slice_nodes,"node");
@@ -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,14 +620,15 @@ 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;
 
   $toggle_nodes->end();
  }
 
+if ($profiling) plc_debug_prof('06: leases',0);
 
 //////////////////// node configuration panel
 if ($first_time_configuration) 
@@ -653,8 +648,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();
 
@@ -673,12 +667,15 @@ print("<br><input type='hidden' size=80 id='full_column_configuration' value='".
 print("<input type='hidden' id='previousConf' value='".$slice_column_configuration."' />");
 print("<input type='hidden' id='defaultConf' value='".$default_configuration."' />");
 
+if ($profiling) plc_debug_prof('07: before configuration_panel',0);
 $ConfigureColumns->configuration_panel_html(true);
 
+if ($profiling) plc_debug_prof('08: before javascript_init',0);
 $ConfigureColumns->javascript_init();
 
 $toggle_nodes->end();
 
+if ($profiling) plc_debug_prof('09: layout',0);
 
 $all_sites=$api->GetSites(NULL, array('site_id','login_base'));
 $site_hash=array();
@@ -692,13 +689,12 @@ $interface_hash=array();
 foreach ($interfaces as $interface) $interface_hash[$interface['node_id']]=$interface;
 
 
-
-
+if ($profiling) plc_debug_prof('10: interfaces',count($interfaces));
 
 //////////////////// 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();
@@ -739,7 +735,7 @@ $table->start();
 if ($slice_nodes) foreach ($slice_nodes as $node) {
   $table->row_start();
 
-$table->cell($node['node_id'], array('display'=>'none'));
+  $table->cell($node['node_id'], array('display'=>'none'));
 
   $table->cell(l_node_obj($node));
   $peers->cell($table,$node['peer_id']);
@@ -780,6 +776,8 @@ if ($privileges) {
 $table->end();
 $toggle_nodes->end();
 
+if ($profiling) plc_debug_prof('11: nodes in',count($slice_nodes));
+
 //////////////////// nodes to add
 if ($privileges) {
   $new_potential_nodes = array();
@@ -794,7 +792,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 ) {
@@ -829,7 +827,7 @@ $notes [] = "For information about the different columns please see the <b>node
     if ($potential_nodes) foreach ($potential_nodes as $node) {
 	$table->row_start();
 
-$table->cell($node['node_id'], array('display'=>'none'));
+	$table->cell($node['node_id'], array('display'=>'none'));
 
 	$table->cell(l_node_obj($node));
 	$peers->cell($table,$node['peer_id']);
@@ -865,6 +863,8 @@ $table->cell($node['node_id'], array('display'=>'none'));
 
 $toggle->end();
 
+if ($profiling) plc_debug_prof('12: nodes to add',count($potential_nodes));
+
 //////////////////////////////////////// retrieve all slice tags
 $tags=$api->GetSliceTags (array('slice_id'=>$slice_id));
 //////////////////////////////////////////////////////////// tab:initscripts
@@ -903,7 +903,7 @@ The slice-specific setting has precedence on a shared initscript.
 
 $shared_initscripts=$api->GetInitScripts(array('-SORT'=>'name'),array('name'));
 //$shared_initscripts=$api->GetInitScripts();
-if ($profiling) plc_debug_prof('6 initscripts',count($initscripts));
+if ($profiling) plc_debug_prof('13: initscripts',count($initscripts));
 // xxx expose this even on foreign slices for now
 if ($local_peer) {
   $initscript='';
@@ -926,7 +926,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
@@ -995,13 +995,13 @@ $tag_value_threshold=24;
 
 // xxx expose this even on foreign slices for now
 //if ( $local_peer ) {
-  if ($profiling) plc_debug_prof('7 slice tags',count($tags));
+  if ($profiling) plc_debug_prof('14: slice tags',count($tags));
   function get_tagname ($tag) { return $tag['tagname'];}
   $tagnames = array_map ("get_tagname",$tags);
   
   $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(
@@ -1040,7 +1040,7 @@ $tag_value_threshold=24;
       $nodegroup_name="n/a";
       if ($tag['nodegroup_id']) { 
         $nodegroups=$api->GetNodeGroups(array('nodegroup_id'=>$tag['nodegroup_id']));
-	if ($profiling) plc_debug_prof('8 nodegroup for slice tag',$nodegroup);
+	if ($profiling) plc_debug_prof('15: nodegroup for slice tag',$nodegroup);
         if ($nodegroup) {
           $nodegroup = $nodegroups[0];
           $nodegroup_name = $nodegroup['groupname'];
@@ -1067,8 +1067,8 @@ $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"));
-    if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags));
+    $all_tags= $api->GetTagTypes( array ("category"=>"*slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id"));
+    if ($profiling) plc_debug_prof('16: tagtypes',count($all_tags));
     $selector_tag=array_map("tag_selector",$all_tags);
     
     function node_selector($node) { 
@@ -1080,7 +1080,7 @@ $tag_value_threshold=24;
       return array("display"=>$ng["groupname"],"value"=>$ng['nodegroup_id']);
     }
     $all_nodegroups = $api->GetNodeGroups( array("groupname"=>"*"), array("groupname","nodegroup_id"));
-    if ($profiling) plc_debug_prof('10 nodegroups',count($all_nodegroups));
+    if ($profiling) plc_debug_prof('17: nodegroups',count($all_nodegroups));
     $selector_nodegroup=array_map("nodegroup_selector",$all_nodegroups);
     
     $table->cell($form->select_html("tag_type_id",$selector_tag,array('label'=>"Choose Tag")));
@@ -1099,7 +1099,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);