X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpersons%2Fperson.php;h=c3eea4ba75436c6d0efc3667c6fb5280792e8df9;hb=1808442881002384b18ea43434c56faad81b31f9;hp=11bcd15b2e24c583035e9eefa4406aa63fe5399e;hpb=affa7b7ae6c08a5499398a6e11c3ca01708e93a4;p=plewww.git diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php index 11bcd15..c3eea4b 100644 --- a/planetlab/persons/person.php +++ b/planetlab/persons/person.php @@ -64,21 +64,16 @@ $slices= $api->GetSlices( $slice_ids, array( "slice_id", "name" ) ); $keys= $api->GetKeys( $key_ids ); drupal_set_title("Details for account " . $first_name . " " . $last_name); +$local_peer = ! $peer_id; $peers = new Peers ($api); -$local_peer = $peers->block_start ($peer_id); $is_my_account = plc_my_person_id() == $person_id; $privileges = plc_is_admin () || ( plc_in_site($site_id) && plc_is_pi()); $tabs=array(); +$tabs []= tab_persons(); -// update -if ($privileges || $is_my_account) - $tabs['Update'] = array('url'=>'/db/persons/update.php', - 'values'=>array('id'=>$person_id), - 'bubble'=>"Update $first_name $last_name"); - // enable / disable if ($local_peer && $privileges) if ($enabled) @@ -120,29 +115,48 @@ if ( $privileges) 'bubble'=>"Events about $first_name $last_name", 'image'=>'/planetlab/icons/event.png','height'=>18); -// Back button -$tabs['All Users'] = array ('url'=>l_persons(), - 'bubble'=>'Back to the Users page'); - 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_text("Disabled"); - -plc_details_start(); -plc_details_line("Enabled",$enabled_text); -plc_details_line("First Name",$first_name); -plc_details_line("Last Name",$last_name); -plc_details_line("Email",href("mailto:$email",$email)); -plc_details_line("URL",$url); -plc_details_line("Phone",$phone); -plc_details_line("Title",$title); -plc_details_line("Bio",wordwrap($bio,50,"
")); -plc_details_line("Peer",$peers->peer_link($peer_id)); -plc_details_end(); +$enabled_label="Yes"; +if ( ! $enabled ) $enabled_label = plc_warning_html("Disabled"); + +$can_update = (plc_is_admin() && $local_peer) || $is_my_account; +$details = new PlcDetails($can_update); + +$details->form_start(l_actions(),array("action"=>"update-person", + "person_id"=>$person_id)); +$details->start(); + + +$details->th_td("Title",$title,"title",array('width'=>5)); +$details->th_td("First Name",$first_name,"first_name"); +$details->th_td("Last Name",$last_name,"last_name"); +$details->th_td(href("mailto:$email","Email"),$email,"email"); +$details->th_td("Phone",$phone,"phone"); +$details->th_td("URL",$url,"url",array('width'=>40)); +$details->th_td("Bio",$bio,"bio",array('input_type'=>'textarea','height'=>4)); + +// xxx need to check that this is working +if ($can_update) { + $details->th_td("Password","","password1",array('input_type'=>'password')); + $details->th_td("Repeat","","password2",array('input_type'=>'password')); + $details->tr_submit("submit","Update Account"); + $details->space(); + } + +$details->th_td("Enabled",$enabled_label); +if ( ! $local_peer ) { + $details->th_td("Peer",$peers->peer_link($peer_id)); + $details->space(); + } + +$details->end(); +$details->form_end(); //////////////////// slices plc_section('Slices'); @@ -157,21 +171,22 @@ if( ! $slices) { $table_options['search_area']=false; $table_options['pagesize_area']=false; } - plc_table_start("person_slices",$headers,1,$table_options); + $table=new PlcTable ("person_slices",$headers,1,$table_options); + $table->start(); foreach( $slices as $slice ) { $slice_name= $slice['name']; $slice_id= $slice['slice_id']; - plc_table_row_start(); - plc_table_cell(l_slice_t($slice_id,$slice_name)); - plc_table_row_end(); + $table->row_start(); + $table->cell(l_slice_t($slice_id,$slice_name)); + $table->row_end(); } - plc_table_end("person_slices"); + $table->end(); } // we don't set 'action', but use the submit button name instead -plc_form_start(l_actions(), - array("person_id"=>$person_id,)); +$form=new PlcForm(l_actions(), array("person_id"=>$person_id)); +$form->start(); //////////////////// keys plc_section ("Keys"); @@ -181,44 +196,47 @@ if ( empty( $key_ids ) ) { plc_warning("This user has no known key"); } -// headers $headers=array("Type"=>"string", "Key"=>"string"); -if ($can_manage_keys) $headers['Remove']="none"; +if ($can_manage_keys) $headers[plc_delete_icon()]="none"; // table overall options $table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); -plc_table_start("person_keys",$headers,"1",$table_options); +$table=new PlcTable("person_keys",$headers,"1",$table_options); +$table->start(); if ($keys) foreach ($keys as $key) { $key_id=$key['key_id']; - plc_table_row_start(); - plc_table_cell ($key['key_type']); - plc_table_cell(wordwrap( $key['key'], 60, "
\n", 1 )); + $table->row_start(); + $table->cell ($key['key_type']); + $table->cell(wordwrap( $key['key'], 60, "
\n", 1 )); if ($can_manage_keys) - plc_table_cell (plc_form_checkbox_text('key_ids[]',$key_id)); - plc_table_row_end(); + $table->cell ($form->checkbox_html('key_ids[]',$key_id)); + $table->row_end(); } // the footer area is used for displaying key-management buttons -$footers=array(); // add the 'remove keys' button and key upload areas as the table footer if ($can_manage_keys) { - $remove_keys_area=plc_form_submit_text ("delete-keys","Remove keys"); - $upload_key_left_area= plc_form_label_text("key","Upload new key") . plc_form_file_text("key",60); - $upload_key_right_area=plc_form_submit_text("upload-key","Upload key"); + $table->tfoot_start(); // no need to remove if there's no key - if ($keys) - $footers[]=" $remove_keys_area "; - // upload a new key - $footers []=" $upload_key_left_area ". - " $upload_key_right_area "; + if ($keys) { + $table->row_start(); + $table->cell($form->submit_html ("delete-keys","Remove keys"), + $table->columns(),"right"); + $table->row_end(); + } + $table->row_start(); + $table->cell($form->label_html("key","Upload new key") + . $form->file_html("key","upload",array('size'=>60)) + . $form->submit_html("upload-key","Upload key"), + $table->columns(),"right"); + $table->row_end(); } -plc_table_end("person_keys",array("footers"=>$footers)); +$table->end(); //////////////////// sites plc_section('Sites'); -// sites if (empty( $sites ) ) { plc_warning('This user is not affiliated with a site !!'); } @@ -226,46 +244,46 @@ $can_manage_sites = $local_peer && plc_is_admin() || $is_my_account; $headers=array(); $headers['Login_base']="string"; $headers['Name']="string"; -if ($can_manage_sites) - $headers['Remove']="string"; +if ($can_manage_sites) $headers[plc_delete_icon()]="none"; $table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false); -plc_table_start ("person_sites",$headers,0,$table_options); +$table=new PlcTable ("person_sites",$headers,0,$table_options); +$table->start(); foreach( $sites as $site ) { $site_name= $site['name']; $site_id= $site['site_id']; $login_base=$site['login_base']; - plc_table_row_start(); - plc_table_cell ($login_base); - plc_table_cell (l_site_t($site_id,$site_name)); + $table->row_start(); + $table->cell ($login_base); + $table->cell (l_site_t($site_id,$site_name)); if ($can_manage_sites) - plc_table_cell (plc_form_checkbox_text('site_ids[]',$site_id)); - plc_table_row_end (); + $table->cell ($form->checkbox_html('site_ids[]',$site_id)); + $table->row_end (); } -// footers : the remove and add buttons -$footers=array(); if ($can_manage_sites) { - // remove selected sites - $remove_sites_area = plc_form_submit_text("remove-person-from-sites","Remove Sites"); + $table->tfoot_start(); + + if ($sites) { + $table->row_start(); + $table->cell($form->submit_html("remove-person-from-sites","Remove Sites"), + $table->columns(),"right"); + $table->row_end(); + } + + $table->row_start(); - // add a site : the button - $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); - // xxx cannot use onchange=submit() - would need to somehow pass action name - $selector=array(); - foreach ($relevant_sites as $site) - $selector[]= array('display'=>$site['name'],"value"=>$site['site_id']); - $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[]=" $remove_sites_area "; - // add a new site - $footers []=" $add_site_area "; + function site_selector($site) { return array('display'=>$site['name'],"value"=>$site['site_id']); } + $selectors = array_map ("site_selector",$relevant_sites); + $table->cell ($form->select_html("site_id",$selectors,array('label'=>"Choose a site to add")). + $form->submit_html("add-person-to-site","Add in site"), + $table->columns(),"right"); + $table->row_end(); } -plc_table_end("person_sites",array("footers"=>$footers)); +$table->end(); //////////////////// roles plc_section("Roles"); @@ -274,11 +292,12 @@ if (! $roles) plc_warning ("This user has no role !"); $can_manage_roles= ($local_peer && plc_is_admin()); $table_options=array("search_area"=>false,"notes_area"=>false); -$headers=array("Role"=>"none"); -if ($can_manage_roles) $headers ["Remove"]="none"; +$headers=array("Role"=>"string"); +if ($can_manage_roles) $headers [plc_delete_icon()]="none"; $table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); -plc_table_start("person_roles",$headers,0,$table_options); +$table=new PlcTable("person_roles",$headers,0,$table_options); +$table->start(); // construct array of role objs $role_objs=array(); @@ -287,40 +306,39 @@ for ($n=0; $nrow_start(); + $table->cell($role_obj['name']); + if ($can_manage_roles) $table->cell ($form->checkbox_html('role_ids[]',$role_obj['role_id'])); + $table->row_end(); } // footers : the remove and add buttons -$footers=array(); if ($can_manage_roles) { - // remove selected roles - $remove_roles_area = plc_form_submit_text("remove-roles-from-person","Remove Roles"); + $table->tfoot_start(); + if ($roles) { + $table->row_start(); + $table->cell($form->submit_html("remove-roles-from-person","Remove Roles"), + $table->columns(),"right"); + $table->row_end(); + } + $table->row_start(); + $selectors=$form->role_selectors_excluding($api,$role_ids); + $add_role_left_area=$form->select_html("role_id",$selectors,array('label'=>"Choose role")); // add a role : the button - $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_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[]=" $remove_roles_area "; - // add a new role - $footers[]=" $add_role_area "; + $add_role_right_area=$form->submit_html("add-role-to-person",array('label'=>"Add role")); + $table->cell ($add_role_left_area . $add_role_right_area, + $table->columns(),"right"); + $table->row_end(); } -plc_table_end("person_roles",array("footers"=>$footers)); +$table->end(); ////////////////////////////// -plc_form_end(); +$form->end(); $peers->block_end($peer_id); +plc_tabs ($tabs,"bottom"); + // Print footer include 'plc_footer.php';