Merge branch 'master' into newmc

diff --git a/css/themes/cerulean.css b/css/themes/cerulean.css
index 9e2aa29387a8f1262b6088801102b969ffb398a8..bb94fe9f9bacfafe11dd4f0b5dbf3dd3b5144474 100644 (file)
--- a/css/themes/cerulean.css
+++ b/css/themes/cerulean.css
@@ -2963,6 +2963,81 @@ tbody.collapse.in {
   background-color: #ffffff;
   cursor: not-allowed;
 }
+.alert {
+  padding: 15px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
+}
+.alert .alert-link {
+  font-weight: bold;
+}
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+.alert > p + p {
+  margin-top: 5px;
+}
+.alert-dismissable,
+.alert-dismissible {
+  padding-right: 35px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
+}
+.alert-success {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #468847;
+}
+.alert-success hr {
+  border-top-color: #c9e2b3;
+}
+.alert-success .alert-link {
+  color: #356635;
+}
+.alert-info {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+  color: #3a87ad;
+}
+.alert-info hr {
+  border-top-color: #a6e1ec;
+}
+.alert-info .alert-link {
+  color: #2d6987;
+}
+.alert-warning {
+  background-color: #fcf8e3;
+  border-color: #fbeed5;
+  color: #c09853;
+}
+.alert-warning hr {
+  border-top-color: #f8e5be;
+}
+.alert-warning .alert-link {
+  color: #a47e3c;
+}
+.alert-danger {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #b94a48;
+}
+.alert-danger hr {
+  border-top-color: #e6c1c7;
+}
+.alert-danger .alert-link {
+  color: #953b39;
+}
 .list-group {
   margin-bottom: 20px;
   padding-left: 0;

diff --git a/css/themes/cosmo.css b/css/themes/cosmo.css
index 9b837545353535a1fad0159ce3e917320c4e94b5..91d6c44780d4a38b686214fb07d0796c228d80f5 100644 (file)
--- a/css/themes/cosmo.css
+++ b/css/themes/cosmo.css
@@ -2963,6 +2963,81 @@ tbody.collapse.in {
   background-color: #ffffff;
   cursor: not-allowed;
 }
+.alert {
+  padding: 15px;
+  margin-bottom: 21px;
+  border: 1px solid transparent;
+  border-radius: 0;
+}
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
+}
+.alert .alert-link {
+  font-weight: bold;
+}
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+.alert > p + p {
+  margin-top: 5px;
+}
+.alert-dismissable,
+.alert-dismissible {
+  padding-right: 35px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
+}
+.alert-success {
+  background-color: #3fb618;
+  border-color: #4e9f15;
+  color: #ffffff;
+}
+.alert-success hr {
+  border-top-color: #438912;
+}
+.alert-success .alert-link {
+  color: #e6e6e6;
+}
+.alert-info {
+  background-color: #9954bb;
+  border-color: #7643a8;
+  color: #ffffff;
+}
+.alert-info hr {
+  border-top-color: #693c96;
+}
+.alert-info .alert-link {
+  color: #e6e6e6;
+}
+.alert-warning {
+  background-color: #ff7518;
+  border-color: #ff4309;
+  color: #ffffff;
+}
+.alert-warning hr {
+  border-top-color: #ee3800;
+}
+.alert-warning .alert-link {
+  color: #e6e6e6;
+}
+.alert-danger {
+  background-color: #ff0039;
+  border-color: #f0005e;
+  color: #ffffff;
+}
+.alert-danger hr {
+  border-top-color: #d60054;
+}
+.alert-danger .alert-link {
+  color: #e6e6e6;
+}
 .list-group {
   margin-bottom: 20px;
   padding-left: 0;

diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css
index e02b2dbbb2e6b64579a972cc89111aa4444ceac5..6dafa4dcdc72c0adf8f33bbe65a50b3269f84f29 100644 (file)
--- a/css/themes/cyborg.css
+++ b/css/themes/cyborg.css
@@ -2963,6 +2963,81 @@ tbody.collapse.in {
   background-color: #222222;
   cursor: not-allowed;
 }
+.alert {
+  padding: 15px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
+}
+.alert .alert-link {
+  font-weight: bold;
+}
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+.alert > p + p {
+  margin-top: 5px;
+}
+.alert-dismissable,
+.alert-dismissible {
+  padding-right: 35px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
+}
+.alert-success {
+  background-color: #77b300;
+  border-color: #809a00;
+  color: #ffffff;
+}
+.alert-success hr {
+  border-top-color: #6a8000;
+}
+.alert-success .alert-link {
+  color: #e6e6e6;
+}
+.alert-info {
+  background-color: #9933cc;
+  border-color: #6e2caf;
+  color: #ffffff;
+}
+.alert-info hr {
+  border-top-color: #61279b;
+}
+.alert-info .alert-link {
+  color: #e6e6e6;
+}
+.alert-warning {
+  background-color: #ff8800;
+  border-color: #f05800;
+  color: #ffffff;
+}
+.alert-warning hr {
+  border-top-color: #d64f00;
+}
+.alert-warning .alert-link {
+  color: #e6e6e6;
+}
+.alert-danger {
+  background-color: #cc0000;
+  border-color: #bd001f;
+  color: #ffffff;
+}
+.alert-danger hr {
+  border-top-color: #a3001b;
+}
+.alert-danger .alert-link {
+  color: #e6e6e6;
+}
 .list-group {
   margin-bottom: 20px;
   padding-left: 0;

diff --git a/css/themes/slate.css b/css/themes/slate.css
index 2445c5389db1358f7d9e1f48ca242171e7c3b409..8e4e47e307325285b0b354501a088a25c21f248f 100644 (file)
--- a/css/themes/slate.css
+++ b/css/themes/slate.css
@@ -2963,6 +2963,81 @@ tbody.collapse.in {
   background-color: #3a3f44;
   cursor: not-allowed;
 }
+.alert {
+  padding: 15px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
+}
+.alert .alert-link {
+  font-weight: bold;
+}
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+.alert > p + p {
+  margin-top: 5px;
+}
+.alert-dismissable,
+.alert-dismissible {
+  padding-right: 35px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
+}
+.alert-success {
+  background-color: #62c462;
+  border-color: #62bd4f;
+  color: #ffffff;
+}
+.alert-success hr {
+  border-top-color: #55b142;
+}
+.alert-success .alert-link {
+  color: #e6e6e6;
+}
+.alert-info {
+  background-color: #5bc0de;
+  border-color: #3dced8;
+  color: #ffffff;
+}
+.alert-info hr {
+  border-top-color: #2ac7d2;
+}
+.alert-info .alert-link {
+  color: #e6e6e6;
+}
+.alert-warning {
+  background-color: #f89406;
+  border-color: #e96506;
+  color: #ffffff;
+}
+.alert-warning hr {
+  border-top-color: #d05a05;
+}
+.alert-warning .alert-link {
+  color: #e6e6e6;
+}
+.alert-danger {
+  background-color: #ee5f5b;
+  border-color: #ed4d63;
+  color: #ffffff;
+}
+.alert-danger hr {
+  border-top-color: #ea364f;
+}
+.alert-danger .alert-link {
+  color: #e6e6e6;
+}
 .list-group {
   margin-bottom: 20px;
   padding-left: 0;

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index c590bc9e2309977edb92554854dd0e66c8605e8b..185017b82b38cf1abe9445621ec75367887f3507 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -18,7 +18,6 @@ use Plack::App::Gruntmaster::HTML;
 
 use warnings NONFATAL => 'all';
 no warnings 'illegalproto';
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 
 ##################################################
 
@@ -34,6 +33,7 @@ use constant CONTENT_TYPES => +{
        pas => 'text/x-pascal',
        pl => 'text/x-perl',
        py => 'text/x-python',
+       l => 'text/plain',
 };
 
 use constant FORMAT_EXTENSION => {

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index f0c49cd66813882540b0db71f552c49ecb26d9b5..319a5e509d70d71b881829a4addeb27fd010bae2 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -197,6 +197,7 @@ sub process_pb {
                $div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
        };
        $tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
+       $tree->fid('open-alert')->detach unless $args{contest};
 }
 
 sub process_log_entry {

diff --git a/tmpl/pb.en b/tmpl/pb.en
index ae1a0023722bac78047e646d637749b4d21e424f..bde0ae89d56fd4a4cfde7b9eb7075d41955b4ec4 100644 (file)
--- a/tmpl/pb.en
+++ b/tmpl/pb.en
@@ -1,4 +1,8 @@
-<div>
+<div id="open-alert" class="alert alert-warning" role="alert">
+<h4>Friendly reminder</h4>
+The timer for a problem starts when you open the problem. You will lose points if you open all problems at the same time.
+</div>
+
 <div id="beginner">
 <h2>Beginner</h2>
 <table border class="table table-bordered table-striped table-fixed">
@@ -8,4 +12,3 @@
 <tr><td class="name"><a href="id">Name</a><td class="author">author<td class="owner"><a href="/us/id">Owner name</a>
 </table>
 </div>
-</div>
\ No newline at end of file