From: Marius Gavrilescu <marius@ieval.ro>
Date: Thu, 6 Aug 2015 09:48:08 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=ae7dfc94a272a943e52957c4bffabecfbceb9b19;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

ae7dfc94a272a943e52957c4bffabecfbceb9b19
diff --combined js/90-themes.js
index 50834da,d65759c..5196574
--- a/js/90-themes.js
+++ b/js/90-themes.js
@@@ -3,14 -3,10 +3,16 @@@ function set_style(name, trans)
  		document.body.classList.add('transition-color');
  		setTimeout(() => document.body.classList.remove('transition-color'), 1000);
  	}
+ 	if(q('html').className == name)
+ 		return;
  	q('html').className = name;
  	localStorage.setItem("theme", name);
 +	$(function() {
 +		if(name == 'slate' || name == 'cyborg')
 +			$('img').each(e => e.setAttribute('src', e.getAttribute('src').replace('logos/light', 'logos/dark')));
 +		else
 +			$('img').each(e => e.setAttribute('src', e.getAttribute('src').replace('logos/dark', 'logos/light')));
 +	});
  }
  
  $(function() {
diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index b23ddb9,f08b66b..6799fb1
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -91,8 -91,6 +91,6 @@@ sub _render 
  	$tree->defmap(smap => \%args);
  	my $process = __PACKAGE__->can("process_$tmpl");
  	$process->($tree, %args) if $process;
- 	$_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes');
- 	$_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')});
  	$_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
  	$tree->as_HTML(undef, undef, $optional_end_tags);
  }
@@@ -184,7 -182,10 +182,7 @@@ sub process_pb_entry 
  	if ($args{contest_stop}) {
  		$tree->fid('solution')->detach;
  		$tree->fid('solution_modal')->detach;
 -		my $score = $tree->fid('score');
 -		$score->attr('data-start' => $args{open_time});
 -		$score->attr('data-stop'  => $args{contest_stop});
 -		$score->attr('data-value'  => $args{value});
 +		$tree->fid('score')->replace_content($args{value});
  		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
  	} else {
  		$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
@@@ -282,10 -283,6 +280,6 @@@ sub process_log 
  		$elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
  	}
  	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
- 
- 	my @detach;
- 	push @detach, $args{args}{$_} ? $tree->fclass($_) : () for qw/problem contest owner/;
- 	$_->detach for @detach;
  }
  
  sub process_st {
diff --combined tmpl/pb_entry.en
index ce2c100,8f42d1b..7f04faf
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@@ -6,21 -6,21 +6,21 @@@
  <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>
  
  <a href="/log/?problem=problem_id" id="job_log">Job log</a><br>
  <a href="/sol/problem_id" id="solution">Solution</a>
  
- <h1 static="no">Submit solution</h1>
+ <h1>Submit solution</h1>
  
  <div id="nosubmit">
  The contest has finished.<br>
  To submit solutions to this problem, please visit the problem <a href="/pb/id">outside&nbsp;the&nbsp;contest</a>.
  </div>
  
- <div id="submit" static="no">
+ <div id="submit">
  <form id="submitform" action="/action/submit" method="POST" enctype="multipart/form-data" role="form">
  <input type="hidden" name="problem" value="problem_id">
  <input type="hidden" name="contest" value="contest_id">
@@@ -28,18 -28,18 +28,18 @@@
  <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="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="C">C11 (gcc 4.9.2)</option>
 +<option value="CPP" selected>C++11 (g++ 4.9.2)</option>
 +<option value="GCCGO">Go (gccgo 4.9.2)</option>
 +<option value="GOLANG">Go (gc 1.3.3)</option>
 +<!-- <option value="GOLFSCRIPT">Golfscript (golfscript.rb)</option> -->
 +<option value="HASKELL">Haskell (ghc 7.6.3)</option>
 +<option value="JAVA">Java (openjdk 7u75)</option>
 +<option value="PASCAL">Pascal (fpc 2.6.4)</option>
 +<option value="PERL">Perl (perl 5.20.2)</option>
 +<option value="PYTHON">Python (python 2.7.9)</option>
 +<option value="RUBY">Ruby (ruby 2.1.5)</option>
 +<option value="SBCL">Common Lisp (sbcl 1.2.4)</option>
  </select></div>
  
  <input type="submit" value="Submit job" class="btn btn-primary">
diff --combined tmpl/skel.en
index f7ca622,3533f56..3622006
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -1,48 -1,33 +1,47 @@@
  <!DOCTYPE html>
 +<html class="slate">
  <title smap="title">TITLE</title>
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
 +<link href="/static/favicon.png" rel="shortcut icon">
  <link href="/static/css/all.css" rel="stylesheet" integrity="x">
  <script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>
  
  <body>
  <nav role="navigation">
  <ul class="nav nav-pills nav-justified">
 -<li id="nav-home"><a href="/">Gruntmaster 6000</a>
 +<li id="nav-home"><a href="/">Home</a>
  <li id="nav-pb"><a href="/pb/">Problems</a>
  <li id="nav-ct"><a href="/ct/">Contests</a>
  <li id="nav-log"><a href="/log/">Job log</a>
  <li id="nav-us"><a href="/us/">Users</a>
- <li id="nav-account" static="no"><a href="/account">Account</a>
+ <li id="nav-account"><a href="/account">Account</a>
 +<li id="nav-about"><a href="/about">About / Help</a>
  <li id="nav-contribute"><a href="/contribute">Contribute!</a>
  
  </ul>
  </nav>
  
 +<img id="logo" class="center-block" src="/static/logos/dark.svg#logo-mindcoding" width="600px" height="152px">
 +
  <h1 id="title">TITLE</h1>
- <div id="static" class="alert alert-info" static="yes">This is a static version of MindCoding, useful when the <a class="alert-link" href="https://mindcoding.ro/">regular version</a> is overloaded.</div>
  
  <div id="result"></div>
  
  <main id="content">Content goes here</main>
  
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
 +
 +<div id="sponsors">
 +</div>
 +
  <footer>
 -Dilmom: Why don't you call your product the Gruntmaster 6000?<br>
 -Dilbert: What kind of product do you see when you imagine a Gruntmaster 6000?<br>
 -Dilmom: Well, it's a stripped-down version of the Gruntmaster 9000, of course. But it's software-upgradeable.
 +<div class="left-half text-center">
 +<a href="http://www.societatea-hermes.ro"><img src="/static/logos/dark.svg#logo-hermes" alt="Societatea Hermes" width="164px" height="100px"></a>
 +</div>
 +
 +<div class="right-half text-center">
 +<a href="http://www.facebook.com/mindcodingcluj"><img src="/static/logos/dark.svg#logo-facebook" alt="MindCoding Facebook page" width="100px" height="100px"></a>
 +</div>
  </footer>