Merge branch 'master' into mindcoding

diff --cc lib/Gruntmaster/Page/Pb/Entry.pm
index 9f3fc6b54ee051342288849732a59ef7da19d1e1,12f5e747bebc7452d25060b7a84c739204120b8b..8877ce54cd9774934e364dec26d5e41ba0e24a07
--- 1/lib/Gruntmaster/Page/Pb/Entry.pm
--- 2/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@@ -25,8 -25,8 +25,9 @@@ 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);
  }
  
  sub vary { 'Authorization' }

diff --cc tmpl/pb_entry.en
index e7fa7826155bb012c17682f670b50e93348fbb6e,cccb33a9233b7602b05d022c587d68453b19e4cc..bd2ce28bbd59e7b2ba5f13766dee70d603ee33b3
--- 1/tmpl/pb_entry.en
--- 2/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>