Merge branch 'master' into mindcoding

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index f63f832cf0279d0c01916c513e7d2b810691475e..6848bcfc8dbf141f7e8f97c4d2483f928fffe89c 100644 (file)
--- 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 9f3fc6b54ee051342288849732a59ef7da19d1e1..8877ce54cd9774934e364dec26d5e41ba0e24a07 100644 (file)
--- 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 e7fa7826155bb012c17682f670b50e93348fbb6e..bd2ce28bbd59e7b2ba5f13766dee70d603ee33b3 100644 (file)
--- 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 4bb3f040e6ce71aca83a27089333912566b91115..2b531c133d4744abc08e1f0f46416b5d31a07be0 100644 (file)
--- 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>