// Common functions
require_once 'plc_functions.php';
+require_once 'plc_peers.php';
require_once 'plc_minitabs.php';
require_once 'plc_tables.php';
require_once 'plc_details.php';
$keys= $api->GetKeys( $key_ids );
drupal_set_title("Details for account " . $first_name . " " . $last_name);
+$local_peer = ! $peer_id;
-$plc_hash=plc_peer_global_hash($api);
+$peers = new Peers ($api);
-$local_peer = plc_peer_block_start ($peer_hash,$peer_id);
$is_my_account = plc_my_person_id() == $person_id;
$privileges = plc_is_admin () || ( plc_in_site($site_id) && plc_is_pi());
$tabs['Events'] = array('url'=>l_events(),
'values'=>array('type'=>'Person','person'=>$person_id),
'bubble'=>"Events about $first_name $last_name",
- 'image'=>'/planetlab/icons/event.png',
- 'height'=>18);
+ 'image'=>'/planetlab/icons/event.png','height'=>18);
// Back button
$tabs['All Users'] = array ('url'=>l_persons(),
plc_tabs($tabs);
+$peers->block_start ($peer_id);
+
if ($local_peer && $privileges && ! $enabled )
drupal_set_message ("$first_name $last_name is not enabled yet, you can enable her/him with the 'Enable' button below");
$enabled_text="Enabled";
-if ( ! $enabled ) $enabled_text = plc_warning_div("Disabled");
+if ( ! $enabled ) $enabled_text = plc_warning_text("Disabled");
plc_details_start();
plc_details_line("Enabled",$enabled_text);
plc_details_line("Phone",$phone);
plc_details_line("Title",$title);
plc_details_line("Bio",wordwrap($bio,50,"<br/>"));
+plc_details_line("Peer",$peers->peer_link($peer_id));
plc_details_end();
//////////////////// slices
-echo "<hr />\n";
-plc_table_title('Slices');
+plc_section('Slices');
if( ! $slices) {
plc_warning ("User has no slice");
} else {
$headers=array('Slice name'=>'string');
- $table_options=array('notes_area'=>false,
- 'pagesize'=>5);
+ $reasonable_page=5;
+ $table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page);
+ if (count ($slices) <= $reasonable_page) {
+ $table_options['search_area']=false;
+ $table_options['pagesize_area']=false;
+ }
plc_table_start("person_slices",$headers,1,$table_options);
foreach( $slices as $slice ) {
}
// we don't set 'action', but use the submit button name instead
-plc_form_start(l_actions(),
- array("person_id"=>$person_id,
- // uncomment this to run the 'debug' action
- //"action"=>"debug",
- ));
+plc_form_start(l_actions(), array("person_id"=>$person_id,));
//////////////////// keys
-echo "<hr />\n";
-plc_table_title ("Keys");
+plc_section ("Keys");
$can_manage_keys = ( $local_peer && ( plc_is_admin() || $is_my_account) );
if ( empty( $key_ids ) ) {
"Key"=>"string");
if ($can_manage_keys) $headers['Remove']="none";
// table overall options
-$table_options=array("search_area"=>false,"notes_area"=>false);
+$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false);
plc_table_start("person_keys",$headers,"1",$table_options);
if ($keys) foreach ($keys as $key) {
$key_id=$key['key_id'];
- plc_table_row_start($key_id);
+ plc_table_row_start();
plc_table_cell ($key['key_type']);
plc_table_cell(wordwrap( $key['key'], 60, "<br />\n", 1 ));
if ($can_manage_keys)
plc_table_end("person_keys",array("footers"=>$footers));
//////////////////// sites
-echo "<hr />\n";
-plc_table_title('Sites');
+plc_section('Sites');
// sites
if (empty( $sites ) ) {
$headers['Name']="string";
if ($can_manage_sites)
$headers['Remove']="string";
-$table_options = array('notes_area'=>false,'search_area'=>false);
+$table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false);
plc_table_start ("person_sites",$headers,0,$table_options);
foreach( $sites as $site ) {
$site_name= $site['name'];
$remove_sites_area = plc_form_submit_text("remove-person-from-sites","Remove Sites");
// add a site : the button
- $add_site_left_area=plc_form_submit_text("add-person-to-site","Add in site");
+ $add_site_right_area=plc_form_submit_text("add-person-to-site","Add in site");
// get list of local sites that the person is not in
+ function get_site_id ($site) { return $site['site_id'];}
$person_site_ids=array_map("get_site_id",$sites);
$relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids), $site_columns);
$selector=array();
foreach ($relevant_sites as $site)
$selector[]= array('display'=>$site['name'],"value"=>$site['site_id']);
- $add_site_right_area=plc_form_select_text("site_id",$selector,"Choose a site to add");
+ $add_site_left_area=plc_form_select_text("site_id",$selector,"Choose a site to add");
+ $add_site_area = $add_site_left_area . $add_site_right_area;
if ($sites)
- $footers[]="<td colspan=3 style='text-align:right'> $remove_sites_area </td>";
+ $footers[]=plc_table_td_text ($remove_sites_area,3,"right");
// add a new site
- $footers []="<td style='text-align:right'> $add_site_left_area </td>".
- "<td colspan=2> $add_site_right_area </td>";
+ $footers []= plc_table_td_text ($add_site_right_area,3,"right");
}
plc_table_end("person_sites",array("footers"=>$footers));
//////////////////// roles
-echo "<hr />\n";
-plc_table_title("Roles");
+plc_section("Roles");
if (! $roles) plc_warning ("This user has no role !");
$can_manage_roles= ($local_peer && plc_is_admin());
$headers=array("Role"=>"none");
if ($can_manage_roles) $headers ["Remove"]="none";
+$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false);
plc_table_start("person_roles",$headers,0,$table_options);
// construct array of role objs
$remove_roles_area = plc_form_submit_text("remove-roles-from-person","Remove Roles");
// add a role : the button
- $add_role_left_area=plc_form_submit_text("add-role-to-person","Add role");
+ $add_role_right_area=plc_form_submit_text("add-role-to-person","Add role");
// get list of local roles that the person has not yet
// xxx this does not work because GetRoles does not support filters
$relevant_roles = $api->GetRoles( array("~role_id"=>$role_ids));
$selector=array();
foreach ($relevant_roles as $role)
$selector[]= array('display'=>$role['name'],"value"=>$role['role_id']);
- $add_role_right_area=plc_form_select_text("role_id",$selector,"Choose a role to add");
+ $add_role_left_area=plc_form_select_text("role_id",$selector,"Choose a role to add");
+ $add_role_area = $add_role_left_area . $add_role_right_area;
if ($roles)
$footers[]="<td colspan=3 style='text-align:right'> $remove_roles_area </td>";
// add a new role
- $footers []="<td style='text-align:right'> $add_role_left_area </td>".
- "<td colspan=2> $add_role_right_area </td>";
+ $footers[]="<td colspan=3 style='text-align:right'> $add_role_area </td>";
}
plc_table_end("person_roles",array("footers"=>$footers));
//////////////////////////////
plc_form_end();
-plc_peer_block_end();
+$peers->block_end($peer_id);
// Print footer
include 'plc_footer.php';
git://git.onelab.eu / plewww.git / blobdiff