From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.8 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2D10320437 for ; Tue, 5 Apr 2016 06:26:35 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] view: link restructuring for index view Date: Tue, 5 Apr 2016 06:26:35 +0000 Message-Id: <20160405062635.26553-1-e@80x24.org> List-Id: The "next/prev" links seem a bit awkward and I don't use them as much as I expected to. However, move the "raw" message link near the top since it's most useful for checking or reinforcing the validity of the message via GPG or just reading headers. Turn the Subject line into a permalink to the message, since that's probably the common behavior anyways for other messaging systems. Make the "[threaded|flat]" view links to always visible for bookmark-ability despite the lack of a "permalink" label. --- lib/PublicInbox/View.pm | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index a4b580d..f074a24 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -102,7 +102,6 @@ sub index_entry { my $midx = $state->{anchor_idx}++; my $ctx = $state->{ctx}; my $srch = $ctx->{srch}; - my ($prev, $next) = ($midx - 1, $midx + 1); my $part_nr = 0; my $hdr = $mime->header_obj; my $enc = enc_for($hdr->header("Content-Type")); @@ -126,44 +125,30 @@ sub index_entry { $from = ascii_html($from); $subj = ascii_html($subj); - if ($srch) { - my $t = $ctx->{flat} ? 'T' : 't'; - $subj = "$subj"; - } - if ($root_anchor eq $id) { - $subj = "$subj"; - } + $subj = "$subj"; + $subj = "$subj" if $root_anchor eq $id; my $ts = _msg_date($hdr); my $rv = ""; $rv .= "$subj\n"; - $rv .= "- $from @ $ts UTC - "; - $rv .= "next"; - if ($prev >= 0) { - $rv .= "/prev"; - } + my $txt = "${path}$href/raw"; my $fh = $state->{fh}; - $fh->write($rv .= "\n\n"); + $fh->write($rv .= "- $from @ $ts UTC (raw)\n\n"); - my ($fhref, $more_ref); + my $fhref; my $mhref = "${path}$href/"; - my $more = 'permalink'; # show full message if it's our root message my $neq = $root_anchor ne $id; if ($neq || ($neq && $level != 0 && !$ctx->{flat})) { $fhref = "${path}$href/f/"; - $more_ref = \$more; } # scan through all parts, looking for displayable text $mime->walk_parts(sub { - index_walk($fh, $_[0], $enc, \$part_nr, $fhref, $more_ref); + index_walk($fh, $_[0], $enc, \$part_nr, $fhref); }); $mime->body_set(''); - - my $txt = "${path}$href/raw"; - $rv = "\n$more raw "; - $rv .= html_footer($hdr, 0, undef, $ctx, $mhref); + $rv = "\n" . html_footer($hdr, 0, undef, $ctx, $mhref); if (defined $irt) { unless (defined $parent_anchor) { @@ -176,13 +161,15 @@ sub index_entry { if (my $pct = $state->{pct}) { # used by SearchView.pm $rv .= " [relevance $pct->{$mid_raw}%]"; } elsif ($srch) { + my $threaded = 'threaded'; + my $flat = 'flat'; if ($ctx->{flat}) { - $rv .= " [threaded" . - "|flat]"; + $flat = "$flat"; } else { - $rv .= " [threaded|" . - "flat]"; + $threaded = "$threaded"; } + $rv .= " [$threaded"; + $rv .= "|$flat]"; } $fh->write($rv .= ''); } @@ -244,8 +231,8 @@ sub emit_thread_html { } sub index_walk { - my ($fh, $part, $enc, $part_nr, $fhref, $more) = @_; - my $s = add_text_body($enc, $part, $part_nr, $fhref); + my ($fh, $part, $enc, $part_nr, $fhref) = @_; + my $s = add_text_body($enc, $part, $part_nr, $fhref, 1); return if $s eq ''; -- EW