view: remove redundant pre closing tag

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 3d6348c71850e308b95ad61f275dbc9c37cc757b..3982a47fa2fe0598d3204ad8184ab4398a0f3de7 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -59,12 +59,14 @@ sub msg_reply {
 
        my ($arg, $link) = mailto_arg_link($hdr);
        push @$arg, '/path/to/YOUR_REPLY';
-       $arg = join(" \\\n    ", '', @$arg);
+       $arg = ascii_html(join(" \\\n    ", '', @$arg));
        <<EOF
-<pre
-id=R>You may reply publically to <a
-href=#t>this message</a> via
-plain-text email using any one of the following methods:
+<hr><pre
+id=R><b>Reply instructions:</b>
+
+You may reply publically to <a
+href=#t>this message</a> via plain-text email
+using any one of the following methods:
 
 * Save the following mbox file, import it into your mail client,
   and reply-to-all from there: <a
@@ -92,7 +94,7 @@ sub in_reply_to {
        my ($hdr) = @_;
        my $irt = $hdr->header_raw('In-Reply-To');
 
-       return mid_clean($irt) if (defined $irt);
+       return mid_clean($irt) if defined $irt && $irt ne '';
 
        my $refs = $hdr->header_raw('References');
        if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
@@ -162,13 +164,17 @@ sub index_entry {
                "<a\nhref=\"$mhref\">permalink</a>" .
                " <a\nhref=\"${mhref}raw\">raw</a>" .
                " <a\nhref=\"${mhref}#R\">reply</a>";
+
+       my $hr;
        if (my $pct = $ctx->{pct}) { # used by SearchView.pm
                $rv .= "\t[relevance $pct->{$mid_raw}%]";
+               $hr = 1;
        } elsif ($mapping) {
                my $threaded = 'threaded';
                my $flat = 'flat';
                my $end = '';
                if ($ctx->{flat}) {
+                       $hr = 1;
                        $flat = "<b>$flat</b>";
                } else {
                        $threaded = "<b>$threaded</b>";
@@ -176,9 +182,12 @@ sub index_entry {
                $rv .= "\t[<a\nhref=\"${mhref}T/#u\">$flat</a>";
                $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
                $rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
+       } else {
+               $hr = $ctx->{-hr};
        }
 
-       $rv .= $more ? "\n\n" : "\n";
+       $rv .= $more ? '</pre><hr><pre>' : '</pre>' if $hr;
+       $rv;
 }
 
 sub pad_link ($$;$) {
@@ -199,8 +208,8 @@ sub _th_index_lite {
        my $nr_s = 0;
        my $level = $map->[4];
        my $idx = $map->[3];
-       if (defined $irt) {
-               my $irt_map = $mapping->{$irt};
+       my $irt_map = $mapping->{$irt} if defined $irt;
+       if (defined $irt_map) {
                my $siblings = $irt_map->[0];
                $nr_s = scalar(@$siblings) - 1;
                $rv .= $pad . $irt_map->[1];
@@ -326,10 +335,12 @@ sub thread_html {
        return missing_thread($ctx) if $nr == 0;
        my $skel = '<hr><pre>';
        $skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
-       $skel .= ", back to <a\nhref=\"../../\">index</a>";
-       $skel .= "\n<a\nid=t>$nr+ messages in thread:</a> (download: ";
-       $skel .= "<a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
+       $skel .= ", back to <a\nhref=\"../../\">index</a>\n\n";
+       $skel .= "<b\nid=t>Thread overview:</b> ";
+       $skel .= $nr == 1 ? '(only message)' : "$nr+ messages";
+       $skel .= " (download: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
        $skel .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>)\n";
+       $skel .= "-- links below jump to the message on this page --\n";
        $ctx->{-upfx} = '../../';
        $ctx->{cur_level} = 0;
        $ctx->{dst} = \$skel;
@@ -367,7 +378,7 @@ sub thread_html {
                        return index_entry($mime, $ctx, scalar @$msgs);
                }
                $msgs = undef;
-               '</pre>'.$skel;
+               $skel;
        });
 }
 
@@ -523,6 +534,7 @@ sub thread_skel {
                        qq(/ <a\nhref="${tpfx}t.atom">Atom feed</a>);
 
        my $parent = in_reply_to($hdr);
+       $$dst .= "\n<b>Thread overview: </b>";
        if ($nr <= 1) {
                if (defined $parent) {
                        $$dst .= "($expand)\n ";
@@ -614,15 +626,15 @@ sub mailto_arg_link {
        my $subj = $hdr->header('Subject') || '';
        $subj = "Re: $subj" unless $subj =~ /\bRe:/i;
        my $mid = $hdr->header_raw('Message-ID');
-       push @arg, '--in-reply-to='.ascii_html(squote_maybe(mid_clean($mid)));
+       push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
        my $irt = uri_escape_utf8($mid);
        delete $cc{$to};
-       push @arg, '--to=' . ascii_html($to);
+       push @arg, "--to=$to";
        $to = uri_escape_utf8($to);
        $subj = uri_escape_utf8($subj);
-       my $cc = join(',', sort values %cc);
-       push @arg, '--cc=' . ascii_html($cc);
-       $cc = uri_escape_utf8($cc);
+       my @cc = sort values %cc;
+       push(@arg, map { "--cc=$_" } @cc);
+       my $cc = uri_escape_utf8(join(',', @cc));
        my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
        $href =~ s/%20/+/g;
 
@@ -905,11 +917,18 @@ sub dump_topics {
 
                # $n isn't the total number of posts on the topic,
                # just the number of posts in the current results window
-               $n = $n == 1 ? '' : " ($n+ messages)";
+               my $anchor;
+               if ($n == 1) {
+                       $n = '';
+                       $anchor = '#u'; # top of only message
+               } else {
+                       $n = " ($n+ messages)";
+                       $anchor = '#t'; # thread skeleton
+               }
 
                my $mbox = qq(<a\nhref="$href/t.mbox.gz">mbox.gz</a>);
                my $atom = qq(<a\nhref="$href/t.atom">Atom</a>);
-               my $s = "<a\nhref=\"$href/T/#t\"><b>$top</b></a>\n" .
+               my $s = "<a\nhref=\"$href/T/$anchor\"><b>$top</b></a>\n" .
                        " $ts UTC $n - $mbox / $atom\n";
                for (my $i = 0; $i < scalar(@ex); $i += 2) {
                        my $level = $ex[$i];