Merge branch 'master' into newmc

diff --git a/a/account.en b/a/account.en
index 6c1b8cce5afc88c3b6680a89cebdcae33f3cf963..01f1bf66c4eb6189b0485dec65f1b8955549c2c3 100644 (file)
--- a/a/account.en
+++ b/a/account.en
@@ -7,7 +7,7 @@
 <div class="form-group"><label for="r_email">Email</label><input type="email" class="form-control" id="r_email" name="email" required></div>
 <div class="form-group"><label for="r_phone">Phone</label><input type="tel" class="form-control" id="r_phone" name="phone" required></div>
 <div class="form-group"><label for="r_town">Town</label><input type="text" class="form-control" id="r_town" name="town" required></div>
-<div class="form-group"><label for="r_country">Nationality</label><select name="country" class="form-control" id="r_country" name="country" required>
+<div class="form-group"><label for="r_country">Nationality</label><select name="country" class="form-control" id="r_country" required>
 <option value="Afganistan">Afghanistan</option>
 <option value="Albania">Albania</option>
 <option value="Algeria">Algeria</option>
@@ -257,7 +257,7 @@
 <option value="Zimbabwe">Zimbabwe</option>
 </select></div>
 <div class="form-group"><label for="r_university">Institution</label><input type="text" class="form-control" id="r_university" name="university" required></div>
-<div class="form-group"><label for="r_level">Level</label><select id="level" name="level" class="form-control"> <option>Highschool</option> <option>Undergraduate</option> <option>Master</option> <option>Doctorate</option> <option>Other</option> </select></div>
+<div class="form-group"><label for="r_level">Level</label><select id="r_level" name="level" class="form-control"> <option>Highschool</option> <option>Undergraduate</option> <option>Master</option> <option>Doctorate</option> <option>Other</option> </select></div>
 <input type="submit" class="btn btn-default" value="Submit">
 </form>
 

diff --git a/a/contribute.en b/a/contribute.en
index b7c04116624fb0df44d356eec5a91a51cc7adb59..8634856bca9c20763d6f17000e70a8d730101246 100644 (file)
--- a/a/contribute.en
+++ b/a/contribute.en
@@ -10,6 +10,7 @@ The Gruntmaster 6000 project has three git repositories:
 <dd>The grader</dd>
 <dt><a href="https://git.ieval.ro/?p=gruntmaster-page.git">gruntmaster-page</a></dt>
 <dd>The website</dd>
+</dl>
 
 <h1>Submitting patches</h1>
 Mail them to <a href="mailto:marius@ieval.ro">marius@ieval.ro</a>. Please try to follow the following guidelines:

diff --git a/app.psgi b/app.psgi
index 323748dc187169003ee5351db4191584ece46163..597e94167d5eebc968ea5e80ce6f66dd0937fe99 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 use v5.14;
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+use warnings;
 
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster;
@@ -8,8 +8,6 @@ use Plack::Builder;
 use Plack::Util;
 use Log::Log4perl;
 
-use constant AUTH_TIMEOUT => 5 * 60;
-
 sub CONTENT_SECURITY_POLICY () {
        my $csp = <<CSP;
 default-src 'none'

diff --git a/tmpl/log.en b/tmpl/log.en
index b81e6ef012d68232437a6d953a74167abd76c5e8..4cd20cf516e95b30b06d073d781bdcf0860c95db 100644 (file)
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -13,7 +13,7 @@
 </table>
 
 <ul class="pager">
-<li class="previous"><a href="?page=id">Previous</a>
+<li class="previous"><a href="?page=id" rel="prev">Previous</a>
 <li class="current">Page 1 of 100
-<li class="next"><a href="?page=id">Next</a>
+<li class="next"><a href="?page=id" rel="next">Next</a>
 </ul>