From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 20 Jan 2009 17:05:14 +0000 (+0000)
Subject: checkpoint
X-Git-Tag: PLEWWW-4.3-1~95
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=980597eb6da7f6bae88f0a0ea64b9c575eca60d9;hp=e13bb3116da73769355116384a77480c59468ec0;p=plewww.git

checkpoint
---

diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
index 2dde891..68cbcdd 100644
--- a/planetlab/includes/plc_functions.php
+++ b/planetlab/includes/plc_functions.php
@@ -201,6 +201,8 @@ function l_person2 ($person_id,$text) { return href (l_person_u($person_id),$tex
 function l_event ($type,$param,$id) { return '/db/events/index.php?type=' . $type . '&' . $param . '=' . $id; }
 function l_comon($id_name,$id_value) { return '/db/nodes/comon.php?' . $id_name . "=" . $id_value; }
 
+function l_logout() { return "/planetlab/logout.php"; }
+
 //////////////////////////////////////////////////////////// titles
 function t_site($site) { return " on site " . $site['name'] . " (" . $site['login_base'] .")"; }
 function t_slice ($slice) { return " running slice " . $slice['name'] . " (" . $slice['slice_id'] . ")"; }
diff --git a/planetlab/js/plc_tables.js b/planetlab/js/plc_tables.js
index 8b8cbde..9207def 100644
--- a/planetlab/js/plc_tables.js
+++ b/planetlab/js/plc_tables.js
@@ -41,7 +41,7 @@ function plc_table_paginator (opts,tablename) {
   p.className = "paginationText";    
   p.appendChild(document.createTextNode(label));
 
-  t.insertBefore(p.cloneNode(true), t.firstChild);
+  /*  t.insertBefore(p.cloneNode(true), t.firstChild); */
   b.appendChild(p);
 }
 
diff --git a/planetlab/minitabs/minitabs.js b/planetlab/minitabs/minitabs.js
index fcceb1e..a433a88 100644
--- a/planetlab/minitabs/minitabs.js
+++ b/planetlab/minitabs/minitabs.js
@@ -142,7 +142,7 @@ var miniTab = {
  submit: function (message) {
     /* ask for confirmation if message is not empty */
     if (message && ! confirm (message) ) return;
-    this.inputArr[this.activeTab].parentNode.submit();
+    this.inputArr[this.activeTab].parentNode.parentNode.submit();
   },
 }
  
diff --git a/planetlab/nodes/nodes.php b/planetlab/nodes/nodes.php
index 8e13d37..52ced4b 100644
--- a/planetlab/nodes/nodes.php
+++ b/planetlab/nodes/nodes.php
@@ -7,7 +7,7 @@ require_once 'plc_login.php';
 
 // Get session and API handles
 require_once 'plc_session.php';
-global $plc, $api, $adm;
+global $plc, $api;
 
 // Print header
 require_once 'plc_drupal.php';
@@ -18,10 +18,6 @@ require_once 'plc_functions.php';
 require_once 'plc_minitabs.php';
 require_once 'plc_tables.php';
 
-// find person roles
-$_person= $plc->person;
-$_roles= $_person['role_ids'];
-
 // -------------------- 
 // recognized URL arguments
 $peerscope=$_GET['peerscope'];
@@ -31,8 +27,8 @@ $slice_id=intval($_GET['slice_id']);
 
 // --- decoration
 $title="Nodes";
-$tabs=array("Old page"=>l_nodes(),
-	    "Logout"=>"/planetlab/logout.php");
+$tabs["Logout"]=array('url'=>l_logout(),
+		      'bubble'=>'Logout ' . $plc->person['email']);
 
 // -------------------- 
 $peer_filter=array();