From: <sta...@us...> - 2003-02-21 20:14:53
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1:/tmp/cvs-serv22857 Modified Files: HTML.pm Log Message: David Smith Accessibility 2b changes Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** HTML.pm 21 Feb 2003 18:55:10 -0000 1.77 --- HTML.pm 21 Feb 2003 20:14:49 -0000 1.78 *************** *** 166,169 **** --- 166,170 ---- LocalPort => $self->{configuration}->{configuration}{ui_port}, Listen => SOMAXCONN, + Reuse => 1 ) or return 0; Reuse => 1 ); *************** *** 397,401 **** my $result = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" " ; $result .= "\"http://www.w3.org/TR/html4/loose.dtd\">\n" ; ! $result .= "<html>\n<head>\n<title>$self->{language}{Header_Title}</title>\n" ; # If we are handling the shutdown page, then send the CSS along with the --- 398,402 ---- my $result = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" " ; $result .= "\"http://www.w3.org/TR/html4/loose.dtd\">\n" ; ! $result .= "<html lang=\"$self->{language}{LanguageCode}\">\n<head>\n<title>$self->{language}{Header_Title}</title>\n" ; # If we are handling the shutdown page, then send the CSS along with the *************** *** 561,565 **** $result .= "POPFile $self->{configuration}{major_version}.$self->{configuration}{minor_version}." ; $result .= "$self->{configuration}{build_version} - \n" ; ! $result .= "<a class=\"bottomLink\" href=\"manual/$self->{language}{LanguageCode}/manual.html\">\n" ; $result .= "$self->{language}{Footer_Manual}</a> - \n" ; --- 562,566 ---- $result .= "POPFile $self->{configuration}{major_version}.$self->{configuration}{minor_version}." ; $result .= "$self->{configuration}{build_version} - \n" ; ! $result .= "<a class=\"bottomLink\" href=\"manual/$self->{language}{ManualLanguage}/manual.html\">\n" ; $result .= "$self->{language}{Footer_Manual}</a> - \n" ; *************** *** 1416,1420 **** $body .= "<td bgcolor=\"$self->{classifier}->{colors}{$bucket}\" title=\"$bucket ($percent%)\" width=\""; $body .= (int($percent)<1)?1:int($percent); ! $body .= "%\" height=\"20px\"></td>\n" ; } } --- 1417,1421 ---- $body .= "<td bgcolor=\"$self->{classifier}->{colors}{$bucket}\" title=\"$bucket ($percent%)\" width=\""; $body .= (int($percent)<1)?1:int($percent); ! $body .= "%\"><img src=\"pix.gif\" alt=\"\" height=\"20px\" width=\"1px\" /></td>\n" ; } } *************** *** 1469,1473 **** $self->{classifier}->{colors}{$self->{form}{bucket}} = $self->{form}{color}; } ! if ( ( defined($self->{form}{bucket}) ) && ( defined($self->{form}{subject}) ) && ( $self->{form}{subject} > 0 ) ) { $self->{classifier}->{parameters}{$self->{form}{bucket}}{subject} = $self->{form}{subject} - 1; --- 1470,1474 ---- $self->{classifier}->{colors}{$self->{form}{bucket}} = $self->{form}{color}; } ! if ( ( defined($self->{form}{bucket}) ) && ( defined($self->{form}{subject}) ) && ( $self->{form}{subject} > 0 ) ) { $self->{classifier}->{parameters}{$self->{form}{bucket}}{subject} = $self->{form}{subject} - 1; *************** *** 1598,1604 **** my $color = $self->{classifier}->{possible_colors}[$i]; if ( $color ne $self->{classifier}->{colors}{$bucket} ) { ! $body .= "<td bgcolor=\"$color\">\n" ; ! $body .= "<a href=\"/buckets?color=$color&bucket=$bucket&session=$self->{session_key}\">\n" ; ! $body .= "<img border=\"0\" alt='". sprintf( $self->{language}{Bucket_SetColorTo}, $bucket, $color ) . "' src=\"pix.gif\" width=\"10px\" height=\"20px\" /></a>\n"; $body .= "</td>\n" ; } --- 1599,1605 ---- my $color = $self->{classifier}->{possible_colors}[$i]; if ( $color ne $self->{classifier}->{colors}{$bucket} ) { ! $body .= "<td bgcolor=\"$color\" title=\"". sprintf( $self->{language}{Bucket_SetColorTo}, $bucket, $color ) . "\">\n" ; ! $body .= "<a class=\"colorChooserLink\" href=\"/buckets?color=$color&bucket=$bucket&session=$self->{session_key}\">\n" ; ! $body .= "<img border=\"0\" alt=\"". sprintf( $self->{language}{Bucket_SetColorTo}, $bucket, $color ) . "\" src=\"pix.gif\" width=\"10px\" height=\"20px\" /></a>\n"; $body .= "</td>\n" ; } *************** *** 1649,1653 **** if ( $percent > 0 ) { ! $body .= "<tr>\n<td height=\"10px\" colspan=\"2\"> </td>\n</tr>\n<tr>\n<td colspan=\"2\">\n" ; $body .= "<table class=\"barChart\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n"; $body .= "<tr>\n"; --- 1650,1654 ---- if ( $percent > 0 ) { ! $body .= "<tr>\n<td colspan=\"2\"> </td>\n</tr>\n<tr>\n<td colspan=\"2\">\n" ; $body .= "<table class=\"barChart\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\">\n"; $body .= "<tr>\n"; *************** *** 1658,1664 **** $body .= "\"accuracy50to93\"" if ( ( $i > 24 ) && ( $i < 47 ) ); $body .= "\"accuracy94to100\"" if ( $i > 46 ); ! $body .= " height=\"10px\">"; if ( ( $i * 2 ) < $percent ) { ! $body .= "<img src=\"black.gif\" height=\"4px\" width=\"6px\" alt=\"\" />"; } else { $body .= "<img src=\"pix.gif\" height=\"4px\" width=\"6px\" alt=\"\" />"; --- 1659,1665 ---- $body .= "\"accuracy50to93\"" if ( ( $i > 24 ) && ( $i < 47 ) ); $body .= "\"accuracy94to100\"" if ( $i > 46 ); ! $body .= ">"; if ( ( $i * 2 ) < $percent ) { ! $body .= "<img class=\"lineImg\" src=\"black.gif\" height=\"4px\" width=\"6px\" alt=\"\" />"; } else { $body .= "<img src=\"pix.gif\" height=\"4px\" width=\"6px\" alt=\"\" />"; *************** *** 1666,1672 **** $body .= "</td>\n"; } $body .= "</tr>\n<tr>\n"; $body .= "<td colspan=\"25\" align=\"left\"><span class=\"graphFont\">0%</span></td>\n"; ! $body .= "<td colspan=\"25\" align=\"right\"><span class=\"graphFont\">100%</span></td>\n</tr></table>\n"; } --- 1667,1677 ---- $body .= "</td>\n"; } + + # Extra td to hold the vertical spacer gif + + $body .= "<td><img src=\"pix.gif\" height=\"10px\" width=\"1px\" alt=\"\" /></td>" ; $body .= "</tr>\n<tr>\n"; $body .= "<td colspan=\"25\" align=\"left\"><span class=\"graphFont\">0%</span></td>\n"; ! $body .= "<td colspan=\"26\" align=\"right\"><span class=\"graphFont\">100%</span></td>\n</tr></table>\n"; } *************** *** 1766,1776 **** # end optional widget placement ! $body .= "</div>\n" ; if ( ( defined($self->{form}{lookup}) ) || ( defined($self->{form}{word}) ) ) { my $word = $self->{classifier}->{mangler}->mangle($self->{form}{word}, 1); - $body .= "<blockquote>\n"; - # Don't print the headings if there are no entries. --- 1771,1779 ---- # end optional widget placement ! $body .= "</div>\n" ; if ( ( defined($self->{form}{lookup}) ) || ( defined($self->{form}{word}) ) ) { my $word = $self->{classifier}->{mangler}->mangle($self->{form}{word}, 1); # Don't print the headings if there are no entries. *************** *** 1841,1848 **** } - $body .= "\n</blockquote>\n"; } ! $body .= "</td>\n</tr>\n</table>"; http_ok($self, $client,$body,1); --- 1844,1850 ---- } } ! $body .= "\n</td>\n</tr>\n</table>"; http_ok($self, $client,$body,1); *************** *** 2009,2015 **** my $body = "$self->{language}{History_Jump}: "; if ( $start_message != 0 ) { ! $body .= "<a href=\"/history?start_message="; $body .= $start_message - $self->{configuration}->{configuration}{page_size}; ! $body .= "&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">< $self->{language}{Previous}</a> "; } my $i = 0; --- 2011,2017 ---- my $body = "$self->{language}{History_Jump}: "; if ( $start_message != 0 ) { ! $body .= "[<a href=\"/history?start_message="; $body .= $start_message - $self->{configuration}->{configuration}{page_size}; ! $body .= "&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">< $self->{language}{Previous}</a>] "; } my $i = 0; *************** *** 2019,2024 **** $body .= $i+1 . "</b>"; } else { ! $body .= "<a href=\"/history?start_message=$i&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">"; ! $body .= $i+1 . "</a>"; } --- 2021,2026 ---- $body .= $i+1 . "</b>"; } else { ! $body .= "[<a href=\"/history?start_message=$i&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">"; ! $body .= $i+1 . "</a>]"; } *************** *** 2027,2033 **** } if ( $start_message < ( history_size( $self ) - $self->{configuration}->{configuration}{page_size} ) ) { ! $body .= "<a href=\"/history?start_message="; $body .= $start_message + $self->{configuration}->{configuration}{page_size}; ! $body .= "&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">$self->{language}{Next} ></a>"; } --- 2029,2035 ---- } if ( $start_message < ( history_size( $self ) - $self->{configuration}->{configuration}{page_size} ) ) { ! $body .= "[<a href=\"/history?start_message="; $body .= $start_message + $self->{configuration}->{configuration}{page_size}; ! $body .= "&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">$self->{language}{Next} ></a>]"; } *************** *** 2256,2260 **** next; } ! $temp_words{$bucket}{$1} = $2 if ( /([^\s]+) (\d+)/ ); } close WORDS; } --- 2258,2264 ---- next; } ! ! $temp_words{$bucket}{$1} = $2 if ( /([^\s]+) (\d+)/ ); ! } close WORDS; } *************** *** 2488,2491 **** --- 2492,2496 ---- $body .= "<td colspan=\"3\">\n" ; $body .= "<form action=\"/history\">\n"; + $body .= "<label class=\"historyLabel\" for=\"historyFilter\">$self->{language}{History_FilterBy}: </label>\n"; $body .= "<input type=\"hidden\" name=\"search\" value=\"$self->{form}{search}\" />\n"; $body .= "<input type=\"hidden\" name=\"sort\" value=\"$self->{form}{sort}\" />\n"; *************** *** 2608,2613 **** $subject =~ s/\"(.*)\"/$1/g; ! $from = $self->{classifier}->{parser}->decode_string( $from ); ! $subject = $self->{classifier}->{parser}->decode_string( $subject ); $short_from = $from; --- 2613,2618 ---- $subject =~ s/\"(.*)\"/$1/g; ! $from = $self->{classifier}->{parser}->decode_string( $from ); ! $subject = $self->{classifier}->{parser}->decode_string( $subject ); $short_from = $from; *************** *** 2697,2701 **** $body .= "<tr>\n<td class=\"openMessageCloser\">\n" ; $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">\n" ; ! $body .= "<span class=\"bucketsLabel\">$self->{language}{Close}</span></a>\n" ; $body .= "<br /><br />\n</td>\n</tr>\n" ; --- 2702,2706 ---- $body .= "<tr>\n<td class=\"openMessageCloser\">\n" ; $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">\n" ; ! $body .= "<span class=\"historyLabel\">$self->{language}{Close}</span></a>\n" ; $body .= "<br /><br />\n</td>\n</tr>\n" ; *************** *** 2731,2735 **** if ( $head =~ /$header/i ) { if ( $arg =~ /$text/i ) { ! $line =~ s/($text)/<b><font color=\"$self->{classifier}->{colors}{$self->{history}{$i}{bucket}}\">$1<\/font><\/b>/; } } --- 2736,2740 ---- if ( $head =~ /$header/i ) { if ( $arg =~ /$text/i ) { ! $line =~ s/($text)/<b><font title=\"[$self->{history}{$i}{bucket}]\" color=\"$self->{classifier}->{colors}{$self->{history}{$i}{bucket}}\">$1<\/font><\/b>/; } } *************** *** 2746,2750 **** # Close button $body .= "<tr>\n<td class=\"openMessageCloser\">" ; ! $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\"><span class=\"bucketsLabel\">$self->{language}{Close}</span></a>" ; $body .= "</td>\n</tr>\n</table>\n</td>\n" ; --- 2751,2756 ---- # Close button $body .= "<tr>\n<td class=\"openMessageCloser\">" ; ! $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&session=$self->{session_key}&sort=$self->{form}{sort}&filter=$self->{form}{filter}\">\n" ; ! $body .= "<span class=\"historyLabel\">$self->{language}{Close}</span></a>\n" ; $body .= "</td>\n</tr>\n</table>\n</td>\n" ; *************** *** 2775,2781 **** $body .= "<form action=\"/history\">\n<input type=\"hidden\" name=\"filter\" value=\"$self->{form}{filter}\" />\n"; $body .= "<input type=\"hidden\" name=\"sort\" value=\"$self->{form}{sort}\" />\n" ; ! $body .= "<label class=\"historyLabel\">$self->{language}{History_Remove}: \n" ; $body .= "<input type=\"submit\" class=\"submit\" name=\"clearall\" value=\"$self->{language}{History_RemoveAll}\" />\n"; ! $body .= "<input type=\"submit\" class=\"submit\" name=\"clearpage\" value=\"$self->{language}{History_RemovePage}\" />\n</label>\n" ; $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key}\" />\n" ; $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n</form>\n" ; --- 2781,2787 ---- $body .= "<form action=\"/history\">\n<input type=\"hidden\" name=\"filter\" value=\"$self->{form}{filter}\" />\n"; $body .= "<input type=\"hidden\" name=\"sort\" value=\"$self->{form}{sort}\" />\n" ; ! $body .= "<span class=\"historyLabel\">$self->{language}{History_Remove}: </span>\n" ; $body .= "<input type=\"submit\" class=\"submit\" name=\"clearall\" value=\"$self->{language}{History_RemoveAll}\" />\n"; ! $body .= "<input type=\"submit\" class=\"submit\" name=\"clearpage\" value=\"$self->{language}{History_RemovePage}\" />\n" ; $body .= "<input type=\"hidden\" name=\"session\" value=\"$self->{session_key}\" />\n" ; $body .= "<input type=\"hidden\" name=\"start_message\" value=\"$start_message\" />\n</form>\n" ; *************** *** 3200,3204 **** } } - # --------------------------------------------------------------------------------------------- --- 3206,3209 ---- |