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

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index cdef1df..19862a8 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -11,27 +11,33 @@ use constant PAGE_SIZE => 10;
 
 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 if $1;
-	my $pages = POSIX::ceil (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 => $_,
@@ -45,6 +51,8 @@ sub _generate{
 		size => sprintf ("%.2f KiB", job_filesize() / 1024),
 		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