more inline updates & cleaned up tags
[plewww.git] / planetlab / sites / site.php
index 67a6783..eac14ef 100644 (file)
@@ -38,7 +38,7 @@ if (empty($sites)) {
 $site=$sites[0];
 // var names to api return
 $sitename= htmlentities($site['name']);
-$abbrev_name= htmlentities($site['abbreviated_name']);
+$abbreviated_name= htmlentities($site['abbreviated_name']);
 $site_url= $site['url'];
 $login_base= $site['login_base'];
 $site_lat= $site['latitude'];
@@ -82,29 +82,26 @@ list( $addresses, $nodes, $persons, $slices )= $api->commit();
   
 $techs = array();
 $pis = array();
+$disabled_persons = array();
 foreach( $persons as $person ) {
   $role_ids= $person['role_ids'];
-  if( in_array( '40', $role_ids ))
-    $techs[] = $person;
-  
-  if( in_array( '20', $role_ids ))
-    $pis[] = $person;
+
+  if ( in_array( '20', $role_ids ))    $pis[] = $person;
+  if ( in_array( '40', $role_ids ))    $techs[] = $person;
+  if ( ! $person['enabled'] )          $disabled_persons[] = $person;
   
 }
 
-// fetches peers and initialize hash peer_id->peer
 drupal_set_title("Details for site " . $sitename);
+$local_peer = ! $peer_id;
   
 // extra privileges to admins, and pi on this site
 $privileges = plc_is_admin () || ( plc_in_site($site_id) && plc_is_pi());
   
 $tabs=array();
 // available actions
-if ( ! $peer_id  && $privileges ) {
+if ( $local_peer  && $privileges ) {
   
-  $tabs['Update']=array('url'=>l_site_update($site_id),
-                       'bubble'=>"Update details of $sitename");
-  // not avail to PI
   $tabs['Expire slices'] = array('url'=>l_actions(),
                                 'method'=>'POST',
                                 'values'=>array('site_id'=>$site_id,
@@ -142,72 +139,96 @@ if ( ! $enabled )
               href (l_sites_pending(),"this page") . 
               " to review pending applications.");
 
-plc_details_start();
-plc_details_line("Full name",$sitename);
-plc_details_line("Login base",$login_base);
-plc_details_line("Abbreviated name",$abbrev_name);
-plc_details_line("URL",$site_url);
-plc_details_line("Latitude",$site_lat);
-plc_details_line("Longitude",$site_long);
-plc_details_line("Peer",$peers->peer_link($peer_id));
-
-if ( ! $peer_id ) {
-
-  // Addresses
-  if ($addresses) {
-    plc_details_space_line();
-    plc_details_line("Addresses","");
-    foreach ($addresses as $address) {
-      plc_details_line(plc_vertical_table($address['address_types']),
-                      plc_vertical_table(array($address['line1'],
-                                               $address['line2'],
-                                               $address['line3'],
-                                               $address['city'],
-                                               $address['state'],
-                                               $address['postalcode'],
-                                               $address['country'])));
-    }
-  }
+$can_update=plc_is_admin () || ( plc_in_site($site_id) && plc_is_pi());
+$details = new PlcDetails($can_update);
+
+if ( ! $site['is_public']) 
+  plc_warning("This site is not public!");
+
+$details->start();
+$details->line("Peer",$peers->peer_link($peer_id));
+$details->space();
+
+$details->form_start(l_actions(),array('action'=>'update-site','site_id'=>$site_id));
+$save_w=$details->set_field_width(30);
+$details->line("Full name",$sitename,'name');
+$details->set_field_width($save_w);
+$details->line("Abbreviated name",$abbreviated_name,'abbreviated_name');
+$details->line("URL",$site_url,'url');
+$details->line("Latitude",$site_lat,'latitude');
+$details->line("Longitude",$site_long,'longitude');
+if (plc_is_admin()) 
+  $details->line("Login base",$login_base,'login_base');
+else
+  $details->line("Login base",$login_base);
+if (plc_is_admin())
+  $details->line("Max slices",$max_slices,'max_slices');
+else
+  $details->line("Max slices",$max_slices);
+$details->line("",$details->submit_html("submit","Update Site"));
+$details->form_end();
+
+if ( $local_peer ) {
 
   // Nodes
-  plc_details_space_line();
+  $details->space();
   $nb_boot = 0;
   if ($nodes) foreach ($nodes as $node) if ($node['boot_state'] == 'boot') $nb_boot ++;
-  $node_text = $nb_boot . " boot / " .  count($nodes) . " total";
-  plc_details_line("# Nodes", href(l_nodes_site($site_id),$node_text));
+  $node_label = $nb_boot . " boot / " .  count($nodes) . " total";
+  $details->line("# Nodes", href(l_nodes_site($site_id),$node_label));
   function n_link ($n) { return l_node_t($n['node_id'],$n['hostname'] . " (" . $n['boot_state'] . ")");}
-  $nodes_text= plc_vertical_table(array_map ("n_link",$nodes));
-  plc_details_line ("hostnames",$nodes_text);
-                  
+  $nodes_label= plc_vertical_table(array_map ("n_link",$nodes));
+  $details->line ("Hostnames",$nodes_label);
+  $button=new PlcFormButton (l_node_add(),"add_node","Add node","POST");
+  $details->line("",$button->html());
+
   // Users
-  plc_details_space_line();
-  $user_text = count($person_ids) . " total / " .
+  $details->space();
+  $user_label = count($person_ids) . " Total / " .
     count ($pis) . " PIs / " .
-    count ($techs) . " techs";
+    count ($techs) . " Techs";
   if ( (count ($pis) == 0) || (count ($techs) == 0) || (count($person_ids) >=50)) 
-    $user_text = plc_warning_text ($user_text);
-  plc_details_line ("# Users",href(l_persons_site($site_id),$user_text));
+    $user_label = plc_warning_html ($user_label);
+  $details->line ("# Users",href(l_persons_site($site_id),$user_label));
   function p_link ($p) { return l_person_t($p['person_id'],$p['email']); }
   // PIs
-  $pi_text = plc_vertical_table (array_map ("p_link",$pis));
-  plc_details_line("PI's",$pi_text);
-  // PIs
-  $tech_text = plc_vertical_table (array_map ("p_link",$techs));
-  plc_details_line("techs's",$tech_text);
+  $details->line("PI's",plc_vertical_table (array_map ("p_link",$pis)));
+  // techs
+  $details->line("Techs's",plc_vertical_table (array_map ("p_link",$techs)));
+  if (count ($disabled_persons)) 
+    $details->line("Disabled",plc_vertical_table (array_map ("p_link",$disabled_persons)));
 
   // Slices
-  plc_details_space_line();
-  // summary on # slices
-  $slice_text = count($slice_ids) . " running / " . $max_slices . " max";
-  if (count($slice_ids) >= $max_slices) $slice_text = plc_warning_text ($slice_text);
-  plc_details_line("# Slices", href(l_slices_site($site_id),$slice_text));
+  $details->space();
+  // summary on slices
+  $slice_label = count($slice_ids) . " running / " . $max_slices . " max";
+  if (count($slice_ids) >= $max_slices) 
+    $slice_label = plc_warning_html ($slice_label);
+  $details->line("# Slices", href(l_slices_site($site_id),$slice_label));
   if ($slices) foreach ($slices as $slice)
-     plc_details_line($slice['instantiation'],l_slice_text($slice));
+     $details->line($slice['instantiation'],l_slice_obj($slice));
+  $button=new PlcFormButton (l_slice_add(),"slice_add","Add slice","POST");
+  $details->line("",$button->html());
 
+  // Addresses
+  if ($addresses) {
+    $details->space();
+    $details->line("Addresses","");
+    foreach ($addresses as $address) {
+      $details->line(plc_vertical_table($address['address_types']),
+                      plc_vertical_table(array($address['line1'],
+                                               $address['line2'],
+                                               $address['line3'],
+                                               $address['city'],
+                                               $address['state'],
+                                               $address['postalcode'],
+                                               $address['country'])));
+    }
+  }
 
  }
 
-plc_details_end();
+$details->end();
 
 ////////////////////////////////////////
 $peers->block_end($peer_id);