return multiple site list for 'my site' link.

[plewww.git] / modules / planetlab.module

diff --git a/modules/planetlab.module b/modules/planetlab.module
index 0abf4a6..2f4ebd3 100644 (file)
--- a/modules/planetlab.module
+++ b/modules/planetlab.module
@@ -128,7 +128,8 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) {
       $site_item = '';
       $site_item .= href(l_sites(),"Sites");
       $site_item .= ul_start();
-      $site_item .= leaf( href(l_site(plc_my_site_id()),"My Site"));
+      #$site_item .= leaf( href(l_site(plc_my_site_id()),"My Site"));
+      $site_item .= plc_my_site_links(); # leaf( href(l_site(plc_my_site_id()),"My Site"));
       if ( $is_admin ) 
        $site_item .= leaf( href(l_sites_pending(),"Pending Requests"));
       $site_item .= ul_end();
@@ -171,17 +172,18 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) {
       $items [] = expanded($slice_item);
 
       //////////////////// Admin
-      if( $is_admin || $is_pi ) {
-       $admin_item = '';
-       $admin_item .= href(l_admin(),"Admin");
-       $admin_item .= ul_start();
-       $admin_item .= leaf( href( l_tags(),"Tags"));
-       $admin_item .= leaf( href( l_nodegroups(),"Node groups"));
-       $admin_item .= leaf (href(l_peers(),'Peers'));
-       if ( $is_admin )
-         $admin_item .= leaf (href(l_events(),'Events'));
-       $admin_item .= ul_end();
-       $items [] = expanded($admin_item);
+      if( plc_is_admin() || plc_is_pi() ) {
+       $bullet_item = '';
+       $bullet_item .= href(l_admin(),"Admin search");
+       $bullet_item .= ul_start();
+       $bullet_item .= leaf( href (l_node_add(),"Add Node"));
+       $bullet_item .= leaf( href( l_tags(),"Tags"));
+       $bullet_item .= leaf( href( l_nodegroups(),"Node groups"));
+       $bullet_item .= leaf (href(l_peers(),'Peers'));
+       if ( plc_is_admin() )
+         $bullet_item .= leaf (href(l_events(),'Events'));
+       $bullet_item .= ul_end();
+       $items [] = expanded($bullet_item);
       }
 
       $doc_item = '';