Merge branch 'master' into mindcoding

Conflicts:
	css/custom.css
	lib/Gruntmaster/Page/St.pm
	tmpl/log.en

diff --combined css/custom.css
index 9bc0cbdde185fb96f5ebeb03e6f557f6435f8df8,9872ee8daf56c22f8819dbf17a8ef45d52c14c23..1e5d955ab6f2e20fc9b85b64066977e7c19ee5fe
--- 1/css/custom.css
--- 2/css/custom.css
+++ b/css/custom.css
@@@ -4,6 -4,14 +4,6 @@@ h1#title
        font-size: 3em !important;
  }
  
 -footer{
 -      width: 60em;
 -      margin: auto;
 -      margin-top: 6em;
 -      white-space: pre-wrap;
 -      color: #777;
 -}
 -
  #logo {
        margin: 5em auto 2em;
        display: block;
@@@ -40,14 -48,10 +40,18 @@@ div#result
        text-align: center;
  }
  
 +footer{
 +      padding: 1.5em 0;
 +}
 +
  a.dropdown-toggle{
        cursor: pointer;
  }
  
 -}
 +#sponsors a.logo{
 +      margin-bottom: 1em;
 +}
++
+ .table-fixed{
+       table-layout: fixed;
++}

diff --combined lib/Gruntmaster/Page/Pb/Entry.pm
index 5dbeb92c2a0d37a20f6a598c95107e102ead8a7a,f03fe7aa265b569dfbb03b046daac7f77f64e080..9f3fc6b54ee051342288849732a59ef7da19d1e1
--- 1/lib/Gruntmaster/Page/Pb/Entry.pm
--- 2/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@@ -1,13 -1,8 +1,8 @@@
  package Gruntmaster::Page::Pb::Entry;
  
- use 5.014000;
- use strict;
- use warnings;
  use Gruntmaster::Page::Base pb_entry => '<tmpl_var name>';
- our @ISA = qw/Gruntmaster::Page::Base/;
- our $VERSION = '0.001';
  
 -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) = @_;
@@@ -21,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);
@@@ -31,7 -26,6 +26,7 @@@
        $htc->param(author => problem_author $id);
        $htc->param(owner => problem_owner $id);
        $htc->param(statement => problem_statement $id);
 +      $htc->param(timelimit => problem_timeout $id);
  }
  
  sub vary { 'Authorization' }