git://git.onelab.eu
/
plewww.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e13bb31
)
checkpoint
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Tue, 20 Jan 2009 17:05:14 +0000
(17:05 +0000)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Tue, 20 Jan 2009 17:05:14 +0000
(17:05 +0000)
planetlab/includes/plc_functions.php
patch
|
blob
|
history
planetlab/js/plc_tables.js
patch
|
blob
|
history
planetlab/minitabs/minitabs.js
patch
|
blob
|
history
planetlab/nodes/nodes.php
patch
|
blob
|
history
diff --git
a/planetlab/includes/plc_functions.php
b/planetlab/includes/plc_functions.php
index
2dde891
..
68cbcdd
100644
(file)
--- 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_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'] . ")"; }
//////////////////////////////////////////////////////////// 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
(file)
--- 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));
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);
}
b.appendChild(p);
}
diff --git
a/planetlab/minitabs/minitabs.js
b/planetlab/minitabs/minitabs.js
index
fcceb1e
..
a433a88
100644
(file)
--- 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;
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
(file)
--- 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';
// Get session and API handles
require_once 'plc_session.php';
-global $plc, $api
, $adm
;
+global $plc, $api;
// Print header
require_once 'plc_drupal.php';
// 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';
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'];
// --------------------
// recognized URL arguments
$peerscope=$_GET['peerscope'];
@@
-31,8
+27,8
@@
$slice_id=intval($_GET['slice_id']);
// --- decoration
$title="Nodes";
// --- 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();
// --------------------
$peer_filter=array();