X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=b4abd19f5194fbe28f40bcd41e9794b237119f8b;hb=refs%2Fheads%2Fnewmc;hp=c629383e76b9425eeaaff1a2947fcfa5b076f2ee;hpb=10a4003fe323fbd7116c99202254dea5d69cdc71;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index c629383..b4abd19 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -4,12 +4,12 @@ use parent qw/Exporter/;
 our @EXPORT = qw/render render_article/;
 
 use File::Slurp qw/read_file/;
+use List::Util qw[min max];
 use HTML::Element::Library;
 use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
 use Sort::ByExample
-  sorter => {-as => 'pb_sort', example => [qw/beginner easy medium hard/], xform => sub {$_->{level}}},
   sorter => {-as => 'ct_sort', example => [qw/Running Pending Finished/], xform => sub {$_->{status}}};
 
 my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1};
@@ -83,7 +83,7 @@ sub render_article {
 	$lang //= 'en';
 	my $title = read_file "a/$art.$lang.title";
 	chomp $title;
-	my $meat  = read_file "a/$art.$lang";
+	my $meat  = read_file "a/$art.$lang", binmode => ':utf8';
 	_render('skel', $lang, title => $title , meat => $meat, %args)
 }
 
@@ -186,10 +186,7 @@ sub process_pb_entry {
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
-		my $score = $tree->fid('score');
-		$score->attr('data-start' => $args{open_time});
-		$score->attr('data-stop'  => $args{contest_stop});
-		$score->attr('data-value'  => $args{value});
+		$tree->fid('score')->replace_content($args{value});
 		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
 	} else {
 		$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
@@ -214,15 +211,19 @@ sub process_pb {
 	my $iter = sub {
 		my ($data, $tr) = @_;
 		$tr->set_child_content(class => 'author', $data->{author});
+		$tr->set_child_content(class => 'value', $data->{value}) if $args{args}{contest};
+		$tr->fclass('value')->detach unless $args{args}{contest};
 		$tr->set_child_content(class => 'level', ucfirst $data->{level});
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
-		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
+		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
-		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest};
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{args}{contest};
 	};
 
-	$tree->find('tbody')->find('tr')->iter3([pb_sort @{$args{pb}}], $iter);
-	$tree->fid('open-alert')->detach unless $args{contest};
+	$tree->find('thead')->fclass('value')->detach unless $args{args}{contest};
+
+	$tree->find('tbody')->find('tr')->iter3([sort { $a->{value} <=> $b->{value} } @{$args{pb}}], $iter);
+	$tree->fid('open-alert')->detach unless $args{args}{contest};
 }
 
 sub process_log_entry {
@@ -257,7 +258,7 @@ sub process_log {
 		my ($data, $tr) = @_;
 		$tr->fclass('id')->namedlink($data->{id});
 		$tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name});
-		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
+		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= '?contest='.$data->{contest}}) if $data->{contest};
 		$tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest};
 		$tr->fclass('contest')->replace_content('None') unless $data->{contest};
 		$tr->fclass('date')->replace_content(ftime $data->{date});
@@ -277,7 +278,9 @@ sub process_log {
 		my $str = join '&', map { $_ . '=' . $args{args}{$_} } keys %{$args{args}};
 		$elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
 	}
-	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
+
+	my $total_pages = max(1, $args{last_page});
+	$tree->fclass('current')->replace_content("Page $args{current_page} of $total_pages");
 }
 
 sub process_st {