From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 28 Feb 2014 10:34:28 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=137683e17847654370c1ecf716905222e8a36d1a;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into mindcoding
---

137683e17847654370c1ecf716905222e8a36d1a
diff --combined lib/Gruntmaster/Page/Pb/Entry.pm
index 9f3fc6b,12f5e74..8877ce5
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@@ -2,7 -2,7 +2,7 @@@ package Gruntmaster::Page::Pb::Entry
  
  use Gruntmaster::Page::Base pb_entry => '<tmpl_var name>';
  
 -use constant FORMATS => [qw/C CPP JAVA PERL PYTHON/];
 +use constant FORMATS => [qw/C CPP JAVA PASCAL PERL PYTHON/];
  
  sub _generate{
  	my ($self, $htc, $lang, $env, $contest, $id) = @_;
@@@ -16,7 -16,7 +16,7 @@@
  
  	$htc->param(cansubmit => 1);
  	if ($contest) {
 -		$htc->param(cansubmit => time <= contest_end $contest);
 +		$htc->param(cansubmit => (time <= contest_end $contest));
  		$htc->param(contest => $contest);
  	}
  	$htc->param(formats => FORMATS);
@@@ -25,8 -25,8 +25,9 @@@
  	$htc->param(name => problem_name $id);
  	$htc->param(author => problem_author $id);
  	$htc->param(owner => problem_owner $id);
+ 	$htc->param(owner_name => do{ local $Gruntmaster::Data::contest; user_name $htc->param('owner')} );
  	$htc->param(statement => problem_statement $id);
 +	$htc->param(timelimit => problem_timeout $id);
  }
  
  sub vary { 'Authorization' }
diff --combined tmpl/pb_entry.en
index e7fa782,cccb33a..bd2ce28
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@@ -4,13 -4,9 +4,13 @@@
  </div>
  
  <div class="col-md-3">
 +<div id="sidebar"></div>
 +
 +<h3>Problem information</h3>
  <dl>
 +<dt>Time limit:</dt> <dd><tmpl_var timelimit>&nbsp;s</dd>
  <dt>Author</dt> <dd><tmpl_var author></dd>
- <dt>Owner</dt> <dd><tmpl_var owner></dd>
+ <dt>Owner</dt> <dd><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a></dd>
  </dl>
  
  <tmpl_if cansubmit>
@@@ -29,4 -25,4 +29,4 @@@
  </form>
  </tmpl_if>
  </div>
 -</div>
 +</div>