add node-usb-partition as an option for download.

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

diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 25edde1..68ef0fc 100644 (file)
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -197,6 +197,7 @@ if ( $local_peer  && $privileges) {
                     array("display"=>"-- All in one images --","disabled"=>true),
                     array("value"=>"download-node-iso","display"=>"Download ISO image for $hostname"),
                     array("value"=>"download-node-usb","display"=>"Download USB image for $hostname"),
+                    array("value"=>"download-node-usb-partition", "display"=>"Download partitioned, USB image for $hostname"),
                     array("display"=>"-- Floppy + generic image --","disabled"=>true),
                     array("value"=>"download-node-floppy","display"=>"Download Floppy file for $hostname"),
                     array("value"=>"download-generic-iso","display"=>"Download generic ISO image (requires floppy)"),
@@ -235,7 +236,7 @@ $form->start();
   } else {
     $headers=array();
     $headers['Peer']="string";
-    $headers['Name']="string";
+    $headers['Slice Name']="string";
     $headers['Sliver']="string";
     $reasonable_page=10;
     $table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page);
@@ -248,9 +249,10 @@ $form->start();
 
     foreach ($slices as $slice) {
       $table->row_start();
-      $table->cell ($peers->shortname($peer_id));
+      $peers->cell ($table,$slice['peer_id']);
       $table->cell (l_slice_t ($slice['slice_id'],$slice['name']));
-      $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'view'));
+      # xxx l_sliver not implemented yet - what should we show exactly ?
+      $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'sliver tags'));
       $table->row_end();
     }
     $table->end();
@@ -327,7 +329,7 @@ if ( $local_peer ) {
 
 //////////////////////////////////////////////////////////// interfaces
 if ( $local_peer ) {
-  $toggle=new PlekitToggle ('interfaces',count_english_warning($interfaces,'interfaces'),
+  $toggle=new PlekitToggle ('interfaces',count_english_warning($interfaces,'interface'),
                            array('bubble'=>'Inspect and tune interfaces on that node',
                                  'visible'=>get_arg('show_interfaces',false)));
   $toggle->start();