From a77cb73ad2df6015a16bb996778ad7bbd3cf2799 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 9 Jan 2009 22:10:47 +0000
Subject: [PATCH] iterating on new nodes index

---
 PLCWWW.spec                                   |   2 +-
 planetlab.conf => httpd.conf                  |   0
 modules/planetlab.module                      |   1 +
 planetlab/css/plc_paginate.css                | 134 +++++++++++++
 planetlab/icons/comon.png                     | Bin 2694 -> 3324 bytes
 planetlab/icons/delete.png                    | Bin 2279 -> 3478 bytes
 planetlab/icons/event.png                     | Bin 2065 -> 3516 bytes
 planetlab/includes/plc_functions.php          |  25 +++
 .../plc_script.js => js/plc_functions.js}     |   0
 planetlab/js/plc_paginate.js                  |  15 ++
 planetlab/nodes/index.php                     |  31 +--
 planetlab/nodes/newindex.php                  | 183 +++++++++++++-----
 planetlab/sites/site_form.php                 |   2 +-
 13 files changed, 320 insertions(+), 73 deletions(-)
 rename planetlab.conf => httpd.conf (100%)
 create mode 100644 planetlab/css/plc_paginate.css
 rename planetlab/{includes/plc_script.js => js/plc_functions.js} (100%)
 create mode 100644 planetlab/js/plc_paginate.js

diff --git a/PLCWWW.spec b/PLCWWW.spec
index 93c7018..20b563f 100644
--- a/PLCWWW.spec
+++ b/PLCWWW.spec
@@ -60,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT/var/www/html
 rsync -a --exclude \*.spec --exclude .svn --exclude CVS ./ $RPM_BUILD_ROOT/var/www/html/
 
 echo "* PLEWWW: Installing config for httpd"
-install -D -m 644 planetlab.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/planetlab.conf
+install -D -m 644 httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/plcwww.conf
 
 %post
 # attempt to perform most of the drupal post-install stuff - assuming version 6.x
diff --git a/planetlab.conf b/httpd.conf
similarity index 100%
rename from planetlab.conf
rename to httpd.conf
diff --git a/modules/planetlab.module b/modules/planetlab.module
index 0a2adb8..e1f7d1f 100644
--- a/modules/planetlab.module
+++ b/modules/planetlab.module
@@ -128,6 +128,7 @@ function planetlab_block($op = 'list', $delta = 0, $edit = array())
       $node_item = '';
       $node_item .= '<a href="/db/nodes/">Nodes</a>';
       $node_item .= '<ul>';
+      $node_item .= '<li><a href="/db/nodes/newindex.php"> New nodes page </a></li>';
       $node_item .= '<li><a href="/db/nodes/index.php?site_id='. $plc->person['site_ids'][0] .'">My Site Nodes</a></li>';
       $node_item .= "<li><a href='/db/nodes/add_node.php'>Add Node</a></li>";
       if ( $is_admin) 
diff --git a/planetlab/css/plc_paginate.css b/planetlab/css/plc_paginate.css
new file mode 100644
index 0000000..d1d83cc
--- /dev/null
+++ b/planetlab/css/plc_paginate.css
@@ -0,0 +1,134 @@
+/* Pagination list styles */
+ul.fdtablePaginater
+        {
+        display:table;
+        list-style:none;
+        padding:0;
+        margin:0 auto;
+        text-align:center;
+        height:2em;
+        width:auto;
+        margin-bottom:2em;
+        }
+ul.fdtablePaginater li
+        {
+        display:table-cell;
+        padding-right:4px;
+        color:#666;
+        list-style:none;
+        
+        -moz-user-select:none;
+        -khtml-user-select:none;
+        }
+ul.fdtablePaginater li a.currentPage
+        {
+        border-color:#a84444 !important;
+        color:#000;
+        }
+ul.fdtablePaginater li a:active
+        {
+        border-color:#222 !important;
+        color:#222;
+        }
+ul.fdtablePaginater li a,
+ul.fdtablePaginater li div
+        {
+        display:block;
+        width:2em;
+        font-size:1em;
+        color:#666;
+        padding:0;
+        margin:0;
+        text-decoration:none;
+        outline:none;
+        border:1px solid #ccc;
+        font-family:georgia, serif;
+        }
+ul.fdtablePaginater li div
+        {
+        cursor:normal;
+        opacity:.5;
+        filter:alpha(opacity=50);
+        }
+ul.fdtablePaginater li a span,
+ul.fdtablePaginater li div span
+        {
+        display:block;
+        line-height:2em;
+        border:1px solid #fff;
+        background:#fff url(../media/gradient.gif) repeat-x 0 -20px;
+        }
+ul.fdtablePaginater li a
+        {
+        cursor:pointer;
+        }
+ul.fdtablePaginater li a:focus
+        {
+        color:#333;
+        text-decoration:none;
+        border-color:#aaa;
+        }
+.fdtablePaginaterWrap
+        {
+        text-align:center;
+        clear:both;
+        text-decoration:none;
+        }
+ul.fdtablePaginater li .next-page span,
+ul.fdtablePaginater li .previous-page span,
+ul.fdtablePaginater li .first-page span,
+ul.fdtablePaginater li .last-page span
+        {
+        font-weight:bold !important;
+        }
+/* Keep the table columns an equal size during pagination */
+td.sized1
+        {
+        width:16em;
+        text-align:left;
+        }
+td.sized2
+        {
+        width:10em;
+        text-align:left;
+        }
+td.sized3
+        {
+        width:7em;
+        text-align:left;
+        }
+tfoot td
+        {
+        text-align:right;
+        font-weight:bold;
+        text-transform:uppercase;
+        letter-spacing:1px;
+        }
+#visibleTotal
+        {
+        text-align:center;
+        letter-spacing:auto;
+        }
+* html ul.fdtablePaginater li div span,
+* html ul.fdtablePaginater li div span
+        {
+        background:#eee;
+        }
+tr.invisibleRow
+        {
+        display:none;
+        visibility:hidden;
+        }
+p.paginationText
+        {
+        font-style:oblique;
+        }
+<!--[if IE]>
+<style type="text/css">
+ul.fdtablePaginater {display:inline-block;}
+mul.fdtablePaginater {display:inline;}
+ul.fdtablePaginater li {float:left;}
+ul.fdtablePaginater {text-align:center;}
+table { border-bottom:1px solid #C1DAD7; }
+</style>
+<![endif]-->
diff --git a/planetlab/icons/comon.png b/planetlab/icons/comon.png
index daa35f3ccbea772e0d889ff1dc9f92323bcb7e87..25a71831a7dd656b503323709c42bae57fe6e698 100644
GIT binary patch
literal 3324
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
GLSTZwSWP_u

literal 2694
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

diff --git a/planetlab/icons/delete.png b/planetlab/icons/delete.png
index 4fe6144eb8ffcc5cb4090fd27d4dba05fc8bc1f4..56c5910d49056bf81045591e370dc72b953d8b9c 100644
GIT binary patch
literal 3478
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
Ef>|eQ<p2Nx

literal 2279
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
BLkj=^

diff --git a/planetlab/icons/event.png b/planetlab/icons/event.png
index d19658e4465a9dfa926880bebad805376d82172a..2be04c1ba59c879bc1cc229c7bace7dfa7041dbf 100644
GIT binary patch
literal 3516
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

literal 2065
zcmV+s2=4cZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000NrNkl<Zc-pm>
zdvH|c8OEP;cF$(B*X(ZCK(e_*QXqsRatok9O1Z^eP_cs+fg-mWp&*@7I#wKTQf-}~
zQUi%fi!?CmR2UktAeSPRRxBZj<YFKRkjw67ca!XH_I}QuzPk|^6(K=<|2ThazW02;
z?|Gm1{Z1GRAu=-4<*Y|o<>3RLnC;e2hLZbD!3=8E8^tjQgr=vz*7AtdC#c16IGthH
zC;Pl^r_JGTe)j-x6|XPkwL4n>QVr|!)Rz(~uK!Tm;`D~)(g4q~tNebyt<z@d{cZqu
z%^f|>lzQP8zTvU&9yt$o$@lQl+JkUx%-k1y+|is-W!}WcE4l<3mIZ_SrR(Mn@BITP
zpFc`3lUMDXJUdGhmLMDqA=n?p)?ZiR!8aepzBQGwPE}X2R(^l>yItkHMs}K)h_8ns
ze%#jCJ}8ho1C-5qe{;^Hg^NsCIMmHU7sDbMe#E%l$VfI~!{XOaRQUw{yuK0^g|}bK
zPgtB)+PF8QQJkPR9}yuQXl=h1x;KE`^OH<UP1AuX-&dXOVR6~RKuW8nECZv0#mE=|
zYKI+pW74psXd6}@T7|a{{|Be{e;f+`ENkhgZC7?OQlTj*WlywqUEex%fL-(6-adZH
zlAoByqRlJdvpyF(0u1;t8_kL&CaNSDt7gz&*M#D^h1l}b9SF=y#--76G^}_JflcF|
zPAk8*Lf#i@_c21vReM+I-~h_z&Y7K*cI*$iQ=wPqLdmJ%@>|g6>Ofte8&`b{e8Me|
zWQ`OL=sCD+8!&zPIP5L0!b!6QzHJ4#Ftq}K4Y|KftnB=O_Np($E7@xvA-Jxy+v>YL
zK=}fNnv>Q1ZSt&9*>TwzuFr!gh7k<;X)zBEfpqqFpuy=zeLo8?fiUzIQ2<PF9A+eP
zaMd*<DZvP@&5P9~uOt6#2@d9#!oMi>a9o|IQ-860&lQ*Bf42uHn^U%IWX{@+Sq0Fl
z#zH1lMt=^6X$OduKqrR)f6#_@cPFa*`qAuRqoolM@dz+d$01KAMeuqD%uN<NG`j$g
z%=#TB9$$va_fCt!zR=5Jj{f&}>ag?60K4Zuo~Tg2^Vf+pk)j<1jXVW{7@|$T&dD;8
zn;>ljQcI<2@k$UB*$5{@N=YQM<{4yA_SjK(wh@mlDMF3IjGdP+;8d5Ri(XK|eC6~X
zZOtuwa8b%wXq98X5J<dZr$#^+0ttkA(CX^M`5q@)eJtrDiRSW@ZlLxZqn9F;4M8UZ
zKJ2Q;rn&}7X4l>V*fnoThDP`Ay%T4$BQ#^6kPSmPQrJPp07w{~fE9JUo%poJg&tl;
zzef}i$+Qe+7)0c%Jb13|Q~cNNK!{<M4**mYvsC0WJMyPZUtlVLDmG(Cn|~FA909wh
z4b}Em)Vf(X1vPZi0A^^r;o*Jw<!22TrvOg&hQ264+1$lHPR-iCJ*O}#y@cUNJn^0Y
z27-Zvm6CJ4xY~CK=k1*^a6zQR@OY)A9Zs(u*$NJCn*Gl()OI=z$JM;`z~q#i_yWYy
z=_AIw9}(#oDa*m)x(K_g1{d9aY_4y@_EaTmJv<Ir{Xb`@_Unp<8~?N|I|D|25!5kB
z)KY=Fns2ZnVP)v?G^5(`FOvQWR4k8|(v&#b8^V68e+@(RA1`B=GsOw<+7;=U7^TlA
z4`fE^!y^AJ6^PhUz%|=3ywF&S(-s>xq^dDqA;F=ZAl~oxZ@gi`3E+i2nHuG|l5`WM
z8M9zekB1`0NDy?n4%v_c?JFVq?fs3YwVuV&i_KVQkm6yzj7kjr-5$VEN8s68ZCFvP
zrA~NN!m>{+91$P;REh~n>P*CuDHSq(RE@|;zT3vs`Ls4bH>WC^bItw%%37Oo&St@u
zWEDcxl5)CHt4M)^Hvih&+y%wdgTl&mm2%^<l;N`J@kZzsnRF@TKqgT@2#4+n5JrGD
z?njKoh;DZyn(gOMLbYEyjIMBbWKtpuaK;tFK1;*{-xRy&7t-_9nZpc)4=3m_!H|R`
z?F1-elcR%WU{2gfzhzjF00hxXt*oWfAICfGS8&4IflVeQeBpt0F$7TEAHpuPfBBui
zh$@O{$_lH&u)mpR(55U;O+<lVG<525kaK!c!%L&qOLA*zG1-ky9toKw4rb>ibU3T=
ztNJT=OczFmTzV5AqQE(K2z$)_=Lh#yTu~fHATKI7Zrx&&5sxRCFie#VooXaFi8N}|
z$mUUxFapG|f}DQ}A9h>u%I7V@Lpr%+F5Qquj*UV@0FLxVyP$M%05|=y;88mE&PnmQ
z5zl5MAx&w7L6c9nrjeS>Nq-6wkPaO^m(b_^92@If(CBn+CMunpV>kRrFOyBxa?ndy
zykYU-RB!OPp#co2kw9v^kPsWY@|lce>7+O{0St$lCa7MS2Djgi4#!FS)8@b*n_D9{
zUJh0rsV8%fCW%%j$t6!u)o{vcnuIN0e!<WIZmBVWUifl;oVI9TVm$ISYG_FbKktW^
zcVi8GCtAGzV_0)^-k0-=Gb!&$`i$x$50~FNz>U~Fzl5GIj@GF4>oZf3M<7+*4s36@
zEYKv1oWAK!>E9k;pe!aDV$Ul$>8jOfDL7)aq1ojw#hMSc+%5I~0NjZ31@j1GC)J%J
viO10C@A}`-{RJ3MV*))#(B}Ub%<}&OqYqK{>XLCJ00000NkvXXu0mjfUV!U)

diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
index 9e7a81d..60a8dc7 100644
--- a/planetlab/includes/plc_functions.php
+++ b/planetlab/includes/plc_functions.php
@@ -398,4 +398,29 @@ function plc_peers_option_list ($api) {
     return $result;
 }
 
+function plc_peer_info ($api,$peerscope) {
+  switch ($_GET['peerscope']) {
+  case '':
+    $peer_filter=array();
+    $peer_label="all peers";
+    break;
+  case 'local':
+    $peer_filter=array("peer_id"=>NULL);
+    $peer_label="local peer";
+    break;
+  case 'foreign':
+    $peer_filter=array("~peer_id"=>NULL);
+    $peer_label="foreign peers";
+    break;
+  default:
+    $peer_id=intval($_GET['peerscope']);
+    $peer_filter=array("peer_id"=>$peer_id);
+    $peer=$api->GetPeers(array("peer_id"=>$peer_id));
+    $peer_label='peer "' . $peer[0]['peername'] . '"';
+    break;
+  }
+  return array ($peer_filter,$peer_label);
+}
+    
+
 ?>
diff --git a/planetlab/includes/plc_script.js b/planetlab/js/plc_functions.js
similarity index 100%
rename from planetlab/includes/plc_script.js
rename to planetlab/js/plc_functions.js
diff --git a/planetlab/js/plc_paginate.js b/planetlab/js/plc_paginate.js
new file mode 100644
index 0000000..fcfe00a
--- /dev/null
+++ b/planetlab/js/plc_paginate.js
@@ -0,0 +1,15 @@
+function displayTextInfo (opts,tablename) {
+
+  if(!("currentPage" in opts)) { return; }
+    
+  var p = document.createElement('p'),
+    t = document.getElementById(tablename+'-fdtablePaginaterWrapTop'),
+    b = document.getElementById(tablename+'-fdtablePaginaterWrapBottom');
+  
+  p.className = "paginationText";    
+  p.appendChild(document.createTextNode("Showing page " + opts.currentPage + " of " + Math.ceil(opts.totalRows / opts.rowsPerPage)));
+                
+  t.insertBefore(p.cloneNode(true), t.firstChild);
+  b.appendChild(p);
+}
+
diff --git a/planetlab/nodes/index.php b/planetlab/nodes/index.php
index 9a7b830..6f7effc 100644
--- a/planetlab/nodes/index.php
+++ b/planetlab/nodes/index.php
@@ -63,31 +63,19 @@ function layout_node ($node) {
 // we use GET rather than POST so paginate can display the right contents on subsequent pages
 // can be useful for writing bookmarkable URL's as well
 if( $_GET['nodepattern'] || $_GET['peerscope']) {
+
+  // nodepattern
   $nodepattern= $_GET['nodepattern'];
+  // need to use a hash filter for patterns to be properly handled
   if (empty($nodepattern)) { 
     $nodepattern="*";
   }
   $filter = array_merge (array( "hostname"=>$nodepattern ), $filter);
-  switch ($_GET['peerscope']) {
-  case '':
-    $peer_label="all peers";
-    break;
-  case 'local':
-    $filter=array_merge(array("peer_id"=>NULL),$filter);
-    $peer_label="local peer";
-    break;
-  case 'foreign':
-    $filter=array_merge(array("~peer_id"=>NULL),$filter);
-    $peer_label="foreign peers";
-    break;
-  default:
-    $peer_id=intval($_GET['peerscope']);
-    $filter=array_merge(array("peer_id"=>$peer_id),$filter);
-    $peer=$api->GetPeers(array("peer_id"=>$peer_id));
-    $peer_label='peer "' . $peer[0]['peername'] . '"';
-    break;
-  }
-  // need to use a hash filter for patterns to be properly handled
+
+  // peerscope
+  list ( $peer_filter, $peer_label) = plc_peer_info($api,$_GET['peerscope']);
+  $filter=array_merge($filter,$peer_filter);
+
   $nodes= $api->GetNodes($filter, $columns);
   $nodes_count = count ($nodes);
   if ( $nodes_count == 1) {
@@ -181,8 +169,7 @@ elseif( !$_GET['id'] ) {
          </tr></table></form></div>\n
           <br />\n";
 
-
-echo paginate( $nodes, "node_id", "Nodes", 25, "hostname" );
+    echo paginate( $nodes, "node_id", "Nodes", 25, "hostname" );
 
     echo "<script type=\"text/javascript\">\n
 var options = {\n
diff --git a/planetlab/nodes/newindex.php b/planetlab/nodes/newindex.php
index 347e1e0..d3a5853 100644
--- a/planetlab/nodes/newindex.php
+++ b/planetlab/nodes/newindex.php
@@ -11,7 +11,7 @@ global $plc, $api, $adm;
 
 // Print header
 require_once 'plc_drupal.php';
-drupal_set_title('New Nodes');
+drupal_set_title('Nodes');
 include 'plc_header.php';
 
 // Common functions
@@ -22,48 +22,109 @@ require_once 'plc_sorts.php';
 $_person= $plc->person;
 $_roles= $_person['role_ids'];
 
-$header_js='
+$header_autocomplete_js='
+<script type="text/javascript" src="/planetlab/bsn/bsn.Ajax.js"></script>
+<script type="text/javascript" src="/planetlab/bsn/bsn.DOM.js"></script>
+<script type="text/javascript" src="/planetlab/bsn/bsn.AutoSuggest.js"></script>
+';
+
+$header_tablesort_js='
 <script type="text/javascript" src="/planetlab/tablesort/tablesort.js"></script>
 <script type="text/javascript" src="/planetlab/tablesort/customsort.js"></script>
 <script type="text/javascript" src="/planetlab/tablesort/paginate.js"></script>
-<script type="text/javascript" src="/planetlab/tablesort/more.js"></script>
-<body OnLoad="init();">
+<script type="text/javascript" src="/planetlab/js/plc_paginate.js"></script>
 ';
-$header_css='
-<link href="/planetlab/css/demo.css" rel="stylesheet" type="text/css" />
-<link href="/planetlab/css/more.css" rel="stylesheet" type="text/css" />
-<!--[if IE]>
-<style type="text/css">
-ul.fdtablePaginater {display:inline-block;}
-mul.fdtablePaginater {display:inline;}
-ul.fdtablePaginater li {float:left;}
-ul.fdtablePaginater {text-align:center;}
-table { border-bottom:1px solid #C1DAD7; }
-</style>
-<![endif]-->
+
+$header_tablesort_css='
+<link href="/planetlab/css/plc_style.css" rel="stylesheet" type="text/css" />
+<link href="/planetlab/css/plc_table.css" rel="stylesheet" type="text/css" />
+<link href="/planetlab/css/plc_paginate.css" rel="stylesheet" type="text/css" />
 ';
 
-$header_unused='
+$unused='
+<script type="text/javascript" src="/planetlab/tablesort/more.js"></script>
+<link href="/planetlab/css/more.css" rel="stylesheet" type="text/css" />
+<body OnLoad="init();">
 ';
 
-drupal_set_html_head($header_js);
-drupal_set_html_head($header_css);
+drupal_set_html_head($header_autocomplete_js);
+drupal_set_html_head($header_tablesort_js);
+drupal_set_html_head($header_tablesort_css);
 
-$site_columns=array("site_id","login_base");
-$site_filter=array("login_base"=>"*");
-$sites=$api->GetSites($site_filter,$site_columns);
+$nodepattern=$_GET['nodepattern'];
+$peerscope=$_GET['peerscope'];
+$tablesize=$_GET['tablesize'];
+if (empty($tablesize)) $tablesize=25;
 
-$site_hash=array();
-foreach ($sites as $site) {
-    $site_hash[$site["site_id"]]=$site;
-}
+?>
+
+<div class="plc_filter">
+<form method=get action='newindex.php'>
+<table>
+
+<tr>
+<th><label for='peerscope'>Federation scope </label></th>
+<td colspan=2><select id='peerscope' name='peerscope' onChange='submit()'>
+<?php echo plc_peers_option_list($api); ?>
+</select></td>
+</tr>
+
+<tr>
+<th><label for='nodepattern'>Hostname </label></th>
+<td><input type='text' id='nodepattern' name='nodepattern' 
+     size=40 value='<?php print $nodepattern; ?>'/></td>
+<td><input type=submit value='Go' /></td>
+</tr> 
+
+<tr> 
+<th><label for='tablesize'>Table size</label></th>
+<td> <input type='text' id='tablesize' name='tablesize' 
+      size=3 value='<?php print $tablesize; ?>'/></td>
+<td><input type=submit value='Go' /> </td>
+</tr>
+</table>
+</form>
+</div>
+
+<script type="text/javascript">
+var options = {
+	script:"/planetlab/nodes/test.php?",
+	varname:"input",
+	minchars:1
+};
+var as = new AutoSuggest('nodepattern', options);
+</script>
+
+
+<?php
+
+$peer_filter=array();
+
+// fetch nodes
+$node_columns=array('hostname','site_id','node_id','boot_state','interface_ids');
+if ($nodepattern) {
+  $node_filter['hostname']=$nodepattern;
+ } else {
+  $node_filter=array('hostname'=>"*");
+ }
+
+// peerscope
+list ( $peer_filter, $peer_label) = plc_peer_info($api,$_GET['peerscope']);
+$node_filter=array_merge($node_filter,$peer_filter);
 
-$node_columns=array("hostname","site_id","node_id","boot_state");
-$node_filter=array("hostname"=>"*");
 $nodes=$api->GetNodes($node_filter,$node_columns);
 
-$interface_columns=array("ip","node_id");
-$interface_filter=array("is_primary"=>TRUE);
+// build site_ids and interface_ids 
+$site_ids=array();
+$interface_ids=array();
+foreach ($nodes as $node) {
+  $site_ids []= $node['site_id'];
+  $interface_ids = array_merge ($interface_ids,$node['interface_ids']);
+}
+
+// fetch related interfaces
+$interface_columns=array('ip','node_id','interface_id');
+$interface_filter=array('is_primary'=>TRUE,'interface_id'=>$interface_ids);
 $interfaces=$api->GetInterfaces($interface_filter,$interface_columns);
 
 $interface_hash=array();
@@ -71,42 +132,64 @@ foreach ($interfaces as $interface) {
     $interface_hash[$interface['node_id']]=$interface;
 }
 
+// fetch related sites
+$site_columns=array('site_id','login_base');
+$site_filter=array('site_id'=>$site_ids);
+$sites=$api->GetSites($site_filter,$site_columns);
+
+$site_hash=array();
+foreach ($sites as $site) {
+    $site_hash[$site['site_id']]=$site;
+}
+
 ?>
 
-<table id="theTable" cellpadding="0" cellspacing="0" border="0" 
-class="sortable-onload-2 rowstyle-alt colstyle-alt no-arrow paginate-50 max-pages-10">
+<div class="fdtablePaginaterWrap" id="nodes-fdtablePaginaterWrapTop"><p></p></div>
+
+<table id="nodes" cellpadding="0" cellspacing="0" border="0" 
+class="plc_table sortable-onload-3r rowstyle-alt colstyle-alt no-arrow paginationcallback-nodesTextInfo max-pages-15 paginate-<?php print $tablesize; ?>">
 <thead>
 <tr>
-<th align=top>Select </th>
-<th class="sortable">State</th>
-<th class="sortable">Hostname</th>
-<th class="sortable">Site</th>
-<th class="sortable">Region</th>
-<th class="sortable-sortIPAddress">IP</th>
-<th class="sortable">Load</th>
-<th class="sortable">Avg Load</th>
+<th class="sortable plc_table">State</th>
+<th class="sortable plc_table">Hostname</th>
+<th class="sortable plc_table">Site</th>
+<th class="sortable plc_table">Region</th>
+<th class="sortable-sortIPAddress plc_table">IP</th>
+<th class="sortable plc_table">Load</th>
+<th class="sortable plc_table">Avg Load</th>
 </tr>
 </thead>
 <tbody>
 
+<script type"text/javascript">
+function nodesTextInfo (opts) {
+  displayTextInfo (opts,"nodes");
+}
+</script>
+
 <?php
 
+  $fake1=1; $fake2=3.14;
 foreach ($nodes as $node) {
     $hostname=$node['hostname'];
-    $site=$site_hash[$node['site_id']];
+    $node_id=$node['node_id'];
+    $site_id=$node['site_id'];
+    $site=$site_hash[$site_id];
     $login_base = $site['login_base'];
     $node_id=$node['node_id'];
     $ip=$interface_hash[$node['node_id']]['ip'];
+    $interface_id=$interface_hash[$node['node_id']]['interface_id'];
     printf ('<tr id="%s">',$hostname);
-    printf ('<td> <input type="checkbox" id="%s"></td>',$hostname);
-    printf ('<td> %s </td>',$node['boot_state']);
-    printf ('<td> %s </td>',$hostname);
-    printf ('<td> %s </td>',$login_base);
-    printf ('<td> %s </td>',topdomain($hostname));
-    printf ('<td> %s </td>',$ip);
-    printf ('<td> 1.0 </td>');
-    printf ('<td> 10.0 </td>');
+    printf ('<td class="plc_table"> %s </td>',$node['boot_state']);
+    printf ('<td class="plc_table"> <a href="/db/nodes/index.php?id=%s">%s</a></td>',$node_id,$hostname);
+    printf ('<td class="plc_table"> <a href="/db/sites/index.php?id=%s">%s</a></td>',$site_id,$login_base);
+    printf ('<td class="plc_table"> %s </td>',topdomain($hostname));
+    printf ('<td class="plc_table"> <a href="/db/nodes/interfaces.php?id=%s">%s</a></td>', $interface_id,$ip);
+    printf ('<td class="plc_table"> %s </td>', $fake1);
+    printf ('<td class="plc_table"> %s </td>', $fake2);
     printf ( '</tr>');
+    $fake1 += 3;
+    $fake2 += 2;
 }
 
 ?>
@@ -115,3 +198,5 @@ foreach ($nodes as $node) {
 </tfoot>
 </table>
 
+<div class="fdtablePaginaterWrap" id="nodes-fdtablePaginaterWrapBottom"><p></p></div>
+
diff --git a/planetlab/sites/site_form.php b/planetlab/sites/site_form.php
index 8a677d1..a5105e5 100644
--- a/planetlab/sites/site_form.php
+++ b/planetlab/sites/site_form.php
@@ -57,7 +57,7 @@ function build_site_form ($register_mode) {
 
   if ($register_mode) {
     // required for the following code
-    drupal_set_html_head('<script type="text/javascript" src="/planetlab/includes/plc_script.js"></script>');
+    drupal_set_html_head('<script type="text/javascript" src="/planetlab/js/plc_functions.js"></script>');
 
     $fill_from_pi_button = <<< EOF
 <input type="button" value="Same as PI" onclick='copyValue("edit-pi:first_name","edit-tech:first_name");
-- 
2.43.0