From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] www: improve visibility of coderepos
Date: Tue, 16 Mar 2021 23:02:17 -0800 [thread overview]
Message-ID: <20210317070218.7971-5-e@80x24.org> (raw)
In-Reply-To: <20210317070218.7971-1-e@80x24.org>
By adding "+code" next to "mirror" at the top next to the search
box. Instead of showing "/path/to/$FOO", showing "$FOO.git"
makes it more obvious we're talking about a git repo, here,
instead of some random directory.
---
lib/PublicInbox/Git.pm | 2 +-
lib/PublicInbox/WwwStream.pm | 23 ++++++++++++++---------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f680eb2f..2ae5eff9 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -427,7 +427,7 @@ sub local_nick ($) {
my $ret = '???';
# don't show full FS path, basename should be OK:
if ($self->{git_dir} =~ m!/([^/]+)(?:/\.git)?\z!) {
- $ret = "/path/to/$1";
+ $ret = "$1.git";
}
wantarray ? ($ret) : $ret;
}
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index be9e762e..4db8dc55 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -51,9 +51,10 @@ sub html_top ($) {
} elsif ($ctx->{qp}->{t}) {
$top = qq(<a\nhref="./">$top</a>);
}
+ my $code = $ibx->{coderepo} ? qq( / <a\nhref=#code>code</a>) : '';
my $links = qq(<a\nhref="$help">help</a> / ).
qq(<a\nhref="$color">color</a> / ).
- qq(<a\nhref=#mirror>mirror</a> / ).
+ qq(<a\nhref=#mirror>mirror</a>$code / ).
qq(<a\nhref="$atom">Atom feed</a>);
if ($ibx->isrch) {
my $q_val = delete($ctx->{-q_value_html}) // '';
@@ -84,16 +85,20 @@ sub coderepos ($) {
my $upfx = ($ctx->{-upfx} // ''). '../';
my @ret;
for my $cr_name (@$cr) {
- my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl") // next;
$ret[0] //= <<EOF;
-code repositories for the project(s) associated with this inbox:
+<a id=code>code repositories for project(s) associated with this inbox:
EOF
- for (@$urls) {
- # relative or absolute URL?, prefix relative "foo.git"
- # with appropriate number of "../"
- my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
- $u = ascii_html(prurl($ctx->{env}, $u));
- $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
+ my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl");
+ if ($urls) {
+ for (@$urls) {
+ # relative or absolute URL?, prefix relative
+ # "foo.git" with appropriate number of "../"
+ my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
+ $u = ascii_html(prurl($ctx->{env}, $u));
+ $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
+ }
+ } else {
+ $ret[0] .= qq[\n\t$cr_name.git (no URL configured)];
}
}
@ret; # may be empty, this sub is called as an arg for join()
next prev parent reply other threads:[~2021-03-17 7:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 7:02 [PATCH 0/5] www: extindex stuff Eric Wong
2021-03-17 7:02 ` [PATCH 1/5] www_stream: add trailing slash for help and color links Eric Wong
2021-03-17 7:02 ` [PATCH 2/5] extindex: add some validation and config knobs for WWW Eric Wong
2021-03-17 7:02 ` [PATCH 3/5] config: lazy-load coderepos, support extindex Eric Wong
2021-03-17 7:02 ` Eric Wong [this message]
2021-03-17 7:02 ` [PATCH 5/5] tests: show lsof output on deleted-file-check failures 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=20210317070218.7971-5-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).