ckp

[plewww.git] / planetlab / sites / site.php

diff --git a/planetlab/sites/site.php b/planetlab/sites/site.php
index 57d89f5..12e8849 100644 (file)
--- a/planetlab/sites/site.php
+++ b/planetlab/sites/site.php
@@ -1,6 +1,6 @@
 <?php
 
-  // $Id: index.php 11750 2009-01-29 10:11:53Z thierry $
+  // $Id$
 
 // Require login
 require_once 'plc_login.php';
@@ -144,14 +144,21 @@ if ( ! $enabled )
               " to review pending applications.");
 
 $can_update=(plc_is_admin ()  && $local_peer) || ( plc_in_site($site_id) && plc_is_pi());
+
+
+$toggle = new PlekitToggle ('site',"Details",
+                           array('trigger-bubble'=>'Display and modify details for that site'));
+$toggle->start();
+
 $details = new PlekitDetails($can_update);
 
 if ( ! $site['is_public']) 
   plc_warning("This site is not public!");
 
+$details->form_start(l_actions(),array('action'=>'update-site','site_id'=>$site_id));
+
 $details->start();
 
-$details->form_start(l_actions(),array('action'=>'update-site','site_id'=>$site_id));
 $details->th_td("Full name",$sitename,'name',array('width'=>50));
 $details->th_td("Abbreviated name",$abbreviated_name,'abbreviated_name',array('width'=>15));
 $details->th_td("URL",$site_url,'url',array('width'=>40));
@@ -168,13 +175,14 @@ if (plc_is_admin())
 else
   $details->th_td("Max slices",$max_slices);
 $details->tr_submit("submit","Update Site");
-$details->form_end();
 
 if ( ! $local_peer) {
   $details->space();
   $details->th_td("Peer",$peers->peer_link($peer_id));
  }
 $details->end();
+$details->form_end();
+$toggle->end();
 
 //////////////////// mode details - for local object
 if ( $local_peer ) {
@@ -184,14 +192,14 @@ if ( $local_peer ) {
   $nb_boot = 0;
   if ($nodes) foreach ($nodes as $node) if ($node['boot_state'] == 'boot') $nb_boot ++;
 
-  $nodes_title = "# Nodes : ";
+  $nodes_title = "Nodes : ";
   $nodes_title .= count($nodes) . " total";
   $nodes_title .= " / " . $nb_boot . " boot";
   if ($nb_boot < 2 ) 
     $nodes_title = plc_warning_html ($nodes_title);
   $nodes_title .= href(l_nodes_site($site_id)," (See as nodes)");
 
-  $toggle=new PlekitToggle ('nodes',$nodes_title,array('trigger-tagname'=>'h2'));
+  $toggle=new PlekitToggle ('nodes',$nodes_title);
   $toggle->start();
 
   $headers=array();
@@ -217,17 +225,17 @@ if ( $local_peer ) {
   $toggle->end();
     
   //////////////////// Users
-  $persons_title = "# Users : ";
+  $persons_title = "Users : ";
   $persons_title .= count($person_ids) . " total";
   $persons_title .= " / " . count ($pis) . " PIs";
   $persons_title .= " / " . count ($techs) . " Techs";
   if ($has_disabled_persons) 
-    $persons_title .= " / " . ($disabled_persons) . " Disabled";
+    $persons_title .= " / " . count($disabled_persons) . " Disabled";
   if ( (count ($pis) == 0) || (count ($techs) == 0) || (count($person_ids) >= 30) || count($disabled_persons) != 0 ) 
     $persons_title = plc_warning_html ($persons_title);
   $persons_title .= href(l_persons_site($site_id)," (See as users)");
 
-  $toggle=new PlekitToggle ('persons',$persons_title,array('trigger-tagname'=>'h2'));
+  $toggle=new PlekitToggle ('persons',$persons_title);
   $toggle->start();
 
   $headers = array ();
@@ -254,7 +262,7 @@ if ( $local_peer ) {
 
   //////////////////// Slices
   // xxx to review after slices gets reworked
-  $toggle=new PlekitToggle ('slices',"Slices",array('trigger-tagname'=>'h2'));
+  $toggle=new PlekitToggle ('slices',"Slices");
   $toggle->start();
   $details=new PlekitDetails (false);
   $details->start();
@@ -271,11 +279,10 @@ if ( $local_peer ) {
   $toggle->end();
 
   // Addresses
-  $toggle=new PlekitToggle ('addresses',"Addresses",array('trigger-tagname'=>'h2',
-                                                      'start-visible'=>false));
+  $toggle=new PlekitToggle ('addresses',"Addresses",array('start-visible'=>false));
   $toggle->start();
   if ( ! $addresses) {
-    print "No known address for this site";
+    print "<p class='addresses'>No known address for this site</p>";
   } else {
     $details=new PlekitDetails (false);
     $details->start();