reimplement slivers.php with plekit and new api calls.

diff --git a/planetlab/common/actions.php b/planetlab/common/actions.php
index 8a3b0fb..1d47ac9 100644 (file)
--- a/planetlab/common/actions.php
+++ b/planetlab/common/actions.php
@@ -600,8 +600,11 @@ switch ($action) {
    if ($result)
      drupal_set_message ("Added slice tag.");
    else 
-     drupal_set_error("Could not add slice tag");
-   plc_redirect(l_slice($slice_id) . "&show_tags=true" );
+       drupal_set_error("Could not add slice tag");
+   if ($_POST['sliver_action'])
+       plc_redirect(l_sliver($node_id,$slice_id));
+   else
+       plc_redirect(l_slice($slice_id) . "&show_tags=true" );
    break;
  }
 

diff --git a/planetlab/nodes/slivers.php b/planetlab/nodes/slivers.php
index 9ab5c61..62e46de 100644 (file)
--- a/planetlab/nodes/slivers.php
+++ b/planetlab/nodes/slivers.php
@@ -9,134 +9,90 @@ global $plc, $api;
 
 // Print header
 require_once 'plc_drupal.php';
-drupal_set_title('Slivers');
+drupal_set_title('Sliver Tags');
 include 'plc_header.php';
 
 // Common functions
 require_once 'plc_functions.php';
-
-// find person roles
-$_person= $plc->person;
-$_roles= $_person['role_ids'];
-
-//print_r( $_person );
-
-
-// if add is set, diplay add sliver form
-if( $_GET['add'] ) {
-  $node_id= $_GET['add'];
-  $slice_id= $_GET['slice'];
-
-  // slice info
-  $slice_info= $api->GetSlices( array( intval( $slice_id ) ), array( "name" ) );
-
-  // node info
-  $node_info= $api->GetNodes( array( intval( $node_id ) ), array( "hostname" ) );
-
-  // get tag types
-  $type_info= $api->GetTagTypes( NULL, array( "tag_type_id", "tagname" ) );
-  
-  // get the slivers for this node
-  $sliver_info= $api->GetSliceTags( array( "node_id"=>intval( $node_id ), "slice_id"=>intval( $slice_id ) ), array( "tag_type_id", "name" ) );
-
-    $types_left= $type_info;
-
-
-  // start form
-  echo "<form action='sliver_action.php' method=post>\n
-  <h2>Add a Sliver Tag to ". $slice_info[0]['name'] ." on node ". $node_info[0]['hostname'] ."</h2>\n
-  <table class='list_set' border=0 cellpadding=2><tbody>\n
-  <tr class='list_set'><th class='list_set'>Tag: </th><td class='list_set'><select name='sliver'>\n";
-
-  foreach( $types_left as $type ) {
-    echo "<option value='". $type['tag_type_id'] ."'>". $type['name'] ."</option>\n";
-
-  }
-
-  echo "</td><td class='list_set'></td></tr>\n
-  <tr class='list_set'><th class='list_set'>Value: </th><td class='list_set'><input type=text name='value'></td></tr>\n
-  </tbody></table>\n
-  <input type=hidden name='node_id' value='$node_id'><input type=hidden name='slice_id' value='$slice_id'>
-  <p><input type=submit name='add_sub' value='Add Sliver Tag'>\n";
-
-  echo "<p><a href='index.php?id=$node_id'>Back to Node</a>\n</form>\n";
-  
-}
+require_once 'table.php';
+require_once 'toggle.php';
+require_once 'form.php';
 
 
 // if slice and node ids are passed display slivers and tags
-if( $_GET['slice'] && $_GET['node'] ) {
-  $slice_id= $_GET['slice'];
-  $node_id= $_GET['node'];
-
-  // slice info
-  $slice_info= $api->GetSlices( array( intval( $slice_id ) ), array( "name" ) );
-
-  // node info
-  $node_info= $api->GetNodes( array( intval( $node_id ) ), array( "hostname" ) );
-
-  // get the slivers for this node
-  $sliver_info= $api->GetSliceTags( array( "node_id"=>intval( $node_id ), "slice_id"=>intval( $slice_id ) ), array( "slice_tag_id", "name", "value", "min_role_id", "description" ) );
-
-  // get the attrbibutes for this slice
-  $tag_info= $api->GetSliceTags( array( intval( $slice_id ) ), array( "slice_tag_id", "name", "value", "min_role_id", "description" ) );
-
-
-  // start form
-  echo "<form action='slivers.php' method=post>\n<h2>Sliver Details for slice ". $slice_info[0]['name'] ." on node ". $node_info[0]['hostname'] ."</h2>\n";
-
-  // sliver tags of slice
-  if( empty( $sliver_info ) )
-    // if no sliver exists tell user
-    echo "No sliver tag for this node/slice sliver combination.\n";
-  else {
-    echo "<p><table class='list_set' border=0 cellpadding=2>\n<caption class='list_set'>Slivers</caption>\n<thead><tr class='list_set'><th class='list_set'>Name</th><th class='list_set'>Value</th><th class='list_set'>Min Roll</th><th class='list_set'>Description</th>";
-    if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "<th></th><th></th>";
-    echo "</tr></thead><tbody>\n";
-
-    foreach( $sliver_info AS $sliver ) {
-      echo "<tr><td>". $sliver['name'] ."</td><td>". $sliver['value'] ."</td><td>". $sliver['min_role_id'] ."</td><td>". $sliver['description'] ."</td>";
-      if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "<td><a href='/db/slices/tags.php?type=slice&id=". $sliver['slice_tag_id'] ."'>Edit</a></td><td><a href='sliver_action.php?rem_id=". $sliver['slice_tag_id'] ."' onclick=\"javascript:return confirm('Are you sure you want to remove ". $sliver['name'] ." from node ". $node_info[0]['hostname'] ."?')\">Remove</a></td>";
-      echo "</tr>\n";
-
-
+if( $_GET['slice_id'] && $_GET['node_id'] ) {
+    $slice_id = $_GET['slice_id'];
+    $node_id = $_GET['node_id'];
+
+
+    // slice info
+    $slice = $api->GetSlices( array( intval( $slice_id ) ), array( "name" ) );
+    $slice = $slice[0];
+
+    // node info
+    $node = $api->GetNodes( array( intval( $node_id ) ), array( "hostname" ) );
+    $node = $node[0];
+
+    drupal_set_title("Sliver tags on node " . $node['hostname'] . " and slice " . $slice['name']);
+
+    $peer_id= $slice['peer_id'];
+    $local_peer = ! $peer_id;
+    $privileges = ( $local_peer && (plc_is_admin()  || plc_is_pi() || $am_in_slice));
+
+    // get the slivers for this node
+    $tags = $api->GetSliceTags( array( "node_id"=>intval( $node_id ), "slice_id"=>intval( $slice_id ) ),
+                                  array( "slice_tag_id", "tagname", "value", "min_role_id", "description" ) );
+
+    $toggle = new PlekitToggle ('sliver-tags',count_english_warning($tags,'tag'),
+                                array('bubble'=>'Inspect and set tags on the sliver',
+                                      'visible'=>true));
+    $toggle->start();
+
+    $headers=array(
+        "Name"=>"string",
+        "Value"=>"string",
+        "Description"=>"string");
+    if ($privileges) $headers[plc_delete_icon()]="none";
+
+    $table_options = array("notes_area"=>false,"pagesize_area"=>false,"search_width"=>10);
+    $table = new PlekitTable("sliver_tags",$headers,'0',$table_options);
+    $form = new PlekitForm(l_actions(),array('slice_id'=>$slice_id, 'node_id'=>$node_id, 'sliver_action'=>true));
+    $form->start();
+    $table->start();
+
+    foreach ($tags as $tag) {
+        $table->row_start();
+        $table->cell($tag['tagname']);
+        $table->cell($tag['value']);
+        $table->cell($tag['description']);
+        $table->row_end();
     }
 
-    echo "</tbody></table>\n";
-
-  }
-  
-  if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "<p><a href='slivers.php?add=$node_id&slice=$slice_id'>Add Sliver Tag</a>\n";
-
-  echo "<br /><hr />";
-
-  // regular tags of slice
-  if( empty( $tag_info ) )
-    // if no tags exist tell user
-    echo "No Tags for this slice.\n";
-  else {
-    echo "<p><table class='list_set' border=0 cellpadding=2>\n<caption class='list_set'>Tags</caption>\n<thead><tr class='list_set'><th class='list_set'>Name</th><th class='list_set'>Value</th><th class='list_set'>Min Roll</th><th class='list_set'>Description</th>";
-    if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "<th></th>";
-    echo "</tr></thead><tbody>\n";
-
-    foreach( $tag_info AS $tag ) {
-      echo "<tr><td>". $tag['name'] ."</td><td>". $tag['value'] ."</td><td>". $tag['min_role_id'] ."</td><td>". $tag['description'] ."</td>";
-      if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "<td><a href='tags.php?type=slice&id=". $tag['slice_tag_id'] ."'>Edit</a></td>";
-      echo "</tr>\n";
-
-
+    if ($privileges) {
+        $table->tfoot_start();
+        $table->row_start();
+        $table->cell($form->submit_html ("delete-slice-tags","Remove selected"),
+                     array('hfill'=>true,'align'=>'right'));
+        $table->row_end();
+
+        $table->row_start();
+        function tag_selector ($tag) {
+            return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']);
+        }
+        $all_tags= $api->GetTagTypes( array ("category"=>"slice*"), array("tagname","tag_type_id"));
+        $selector_tag=array_map("tag_selector",$all_tags);
+
+        $table->cell($form->select_html("tag_type_id",$selector_tag,array('label'=>"Choose Tag")));
+        $table->cell($form->text_html("value","",array('width'=>8)));
+        $table->cell($form->submit_html("add-slice-tag","Set Tag"),array('columns'=>2,'align'=>'left'));
+        $table->row_end();
     }
 
-    echo "</tbody></table>\n";
-
-  }
-
-
-  echo "<p><a href='index.php?id=$node_id'>Back to Node</a>\n</form>\n";
-
+    $form->end();
+    $table->end();
+    $toggle->end();
 }
 
-
 // Print footer
 include 'plc_footer.php';