www: label sections and hopefully improve navigation

[public-inbox.git] / lib / PublicInbox / WwwStream.pm

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 6de1b310da360bbbee5bcbd580b7d552bc2b8298..bdc8048d5ef1cc6050d6a4903b0f3b308bfd7101 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -7,11 +7,13 @@ use strict;
 use warnings;
 use PublicInbox::Hval qw(ascii_html);
 use URI;
-use constant PI_URL => 'https://public-inbox.org/README.html';
+use constant PI_URL => 'https://public-inbox.org/';
+
+sub close {}
 
 sub new {
        my ($class, $ctx, $cb) = @_;
-       bless { nr => 0, cb => $cb, ctx => $ctx }, $class;
+       bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class;
 }
 
 sub response {
@@ -39,7 +41,8 @@ sub _html_top ($) {
                }
                # XXX gross, for SearchView.pm
                my $extra = $ctx->{-extra_form_html} || '';
-               $top = qq{<form\naction="$upfx"><pre>$top} .
+               my $action = $upfx eq '' ? './' : $upfx;
+               $top = qq{<form\naction="$action"><pre>$top} .
                          qq{ <input\nname=q\ntype=text$q_val/>} .
                          $extra .
                          qq{<input\ntype=submit\nvalue=search />} .
@@ -56,18 +59,13 @@ sub _html_top ($) {
 
 sub _html_end {
        my ($self) = @_;
-       my $urls = 'Archives are clone-able:';
+       my $urls = 'Archives are clonable:';
        my $ctx = $self->{ctx};
        my $obj = $ctx->{-inbox};
        my $desc = ascii_html($obj->description);
 
-       # FIXME: cleanup
-       my $env = $ctx->{env};
-       my $scheme = $env->{'psgi.url_scheme'};
-       my $host_port = $env->{HTTP_HOST} ||
-                       "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
-       my $http = "$scheme://$host_port".($env->{SCRIPT_NAME} || '/');
-       $http = URI->new($http . $obj->{name})->canonical->as_string;
+       my $http = $obj->base_url($ctx->{env});
+       chop $http;
        my %seen = ( $http => 1 );
        my @urls = ($http);
        foreach my $u (@{$obj->cloneurl}) {
@@ -82,11 +80,11 @@ sub _html_end {
                        join("\n", map { "\tgit clone --mirror $_" } @urls);
        }
        my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL);
-       '<pre>'.join("\n",
+       '<hr><pre>'.join("\n",
                '- ' . $desc,
                $urls,
-               'served with software from public-inbox: '
-                       ."<a\nhref=\"$url\">$url</a>",
+               'Served with public-inbox: '.
+               qq(git clone <a\nhref="$url">$url</a> public-inbox),
        ).'</pre></body></html>';
 }
 
@@ -103,6 +101,4 @@ sub getline {
        delete $self->{cb} ? _html_end($self) : undef;
 }
 
-sub close {}
-
 1;