From 3aca091c5ef5315b2f8ab1b11b65ddf8f42cc370 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Tue, 2 Jun 2009 18:08:40 +0000 Subject: [PATCH] replace 'Add Node' with 'Register Node' as link to registerwizard. move 'Add Node' to 'Admin' menu, to encourage users to use the wizard over just adding a node. --- modules/planetlab.module | 2 ++ planetlab/includes/plc_functions.php | 1 + planetlab/includes/plc_objects.php | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/planetlab.module b/modules/planetlab.module index cc131fc..378d1f9 100644 --- a/modules/planetlab.module +++ b/modules/planetlab.module @@ -159,6 +159,7 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) { $bullet_item .= ul_start(); $bullet_item .= leaf( href (l_nodes_site (plc_my_site_id()),"My Site Nodes")); $bullet_item .= leaf( href (l_node_add(),"Add Node")); + $bullet_item .= leaf( href (l_register_node(),"Register Node")); $bullet_item .= ul_end(); $items [] = expanded($bullet_item); @@ -182,6 +183,7 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array()) { $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')); diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php index a54dd65..83a764b 100644 --- a/planetlab/includes/plc_functions.php +++ b/planetlab/includes/plc_functions.php @@ -55,6 +55,7 @@ function href ($url,$text) { return "" . $text . ""; function l_actions () { return "/db/common/actions.php"; } // some complex node actions are kept separate, e.g. the ones related to getbootmedium function l_actions_download () { return "/db/nodes/node_downloads.php"; } +function l_register_node () { return "/registerwizard/index.php"; } function l_nodes () { return "/db/nodes/index.php"; } function l_nodes_peer ($peer_id) { return "/db/nodes/index.php?peerscope=$peer_id"; } diff --git a/planetlab/includes/plc_objects.php b/planetlab/includes/plc_objects.php index 65abc9a..db354bc 100644 --- a/planetlab/includes/plc_objects.php +++ b/planetlab/includes/plc_objects.php @@ -216,7 +216,7 @@ class Node extends PlcObject { $this->last_contact = $node['last_contact']; $this->site_id = $node['site_id']; $this->pcu_ids = $node['pcu_ids']; - $this->nn = $api->GetNodeNetworks($node['nodenetwork_ids']); + $this->nn = $api->GetInterfaces($node['interface_ids']); foreach ($this->nn as $nnet) { if ( $nnet['is_primary'] == true ) -- 2.43.0