From f3508aaccceba3f09942579a3f7a337a2196c9b1 Mon Sep 17 00:00:00 2001 From: "Julian M. Kunkel" Date: Mon, 7 May 2018 10:30:15 +0100 Subject: [PATCH] Favicon --- .../match-regex-parallel/controller.py | 3 + .../program/match-regex/controller.py | 4 +- .../program/scriptgrade/controller.py | 3 + src/courses/templates/courses/course.html | 8 +- src/frontend/static/favicon.ico | Bin 0 -> 38078 bytes src/frontend/static/frontend/index/styles.css | 17 +++- src/frontend/static/logo.svg | 79 ++++++++++++++++++ src/frontend/static/notes.txt | 3 - src/frontend/templates/frontend/footer.html | 37 +++----- src/frontend/templates/frontend/header.html | 4 +- src/frontend/templates/frontend/index.html | 1 + 11 files changed, 118 insertions(+), 41 deletions(-) create mode 100644 src/frontend/static/favicon.ico create mode 100644 src/frontend/static/logo.svg delete mode 100644 src/frontend/static/notes.txt 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 0000000000000000000000000000000000000000..62590dca7667f764efb740ee11a637c852965c73 GIT binary patch literal 38078 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 Dkx$64 literal 0 HcmV?d00001 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 %} +
+
-{% if user.is_authenticated %} - -{% else %} - -{% endif %} - - - - -
- + 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 %}