From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 12/18] www: atom: fix "changed" href to nowhere
Date: Mon, 29 Aug 2022 09:26:41 +0000 [thread overview]
Message-ID: <20220829092647.1512215-13-e@80x24.org> (raw)
In-Reply-To: <20220829092647.1512215-1-e@80x24.org>
The HTML generated for the Atom feed doesn't have the footer
of /T/ and /t/ HTML-only views, so just make "changed" in
the diffstat go directly to the permalink #related anchor.
Fixes: 66512e177390 ("view: generate query in single-message and commit views")
---
lib/PublicInbox/View.pm | 2 +-
lib/PublicInbox/ViewDiff.pm | 4 ++--
lib/PublicInbox/WwwAtomStream.pm | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 354cdd93..86f4a467 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -248,7 +248,7 @@ sub eml_entry {
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
- $ctx->{end_id} = "e$id";
+ $ctx->{changed_href} = "#e$id"; # for diffstat "files? changed,"
$ctx->{obuf} = \$rv;
$eml->each_part(\&add_text_body, $ctx, 1);
delete $ctx->{obuf};
diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index ee2d688c..8c1853e6 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -180,8 +180,8 @@ sub diff_before_or_after ($$) {
$$dst .= $linkify->to_html($l);
}
$$dst .= $x[2]; # $3 /^ \d+ files? /
- my $end = $ctx->{end_id} // 'related';
- $$dst .= "<a href=#$end>changed</a>,";
+ my $ch = $ctx->{changed_href} // '#related';
+ $$dst .= qq(<a href="$ch">changed</a>,);
$$dst .= ascii_html($x[1]); # $4: insertions/deletions
$$dst .= $linkify->to_html($x[0]); # notes, commit message, etc
} else {
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 7b7047ac..09b6facb 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -156,6 +156,7 @@ sub feed_entry {
qq(<pre\nstyle="white-space:pre-wrap">);
$ctx->{obuf} = \$s;
$ctx->{mhref} = $href;
+ $ctx->{changed_href} = "${href}#related";
PublicInbox::View::multipart_text_as_html($eml, $ctx);
delete $ctx->{obuf};
$s .= '</pre></div></content></entry>';
next prev parent reply other threads:[~2022-08-29 9:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 9:26 [PATCH 00/18] WWW: patch, tree, git glossary Eric Wong
2022-08-29 9:26 ` [PATCH 01/18] solver: create tmpdir lazily Eric Wong
2022-08-29 9:26 ` [PATCH 02/18] viewvcs: share File::Temp::Dir with solver Eric Wong
2022-08-29 9:26 ` [PATCH 03/18] viewvcs: delay stringification of solver debug log Eric Wong
2022-08-29 9:26 ` [PATCH 04/18] www: allow html_oneshot to take an array arg Eric Wong
2022-08-29 9:26 ` [PATCH 05/18] viewvcs: use array for highlighted blob display Eric Wong
2022-08-29 9:26 ` [PATCH 06/18] viewvcs: add patch download link for single-parent commits Eric Wong
2022-08-29 9:26 ` [PATCH 07/18] viewvcs: author date links to contemporary messages Eric Wong
2022-08-29 9:26 ` [PATCH 08/18] view: speed up /$INBOX/ landing page by 0.5-1.0% Eric Wong
2022-08-29 9:26 ` [PATCH 09/18] treewide: ditch inbox->recent method Eric Wong
2022-08-29 9:26 ` [PATCH 10/18] view: /$INBOX/: show "messages from $old to $new" Eric Wong
2022-08-29 9:26 ` [PATCH 11/18] view: cleanups and reuse for {obuf} preparation Eric Wong
2022-08-29 9:26 ` Eric Wong [this message]
2022-08-29 9:26 ` [PATCH 13/18] www: provide text/help/#search anchor Eric Wong
2022-08-29 9:26 ` [PATCH 14/18] solver: early make hints detection more robust Eric Wong
2022-08-29 9:26 ` [PATCH 15/18] viewvcs: add tree view Eric Wong
2022-08-29 9:26 ` [PATCH 16/18] viewvcs: reduce hash assignments for commit info Eric Wong
2022-08-29 9:26 ` [PATCH 17/18] viewvcs: add glossary for commit Eric Wong
2022-08-29 9:57 ` [19/18 PATCH] viewvcs: fixup commit glossary stuff Eric Wong
2022-08-29 9:26 ` [PATCH 18/18] viewvcs: show "blob $OID" rather than "$OID blob" Eric Wong
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=20220829092647.1512215-13-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).