X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog.pm;h=c9d0dfb60834a277e9b6ff58071ce6a68d2fc64c;hb=0b282e58119cc0dbce678ef56eab20cc352557b5;hp=47c8a2e9288770b3df5d7062831aca3e3d1abe72;hpb=2b0036ac8e077cc20cf9db6ff8dad4091ab50cb3;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 47c8a2e..c9d0dfb 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -3,47 +3,40 @@ package Gruntmaster::Page::Log;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
+use Gruntmaster::Page::Base log => 'Job log';
+our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
 use constant PAGE_SIZE => 10;
 
-use constant FORMAT_EXTENSION => {
-  CPP => 'cpp',
-};
-
-use HTML::Template::Compiled;
-use POSIX qw/strftime/;
-use Gruntmaster::Page::Common qw/cook_templates reload_templates/;
-use Gruntmaster::Data qw/jobcard job_date job_extension job_filesize problem_name job_private job_problem job_result job_result_text job_user/;
-
-my %orig_templates = (
+use constant TEMPLATES => {
 	en => <<'HTML',
 <table border>
 <thead>
 <tr><th>ID<th>Problem<th>Date<th>Size<th>User<th>Result
 <tbody>
 <tmpl_loop log><tr><td><a href="job/<tmpl_var id>.var"><tmpl_var id></a>
-<td><a href="../pb/<tmpl_var problem>"><tmpl_var name></a>
+<td><a href="/pb/<tmpl_var problem>.var"><tmpl_var name></a>
 <td><tmpl_var date>
-<td><a href="src/<tmpl_var id>.<tmpl_var extension>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a></a>
+<td><a href="src/<tmpl_var id>.<tmpl_var extension>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a>
 <td><tmpl_var user><td class="r<tmpl_var result>"><tmpl_var result_text>
 </tmpl_loop>
 </table>
+
+<tmpl_if prev><a href="<tmpl_var prev>.var">Prev page</a></tmpl_if>
+<tmpl_if next><a href="<tmpl_var next>.var">Next page</a></tmpl_if>
 HTML
-);
+};
 
-my %templates = cook_templates %orig_templates, log => 'Job log';
+sub _generate{
+	my ($self, $htc, $path, $lang) = @_;
 
-sub generate{
-	%templates = cook_templates %orig_templates, log => 'Job log' if reload_templates;
-	$_[0] =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
-	local $Gruntmaster::Data::contest = $1;
-	my $pages = jobcard / PAGE_SIZE;
+	$path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
+	local $Gruntmaster::Data::contest = $1 if $1;
+	my $pages = POSIX::floor (jobcard / PAGE_SIZE);
+	$pages ||= 1;
 	my $page = $2 eq 'index' ? $pages : $2;
 
-	my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$_[1]});
 	my @log = sort { $b->{id} <=> $a->{id} } map +{
 		id => $_,
 		(job_private() ? (private => job_private) : ()),
@@ -54,9 +47,10 @@ sub generate{
 		result => job_result,
 		result_text => job_result_text,
 		size => sprintf ("%.2f KiB", job_filesize() / 1024),
-		user => job_user}, ($page - 1) * PAGE_SIZE + 1 .. $page == $pages ? jobcard : $page * PAGE_SIZE;
+		user => job_user}, ($page - 1) * PAGE_SIZE + 1 .. ($page == $pages ? jobcard : $page * PAGE_SIZE);
 	$htc->param(log => \@log);
-	$htc->output
+	$htc->param(next => $page + 1) unless $page == $pages;
+	$htc->param(prev => $page - 1) unless $page == 1;
 }
 
 1