X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnodes.php;h=8f9a9b62d40a4067f4442f910f16d8ff429ad70f;hb=5ac4c67452d71c4becced6679b2fc4a1e886a7d7;hp=ff11dc4ee2913241326eceef78056a145b475228;hpb=879ebffbace539d3ee61978336486b3c17314866;p=plewww.git
diff --git a/planetlab/nodes/nodes.php b/planetlab/nodes/nodes.php
index ff11dc4..8f9a9b6 100644
--- a/planetlab/nodes/nodes.php
+++ b/planetlab/nodes/nodes.php
@@ -71,8 +71,6 @@ function node_status ($node) {
}
-$first_time_configuration = false;
-
if (plc_is_admin())
$default_configuration = "ID:f|hostname:f|ST:f|AU:f|RES:f";
else
@@ -104,7 +102,6 @@ foreach ($PersonTags as $ptag) {
$nodesconf_exists = false;
if ($column_configuration == "")
{
- $first_time_configuration = true;
$column_configuration = "nodes;default";
$nodesconf_exists = true;
}
@@ -319,37 +316,10 @@ if ( ! $nodes ) {
$nifty=new PlekitNifty ('','objects-list','big');
$nifty->start();
-$headers = array (); $offset=0;
+$headers = array ();
$notes=array();
$notes [] = "For information about the different columns please see the node table layout tab above or mouse over the column headers";
-
-/*
-// fixed columns
-if (plc_is_admin()) {
- $short="I"; $long="node_id"; $type='int';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
- $offset=1;
- }
-$short="P"; $long="Peer"; $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$short="D"; $long="toplevel domain name"; $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$headers["Site"]="string";
-$headers["Hostname"]="string";
-$short="IP"; $long="IP Address"; $type='sortIPAddress';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$short="ST"; $long=Node::status_footnote(); $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-$short="SL"; $long="Number of slivers"; $type='int';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-
-$headers=array_merge($headers,$visibletags->headers());
-$notes=array_merge($notes,$visibletags->notes());
-$short="?"; $long="extra status info"; $type='string';
- $headers[$short]=array('type'=>$type,'title'=>$long); $notes []= "$short = $long";
-*/
-
$info_header = array();
$short="?"; $long="extra status info"; $type='string';
$info_header[$short]=array('type'=>$type,'title'=>$long, 'label'=>'?', 'header'=>'?', 'visible'=>true);
@@ -357,11 +327,6 @@ $info_header[$short]=array('type'=>$type,'title'=>$long, 'label'=>'?', 'header'=
//$info_header["?"] = "none";
$headers = array_merge($ConfigureColumns->get_headers(),$info_header);
-if ($first_time_configuration)
-$column_conf_visible = '1';
-else
-$column_conf_visible = '0';
-
$layout_help='
This tab allows you to customize the columns in the node tables,
below. Information on the nodes comes from a variety of monitoring
@@ -374,7 +339,7 @@ href="http://trac.myslice.info">http://trac.myslice.info.
';
$toggle_nodes=new PlekitToggle('nodes-layout',
"Node table layout",
- array('visible'=>$column_conf_visible,
+ array('visible'=>NULL,
'info-text'=>$layout_help,
'info-visible'=>$show_columns_message));
$toggle_nodes->start();
@@ -400,7 +365,7 @@ $table_options = array('notes'=>$notes,
'configurable'=>true);
# initial sort on hostnames
-$table=new PlekitTable ("nodes",$headers,3+$offset, $table_options);
+$table=new PlekitTable ("nodes",$headers,3, $table_options);
$table->start();
$peers = new Peers ($api);