message.pl: Don't elide control-reply messages in this context

Also format the elided version a bit.

diff --git a/CGI/message.pl b/CGI/message.pl
index ced1d8e150e7bbf14fd9fd52da1ac08603c16044..14ff97e9c37975417c8350cae97f9e85db3309ea 100755 (executable)
--- a/CGI/message.pl
+++ b/CGI/message.pl
@@ -95,7 +95,7 @@ elsif ( $mode eq "normal" ) {
         -title => $c{TrackerName} . ": " . $title,
         -style => { 'src' => $c{StyleSheet} }
     );
-    format_html( $msg );
+    format_html( $msg, SuppressControlReply => 0 );
     print end_html;
 }
 elsif ( $mode eq "part" ) {

diff --git a/Emesinae/CGI/Message.pm b/Emesinae/CGI/Message.pm
index 8d421038b1e090924befcd61cc4a09784e6d252a..3422fb93d20fe7c2d3b3e9cc6b47b6561837ab82 100644 (file)
--- a/Emesinae/CGI/Message.pm
+++ b/Emesinae/CGI/Message.pm
@@ -160,6 +160,8 @@ sub format_html ($;%) {
 
     my $bug = $attrs{Bug} || undef;
 
+    $attrs{SuppressControlReply} = 1 unless defined $attrs{SuppressControlReply};
+
     print comment( "Message "
           . $m->{id} . ": "
           . $m->{msgid}
@@ -174,10 +176,10 @@ sub format_html ($;%) {
 
     my @archives = archive_list( $m->{msgid} );
 
-    if ( $m->{msgtype} eq "control-reply" ) {
-        print p ( "Control reply; (" . msglink( $m, "Full Text" ) . ")" )
+    if ( $m->{msgtype} eq "control-reply" && $attrs{SuppressControlReply} ) {
+        print p ( { -class => "controlreplylink" },
+                "Control reply; (" . msglink( $m, "Full Text" ) . ")" )
           . "\n";
-        print hr . "\n";
         return;
     }
 

diff --git a/css/style.css b/css/style.css
index 91946f222af1ede4d40b5b2c8ff0484af7675166..6f8885c573f76b50d75b49bd08068a94f08bed64 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -10,6 +10,12 @@ p.msgcontrol {
     color: #686868;
 }
 
+p.controlreplylink {
+    font-family: sans-serif;
+    font-size: 60%;
+    color: #686868;
+};
+
 p.bugcontrol {
     font-family: sans-serif;
     font-size: 60%;