- remove inconsistency between user/account (rename all to account)

- make persons pages' linetabs to show the page (for admins)

diff --git a/modules/planetlab.module b/modules/planetlab.module
index c62a00f..69e6852 100644 (file)
--- a/modules/planetlab.module
+++ b/modules/planetlab.module
@@ -158,10 +158,10 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) {
       $bullet_item .=  l_person_t(plc_my_person_id(),"My Account");
       $bullet_item .= ul_start();
       if (plc_is_admin() || plc_is_pi()) 
-       $bullet_item .= leaf( href( l_persons_site(plc_my_site_id()), "My Users"));
+       $bullet_item .= leaf( href( l_persons_site(plc_my_site_id()), "My Site Accounts"));
       if (plc_is_admin()) {
-       $bullet_item .= leaf(href(l_persons_peer('local'),'Local users (looong)'));
-       $bullet_item .= leaf(href(l_persons(),'All users (looong)'));
+       $bullet_item .= leaf(href(l_persons_peer('local'),'Local Accounts (slow)'));
+       $bullet_item .= leaf(href(l_persons(),'All Accounts (slow)'));
       }
        
       $bullet_item .= ul_end();

diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
index b807342..cd78d8a 100644 (file)
--- a/planetlab/includes/plc_functions.php
+++ b/planetlab/includes/plc_functions.php
@@ -110,8 +110,8 @@ function l_sliver ($node_id,$slice_id)      { return "/db/nodes/slivers.php?node_id=$
 function l_sliver_t ($node_id,$slice_id,$text) { 
                                          return href (l_sliver($node_id,$slice_id),$text) ; }
 
-function l_persons ()                  { return "/db/persons/index.php"; }
-function l_persons_peer ($peer_id)     { return "/db/persons/index.php?peerscope=$peer_id"; }
+function l_persons ()                  { return "/db/persons/index.php&active_line_tab=All Accounts"; }
+function l_persons_peer ($peer_id)     { return "/db/persons/index.php?peerscope=$peer_id&active_line_tab=Local Accounts"; }
 function l_person ($person_id)         { return "/db/persons/index.php?id=$person_id"; }
 function l_person_t ($person_id,$text) { return href (l_person($person_id),$text); }
 function l_persons_site ($site_id)     { return "/db/persons/index.php?site_id=$site_id"; }
@@ -185,11 +185,11 @@ function tab_slices_local ()      { return array ('label'=>'Local slices', 'url'=>l_s
 function tab_slice($slice)     { return array ('label'=>'Slice '.$slice['name'], 'url'=>l_slice($slice['slice_id']),
                                                'bubble' => 'Details for ' . $slice['name']); }
 //////////
-function tab_persons()         { return array ('label'=>'All accounts', 'url'=>l_persons(),
+function tab_persons()         { return array ('label'=>'All Accounts', 'url'=>l_persons(),
                                                'bubble'=>'Display users from all peers'); }
-function tab_persons_local()   { return array ('label'=>'Local accounts', 'url'=>l_persons_peer('local'),
+function tab_persons_local()   { return array ('label'=>'Local Accounts', 'url'=>l_persons_peer('local'),
                                                'bubble'=>'Display all users local to this peer'); }
-function tab_persons_mysite()  { return array ('label'=>'My accounts' , 'url'=>l_persons_site(plc_my_site_id()),
+function tab_persons_mysite()  { return array ('label'=>'My site accounts' , 'url'=>l_persons_site(plc_my_site_id()),
                                                'bubble'=>'Display accounts on site ' . plc_my_site_id()); }
 function tab_person($person)   { return array ('label'=>'Account '.$person['email'], 'url'=>l_person($person['person_id']),
                                                'bubble'=>'Details for ' . $person['email']); }

diff --git a/planetlab/persons/persons.php b/planetlab/persons/persons.php
index 85d8b40..d4fcdfc 100644 (file)
--- a/planetlab/persons/persons.php
+++ b/planetlab/persons/persons.php
@@ -35,8 +35,10 @@ $title="Accounts";
 $tabs=array();
 $tabs []= tab_persons_mysite();
 
-if (plc_is_admin()) 
+if (plc_is_admin()) {
   $tabs []= tab_persons_local();
+  $tabs []= tab_persons();
+}
 // -------------------- 
 $person_filter=array();