slice creation page - sites sorted and correctly show current site - layout reviewed

[plewww.git] / planetlab / nodes / nodes.php

diff --git a/planetlab/nodes/nodes.php b/planetlab/nodes/nodes.php
index a6528d1..ebe8079 100644 (file)
--- a/planetlab/nodes/nodes.php
+++ b/planetlab/nodes/nodes.php
@@ -20,7 +20,7 @@ require_once 'linetabs.php';
 require_once 'table.php';
 require_once 'nifty.php';
 
-ini_set("memory_limit","48M");
+ini_set("memory_limit","64M");
 
 // -------------------- 
 // recognized URL arguments
@@ -33,7 +33,12 @@ $person_id=intval($_GET['person_id']);
 // --- decoration
 $title="Nodes";
 $tabs=array();
-$tabs []= tab_nodes_mysite();
+$tabs []= tab_nodes();
+if (count (plc_my_site_ids()) == 1) {
+    $tabs []= tab_nodes_mysite();
+} else {
+    $tabs []= tab_nodes_all_mysite();
+}
 $tabs []= tab_nodes_local();
 
 // -------------------- 
@@ -56,7 +61,7 @@ function node_status ($node) {
 }
 
 // fetch nodes 
-$node_columns=array('hostname','node_type','site_id','node_id','boot_state','interface_ids','peer_id', 'arch','slice_ids');
+$node_columns=array('hostname','node_type','site_id','node_id','boot_state','run_level','interface_ids','peer_id', 'arch','slice_ids');
 // server-side filtering - set pattern in $_GET for filtering on hostname
 if ($pattern) {
   $node_filter['hostname']=$pattern;
@@ -152,7 +157,7 @@ $headers["Site"]="string";
 $headers["State"]="string";
 $headers["Hostname"]="string";
 $headers["Type"]="string";
-$headers["IP"]="IPAddress";
+$headers["IP"]="sortIPAddress";
 $headers["A"]="string";
 $headers["S"]='int';
 $headers["?"]="string";
@@ -179,7 +184,11 @@ foreach ($nodes as $node) {
   $peers->cell ($table,$peer_id);
   $table->cell (topdomain($hostname));
   $table->cell (l_site_t($site_id,$login_base));
-  $table->cell ($node['boot_state']);
+  if ($node['run_level']) {
+      $table->cell($node['run_level']);
+  } else {
+      $table->cell ($node['boot_state'] . '*');
+  }
   $table->cell (l_node_t($node_id,$hostname));
   $table->cell ($node_type);
   $table->cell (l_interface_t($interface_id,$ip),array('only-if'=> !$peer_id));
@@ -196,6 +205,7 @@ $notes []= "R = region";
 $notes []= "A = arch";
 $notes []= "S = number of slivers";
 $notes []= "? = status";
+$notes []= "status* = node doesn't have an observed state, preferred state is displayed";
 $table->end(array('notes'=>$notes));
 $nifty->end();