From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 18 Apr 2015 09:35:15 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=1d4981aae22600f090d67d740017682354162ec8;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

1d4981aae22600f090d67d740017682354162ec8
diff --combined tmpl/pb_entry.en
index dd03ea9,7b37669..bc637d3
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@@ -9,7 -9,7 +9,7 @@@
  <dt>Owner</dt> <dd id="owner">owner</dd>
  <dt>Level</dt> <dd id="level">Easy</dd>
  <dt>Time limit (seconds)</dt> <dd smap="timeout">1</dd>
 -<dt class="rc reqjs">Score</dt> <dd id="score" class="timer reqjs rc" data-start="..." data-stop="..." data-value="100">50</dd>
 +<dt class="rc reqjs">Score</dt> <dd id="score" class="rc">50</dd>
  <dt class="rc reqjs">Contest ends in</dt> <dd id="countdown" class="timer reqjs rc" data-stop="...">01:30</dd>
  </dl>
  
@@@ -31,18 -31,18 +31,18 @@@ To submit solutions to this problem, pl
  <div class="form-group"><label for="prog">File:</label><input id="prog" name="prog" type="file"></div>
  <div class="form-group"><label for="source_code">Source code:</label> <textarea class="form-control" id="source_code" name="source_code"></textarea></div>
  <div class="form-group"><label for="prog_format">File format:</label><select id="prog_format" name="prog_format" class="form-control" required>
 -<option value="C">C (gcc)</option>
 -<option value="CPP" selected>C++ (g++)</option>
 -<option value="GCCGO">Go (gccgo)</option>
 -<option value="GOLANG">Go (gc)</option>
 +<option value="C">C11 (gcc 4.7.2)</option>
 +<option value="CPP" selected>C++11 (g++ 4.7.2)</option>
 +<option value="GCCGO">Go (gccgo 4.7.2)</option>
 +<option value="GOLANG">Go (gc 1.0.2)</option>
  <option value="GOLFSCRIPT">Golfscript (golfscript.rb)</option>
 -<option value="HASKELL">Haskell (ghc)</option>
 -<option value="JAVA">Java (javac)</option>
 -<option value="PASCAL">Pascal (fpc)</option>
 -<option value="PERL">Perl (perl)</option>
 -<option value="PYTHON">Python (python)</option>
 -<option value="RUBY">Ruby (ruby)</option>
 -<option value="SBCL">Common Lisp (sbcl)</option>
 +<option value="HASKELL">Haskell (ghc 7.4.1)</option>
 +<option value="JAVA">Java (openjdk 7u75)</option>
 +<option value="PASCAL">Pascal (fpc 2.6.0)</option>
 +<option value="PERL">Perl (perl 5.14.2)</option>
 +<option value="PYTHON">Python (python 2.7.3)</option>
 +<option value="RUBY">Ruby (ruby 2.2.1)</option>
 +<option value="SBCL">Common Lisp (sbcl 1.0.57)</option>
  </select></div>
  
  <input type="submit" value="Submit job" class="btn btn-primary">
@@@ -51,5 -51,5 +51,5 @@@
  </div>
  </div>
  
- <div class="backdrop"></div>
+ <div class="hidden backdrop"></div>
  <div id="solution_modal" class="hidden modal"></div>