www: label sections and hopefully improve navigation

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 3d6348c71850e308b95ad61f275dbc9c37cc757b..5f99644f8abaaebf630624c587b1b835dcd52058 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -61,10 +61,12 @@ sub msg_reply {
        push @$arg, '/path/to/YOUR_REPLY';
        $arg = 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
@@ -326,10 +328,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;
@@ -523,6 +527,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 ";
@@ -905,11 +910,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];