X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpersons%2Fperson.php;h=ea948f95f54c87dc045ccf8dce54fe3ed751b5fd;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=5fac9b24b549505e1d700849c8ca7ac0c37720bd;hpb=878ce4154f4619a5d07c780bf1f76dfd46771df4;p=plewww.git diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php index 5fac9b2..ea948f9 100644 --- a/planetlab/persons/person.php +++ b/planetlab/persons/person.php @@ -1,7 +1,5 @@ 'POST', + 'url'=>l_actions(), + 'values'=>array('action'=>'become-person', + 'person_id'=>$person_id), + 'bubble'=>"Become $first_name $last_name", + 'confirm'=>"Are you sure you want to become $first_name $last_name"); + +if ($local_peer && $privileges && ! $is_my_account) if ($enabled) $tabs['Disable'] = array ('method'=>'POST', 'url'=>l_actions(), @@ -92,17 +100,8 @@ if ($local_peer && $privileges) 'bubble'=>"Enable $first_name $last_name", 'confirm'=>"Are you sure you want to enable $first_name $last_name"); -// become -if (plc_is_admin() && ! $is_my_account) - $tabs['Become'] = array('method'=>'POST', - 'url'=>l_actions(), - 'values'=>array('action'=>'become-person', - 'person_id'=>$person_id), - 'bubble'=>"Become $first_name $last_name", - 'confirm'=>"Are you sure you want to su $first_name $last_name"); - // delete -if ($local_peer && $privileges) +if ($local_peer && $privileges && $local_peer && ! $is_my_account) $tabs['Delete'] = array ('method'=>'POST', 'url'=>l_actions(), 'values'=> array ('person_id'=>$person_id, @@ -116,7 +115,7 @@ if ( $privileges) 'bubble'=>"Events about $first_name $last_name", 'image'=>'/planetlab/icons/event.png','height'=>18); -plc_tabs($tabs); +plekit_linetabs($tabs); $peers->block_start ($peer_id); @@ -127,17 +126,23 @@ $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); + +$toggle = new PlekitToggle ('person',"Details", + array('bubble'=>'Display and modify details for that account', + 'visible'=>get_arg('show_details'))); +$toggle->start(); + +$details = new PlekitDetails($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("Title",$title,"title",array('width'=>10)); $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(href("mailto:$email","Email"),$email,"email",array("width"=>30)); $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)); @@ -158,196 +163,227 @@ if ( ! $local_peer ) { $details->end(); $details->form_end(); +$toggle->end(); //////////////////// slices -$toggle=new PlcToggle ('slices','Slices',array('trigger-tagname'=>'h2')); -$toggle->start(); - -if( ! $slices) { - plc_warning ("User has no slice"); - } else { - $headers=array('Slice name'=>'string'); - $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; - } - $table=new PlcTable ("person_slices",$headers,1,$table_options); - $table->start(); - - foreach( $slices as $slice ) { - $slice_name= $slice['name']; - $slice_id= $slice['slice_id']; - $table->row_start(); - $table->cell(l_slice_t($slice_id,$slice_name)); - $table->row_end(); +if ($local_peer) { + $slices_title=count_english_warning($slices,'slice'); + $toggle=new PlekitToggle ('slices',$slices_title, + array('visible'=>get_arg('show_slices'))); + $toggle->start(); + + if( ! $slices) { + plc_warning ("User has no slice"); + } else { + $headers=array('Slice name'=>'string'); + $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; + } + $table=new PlekitTable ("person_slices",$headers,1,$table_options); + $table->start(); + + foreach( $slices as $slice ) { + $slice_name= $slice['name']; + $slice_id= $slice['slice_id']; + $table->row_start(); + $table->cell(l_slice_t($slice_id,$slice_name)); + $table->row_end(); + } + $table->end(); } - $table->end(); + $toggle->end(); } -$toggle->end(); +//////////////////////////////////////// // we don't set 'action', but use the submit button name instead -$form=new PlcForm(l_actions(), array("person_id"=>$person_id)); +$form=new PlekitForm(l_actions(), array("person_id"=>$person_id)); $form->start(); //////////////////// keys -$toggle=new PlcToggle ('keys',"Keys",array('trigger-tagname'=>'h2')); -$toggle->start(); +if ($local_peer) { + $keys_title = count_english_warning($keys,'key'); + $toggle=new PlekitToggle ('keys',$keys_title,array('visible'=>get_arg('show_keys'))); + $toggle->start(); -$can_manage_keys = ( $local_peer && ( plc_is_admin() || $is_my_account) ); -if ( empty( $key_ids ) ) { - plc_warning("This user has no known key"); - } - -$headers=array("Type"=>"string", - "Key"=>"string"); -if ($can_manage_keys) $headers[plc_delete_icon()]="none"; -// table overall options -$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); -$table=new PlcTable("person_keys",$headers,"1",$table_options); -$table->start(); + $can_manage_keys = ( $local_peer && ( plc_is_admin() || $is_my_account) ); + if ( empty( $key_ids ) ) { + plc_warning("This user has no known key"); + } + + $headers=array("Type"=>"string", + "Key"=>"string"); + if ($can_manage_keys) $headers[plc_delete_icon()]="none"; + // table overall options + $table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); + $table=new PlekitTable("person_keys",$headers,"1",$table_options); + $table->start(); -if ($keys) foreach ($keys as $key) { - $key_id=$key['key_id']; - $table->row_start(); - $table->cell ($key['key_type']); - $table->cell(wordwrap( $key['key'], 60, "
\n", 1 )); - if ($can_manage_keys) - $table->cell ($form->checkbox_html('key_ids[]',$key_id)); - $table->row_end(); -} -// the footer area is used for displaying key-management buttons -// add the 'remove keys' button and key upload areas as the table footer -if ($can_manage_keys) { - $table->tfoot_start(); - // no need to remove if there's no key - if ($keys) { + if ($keys) foreach ($keys as $key) { + $key_id=$key['key_id']; + $table->row_start(); + $table->cell ($key['key_type']); + $table->cell(wordwrap( $key['key'], 60, "
\n", 1 )); + if ($can_manage_keys) + $table->cell ($form->checkbox_html('key_ids[]',$key_id)); + $table->row_end(); + } + // the footer area is used for displaying key-management buttons + // add the 'remove keys' button and key upload areas as the table footer + if ($can_manage_keys) { + $table->tfoot_start(); + // no need to remove if there's no key + if ($keys) { + $table->row_start(); + $table->cell($form->submit_html ("delete-keys","Remove keys"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } $table->row_start(); - $table->cell($form->submit_html ("delete-keys","Remove keys"), - $table->columns(),"right"); + $table->cell($form->label_html("key","Upload new key") + . $form->file_html("key","upload",array('size'=>60)) + . $form->submit_html("upload-key","Upload key"), + array('hfill'=>true,'align'=>'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(); -} - -$table->end(); -$toggle->end(); + + $table->end(); + $toggle->end(); + } //////////////////// sites -$toggle=new PlcToggle('sites','Sites',array('trigger-tagname'=>'h2')); -$toggle->start(); +if ($local_peer) { + $sites_title = count_english_warning($sites,'site'); + $toggle=new PlekitToggle('sites',$sites_title, + array('visible'=>get_arg('show_sites'))); + $toggle->start(); -if (empty( $sites ) ) { - plc_warning('This user is not affiliated with a site !!'); - } -$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[plc_delete_icon()]="none"; -$table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false); -$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']; - $table->row_start(); - $table->cell ($login_base); - $table->cell (l_site_t($site_id,$site_name)); - if ($can_manage_sites) - $table->cell ($form->checkbox_html('site_ids[]',$site_id)); - $table->row_end (); -} -if ($can_manage_sites) { - $table->tfoot_start(); - - if ($sites) { + if (empty( $sites ) ) { + plc_warning('This user is not affiliated with a site !!'); + } + $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[plc_delete_icon()]="none"; + $table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false); + $table=new PlekitTable ("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']; $table->row_start(); - $table->cell($form->submit_html("remove-person-from-sites","Remove Sites"), - $table->columns(),"right"); - $table->row_end(); + $table->cell ($login_base); + $table->cell (l_site_t($site_id,$site_name)); + if ($can_manage_sites) + $table->cell ($form->checkbox_html('site_ids[]',$site_id)); + $table->row_end (); } - - $table->row_start(); - - // 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 - 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(); + if ($can_manage_sites) { + $table->tfoot_start(); + + if ($sites) { + $table->row_start(); + $table->cell($form->submit_html("remove-person-from-sites","Remove Sites"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + + if (plc_is_admin()) + { + // NOTE: only admins can add users to different sites. + $table->row_start(); + // 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, '-SORT'=>'name'), $site_columns); + // xxx cannot use onchange=submit() - would need to somehow pass action name + 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"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + } + $table->end(); + $toggle->end(); } -$table->end(); -$toggle->end(); - //////////////////// roles -$toggle=new PlcToggle ('roles','Roles',array('trigger-tagname'=>'h2')); -$toggle->start(); +if ($local_peer) { + $toggle=new PlekitToggle ('roles',count_english($roles,"role"),array('visible'=>get_arg('show_roles'))); + $toggle->start(); -if (! $roles) plc_warning ("This user has no role !"); + 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); + $is_pi_of_the_site = ( plc_in_site($site_ids[0]) && plc_is_pi() ); + $can_manage_roles= ( ($local_peer && plc_is_admin()) || $is_pi_of_the_site ); -$headers=array("Role"=>"string"); -if ($can_manage_roles) $headers [plc_delete_icon()]="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); -$table=new PlcTable("person_roles",$headers,0,$table_options); -$table->start(); + $table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false); + $table=new PlekitTable("person_roles",$headers,0,$table_options); + $table->start(); -// construct array of role objs -$role_objs=array(); -for ($n=0; $n$role_ids[$n], 'name'=>$roles[$n]); - } - -if ($role_objs) foreach ($role_objs as $role_obj) { - $table->row_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 -if ($can_manage_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(); + // construct array of role objs + $role_objs=array(); + for ($n=0; $n$role_ids[$n], 'name'=>$roles[$n]); } - $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=$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(); + if ($role_objs) foreach ($role_objs as $role_obj) { + $table->row_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 + if ($can_manage_roles) { + + // remove + $table->tfoot_start(); + if ($roles) { + $table->row_start(); + $table->cell($form->submit_html("remove-roles-from-person","Remove Roles"), + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + + // add + // compute the roles that can be added + if (plc_is_admin()) + // all roles + $exclude_role_ids=array(); + else + // all roles except admin and pi + $exclude_role_ids=array(10,20); + $possible_roles = roles_except($api->GetRoles(),$exclude_role_ids); + $roles_to_add = roles_except ($possible_roles,$role_ids); + if ( $roles_to_add ) { + $selectors=$form->role_selectors($roles_to_add); + $table->row_start(); + $add_role_left_area=$form->select_html("role_id",$selectors,array('label'=>"Choose role")); + // add a role : the button + $add_role_right_area=$form->submit_html("add-role-to-person","Add role"); + $table->cell ($add_role_left_area . $add_role_right_area, + array('hfill'=>true,'align'=>'right')); + $table->row_end(); + } + } + $table->end(); + $toggle->end(); } -$table->end(); -$toggle->end(); ////////////////////////////// $form->end(); $peers->block_end($peer_id); -//plc_tabs ($tabs,"bottom"); +//plekit_linetabs ($tabs,"bottom"); // Print footer include 'plc_footer.php';