X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=8969e17576f60de54152ebb2d4502571610801ef;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=65ef1e786ddec5853448b6cf4e4eef2c6c1d4a46;hpb=16ca6b7a57266fcb466ffff005bc1d644bad14c1;p=public-inbox.git

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 65ef1e78..8969e175 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 package PublicInbox::View;
 use strict;
@@ -85,7 +85,7 @@ sub index_entry {
 	$from = PublicInbox::Hval->new_oneline($from)->as_html;
 	$subj = PublicInbox::Hval->new_oneline($subj)->as_html;
 	my $more = 'permalink';
-	my $root_anchor = $state->{root_anchor};
+	my $root_anchor = $state->{root_anchor} || '';
 	my $path = $root_anchor ? '../../' : '';
 	my $href = $mid->as_href;
 	my $irt = in_reply_to($header_obj);
@@ -95,7 +95,7 @@ sub index_entry {
 		my $t = $ctx->{flat} ? 'T' : 't';
 		$subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
 	}
-	if ($root_anchor && $root_anchor eq $id) {
+	if ($root_anchor eq $id) {
 		$subj = "<u\nid=\"u\">$subj</u>";
 	}
 
@@ -116,8 +116,8 @@ sub index_entry {
 	my ($fhref, $more_ref);
 	my $mhref = "${path}$href/";
 
-	# show full messages at level == 0 in threaded view
-	if ($level > 0 || ($ctx->{flat} && $root_anchor ne $id)) {
+	# show full message if it's our root message
+	if ($root_anchor ne $id) {
 		$fhref = "${path}$href/f/";
 		$more_ref = \$more;
 	}
@@ -196,11 +196,6 @@ sub emit_thread_html {
 	my $next = "<a\nid=\"s$final_anchor\">";
 	$next .= $final_anchor == 1 ? 'only message in' : 'end of';
 	$next .= " thread</a>, back to <a\nhref=\"../../\">index</a>";
-	if ($flat) {
-		$next .= " [<a\nhref=\"../t/#u\">threaded</a>|<b>flat</b>]";
-	} else {
-		$next .= " [<b>threaded</b>|<a\nhref=\"../T/#u\">flat</a>]";
-	}
 	$next .= "\ndownload thread: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
 	$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>";
 	$cb->write("<hr />" . PRE_WRAP . $next . "\n\n". $foot .
@@ -256,7 +251,7 @@ sub multipart_text_as_html {
 	# scan through all parts, looking for displayable text
 	$mime->walk_parts(sub {
 		my ($part) = @_;
-		$rv .= add_text_body($enc, $part, \$part_nr, $full_pfx);
+		$rv .= add_text_body($enc, $part, \$part_nr, $full_pfx, 1);
 	});
 	$mime->body_set('');
 	$rv;
@@ -308,7 +303,7 @@ sub linkify_2 {
 }
 
 sub flush_quote {
-	my ($quot, $n, $part_nr, $full_pfx, $final) = @_;
+	my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_;
 
 	if ($full_pfx) {
 		if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) {
@@ -342,18 +337,18 @@ sub flush_quote {
 	} else {
 		# show everything in the full version with anchor from
 		# short version (see above)
-		my $nr = ++$$n;
-		my $rv = "";
 		my %l;
-		$rv .= join('', map { linkify_1(\%l, $_) } @$quot);
+		my $rv .= join('', map { linkify_1(\%l, $_) } @$quot);
 		@$quot = ();
 		$rv = ascii_html($rv);
+		return linkify_2(\%l, $rv) unless $do_anchor;
+		my $nr = ++$$n;
 		"<a\nid=q${part_nr}_$nr></a>" . linkify_2(\%l, $rv);
 	}
 }
 
 sub add_text_body {
-	my ($enc_msg, $part, $part_nr, $full_pfx) = @_;
+	my ($enc_msg, $part, $part_nr, $full_pfx, $do_anchor) = @_;
 	return '' if $part->subparts;
 
 	my $ct = $part->content_type;
@@ -383,7 +378,7 @@ sub add_text_body {
 			# show the previously buffered quote inline
 			if (scalar @quot) {
 				$s .= flush_quote(\@quot, \$n, $$part_nr,
-						  $full_pfx, 0);
+						  $full_pfx, 0, $do_anchor);
 			}
 
 			# regular line, OK
@@ -395,7 +390,10 @@ sub add_text_body {
 			push @quot, $cur;
 		}
 	}
-	$s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1) if scalar @quot;
+	if (scalar @quot) {
+		$s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1,
+				  $do_anchor);
+	}
 	$s .= "\n" unless $s =~ /\n\z/s;
 	++$$part_nr;
 	$s;
@@ -467,6 +465,8 @@ sub thread_inline {
 		cur => $mid,
 		parent_cmp => defined $parent ? $parent : '',
 		parent => $parent,
+		prev_attr => '',
+		prev_level => 0,
 	};
 	for (thread_results(load_results($res))->rootset) {
 		inline_dump($dst, $state, $upfx, $_, 0);
@@ -620,7 +620,7 @@ sub __thread_entry {
 		foreach my $g (@$ghost) {
 			$$cb->write("<table\nsummary=ghost><tr><td>" .
 				(INDENT x $g->[1]) . "</td><td>" .
-				PRE_WRAP . ghost_parent('', $g->[0]) .
+				PRE_WRAP . ghost_parent('../', $g->[0]) .
 				'</pre></td></table>');
 		}
 	}
@@ -687,21 +687,31 @@ sub _msg_date {
 
 sub _inline_header {
 	my ($dst, $state, $upfx, $mime, $level) = @_;
-	my $pfx = INDENT x $level;
+	my $pfx = INDENT x ($level - 1);
+	my $dot = $level == 0 ? '' : '` ';
 
 	my $cur = $state->{cur};
 	my $mid = mid_clean($mime->header('Message-ID'));
 	my $f = $mime->header('X-PI-From');
 	my $d = _msg_date($mime);
-	$f = PublicInbox::Hval->new($f);
-	$d = PublicInbox::Hval->new($d);
-	$f = $f->as_html;
-	$d = $d->as_html . ' UTC';
+	$f = PublicInbox::Hval->new($f)->as_html;
+	$d = PublicInbox::Hval->new($d)->as_html;
+	my $attr = "$f @ $d";
+	$state->{first_level} ||= $level;
+	if ($attr ne $state->{prev_attr} || $state->{prev_level} > $level) {
+		$state->{prev_attr} = $attr;
+		$attr = ' - ' . $attr;
+		$attr .= ' UTC' if $level >= $state->{first_level};
+	} else {
+		$attr = '';
+	}
+	$state->{prev_level} = $level;
+
 	if ($cur) {
 		if ($cur eq $mid) {
 			delete $state->{cur};
-			$$dst .= "$pfx` <b><a\nid=\"r\"\nhref=\"#t\">".
-				 "[this message]</a></b> by $f @ $d\n";
+			$$dst .= "$pfx$dot<b><a\nid=\"r\"\nhref=\"#t\">".
+				 "[this message]</a></b>$attr\n";
 
 			return;
 		}
@@ -724,10 +734,9 @@ sub _inline_header {
 	my $m = PublicInbox::Hval->new_msgid($mid);
 	$m = $upfx . '../' . $m->as_href . '/';
 	if (defined $s) {
-		$$dst .= "$pfx` <a\nhref=\"$m\">$s</a>\n" .
-		         "$pfx  $f @ $d\n";
+		$$dst .= "$pfx$dot<a\nhref=\"$m\">$s</a>$attr\n";
 	} else {
-		$$dst .= "$pfx` <a\nhref=\"$m\">$f @ $d</a>\n";
+		$$dst .= "$pfx$dot<a\nhref=\"$m\">$f @ $d</a>\n";
 	}
 }
 
@@ -741,8 +750,9 @@ sub inline_dump {
 		}
 		_inline_header($dst, $state, $upfx, $mime, $level);
 	} else {
-		my $pfx = INDENT x $level;
-		$$dst .= $pfx . '` ' . ghost_parent($upfx, $node->messageid);
+		my $dot = $level == 0 ? '' : '` ';
+		my $pfx = (INDENT x $level) . $dot;
+		$$dst .= $pfx . ghost_parent($upfx, $node->messageid) . "\n";
 	}
 	inline_dump($dst, $state, $upfx, $node->child, $level+1);
 	inline_dump($dst, $state, $upfx, $node->next, $level);
@@ -767,6 +777,7 @@ sub rsort_ts {
 sub add_topic {
 	my ($state, $node, $level) = @_;
 	return unless $node;
+	my $child_adjust = 1;
 
 	if (my $x = $node->message) {
 		$x = $x->header_obj;
@@ -789,9 +800,12 @@ sub add_topic {
 		my $u = $x->header('X-PI-From');
 		my $ts = $x->header('X-PI-TS');
 		$state->{latest}->{$topic} = [ $mid, $u, $ts ];
-	} # else { } # ghost ignored...
+	} else {
+		# ghost message, do not bump level
+		$child_adjust = 0;
+	}
 
-	add_topic($state, $node->child, $level + 1);
+	add_topic($state, $node->child, $level + $child_adjust);
 	add_topic($state, $node->next, $level);
 }
 
@@ -812,9 +826,9 @@ sub dump_topics {
 		$mid = PublicInbox::Hval->new($mid)->as_href;
 		$subj = PublicInbox::Hval->new($subj)->as_html;
 		$u = PublicInbox::Hval->new($u)->as_html;
-		$pfx = INDENT x $level;
+		$pfx = INDENT x ($level - 1);
 		my $nl = $level == $prev ? "\n" : '';
-		my $dot = $level == 0 ? '' : '`';
+		my $dot = $level == 0 ? '' : '` ';
 		$dst .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
 
 		my $attr;
@@ -830,7 +844,8 @@ sub dump_topics {
 			$n = " ($n)\n";
 		}
 		if ($level == 0 || $attr ne $prev_attr) {
-			$dst .= "$pfx - ". $attr . $n;
+			$pfx .= INDENT if $level > 0;
+			$dst .= "$pfx- ". $attr . $n;
 			$prev_attr = $attr;
 		}
 	}