oops, textareas were rendered like passwords

[plewww.git] / planetlab / tags / tags.php

diff --git a/planetlab/tags/tags.php b/planetlab/tags/tags.php
index b210cb2..0f57723 100644 (file)
--- a/planetlab/tags/tags.php
+++ b/planetlab/tags/tags.php
@@ -15,9 +15,9 @@ include 'plc_header.php';
 
 // Common functions
 require_once 'plc_functions.php';
-require_once 'plc_minitabs.php';
-require_once 'plc_tables.php';
-require_once 'plc_forms.php';
+require_once 'linetabs.php';
+require_once 'table.php';
+require_once 'form.php';
 
 // -------------------- 
 // recognized URL arguments
@@ -27,13 +27,12 @@ $pattern=$_GET['pattern'];
 $title="Tag Types";
 $tabs=array();
 $tabs []= tab_tags();
-$tabs []= tab_nodes();
 $tabs []= tab_nodes_local();
 $tabs []= tab_slices();
 
 // -------------------- 
 drupal_set_title($title);
-plc_tabs($tabs);
+plekit_linetabs($tabs);
 
 $tag_type_columns = array( "tag_type_id", "tagname", "category", "description", "min_role_id" );
 
@@ -45,20 +44,24 @@ if ($pattern)
 $tag_types= $api->GetTagTypes($tag_type_filter, $tag_type_columns);
   
 $headers=array();
+$notes=array();
 // delete button
 $headers['Name']="string";
 $headers['Description']="string";
 $headers['Category']="string";
-$headers['Min role']="string";
-// xxx ref count would be helpful
-//if (plc_is_admin()) $headers['#']='int';
+$headers['MR']="string";
+$notes []= "MR: Min Role, needed to manage this tag";
+
+// xxx ref count would be helpful but seem too expensive to compute at this stage 
+// the individual tag page show those ref counts per type
+
 $headers["Id"]="int";
 if (plc_is_admin()) $headers[plc_delete_icon()]="none";
 
-$form=new PlcForm(l_actions(),NULL);
+$form=new PlekitForm(l_actions(),NULL);
 $form->start();
 
-$table = new PlcTable("tags",$headers,0);
+$table = new PlekitTable("tags",$headers,0,array('notes'=>$notes));
 $table->start();
 
 $roles_hash=plc_role_global_hash($api);
@@ -87,7 +90,7 @@ if (plc_is_admin()) {
 
   $table->row_start();
   $table->cell($form->submit_html ("delete-tag-types","Remove tags"),
-              $table->columns(),"right");
+              array('hfill'=>true,'align'=>'right'));
   $table->row_end();
 
   // an inline area to add a tag type
@@ -103,14 +106,14 @@ if (plc_is_admin()) {
   $table->cell($form->textarea_html('description','',$description_width,2));
   $table->cell($form->text_html('category',''));
   $table->cell($role_input);
-  $table->cell($form->submit_html("add-tag-type","Add Type"),2);
+  $table->cell($form->submit_html("add-tag-type","Add"),2);
   $table->row_end();
  }
 
 $table->end();
 $form->end();
 
-//plc_tabs ($tabs,"bottom");
+//plekit_linetabs ($tabs,"bottom");
 
 // Print footer
 include 'plc_footer.php';