From: Marius Gavrilescu Date: Sun, 8 Feb 2015 10:56:33 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=760348134595e67b49d9be7284ae9c74c1d2d9b5;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- 760348134595e67b49d9be7284ae9c74c1d2d9b5 diff --cc lib/Plack/App/Gruntmaster/HTML.pm index 090ca32,bdd20c2..0a68116 --- a/lib/Plack/App/Gruntmaster/HTML.pm +++ b/lib/Plack/App/Gruntmaster/HTML.pm @@@ -114,8 -114,9 +114,10 @@@ sub process_us sub process_ct_entry { my ($tree, %args) = @_; $_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a'); + $tree->fid('editorial')->detach unless $args{finished}; $tree->fid('links')->detach unless $args{started}; + my $status = ($args{time} < $args{start} ? 'starts' : 'ends'); + $tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start}); $tree->content_handler( start => ftime $args{start}, stop => ftime $args{stop}, diff --cc tmpl/skel.en index 16ebd70,19f3180..19377d9 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -16,8 -16,7 +16,8 @@@
  • Theme