Menu
▾
▴
[popfile-commit] engine/UI HTML.pm,1.111,1.112
|
From: <kin...@us...> - 2003-03-11 22:19:35
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv7144
Modified Files:
HTML.pm
Log Message:
Convert all tabs to spaces
Fixed indenting in a few places
Change the & lt; and & gt; used in the <no from/subject> text to use <>'s because we're going to do the substitution ourselves a few lines later.
Fixed an & in the bottom links.
Move Apply buttons in the Config/History View to the right side of the text fields.
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** HTML.pm 11 Mar 2003 08:47:33 -0000 1.111
--- HTML.pm 11 Mar 2003 22:19:22 -0000 1.112
***************
*** 231,235 ****
EOM
! return 0;
}
--- 231,235 ----
EOM
! return 0;
}
***************
*** 606,610 ****
$result .= "$self->{language__}{Footer_Manual}</a> - \n";
! $result .= "<a class=\"bottomLink\" href=\"http://sourceforge.net/docman/display_doc.php?docid=14421&group_id=63137\">FAQ</a> - \n";
$result .= "<a class=\"bottomLink\" href=\"http://popfile.sourceforge.net/\">$self->{language__}{Footer_HomePage}</a> - \n";
$result .= "<a class=\"bottomLink\" href=\"http://sourceforge.net/forum/forum.php?forum_id=213876\">$self->{language__}{Footer_FeedMe}</a> - \n";
--- 606,610 ----
$result .= "$self->{language__}{Footer_Manual}</a> - \n";
! $result .= "<a class=\"bottomLink\" href=\"http://sourceforge.net/docman/display_doc.php?docid=14421&group_id=63137\">FAQ</a> - \n";
$result .= "<a class=\"bottomLink\" href=\"http://popfile.sourceforge.net/\">$self->{language__}{Footer_HomePage}</a> - \n";
$result .= "<a class=\"bottomLink\" href=\"http://sourceforge.net/forum/forum.php?forum_id=213876\">$self->{language__}{Footer_FeedMe}</a> - \n";
***************
*** 833,838 ****
$body .= "<form action=\"/configuration\">\n";
$body .= "<label class=\"configurationLabel\" for=\"configPageSize\">$self->{language__}{Configuration_History}:</label><br />\n";
- $body .= "<input type=\"submit\" class=\"submit\" name=\"update_page_size\" value=\"$self->{language__}{Apply}\" />\n";
$body .= "<input name=\"page_size\" id=\"configPageSize\" type=\"text\" value=\"" . $self->config_( 'page_size' ) . "\" />\n";
$body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n</form>\n$page_size_error\n";
$body .= sprintf( $self->{language__}{Configuration_HistoryUpdate}, $self->config_( 'page_size' ) ) if ( defined($self->{form__}{page_size}) );
--- 833,838 ----
$body .= "<form action=\"/configuration\">\n";
$body .= "<label class=\"configurationLabel\" for=\"configPageSize\">$self->{language__}{Configuration_History}:</label><br />\n";
$body .= "<input name=\"page_size\" id=\"configPageSize\" type=\"text\" value=\"" . $self->config_( 'page_size' ) . "\" />\n";
+ $body .= "<input type=\"submit\" class=\"submit\" name=\"update_page_size\" value=\"$self->{language__}{Apply}\" />\n";
$body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n</form>\n$page_size_error\n";
$body .= sprintf( $self->{language__}{Configuration_HistoryUpdate}, $self->config_( 'page_size' ) ) if ( defined($self->{form__}{page_size}) );
***************
*** 841,846 ****
$body .= "\n<form action=\"/configuration\">\n";
$body .= "<label class=\"configurationLabel\" for=\"configHistoryDays\">$self->{language__}{Configuration_Days}:</label> <br />\n";
- $body .= "<input type=\"submit\" class=\"submit\" name=\"update_history_days\" value=\"$self->{language__}{Apply}\" />\n";
$body .= "<input name=\"history_days\" id=\"configHistoryDays\" type=\"text\" value=\"" . $self->config_( 'history_days' ) . "\" />\n";
$body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n";
$body .= "</form>\n$history_days_error\n";
--- 841,846 ----
$body .= "\n<form action=\"/configuration\">\n";
$body .= "<label class=\"configurationLabel\" for=\"configHistoryDays\">$self->{language__}{Configuration_Days}:</label> <br />\n";
$body .= "<input name=\"history_days\" id=\"configHistoryDays\" type=\"text\" value=\"" . $self->config_( 'history_days' ) . "\" />\n";
+ $body .= "<input type=\"submit\" class=\"submit\" name=\"update_history_days\" value=\"$self->{language__}{Apply}\" />\n";
$body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key__}\" />\n";
$body .= "</form>\n$history_days_error\n";
***************
*** 1346,1350 ****
$self->{form__}{text} =~ s/[ \t]+$//;
! $self->{classifier__}->create_magnet( $self->{form__}{bucket}, $self->{form__}{type}, $self->{form__}{text});
$magnet_message = "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$self->{form__}{type}: $self->{form__}{text}", $self->{form__}{bucket} ) . "</blockquote>";
}
--- 1346,1350 ----
$self->{form__}{text} =~ s/[ \t]+$//;
! $self->{classifier__}->create_magnet( $self->{form__}{bucket}, $self->{form__}{type}, $self->{form__}{text});
$magnet_message = "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$self->{form__}{type}: $self->{form__}{text}", $self->{form__}{bucket} ) . "</blockquote>";
}
***************
*** 1438,1443 ****
$body .="<br />\n";
! # end optional widget placement
! $body .= "</div>\n";
http_ok($self, $client,$body,4);
--- 1438,1443 ----
$body .="<br />\n";
! # end optional widget placement
! $body .= "</div>\n";
http_ok($self, $client,$body,4);
***************
*** 1628,1632 ****
if ( ( defined($self->{form__}{delete}) ) && ( $self->{form__}{name} ne '' ) ) {
$self->{form__}{name} = lc($self->{form__}{name});
! $self->{classifier__}->delete_bucket( $self->{form__}{name} );
$deletemessage = "<blockquote><b>" . sprintf( $self->{language__}{Bucket_Error6}, $self->{form__}{name} ) . "</b></blockquote>";
}
--- 1628,1632 ----
if ( ( defined($self->{form__}{delete}) ) && ( $self->{form__}{name} ne '' ) ) {
$self->{form__}{name} = lc($self->{form__}{name});
! $self->{classifier__}->delete_bucket( $self->{form__}{name} );
$deletemessage = "<blockquote><b>" . sprintf( $self->{language__}{Bucket_Error6}, $self->{form__}{name} ) . "</b></blockquote>";
}
***************
*** 1638,1642 ****
$self->{form__}{oname} = lc($self->{form__}{oname});
$self->{form__}{newname} = lc($self->{form__}{newname});
! $self->{classifier__}->rename_bucket( $self->{form__}{oname}, $self->{form__}{newname} );
$rename_message = "<blockquote><b>" . sprintf( $self->{language__}{Bucket_Error5}, $self->{form__}{oname}, $self->{form__}{newname} ) . "</b></blockquote>";
}
--- 1638,1642 ----
$self->{form__}{oname} = lc($self->{form__}{oname});
$self->{form__}{newname} = lc($self->{form__}{newname});
! $self->{classifier__}->rename_bucket( $self->{form__}{oname}, $self->{form__}{newname} );
$rename_message = "<blockquote><b>" . sprintf( $self->{language__}{Bucket_Error5}, $self->{form__}{oname}, $self->{form__}{newname} ) . "</b></blockquote>";
}
***************
*** 1886,1891 ****
$body .= "</form>\n$rename_message\n<br />\n";
! # end optional widget placement
! $body .= "</div>\n</td>\n";
# Lookup panel
--- 1886,1891 ----
$body .= "</form>\n$rename_message\n<br />\n";
! # end optional widget placement
! $body .= "</div>\n</td>\n";
# Lookup panel
***************
*** 1903,1907 ****
# end optional widget placement
! $body .= "</div>\n";
if ( ( defined($self->{form__}{lookup}) ) || ( defined($self->{form__}{word}) ) ) {
--- 1903,1907 ----
# end optional widget placement
! $body .= "</div>\n";
if ( ( defined($self->{form__}{lookup}) ) || ( defined($self->{form__}{word}) ) ) {
***************
*** 2164,2169 ****
}
! $from = "<$self->{language__}{History_NoFrom}>" if ( $from eq '' );
! $subject = "<$self->{language__}{History_NoSubject}>" if ( !( $subject =~ /[^ \t\r\n]/ ) );
$from =~ s/\"(.*)\"/$1/g;
--- 2164,2169 ----
}
! $from = "<$self->{language__}{History_NoFrom}>" if ( $from eq '' );
! $subject = "<$self->{language__}{History_NoSubject}>" if ( !( $subject =~ /[^ \t\r\n]/ ) );
$from =~ s/\"(.*)\"/$1/g;
***************
*** 2428,2432 ****
if ( !$reclassified ) {
! $self->{classifier__}->add_message_to_bucket( $self->global_config_( 'msgdir' ) . $mail_file, $newbucket );
$self->global_config_( 'ecount', $self->global_config_( 'ecount' ) + 1 ) if ( $newbucket ne $bucket );
--- 2428,2432 ----
if ( !$reclassified ) {
! $self->{classifier__}->add_message_to_bucket( $self->global_config_( 'msgdir' ) . $mail_file, $newbucket );
$self->global_config_( 'ecount', $self->global_config_( 'ecount' ) + 1 ) if ( $newbucket ne $bucket );
***************
*** 2434,2440 ****
$self->{classifier__}->set_bucket_parameter( $newbucket, 'count',
! $self->{classifier__}->get_bucket_parameter( $newbucket, 'count' ) + 1 );
$self->{classifier__}->set_bucket_parameter( $bucket, 'count',
! $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1 );
# Update the class file
--- 2434,2440 ----
$self->{classifier__}->set_bucket_parameter( $newbucket, 'count',
! $self->{classifier__}->get_bucket_parameter( $newbucket, 'count' ) + 1 );
$self->{classifier__}->set_bucket_parameter( $bucket, 'count',
! $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1 );
# Update the class file
***************
*** 2453,2457 ****
$self->{feedback}{$mail_file} = sprintf( $self->{language__}{History_ChangedTo}, $self->{classifier__}->get_bucket_color($newbucket), $newbucket );
! $self->{configuration__}->save_configuration();
}
}
--- 2453,2457 ----
$self->{feedback}{$mail_file} = sprintf( $self->{language__}{History_ChangedTo}, $self->{classifier__}->get_bucket_color($newbucket), $newbucket );
! $self->{configuration__}->save_configuration();
}
}
***************
*** 2487,2494 ****
$self->global_config_( 'ecount', $self->global_config_( 'ecount' ) - 1 ) if ( $self->global_config_( 'ecount' ) > 0 );
! $self->{classifier__}->set_bucket_parameter( $bucket, 'count',
! $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1 );
! $self->{classifier__}->set_bucket_parameter( $usedtobe, 'count',
! $self->{classifier__}->get_bucket_parameter( $usedtobe, 'count' ) + 1 );
}
--- 2487,2494 ----
$self->global_config_( 'ecount', $self->global_config_( 'ecount' ) - 1 ) if ( $self->global_config_( 'ecount' ) > 0 );
! $self->{classifier__}->set_bucket_parameter( $bucket, 'count',
! $self->{classifier__}->get_bucket_parameter( $bucket, 'count' ) - 1 );
! $self->{classifier__}->set_bucket_parameter( $usedtobe, 'count',
! $self->{classifier__}->get_bucket_parameter( $usedtobe, 'count' ) + 1 );
}
***************
*** 2508,2512 ****
$self->{feedback}{$mail_file} = sprintf( $self->{language__}{History_ChangedTo}, ($self->{classifier__}->get_bucket_color($usedtobe) || ''), $usedtobe );
! $self->{configuration__}->save_configuration();
}
}
--- 2508,2512 ----
$self->{feedback}{$mail_file} = sprintf( $self->{language__}{History_ChangedTo}, ($self->{classifier__}->get_bucket_color($usedtobe) || ''), $usedtobe );
! $self->{configuration__}->save_configuration();
}
}
***************
*** 2872,2876 ****
if ( $head =~ /\Q$header\E/i ) {
if ( $arg =~ /\Q$text\E/i ) {
! my $new_color = $self->{classifier__}->get_bucket_color($self->{history__}{$mail_file}{bucket});
$line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/;
}
--- 2872,2876 ----
if ( $head =~ /\Q$header\E/i ) {
if ( $arg =~ /\Q$text\E/i ) {
! my $new_color = $self->{classifier__}->get_bucket_color($self->{history__}{$mail_file}{bucket});
$line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/;
}
|
