From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 30 Jan 2009 10:28:29 +0000 (+0000)
Subject: ckp
X-Git-Tag: PLEWWW-4.3-1~71
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7d691243cb80f8888cbf1079fc6ebb488f03292f;p=plewww.git

ckp
---

diff --git a/planetlab/css/plc_tables.css b/planetlab/css/plc_tables.css
index 6d425b6..48f8da0 100644
--- a/planetlab/css/plc_tables.css
+++ b/planetlab/css/plc_tables.css
@@ -26,7 +26,7 @@ th.plc_table {
     background: #CAE8EA url(/planetlab/icons/tablesort_header.jpg) no-repeat;
     vertical-align:middle;
 }
-td.plc_table {
+table.plc_table>tbody>tr>td {
     font: normal 11px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
     border-right: 1px solid #C1DAD7;
     border-bottom: 1px solid #C1DAD7;
@@ -76,7 +76,7 @@ tr.alt {
 tr[class="alt"]>td {
     background: #F5FAFA url(/planetlab/icons/tablesort_td_alt.jpg) no-repeat;
 }
-td.plc_table [class~="alt"] {
+table.plc_table>tbody>tr>td [class~="alt"] {
     background: #edf3f3 url(/planetlab/icons/tablesort_col_alt.jpg) no-repeat !important;
 }
 /* Poor old Internet Explorer won't see the next two rules either as it doesn't get :first-child */
@@ -89,15 +89,7 @@ table.plc_table>tbody>tr>td:first-child {
     font-weight:bold;
 }
 
-/*td.table_flushleft {
-    text-align:left;
-    padding-left: 30px;
-}
-table.table_dialogs {
-    width:100%;
-    border:1px;
-}
-*/
+/* table decorations */
 td.search_area {
     text-align:right;
     padding-right: 30px;
diff --git a/planetlab/includes/plc_forms.php b/planetlab/includes/plc_forms.php
index 19052e9..e67a2fd 100644
--- a/planetlab/includes/plc_forms.php
+++ b/planetlab/includes/plc_forms.php
@@ -59,12 +59,13 @@ function plc_form_textarea_text ($name,$value,$cols,$rows) {
 }
  
 function plc_form_select_text ($name,$values,$label="") {
+  $encoded=htmlentities($label,ENT_QUOTES);
   $selector="";
   $selector.="<select name='$name'>";
   if ($label) 
-    $selector.="<option value=''>$label</option>";
+    $selector.="<option value=''>$encoded</option>";
   foreach ($values as $chunk) {
-    $display=$chunk['display'];
+    $display=htmlentities($chunk['display'],ENT_QUOTES);
     $value=$chunk['value'];
     $selector .= "<option value='$value'";
     if ($chunk['selected']) $selector .= " selected=selected";
diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
index 44bf9d9..10172a2 100644
--- a/planetlab/includes/plc_functions.php
+++ b/planetlab/includes/plc_functions.php
@@ -345,8 +345,8 @@ function plc_vertical_table ($messages, $class="") {
   // pretty print the cell
   if ( empty( $messages) ) return "";
   $formatted = "";
-  $formatted .= "<table ";
-  if ($class) $formatted .= "class='" . $class . "'";
+  $formatted .= "<table";
+  if ($class) $formatted .= " class='" . $class . "'";
   $formatted .= ">";
   foreach ($messages as $message) {
     $formatted .= "<tr><td>" . $message . "</td></tr>";
diff --git a/planetlab/includes/plc_minitabs.php b/planetlab/includes/plc_minitabs.php
index 4920660..78d34f1 100644
--- a/planetlab/includes/plc_minitabs.php
+++ b/planetlab/includes/plc_minitabs.php
@@ -72,8 +72,7 @@ function plc_tabs ($array) {
   }
   print '</ul>';
   print '</div>';
-  print "\n";
-  print "<br/>\n";
+  print "<p style='height:15px'></p>\n";
 }
 
 ?>
diff --git a/planetlab/includes/plc_tables.php b/planetlab/includes/plc_tables.php
index 566bf8e..dcebdb1 100644
--- a/planetlab/includes/plc_tables.php
+++ b/planetlab/includes/plc_tables.php
@@ -16,11 +16,12 @@ $plc_table_hash=array();
 
 ////////////////////////////////////////
 function plc_table_cell($cell) {
-  printf ('<td class="plc_table"> %s </td>',$cell);
+  //  printf ('<td class="plc_table"> %s </td>',$cell);
+  printf ('<td>%s</td>',$cell);
 }
 
 ////////////////////////////////////////
-// table_id: <table>'s id tag
+// table_id: <table>'s id tag - WARNING : do not use '-' in table ids as it's used for generating javascript code
 // headers: an associative array "label"=>"type" 
 // column_sort: the column to sort on at load-time
 // options : an associative array to override options (should be passed to both _stsart and _end)
diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index c4bd0c6..8e4117b 100644
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -209,7 +209,7 @@ $headers=array("Name"=>"string",
 	       "Nodegroup"=>"string");
 
 $table_options=array("notes_area"=>false,"pagesize_area"=>false,"search_width"=>10);
-plc_table_start("node-tags",$headers,0,$table_options);
+plc_table_start("node_tags",$headers,0,$table_options);
 if ($tags) foreach ($tags as $tag) {
   // does this match a nodegroup ?
   $nodegroup_name="n/a";
@@ -222,7 +222,7 @@ if ($tags) foreach ($tags as $tag) {
   plc_table_cell($nodegroup_name);
   plc_table_row_end();
 }
-plc_table_end("node-tags");
+plc_table_end("node_tags");
 
 //////////////////////////////////////////////////////////// slices
 // display slices
@@ -236,7 +236,7 @@ if ( ! $slices  ) {
   $headers['Name']="string";
   $headers['Slivers']="string";
   $table_options = array('notes_area'=>false,"search_width"=>10);
-  plc_table_start ("node-slices",$headers,1,$table_options);
+  plc_table_start ("node_slices",$headers,1,$table_options);
 
   foreach ($slices as $slice) {
     plc_table_row_start($slice['name']);
@@ -245,7 +245,7 @@ if ( ! $slices  ) {
     plc_table_cell (l_sliver_t ($node_id,$slice['slice_id'],'view'));
     plc_table_row_end();
   }
-  plc_table_end("node-slices");
+  plc_table_end("node_slices");
  }
 
 //////////////////////////////////////////////////////////// interfaces
@@ -269,7 +269,7 @@ if ( ! $peer_id ) {
 
     plc_section('Interfaces');
     $table_options=array('search_area'=>false,"pagesize_area"=>false,'notes_area'=>false);
-    plc_table_start("node-interfaces",$headers,2,$table_options);
+    plc_table_start("node_interfaces",$headers,2,$table_options);
 	
     foreach ( $interfaces as $interface ) {
       $interface_id= $interface['interface_id'];
@@ -308,7 +308,7 @@ if ( ! $peer_id ) {
       $button=plc_form_simple_button(l_interface_add($node_id),"Add interface","GET");
       $footers=array(plc_table_td_text($button,6,"right"));
     }
-    plc_table_end("node-interfaces",array("footers"=>$footers));
+    plc_table_end("node_interfaces",array("footers"=>$footers));
   }
  }
       
diff --git a/planetlab/persons/person.php b/planetlab/persons/person.php
index 3419150..965e1d8 100644
--- a/planetlab/persons/person.php
+++ b/planetlab/persons/person.php
@@ -150,9 +150,8 @@ if( ! $slices) {
   plc_warning ("User has no slice");
  } else {
   $headers=array('Slice name'=>'string');
-  $table_options=array('notes_area'=>false,
-		       'pagesize'=>5);
-  plc_table_start("person-slices",$headers,1,$table_options);
+  $table_options=array('notes_area'=>false, 'pagesize_area'=>false, 'pagesize'=>999, 'search_width'=>10);
+  plc_table_start("person_slices",$headers,1,$table_options);
 
   foreach( $slices as $slice ) {
     $slice_name= $slice['name'];
@@ -161,7 +160,7 @@ if( ! $slices) {
     plc_table_cell(l_slice_t($slice_id,$slice_name));
     plc_table_row_end();
   }
-  plc_table_end("person-slices");
+  plc_table_end("person_slices");
  }
 
 // we don't set 'action', but use the submit button name instead
@@ -184,8 +183,8 @@ $headers=array("Type"=>"string",
 	       "Key"=>"string");
 if ($can_manage_keys) $headers['Remove']="none";
 // table overall options
-$table_options=array("search_area"=>false,"notes_area"=>false);
-plc_table_start("person-keys",$headers,"1",$table_options);
+$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false);
+plc_table_start("person_keys",$headers,"1",$table_options);
     
 if ($keys) foreach ($keys as $key) {
   $key_id=$key['key_id'];
@@ -211,7 +210,7 @@ if ($can_manage_keys) {
     "<td> $upload_key_right_area </td>";
 }
 
-plc_table_end("person-keys",array("footers"=>$footers));
+plc_table_end("person_keys",array("footers"=>$footers));
 
 //////////////////// sites
 plc_section('Sites');
@@ -226,8 +225,8 @@ $headers['Login_base']="string";
 $headers['Name']="string";
 if ($can_manage_sites) 
   $headers['Remove']="string";
-$table_options = array('notes_area'=>false,'search_area'=>false);
-plc_table_start ("person-sites",$headers,0,$table_options);
+$table_options = array('notes_area'=>false,'search_area'=>false, 'pagesize_area'=>false);
+plc_table_start ("person_sites",$headers,0,$table_options);
 foreach( $sites as $site ) {
   $site_name= $site['name'];
   $site_id= $site['site_id'];
@@ -246,7 +245,7 @@ if ($can_manage_sites) {
   $remove_sites_area = plc_form_submit_text("remove-person-from-sites","Remove Sites");
 
   // add a site : the button
-  $add_site_left_area=plc_form_submit_text("add-person-to-site","Add in site");
+  $add_site_right_area=plc_form_submit_text("add-person-to-site","Add in site");
   // get list of local sites that the person is not in
   $person_site_ids=array_map("get_site_id",$sites);
   $relevant_sites= $api->GetSites( array("peer_id"=>NULL,"~site_id"=>$person_site_ids), $site_columns);
@@ -255,14 +254,14 @@ if ($can_manage_sites) {
   $selector=array();
   foreach ($relevant_sites as $site) 
     $selector[]= array('display'=>$site['name'],"value"=>$site['site_id']);
-  $add_site_right_area=plc_form_select_text("site_id",$selector,"Choose a site to add");
+  $add_site_left_area=plc_form_select_text("site_id",$selector,"Choose a site to add");
+  $add_site_area = $add_site_left_area . $add_site_right_area;
   if ($sites) 
     $footers[]="<td colspan=3 style='text-align:right'> $remove_sites_area </td>";
   // add a new site
-  $footers []="<td style='text-align:right'> $add_site_left_area </td>".
-    "<td colspan=2> $add_site_right_area </td>";
+  $footers []="<td colspan=3 style='text-align:right'> $add_site_area </td>";
  }
-plc_table_end("person-sites",array("footers"=>$footers));
+plc_table_end("person_sites",array("footers"=>$footers));
 
 //////////////////// roles
 plc_section("Roles");
@@ -274,7 +273,8 @@ $table_options=array("search_area"=>false,"notes_area"=>false);
 $headers=array("Role"=>"none");
 if ($can_manage_roles) $headers ["Remove"]="none";
 
-plc_table_start("person-roles",$headers,0,$table_options);  
+$table_options=array('search_area'=>false,'pagesize_area'=>false,'notes_area'=>false);
+plc_table_start("person_roles",$headers,0,$table_options);  
   
 // construct array of role objs
 $role_objs=array();
@@ -296,7 +296,7 @@ if ($can_manage_roles) {
   $remove_roles_area = plc_form_submit_text("remove-roles-from-person","Remove Roles");
 
   // add a role : the button
-  $add_role_left_area=plc_form_submit_text("add-role-to-person","Add role");
+  $add_role_right_area=plc_form_submit_text("add-role-to-person","Add role");
   // get list of local roles that the person has not yet
   // xxx this does not work because GetRoles does not support filters
   $relevant_roles = $api->GetRoles( array("~role_id"=>$role_ids));
@@ -304,14 +304,14 @@ if ($can_manage_roles) {
   $selector=array();
   foreach ($relevant_roles as $role) 
     $selector[]= array('display'=>$role['name'],"value"=>$role['role_id']);
-  $add_role_right_area=plc_form_select_text("role_id",$selector,"Choose a role to add");
+  $add_role_left_area=plc_form_select_text("role_id",$selector,"Choose a role to add");
+  $add_role_area = $add_role_left_area . $add_role_right_area;
   if ($roles) 
     $footers[]="<td colspan=3 style='text-align:right'> $remove_roles_area </td>";
   // add a new role
-  $footers []="<td style='text-align:right'> $add_role_left_area </td>".
-    "<td colspan=2> $add_role_right_area </td>";
+  $footers[]="<td colspan=3 style='text-align:right'> $add_role_area </td>";
  }
-plc_table_end("person-roles",array("footers"=>$footers));
+plc_table_end("person_roles",array("footers"=>$footers));
 
 //////////////////////////////
 plc_form_end();