X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FLog.pm;h=19862a82b69a8840a5dd6a00c615a8a5bea30c71;hb=dfe9fad19b62489af03cdd2fd29cc5057536b483;hp=fce36cbe8fe1a4f5d91b3082c528a9cb18060bcb;hpb=bb95f538bf263c0294d87cfb90d58c66117b9aab;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index fce36cb..19862a8 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -9,33 +9,35 @@ our $VERSION = '0.001';
 
 use constant PAGE_SIZE => 10;
 
-use constant FORMAT_EXTENSION => {
-  CPP => 'cpp',
-};
-
 use constant TEMPLATES => {
 	en => <<'HTML',
-<table border>
+<table border class="table table-bordered table-striped">
 <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>
+<tmpl_loop log><tr><td><a href="job/<tmpl_var id>"><tmpl_var id></a>
 <td><a href="../pb/<tmpl_var problem>"><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>
+
+<ul class="pager">
+<tmpl_if prev><li class="previous"><a href="<tmpl_var prev>">Previous</a></tmpl_if>
+<tmpl_if next><li class="next"><a href="<tmpl_var next>">Next</a></tmpl_if>
+</ul>
 HTML
 };
 
 sub _generate{
-	my ($self, $htc, $path, $lang) = @_;
+	my ($self, $htc, $lang, $logger, $ct, $page) = @_;
+	debug $logger => "language is '$lang', contest is '$ct' and page is '$page'";
+	local $Gruntmaster::Data::contest = $ct if $ct;
 
-	$path =~ m,^(?:ct/([^/]+)/)?log/(\w+)\.html$,;
-	local $Gruntmaster::Data::contest = $1;
-	my $pages = jobcard / PAGE_SIZE;
-	my $page = $2 eq 'index' ? $pages : $2;
+	my $pages = POSIX::floor (jobcard / PAGE_SIZE);
+	$pages ||= 1;
+	$page ||= $pages;
 
 	my @log = sort { $b->{id} <=> $a->{id} } map +{
 		id => $_,
@@ -47,8 +49,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->param(next => $page + 1) unless $page == $pages;
+	$htc->param(prev => $page - 1) unless $page == 1;
 }
 
 1