Thread: [popfile-commit] engine/UI HTML.pm,1.139,1.140

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv24838/UI

Modified Files:
	HTML.pm 
Log Message:
Improved the Magnets page so that one of more magnets can be edited and updated without having to remove and reenter them, also added the ability to delete multiple magnets; added a new clear_magnets API

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** HTML.pm	19 Apr 2003 12:30:04 -0000	1.139
--- HTML.pm	20 Apr 2003 21:00:09 -0000	1.140
***************
*** 1223,1227 ****
  
      my $magnet_message = '';
!     if ( defined( $self->{form_}{count} ) ) {
          for my $i ( 1 .. $self->{form_}{count} ) {
              my $mtype   = $self->{form_}{"type$i"};
--- 1223,1242 ----
  
      my $magnet_message = '';
! 
!     if ( defined( $self->{form_}{delete} ) ) {
!         for my $i ( 1 .. $self->{form_}{count} ) {
!   	    if ( defined( $self->{form_}{"remove$i"} ) && ( $self->{form_}{"remove$i"} ) ) {
!                 my $mtype   = $self->{form_}{"type$i"};
!                 my $mtext   = $self->{form_}{"text$i"};
!                 my $mbucket = $self->{form_}{"bucket$i"};
! 
!                 $self->{classifier__}->delete_magnet( $mbucket, $mtype, $mtext );
! 	    }
!         }
!     }
! 
!     if ( defined( $self->{form_}{count} ) && ( defined( $self->{form_}{update} ) || defined( $self->{form_}{create} ) ) ) {
!         $self->{classifier__}->clear_magnets() if ( defined( $self->{form_}{update} ) );
! 
          for my $i ( 1 .. $self->{form_}{count} ) {
              my $mtype   = $self->{form_}{"type$i"};
***************
*** 1275,1291 ****
      }
  
-     if ( defined($self->{form_}{dtype}) )  {
-         $self->{classifier__}->delete_magnet( $self->{form_}{bucket}, $self->{form_}{dtype}, $self->{form_}{dmagnet});
-     }
- 
      # Current Magnets panel
      my $body = "<h2 class=\"magnets\">$self->{language__}{Magnet_CurrentMagnets}</h2>\n";
  
      # magnet listing headings
      $body .= "<table width=\"75%\" class=\"magnetsTable\" summary=\"$self->{language__}{Magnet_MainTableSummary}\">\n";
      $body .= "<caption>$self->{language__}{Magnet_Message1}</caption>\n";
      $body .= "<tr>\n<th class=\"magnetsLabel\" scope=\"col\">$self->{language__}{Magnet}</th>\n";
      $body .= "<th class=\"magnetsLabel\" scope=\"col\">$self->{language__}{Bucket}</th>\n";
!     $body .= "<th class=\"magnetsLabel\" scope=\"col\">$self->{language__}{Delete}</th>\n</tr>\n";
  
      # magnet listing
--- 1290,1306 ----
      }
  
      # Current Magnets panel
      my $body = "<h2 class=\"magnets\">$self->{language__}{Magnet_CurrentMagnets}</h2>\n";
  
      # magnet listing headings
+     $body .= "<form action=\"/magnets\">\n";
      $body .= "<table width=\"75%\" class=\"magnetsTable\" summary=\"$self->{language__}{Magnet_MainTableSummary}\">\n";
      $body .= "<caption>$self->{language__}{Magnet_Message1}</caption>\n";
      $body .= "<tr>\n<th class=\"magnetsLabel\" scope=\"col\">$self->{language__}{Magnet}</th>\n";
      $body .= "<th class=\"magnetsLabel\" scope=\"col\">$self->{language__}{Bucket}</th>\n";
!     $body .= "<th class=\"magnetsLabel\" scope=\"col\">$self->{language__}{Remove}</th>\n</tr>\n";
! 
!     my %magnet_types = ( 'from', 'From', 'to', 'To', 'subject', 'Subject' );
!     my $i = 0;
  
      # magnet listing
***************
*** 1294,1297 ****
--- 1309,1313 ----
          for my $type ($self->{classifier__}->get_magnet_types_in_bucket($bucket)) {
              for my $magnet ($self->{classifier__}->get_magnets( $bucket, $type))  {
+                 $i += 1;
                  $body .= "<tr ";
                  if ( $stripe )  {
***************
*** 1306,1322 ****
                  $validatingMagnet =~ s/</&lt;/g;
                  $validatingMagnet =~ s/>/&gt;/g;
  
!                 $body .= ">\n<td>$type: $validatingMagnet</td>\n";
!                 $body .= "<td><font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font></td>\n";
  
!                 # Remove magnet button
  
!                 $body .= "<td>\n<form class=\"magnetsDelete\" style=\"margin: 0\" action=\"/magnets\">\n";
!                 $body .= "<input type=\"submit\" class=\"deleteButton\" name=\"deleteMagnet\" value=\"$self->{language__}{Delete}\" />\n";
!                 $body .= "<input type=\"hidden\" name=\"bucket\" value=\"$bucket\" />\n";
!                 $body .= "<input type=\"hidden\" name=\"dtype\" value=\"$type\" />\n";
!                 $body .= "<input type=\"hidden\" name=\"dmagnet\" value=\"$validatingMagnet\" />\n";
!                 $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n";
!                 $body .= "</form>\n</td>\n";
                  $body .= "</tr>";
                  $stripe = 1 - $stripe;
--- 1322,1344 ----
                  $validatingMagnet =~ s/</&lt;/g;
                  $validatingMagnet =~ s/>/&gt;/g;
+                 $body .= ">\n<td><select name=\"type$i\" id=\"magnetsAddType\">\n";
  
! 		for my $mtype (keys %magnet_types) {
!                     my $selected = ( $mtype eq $type )?"selected":"";
!                     $body .= "<option value=\"$mtype\" $selected>\n$self->{language__}{$magnet_types{$mtype}}</option>\n";
! 		}
!                 $body .= "</select>: <input type=\"text\" name=\"text$i\" value=\"$validatingMagnet\" /></td>\n";
!                 $body .= "<td><select name=\"bucket$i\" id=\"magnetsAddBucket\">\n";
  
!                 my @buckets = $self->{classifier__}->get_buckets();
!                 foreach my $mbucket (@buckets) {
!                     my $selected = ( $bucket eq $mbucket )?"selected":"";
!                     $body .= "<option value=\"$mbucket\" $selected>$mbucket</option>\n";
!                 }
!                 $body .= "</select></td>\n";
  
!                 $body .= "<td>\n";
!                 $body .= "<input type=\"checkbox\" class=\"deleteButton\" name=\"remove$i\" />$self->{language__}{Remove}\n";
!                 $body .= "</td>\n";
                  $body .= "</tr>";
                  $stripe = 1 - $stripe;
***************
*** 1325,1329 ****
      }
  
!     $body .= "</table>\n<br /><br />\n<hr />\n";
  
      # Create New Magnet panel
--- 1347,1353 ----
      }
  
!     $body .= "<tr><td></td><td><input type=\"submit\" class=\"deleteButton\" name=\"update\" value=\"$self->{language__}{Update}\" /></td><td><input type=\"submit\" class=\"deleteButton\" name=\"delete\" value=\"$self->{language__}{Remove}\" /></td></tr></table>";
!     $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n<br /><br />\n";
!     $body .= "<input type=\"hidden\" name=\"count\" value=\"$i\" />\n</form>\n<br /><br />\n<hr />\n";
  
      # Create New Magnet panel
***************
*** 2867,2871 ****
      $self->{form_}{search} = '' if ( !defined( $self->{form_}{search} ) );
      $self->{form_}{filter} = '' if ( !defined( $self->{form_}{filter} ) );
!     
      my $index;
      foreach my $i ( $start_message  .. $start_message + $self->config_( 'page_size' ) - 1) {
--- 2891,2895 ----
      $self->{form_}{search} = '' if ( !defined( $self->{form_}{search} ) );
      $self->{form_}{filter} = '' if ( !defined( $self->{form_}{filter} ) );
! 
      my $index;
      foreach my $i ( $start_message  .. $start_message + $self->config_( 'page_size' ) - 1) {
***************
*** 2905,2909 ****
  
      $body .= "<table class=\"openMessageTable\" cellpadding=\"10%\" cellspacing=\"0\" width=\"100%\" summary=\"$self->{language__}{History_OpenMessageSummary}\">\n";
!     
      # Close button
  
--- 2929,2933 ----
  
      $body .= "<table class=\"openMessageTable\" cellpadding=\"10%\" cellspacing=\"0\" width=\"100%\" summary=\"$self->{language__}{History_OpenMessageSummary}\">\n";
! 
      # Close button
  
***************
*** 2919,2924 ****
      $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n";
      $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n";
!     $body .= "<input type=\"hidden\" name=\"filter\" value=\"$self->{form_}{filter}\" />\n";    
!     $body .= "<table align=left>";    
      $body .= "<tr><td><font size=+1><b>$self->{language__}{From}</b>: </font></td><td><font size=+1>$self->{history__}{$mail_file}{from}</font></td></tr>";
      $body .= "<tr><td><font size=+1><b>$self->{language__}{Subject}</b>: </font></td><td><font size=+1>$self->{history__}{$mail_file}{subject}</font></td></tr>";
--- 2943,2948 ----
      $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n";
      $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n";
!     $body .= "<input type=\"hidden\" name=\"filter\" value=\"$self->{form_}{filter}\" />\n";
!     $body .= "<table align=left>";
      $body .= "<tr><td><font size=+1><b>$self->{language__}{From}</b>: </font></td><td><font size=+1>$self->{history__}{$mail_file}{from}</font></td></tr>";
      $body .= "<tr><td><font size=+1><b>$self->{language__}{Subject}</b>: </font></td><td><font size=+1>$self->{history__}{$mail_file}{subject}</font></td></tr>";
***************
*** 2933,2940 ****
          if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
          	$body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
!         
          	# Show a blank bucket field
          	$body .= "<option selected=\"selected\"></option>\n";
!         
          	foreach my $abucket ($self->{classifier__}->get_buckets()) {
          	    $body .= "<option value=\"$abucket\">$abucket</option>\n";
--- 2957,2964 ----
          if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
          	$body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
! 
          	# Show a blank bucket field
          	$body .= "<option selected=\"selected\"></option>\n";
! 
          	foreach my $abucket ($self->{classifier__}->get_buckets()) {
          	    $body .= "<option value=\"$abucket\">$abucket</option>\n";
***************
*** 2947,2951 ****
  
      $body .= "</font></td></tr>";
!     $body .= "</table></form>";    
      $body .= "</td></tr>";
  
--- 2971,2975 ----
  
      $body .= "</font></td></tr>";
!     $body .= "</table></form>";
      $body .= "</td></tr>";