vndb/manned
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved package page with version selector and paginate man list

Browse source 
The pagination is kinda necessary, /arch/man-pages has more than 3500
manuals.
This commit is contained in:
Yorhel 2012-07-05 14:02:12 +02:00
parent 7c5e8b5f9c
commit 1e97e055db
2 changed files with 66 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

88
www/index.pl
View file

@ -41,7 +41,7 @@ TUWF::register(
qr// => \&home, qr// => \&home,
qr{info/about} => \&about, qr{info/about} => \&about,
qr{browse/([^/]+)} => \&browsesys, qr{browse/([^/]+)} => \&browsesys,
qr{browse/([^/]+)/([^/]+)} => \&browsepkg, qr{browse/([^/]+)/([^/]+)(?:/([^/]+))?} => \&browsepkg,
qr{([^/]+)/([0-9a-f]{8})} => \&man, qr{([^/]+)/([0-9a-f]{8})} => \&man,
qr{([^/]+)/([0-9a-f]{8})/src} => \&src, qr{([^/]+)/([0-9a-f]{8})/src} => \&src,
qr{([^/]+)} => \&man, qr{([^/]+)} => \&man,
@ -231,9 +231,11 @@ sub browsesys {
# TODO: A "previous" link would be nice... # TODO: A "previous" link would be nice...
my $next = sub { my $next = sub {
use utf8; use utf8;
p class => 'pagination'; if($more) {
a href => "/browse/$short?c=$f->{c};s=$pkg->[199]{name}", class => 'next', 'next »' if $more; p class => 'pagination';
end; a href => "/browse/$short?c=$f->{c};s=$pkg->[199]{name}", 'next »';
end;
}
}; };
my $title = "Packages for $sys->{name}".($sys->{release}?" $sys->{release}":""); my $title = "Packages for $sys->{name}".($sys->{release}?" $sys->{release}":"");
@ -263,40 +265,61 @@ sub browsesys {
sub browsepkg { sub browsepkg {
my($self, $short, $name) = @_; my($self, $short, $name, $ver) = @_;
my $sys = $self->{sysbyshort}{$short}; my $sys = $self->{sysbyshort}{$short};
return $self->resNotFound if !$sys; return $self->resNotFound if !$sys;
my $pkgs = $self->dbPackageGet($sys->{id}, $name); my $pkgs = $self->dbPackageGet($sys->{id}, $name);
return $self->resNotFound if !@$pkgs; my $sel = $ver ? (grep $_->{version} eq $ver, @$pkgs)[0] : $pkgs->[0];
return $self->resNotFound if !$sel;
my $title = "$sys->{name}".($sys->{release}?" $sys->{release}":"")." / $name"; my $f = $self->formValidate({ get => 's', required => 0});
return $self->resNotFound if $f->{_err};
my $mans = $self->dbManInfo(package => $sel->{id}, results => 201, start => $f->{s}, sort => 'name');
my $more = @$mans > 200 && pop @$mans;
# TODO: A "previous" link would be nice...
my $next = sub {
use utf8;
if($more) {
p class => 'pagination';
a href => "/browse/$sys->{short}/$name/$sel->{version}?s=$mans->[199]{name}", 'next »';
end;
}
};
my $title = "$sys->{name}".($sys->{release}?" $sys->{release}":"")." / $name $sel->{version}";
$self->htmlHeader(title => $title); $self->htmlHeader(title => $title);
h1 $title; h1 $title;
#TODO: Link back to the system browsing page # TODO: Link back to the system browsing page
#TODO: Have a menu/index listing the versions of this package? (With links to the anchors)
#TODO: Collapse the man page list by default for older versions if the page becomes too long?
for my $pkg (@$pkgs) { h2 'Versions';
h2; ul id => 'packages';
a name => $pkg->{version}, href => "#$pkg->{version}", "$pkg->{category} / $pkg->{name} $pkg->{version} ($pkg->{released})"; for(@$pkgs) {
end; li;
txt "$_->{released} ";
a href => "/browse/$sys->{short}/$name/$_->{version}", $_->{version} if $_ != $sel;
b $_->{version} if $_ == $sel;
i " $_->{category}";
end;
}
end;
my $mans = $self->dbManInfo(package => $pkg->{id}); h2 "Manuals for version $sel->{version}";
# This can be a table as well. $next->();
ul id => 'packages'; ul id => 'manuals';
# TODO: Put this sort in the SQL query for(@$mans) {
for(sort { $a->{name} cmp $b->{name} || ($a->{locale}||'') cmp ($b->{locale}||'') } @$mans) { li;
li; a href => "/$_->{name}/".substr($_->{hash},0,8), "$_->{name}($_->{section})";
a href => "/$_->{name}/".substr($_->{hash},0,8), "$_->{name}($_->{section})"; b " $_->{locale}" if $_->{locale};
b " $_->{locale}" if $_->{locale}; i " $_->{filename}";
i " $_->{filename}"; end;
end; }
} end;
end; $next->();
}
$self->htmlFooter; $self->htmlFooter;
} }
@ -583,7 +606,7 @@ sub dbManContent {
} }
# Options: name, section, shorthash, locale, package # Options: name, section, shorthash, locale, package, start, results, sort
sub dbManInfo { sub dbManInfo {
my $s = shift; my $s = shift;
my %o = @_; my %o = @_;
@ -596,6 +619,7 @@ sub dbManInfo {
$o{shorthash} ? (q{substring(m.hash from 1 for 4) = decode(?, 'hex')} => $o{shorthash}) : (), $o{shorthash} ? (q{substring(m.hash from 1 for 4) = decode(?, 'hex')} => $o{shorthash}) : (),
$o{hash} ? (q{m.hash = decode(?, 'hex')} => $o{hash}) : (), $o{hash} ? (q{m.hash = decode(?, 'hex')} => $o{hash}) : (),
$o{locale} ? ('m.locale = ?', $o{locale}) : exists $o{locale} ? ('m.locale IS NULL' => 1) : (), $o{locale} ? ('m.locale = ?', $o{locale}) : exists $o{locale} ? ('m.locale IS NULL' => 1) : (),
$o{start} ? ('m.name > ?' => $o{start}) : (),
); );
# TODO: Flags to indicate what to information to fetch # TODO: Flags to indicate what to information to fetch
@ -604,7 +628,13 @@ sub dbManInfo {
FROM package p FROM package p
JOIN man m ON m.package = p.id JOIN man m ON m.package = p.id
!W !W
}, \%where); !s
LIMIT ?
},
\%where,
$o{sort} ? 'ORDER BY name, locale NULLS FIRST' : '',
$o{results}||10000
);
} }

9
www/man.css
View file

@ -59,9 +59,14 @@ td { padding: 1px 5px; font-size: 12px; border-left: 1px solid #ccc; }
#external { list-style-type: none } #external { list-style-type: none }
#packages { margin: 20px 0; -webkit-column-width: 500px; -moz-column-width: 500px; column-width: 500px } #packages { margin: 20px 0; -webkit-column-width: 300px; -moz-column-width: 300px; column-width: 300px }
#packages li { display: block; } #packages li { display: block; }
#packages i { color: #ccc; font-size: 13px; } #packages i { color: #aaa; font-size: 13px; }
#packages b { padding: 3px 5px; font-family: "Verdana"; font-size: 14px }
#manuals { margin: 20px 0; -webkit-column-width: 500px; -moz-column-width: 500px; column-width: 500px }
#manuals li { display: block; }
#manuals i { color: #aaa; font-size: 13px; }
#footer { height: 60px; clear: both; padding: 4px 10px; color: #f8f8f8; margin: 0 0 -20px 0; #footer { height: 60px; clear: both; padding: 4px 10px; color: #f8f8f8; margin: 0 0 -20px 0;
border-top: 1px solid #888; font-size: 13px; border-top: 1px solid #888; font-size: 13px;