diff --git a/oer/exercise-formats/program/match-regex-parallel/controller.py b/oer/exercise-formats/program/match-regex-parallel/controller.py index a3c9296..ff59b44 100644 --- a/oer/exercise-formats/program/match-regex-parallel/controller.py +++ b/oer/exercise-formats/program/match-regex-parallel/controller.py @@ -55,6 +55,9 @@ def execute(ctx): errs = errs.decode("utf-8") msgs = msgs.decode("utf-8") + + if timeout <= 0: + errs += "\nKilled after timeout!\n" return retval, errs, msgs diff --git a/oer/exercise-formats/program/match-regex/controller.py b/oer/exercise-formats/program/match-regex/controller.py index b3802ab..cf4bfe1 100755 --- a/oer/exercise-formats/program/match-regex/controller.py +++ b/oer/exercise-formats/program/match-regex/controller.py @@ -53,7 +53,9 @@ def execute(ctx): errs = errs.decode("utf-8") msgs = msgs.decode("utf-8") - #print(errs, file=sys.stderr) + if timeout <= 0: + errs += "\nKilled after timeout!\n" + return retval, errs, msgs diff --git a/oer/exercise-formats/program/scriptgrade/controller.py b/oer/exercise-formats/program/scriptgrade/controller.py index 1230822..cde43fe 100644 --- a/oer/exercise-formats/program/scriptgrade/controller.py +++ b/oer/exercise-formats/program/scriptgrade/controller.py @@ -47,6 +47,9 @@ def execute(ctx): errs = errs.decode("utf-8") msgs = msgs.decode("utf-8") + + if timeout <= 0: + errs += "\nKilled after timeout!\n" return retval, errs, msgs diff --git a/src/courses/templates/courses/course.html b/src/courses/templates/courses/course.html index 2ed243d..c021564 100644 --- a/src/courses/templates/courses/course.html +++ b/src/courses/templates/courses/course.html @@ -10,7 +10,7 @@ - + {{ course.title }} @@ -52,12 +52,6 @@ {% include "frontend/navbar.html" %} - -
-
-
 
-
-
diff --git a/src/frontend/static/favicon.ico b/src/frontend/static/favicon.ico new file mode 100644 index 0000000..62590dc Binary files /dev/null and b/src/frontend/static/favicon.ico differ diff --git a/src/frontend/static/frontend/index/styles.css b/src/frontend/static/frontend/index/styles.css index 5f64b70..a4a6b83 100644 --- a/src/frontend/static/frontend/index/styles.css +++ b/src/frontend/static/frontend/index/styles.css @@ -7,14 +7,25 @@ #dummy { margin-top: 12.5%; /* 4:3 aspect ratio */ } + #element { position: absolute; top: 0; bottom: 0; left: 0; right: 0; - background-color: silver /* show me! */ + height:0.5em; + margin-top:50px; } +.red { + background-color: #d61926; +} + +.sep { + color: #d61926; + margin: 0.3em; +} + /* navbar fixes -------------------------------------------------------------*/ .navbar-inverse .navbar-toggle { @@ -63,13 +74,13 @@ @media (min-width: 992px) { .course-listing { - min-height: 220px; + min-height: 220px; } } /* Large devices (large desktops, 1200px and up) */ -@media (min-width: 1200px) { +@media (min-width: 1200px) { } diff --git a/src/frontend/static/logo.svg b/src/frontend/static/logo.svg new file mode 100644 index 0000000..14e7cdb --- /dev/null +++ b/src/frontend/static/logo.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + C + + diff --git a/src/frontend/static/notes.txt b/src/frontend/static/notes.txt deleted file mode 100644 index b28b04f..0000000 --- a/src/frontend/static/notes.txt +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/frontend/templates/frontend/footer.html b/src/frontend/templates/frontend/footer.html index db5dfa2..652653a 100644 --- a/src/frontend/templates/frontend/footer.html +++ b/src/frontend/templates/frontend/footer.html @@ -1,30 +1,17 @@ {% load staticfiles %} +
- + Privacy + | + Impressum + | + Contact + | + Attribution + + +
diff --git a/src/frontend/templates/frontend/header.html b/src/frontend/templates/frontend/header.html index e7bc41f..758f992 100644 --- a/src/frontend/templates/frontend/header.html +++ b/src/frontend/templates/frontend/header.html @@ -7,10 +7,10 @@ - + - + Teaching @ HPS diff --git a/src/frontend/templates/frontend/index.html b/src/frontend/templates/frontend/index.html index da142e5..9ce17b2 100644 --- a/src/frontend/templates/frontend/index.html +++ b/src/frontend/templates/frontend/index.html @@ -1,5 +1,6 @@ {% load staticfiles %} {% include "frontend/header.html" %} +
{% for course in courses_list %}