return multiple site list for 'my site' link.

[plewww.git] / modules / planetlab.module

diff --git a/modules/planetlab.module b/modules/planetlab.module
index 45e2db4..2f4ebd3 100644 (file)
--- a/modules/planetlab.module
+++ b/modules/planetlab.module
@@ -12,6 +12,8 @@ require_once 'plc_config.php';
 require_once 'plc_session.php';
 require_once 'plc_functions.php';
 
+drupal_set_html_head('<link href="/planetlab/css/plc_style.css" rel="stylesheet" type="text/css"/>');
+
 function planetlab_help($section) {
   switch ($section) {
   case 'admin/modules#description':
@@ -34,8 +36,8 @@ function planetlab_menu($may_cache) {
 
   if ($may_cache) {
     $items[] = array(
-                    'path' => 'planetlab/logout',
-                    'title' => t('Log out of %s', array('%s' => variable_get('site_name', 'local'))),
+                    'path' => 'planetlab/common/logout',
+                    'title' => t('Logout of %s', array('%s' => variable_get('site_name', 'local'))),
                     'callback' => 'planetlab_logout',
                     'access' => TRUE,
                     'type' => MENU_CALLBACK
@@ -53,10 +55,10 @@ function planetlab_menu($may_cache) {
 }
 
 // formatting helpers
-function ul_start () { return '<ul class=menu>'; }
+function ul_start () { return '<ul class="menu">'; }
 function ul_end () { return '</ul>'; }
-function leaf($text) { return '<li class=leaf>' . $text . '</li>'; }
-function expanded($text) { return '<li class=expanded>' . $text . '</li>'; }
+function leaf($text) { return '<li class="leaf">' . $text . '</li>'; }
+function expanded($text) { return '<li class="expanded">' . $text . '</li>'; }
 function p($text) { return '<p>' . $text . '</p>'; }
 // fake theme to look like menu
 function menu_theme ($menu) {
@@ -111,22 +113,23 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) {
       $is_user  = in_array(30,$plc->person['role_ids']);
       $is_tech  = in_array(40,$plc->person['role_ids']);
 
-      //////////////////// Log out
+      //////////////////// Logout
       if ($user->uid) {
        // Drupal logout (destroys the session and cleans up $user)
        // Thierry unclear when this triggers, I suspect this is obsolete
-       $items[] = leaf (l(t('Log out of %s', 
+       $items[] = leaf (l(t('Logout of %s', 
                             array('%s' => variable_get('site_name', 'local'))), 'logout'));
       } else {
        // PlanetLab logout (just destroy the session)
-       $items[] = leaf ( href (l_logout(),'Log out'));
+       $items[] = leaf ( href (l_logout(),'Logout'));
       }
       
       //////////////////// Sites
       $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();
@@ -136,12 +139,12 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) {
       $user_item = '';
       $user_item .= href(l_persons(),'Users');
       $user_item .= ul_start();
-      $user_item .= leaf( l_person_t(plc_my_person_id(),"My account"));
+      $user_item .= leaf( l_person_t(plc_my_person_id(),"My Account"));
       if (is_pi) 
-       $user_item .= leaf( href( l_persons_site(plc_my_site_id()), "My users"));
+       $user_item .= leaf( href( l_persons_site(plc_my_site_id()), "My Users"));
       if ( $plc->alt_person && $plc->alt_auth) {
        $email = truncate($plc->person['email'],20); 
-       $user_item .= leaf( href( l_sulogout(),"Log out of $email"));
+       $user_item .= leaf( href( l_sulogout(),"Logout of $email"));
       }        
       $user_item .= ul_end();
       $items [] = expanded($user_item);
@@ -169,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 = '';
@@ -270,7 +274,7 @@ function planetlab_login_submit($form_id, $form_values) {
       if ($url[0] != "/") {
        $url = "/$url";
       }
-      Header("Location: $url");
+      header("Location: $url");
       exit();
     }
   }