scaffolding

diff --git a/planetlab/includes/plc_minitab.php b/planetlab/includes/plc_minitabs.hp
similarity index 100%
rename from planetlab/includes/plc_minitab.php
rename to planetlab/includes/plc_minitabs.hp

diff --git a/planetlab/includes/plc_tables.php b/planetlab/includes/plc_tables.php
new file mode 100644 (file)
index 0000000..95e23be
--- /dev/null
+++ b/planetlab/includes/plc_tables.php
@@ -0,0 +1,39 @@
+<?php
+  /* table_id */
+function plc_table_header ($table_id,$size_init,$size_def) {
+  $tablesize_text_id = $table_id . "_tablesize";
+  $search_text_id = $table_id . "_search";
+  $search_reset_id = $table_id . "_search_reset";
+  $search_and_id = $table_id . "_search_and";
+  print <<< EOF
+<table class='table_dialogs'> <tr>
+<td class='table_flushleft'>
+<form class='table_size'>
+   <input class='table_size_input' type='text' id="$tablesize_text_id" value=$size_init 
+      onkeyup='plc_table_setsize("$table_id","$tablesize_text_id", $size_init);' 
+      size=3 maxlength=3 /> 
+  <label class='table_size_label'> items/page </label>   
+  <img class='table_reset' src="/planetlab/icons/clear.png" 
+      onmousedown='plc_table_size_reset("$table_id","$tablesize_text_id",$size_def);'>
+</form>
+</td>
+
+<td class='table_flushright'> 
+<form class='table_search'>
+   <label class='table_search_label'> Search </label> 
+   <input class='table_search_input' type='text' id='$search_text_id'
+      onkeyup='plc_table_filter("$table_id","$search_text_id","$search_and_id");'
+      size=40 maxlength=256 />
+   <label>and</label>
+   <input id='$search_and_id' class='table_search_and' 
+      type='checkbox' checked='checked' 
+      onchange='plc_table_filter("$table_id","$search_text_id","$search_and_id");' />
+   <img class='table_reset' src="/planetlab/icons/clear.png" 
+      onmousedown='plc_table_filter_reset("$table_id","$search_text_id","$search_and_id");'>
+</form>
+</td>
+</tr></table>
+EOF;
+}
+?>
+

diff --git a/planetlab/js/plc_filter.js b/planetlab/js/plc_filter.js
index f11c72c..e91cfe8 100644 (file)
--- a/planetlab/js/plc_filter.js
+++ b/planetlab/js/plc_filter.js
@@ -35,7 +35,6 @@ function plc_table_filter (table_id,pattern_id,and_id) {
   var and_button=document.getElementById(and_id);
   var and_if_true=and_button.checked;
 
-  
   // remove whitespaces at the beginning and end
   pattern_text = pattern_text.replace(/[ \t]+$/,"");
   pattern_text = pattern_text.replace(/^[ \t]+/,"");
@@ -67,7 +66,11 @@ function plc_table_filter (table_id,pattern_id,and_id) {
        var pattern_matched=false;
        pattern=patterns[i];
        for (cell_index = 0; cell=cells[cell_index]; cell_index++) {
-         if ( cell.innerHTML.match(pattern)) pattern_matched=true;
+         if ( cell.innerHTML.match(pattern)) {
+           pattern_matched=true;
+           // alert ('AND matched! p='+pattern+' c='+cell.innerHTML);
+           break;        
+         }
        }
        if ( ! pattern_matched ) visible=false;
       }
@@ -77,7 +80,11 @@ function plc_table_filter (table_id,pattern_id,and_id) {
       for (cell_index = 0; cell=cells[cell_index]; cell_index++) {
        for (i in patterns) {
          pattern=patterns[i];
-         if (cell.innerHTML.match(pattern)) visible=true;
+         if (cell.innerHTML.match(pattern)) {
+           visible=true;
+           // alert ('OR matched! p='+pattern+' c='+cell.innerHTML);
+           break;
+         }
        }
       }
     }
@@ -88,8 +95,8 @@ function plc_table_filter (table_id,pattern_id,and_id) {
   tablePaginater.init(table_id);
 }
 
-function plc_table_filter_reset (table_id, pattern_id) {
+function plc_table_filter_reset (table_id, pattern_id,and_id) {
   /* reset pattern */
   document.getElementById(pattern_id).value="";
-  plc_table_filter (table_id, pattern_id);
+  plc_table_filter (table_id, pattern_id,and_id);
 }

diff --git a/planetlab/minitab/minitab.css b/planetlab/minitabs/minitabs.css
similarity index 97%
rename from planetlab/minitab/minitab.css
rename to planetlab/minitabs/minitabs.css
index e278c9a..065cf0d 100644 (file)
--- a/planetlab/minitab/minitab.css
+++ b/planetlab/minitabs/minitabs.css
@@ -1,10 +1,10 @@
-li.minitab {
+li.minitabs {
     font-family: verdana, sans-serif;
     font-size: 14px;
     text-align: center;
     font-style: oblique;
 }    
-#container {
+#minitabs_container {
         padding: 20px;
         margin: 8px 0;
         width:80%;

diff --git a/planetlab/minitab/minitab.js b/planetlab/minitabs/minitabs.js
similarity index 100%
rename from planetlab/minitab/minitab.js
rename to planetlab/minitabs/minitabs.js

diff --git a/planetlab/nodes/newindex.php b/planetlab/nodes/newindex.php
index 11cbe98..7d8eaf0 100644 (file)
--- a/planetlab/nodes/newindex.php
+++ b/planetlab/nodes/newindex.php
@@ -16,52 +16,52 @@ include 'plc_header.php';
 // Common functions
 require_once 'plc_functions.php';
 require_once 'plc_sorts.php';
+require_once 'plc_tables.php';
 
 // find person roles
 $_person= $plc->person;
 $_roles= $_person['role_ids'];
 
-$header_tablesort_js='
+$header_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/minitab/minitab.js"></script>
+<script type="text/javascript" src="/planetlab/minitabs/minitabs.js"></script>
 <script type="text/javascript" src="/planetlab/js/plc_paginate.js"></script>
 <script type="text/javascript" src="/planetlab/js/plc_filter.js"></script>
 ';
 
-$header_tablesort_css='
-<link href="/planetlab/minitab/minitab.css" rel="stylesheet" type="text/css" />
+$header_css='
+<link href="/planetlab/minitabs/minitabs.css" rel="stylesheet" type="text/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" />
 ';
 
-drupal_set_html_head($header_tablesort_js);
-drupal_set_html_head($header_tablesort_css);
+drupal_set_html_head($header_js);
+drupal_set_html_head($header_css);
 
 // -------------------- 
-$nodepattern=$_GET['nodepattern'];
+$pattern=$_GET['pattern'];
 $peerscope=$_GET['peerscope'];
-$tablesize=25;
 
 drupal_set_title('Nodes');
 
-require_once 'plc_minitab.php';
-$minitab=array("Old page"=>"/db/nodes/index.php",
+require_once 'plc_minitabs.php';
+$minitabs=array("Old page"=>"/db/nodes/index.php",
               "About"=>"/db/about.php",
               "Logout"=>"/planetlab/logout.php",
-              "And other buttons"=>"http://www.google.com",
-              "For demo purposes"=>"/undefined");
-plc_show_options($minitab);
+              "And others"=>"http://www.google.com",
+              "For demo"=>"/undefined");
+plc_show_options($minitabs);
 
 // -------------------- 
 $peer_filter=array();
 
-// fetch nodes - use nodepattern for server-side filtering
+// fetch nodes - set pattern in the url for server-side filtering
 $node_columns=array('hostname','site_id','node_id','boot_state','interface_ids','peer_id');
-if ($nodepattern) {
-  $node_filter['hostname']=$nodepattern;
+if ($pattern) {
+  $node_filter['hostname']=$pattern;
  } else {
   $node_filter=array('hostname'=>"*");
  }
@@ -113,49 +113,21 @@ foreach ($peers as $peer) {
 
 ?>
 
+<?php
+$tablesize=25;
+plc_table_header("nodes",$tablesize,999);
+?>
+
 <!------------------------------------------------------------>
 <!-- instantiate generic mechanisms for nodes -->
 <script type"text/javascript">
 function nodes_paginator (opts) {
   plc_table_paginator (opts,"nodes");
 }
-function nodes_filter () {
-  plc_table_filter("nodes","search_text","nodes_and");
-}
 </script>
 
 <br/>
 <!------------------------------------------------------------>
-<table class='table_dialogs'> <tr>
-<td class='table_flushleft'>
-<form class='table_size'>
-  <input class='table_size_input' type='text' id='tablesize_text' value="<?php echo $tablesize; ?>" 
-  onkeyup='plc_table_setsize("nodes","tablesize_text", "<?php echo $tablesize; ?>" );' 
-  size=3 maxlength=3 /> 
-  <label class='table_size_label'> Items per page </label>   
-  <img class='table_reset' src="/planetlab/icons/clear.png" 
-    onmousedown='plc_table_size_reset("nodes","tablesize_text","999");'>
-</form>
-</td>
-
-<td class='table_flushright'> 
-<form class='table_search'>
-  <label class='table_search_label'> Search </label> 
-  <input class='table_search_input' type='text' id='search_text'
-     onkeyup='nodes_filter();'
-  size=40 maxlength=256 />
-  <label>and</label>
-  <input id='nodes_and' class='table_search_and' 
-    type='checkbox' checked='checked' onchange='nodes_filter();' />
-  <img class='table_reset' src="/planetlab/icons/clear.png" 
-  onmousedown='plc_table_filter_reset("nodes","search_text");'>
-</form>
-</td>
-</tr></table>
-
-<!------------------------------------------------------------>
-<!-- <div class="fdtablePaginaterWrap" id="nodes-fdtablePaginaterWrapTop"><p></p></div> -->
-
 <!------------------------------------------------------------>
 <table id="nodes" cellpadding="0" cellspacing="0" border="0" 
 class="plc_table sortable-onload-4 rowstyle-alt colstyle-alt no-arrow paginationcallback-nodes_paginator max-pages-15 paginate-<?php print $tablesize; ?>">
@@ -212,8 +184,6 @@ foreach ($nodes as $node) {
 </tfoot>
 </table>
 
-<!-- <div class="fdtablePaginaterWrap" id="nodes-fdtablePaginaterWrapBottom"><p></p></div> -->
-
 <p class='plc_filter_note'> 
 Notes: Enter & or | in the search area to alternate between <bold>AND</bold> and <bold>OR</bold> search modes
 <br/>