user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 11/11] view: do not fold top-level messages in thread
Date: Thu, 20 Aug 2015 02:57:23 +0000	[thread overview]
Message-ID: <1440039443-27052-11-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1440039443-27052-1-git-send-email-e@80x24.org>

This hopefully reduces clicking.  We may drop folding entirely
since we can use Xapian to make searching easier.
---
 lib/PublicInbox/View.pm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 391e3ad..17af21f 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -109,11 +109,15 @@ sub index_entry {
 	}
 	$rv .= "\n\n";
 
+	my ($fhref, $more_ref);
 	my $mhref = "${path}m/$href.html";
-	my $fhref = "${path}f/$href.html";
+	if ($level > 0) {
+		$fhref = "${path}f/$href.html";
+		$more_ref = \$more;
+	}
 	# scan through all parts, looking for displayable text
 	$mime->walk_parts(sub {
-		$rv .= index_walk($_[0], $enc_msg, $part_nr, $fhref, \$more);
+		$rv .= index_walk($_[0], $enc_msg, $part_nr, $fhref, $more_ref);
 		$part_nr++;
 	});
 	$mime->body_set('');
@@ -220,12 +224,14 @@ sub index_walk {
 
 	my $s = add_text_body($enc, $part, $part_nr, $fhref);
 
-	# drop the remainder of git patches, they're usually better
-	# to review when the full message is viewed
-	$s =~ s!^---+\n.*\z!!ms and $$more = 'more...';
+	if ($more) {
+		# drop the remainder of git patches, they're usually better
+		# to review when the full message is viewed
+		$s =~ s!^---+\n.*\z!!ms and $$more = 'more...';
 
-	# Drop signatures
-	$s =~ s/^-- \n.*\z//ms and $$more = 'more...';
+		# Drop signatures
+		$s =~ s/^-- \n.*\z//ms and $$more = 'more...';
+	}
 
 	# kill any leading or trailing whitespace lines
 	$s =~ s/^\s*$//sgm;
-- 
EW


      parent reply	other threads:[~2015-08-20  2:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-20  2:57 [PATCH 01/11] feed: remove threading from index Eric Wong
2015-08-20  2:57 ` [PATCH 02/11] feed: move timestamp parsing to view Eric Wong
2015-08-20  2:57 ` [PATCH 03/11] use tables for rendering comment nesting Eric Wong
2015-08-20  2:57 ` [PATCH 04/11] view: avoid nesting <a> tags from auto-linkification Eric Wong
2015-08-20  2:57 ` [PATCH 05/11] index: simplify main landing page if search-enabled Eric Wong
2015-08-20  2:57 ` [PATCH 06/11] search: avoid needless decode Eric Wong
2015-08-20  2:57 ` [PATCH 07/11] search: reject ghosts in all cases Eric Wong
2015-08-20  2:57 ` [PATCH 08/11] view: reduce memory usage when displaying large threads Eric Wong
2015-08-20  2:57 ` [PATCH 09/11] search: bump schema version to 5 for subject_path Eric Wong
2015-08-20  2:57 ` [PATCH 10/11] index: layout fix + title and Atom feed links at top Eric Wong
2015-08-20  2:57 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message 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: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440039443-27052-11-git-send-email-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).