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=13a6bf78b6b3de37fde491c576dc654857efc987;p=gruntmaster-page.git

Merge branch 'master' into mindcoding
---

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index f63f832..6848bcf 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -19,12 +19,12 @@ sub _generate{
 		date => (job_date() ? strftime ('%c' => localtime job_date) : '?'),
 		extension => job_extension,
 		name => problem_name job_problem,
-		user_name => do { local $Gruntmaster::Data::contest; user_name job_user },
 		problem => job_problem,
 		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_name} = do { local $Gruntmaster::Data::contest; user_name $_->{user} } for @log;
 	$htc->param(log => \@log);
 	$htc->param(next => $page + 1) unless $page == $pages;
 	$htc->param(prev => $page - 1) unless $page == 1;
diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index 9f3fc6b..8877ce5 100644
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -25,6 +25,7 @@ sub _generate{
 	$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);
 }
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index e7fa782..bd2ce28 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -10,7 +10,7 @@
 <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>
diff --git a/tmpl/st.en b/tmpl/st.en
index 4bb3f04..2b531c1 100644
--- a/tmpl/st.en
+++ b/tmpl/st.en
@@ -5,7 +5,7 @@
 </tmpl_if>
 
 <tbody>
-<tmpl_loop st><tr><td><tmpl_var rank><td><tmpl_var user><tmpl_if name> (<tmpl_var_name>)</tmpl_if>
+<tmpl_loop st><tr><td><tmpl_var rank><td><a href="/us/<tmpl_var user>"><tmpl_if name><tmpl_var name><tmpl_else><tmpl_var user></tmpl_if></a>
 <tmpl_if problems><tmpl_loop scores><td><tmpl_var _>
 </tmpl_loop></tmpl_if><td><tmpl_var score>
 </tmpl_loop>