From 6b770362ceb3dd9089de0cffb7716fb533d2709b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 13 Sep 2014 21:50:31 +0000 Subject: line-wrap generated HTML source around attrs for readability It's important to keep HTML source readable to folks who prefer to read raw HTML. This should improve readability of the HTML source by keeping line length in check without wasting bytes. --- lib/PublicInbox/Feed.pm | 6 +++--- lib/PublicInbox/View.pm | 14 +++++++------- lib/PublicInbox/WWW.pm | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 350cc65e..339d9c20 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -12,7 +12,7 @@ use PublicInbox::View; use constant { DATEFMT => '%Y-%m-%dT%H:%M:%SZ', # atom standard MAX_PER_PAGE => 25, # this needs to be tunable - PRE_WRAP => '
',
+	PRE_WRAP => "",
 };
 
 # main function
@@ -73,8 +73,8 @@ sub generate_html_index {
 	my $th = PublicInbox::Thread->new(@messages);
 	$th->thread;
 	my $html = "$title" .
-		'' .
+		'{atomurl} . "\"\ntype=\"application/atom+xml\"/>" .
 		'' . PRE_WRAP;
 
 	# sort child messages in chronological order
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 262e72e9..14133d55 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -13,7 +13,7 @@ require POSIX;
 # TODO: make these constants tunable
 use constant MAX_INLINE_QUOTED => 12; # half an 80x24 terminal
 use constant MAX_TRUNC_LEN => 72;
-use constant PRE_WRAP => '
';
+use constant PRE_WRAP => "";
 
 *ascii_html = *PublicInbox::Hval::ascii_html;
 
@@ -74,7 +74,7 @@ sub index_entry {
 	}
 	$ts = POSIX::strftime($fmt, gmtime($ts));
 
-	$rv .= "$pfx$subj $from - $ts\n\n";
+	$rv .= "$pfx$subj $from - $ts\n\n";
 
 	my $irp = $header_obj->header_raw('In-Reply-To');
 	my ($anchor_idx, $anchor);
@@ -217,7 +217,7 @@ sub add_text_body_short {
 				}
 			} while (@sum && length($cur) < MAX_TRUNC_LEN);
 			$cur =~ s/ \z/ .../;
-			"> <$cur<\/a>>\n";
 		} else {
 			$cur;
@@ -234,7 +234,7 @@ sub add_text_body_full {
 		my $cur = $1;
 		my @lines = split(/\n/, $cur);
 		if (@lines > MAX_INLINE_QUOTED) {
-			"$cur";
+			"$cur";
 		} else {
 			$cur;
 		}
@@ -272,7 +272,7 @@ sub headers_to_html_header {
 		$rv .= 'Message-ID: <' . $mid->as_html . '> ';
 		my $href = $mid->as_href;
 		$href = "../m/$href" unless $full_pfx;
-		$rv .= "(original)\n";
+		$rv .= "(original)\n";
 	}
 
 	my $irp = $header_obj->header_raw('In-Reply-To');
@@ -281,7 +281,7 @@ sub headers_to_html_header {
 		my $html = $v->as_html;
 		my $href = $v->as_href;
 		$rv .= "In-Reply-To: <";
-		$rv .= "$html>\n";
+		$rv .= "$html>\n";
 	}
 
 	my $refs = $header_obj->header_raw('References');
@@ -336,7 +336,7 @@ sub linkify_refs {
 		my $v = PublicInbox::Hval->new_msgid($_);
 		my $html = $v->as_html;
 		my $href = $v->as_href;
-		"<$html>";
+		"<$html>";
 	} @_);
 }
 
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 2d8f2afc..f67e72ce 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -252,10 +252,10 @@ sub footer {
 	if ($nurls == 0) {
 		$urls = '($GIT_DIR/cloneurl missing)';
 	} elsif ($nurls == 1) {
-		$urls = 'git URL for ssoma: ' . $urls[0];
 	} else {
-		$urls = 'git URLs for ssoma:\n" . join("\n", map { "\t$_" } @urls);
 	}
 
@@ -264,11 +264,11 @@ sub footer {
 		$addr = $addr->[0]; # first address is primary
 	}
 
-	$addr = "$addr";
+	$addr = "$addr";
 	$desc =  $desc;
 	join("\n",
 		'- ' . $desc,
-		'A public-inbox, ' .
+		"A public-inbox, ' .
 			'anybody may post in plain-text (not HTML):',
 		$addr,
 		$urls
-- 
cgit v1.2.3-24-ge0c7