index pages should show object ids to admins like nodes pages do (first column)

diff --git a/planetlab/sites/sites.php b/planetlab/sites/sites.php
index 9b0e9cd..1220038 100644 (file)
--- a/planetlab/sites/sites.php
+++ b/planetlab/sites/sites.php
@@ -112,6 +112,9 @@ $peers=new Peers($api);
 
 $nifty=new PlekitNifty ('','objects-list','big');
 $nifty->start();
+if (plc_is_admin()) {
+  $headers['I']='int';
+}
 $headers['Peer']="string";
 $headers['Full Name']="string";
 $headers['Login']="string";
@@ -120,7 +123,6 @@ if (plc_is_admin()) {
   $headers['N']="int";
   $headers['U']="int";
   $headers['S']="int";
-  $headers['I']='int';
   $headers['?']="string";
  }
 
@@ -132,6 +134,9 @@ if ($sites) foreach ($sites as $site) {
   $site_id=$site['site_id'];
   $login_base=$site['login_base'];
   $table->row_start();
+  if (plc_is_admin()) {
+    $table->cell(l_site_t($site_id,$site_id));
+  }
   $peers->cell($table,$peer_id);
   $table->cell (l_site_t($site_id,htmlentities($site['name'])));
   $table->cell (l_site_t($site_id,$login_base));
@@ -140,7 +145,6 @@ if ($sites) foreach ($sites as $site) {
     $table->cell(href(l_nodes_site($site_id),count($site['node_ids'])));
     $table->cell(href(l_persons_site($site_id),count($site['person_ids'])));
     $table->cell(href(l_slices_site($site_id),count($site['slice_ids'])));
-    $table->cell(l_site_t($site_id,$site_id));
     $table->cell(site_status($site));
   }
   $table->row_end();

diff --git a/planetlab/slices/slices.php b/planetlab/slices/slices.php
index 8fd5a02..7747b01 100644 (file)
--- a/planetlab/slices/slices.php
+++ b/planetlab/slices/slices.php
@@ -106,12 +106,13 @@ if ( ! $slices ) {
   
 $nifty=new PlekitNifty ('','objects-list','big');
 $nifty->start();
-$headers = array ("Peer"=>"string",
-                 "Name"=>"string",
-                 "Users"=>"string",
-                 "U"=>"int",
-                 "N"=>"int",
-                 "Exp. d/m/y"=>"date-dmy");
+$headers["I"]="int";
+$headers["Peer"]="string";
+$headers["Name"]="string";
+$headers["Users"]="string";
+$headers["U"]="int";
+$headers["N"]="int";
+$headers["Exp. d/m/y"]="date-dmy";
 
 # initial sort on hostnames
 $table=new PlekitTable ("slices",$headers,2,
@@ -127,6 +128,7 @@ foreach ($slices as $slice) {
   $expires= date( "d/m/Y", $slice['expires'] );
 
   $table->row_start();
+  $table->cell (l_slice_t($slice_id,$slice_id));
   $peers->cell($table,$peer_id);
   $table->cell (l_slice_obj($slice));
   $table->cell ($users);