cs/icp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Favicon

Browse Source
This commit is contained in:
Julian M. Kunkel 2018-05-07 10:30:15 +01:00
parent 1375b6ef52
commit f3508aaccc
11 changed files with 118 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oer/exercise-formats/program/match-regex-parallel/controller.py
View File

@ -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

4
oer/exercise-formats/program/match-regex/controller.py
View File

@ -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

3
oer/exercise-formats/program/scriptgrade/controller.py
View File

@ -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

8
src/courses/templates/courses/course.html
View File

@ -10,7 +10,7 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../favicon.ico">
<link rel="icon" href="/favicon.ico">
<title>{{ course.title }}</title>
@ -52,12 +52,6 @@
{% include "frontend/navbar.html" %}
<!-- -->
<div id="head-container" style="position: relative; top: -2em;">
<div id="dummy" style="margin-top: 8px;"></div>
<div id="element" style="background-color:#d61926;">&nbsp;</div>
</div>
<!-- -->
<div class="container">

BIN
src/frontend/static/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

17
src/frontend/static/frontend/index/styles.css
View File

@ -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) {
}

79
src/frontend/static/logo.svg Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="33.900002mm"
height="33.900002mm"
viewBox="0 0 33.900002 33.900002"
version="1.1"
id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="logo.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="116.37139"
inkscape:cy="-58.670637"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1680"
inkscape:window-height="986"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-14.53458,-11.376955)">
<rect
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d61926;stroke-width:2.72900009;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.83921569"
id="rect853"
width="31.171"
height="31.171001"
x="15.89908"
y="12.741455" />
<text
xml:space="preserve"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.65482712px;line-height:125%;font-family:'Abyssinica SIL';-inkscape-font-specification:'Abyssinica SIL Bold';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26458329px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
x="19.006075"
y="39.203796"
id="text857"><tspan
sodipodi:role="line"
id="tspan855"
x="19.006075"
y="39.203796"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:ARial;-inkscape-font-specification:'ARial Bold';stroke-width:0.26458329px">C</tspan></text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

3
src/frontend/static/notes.txt
View File

@ -1,3 +0,0 @@

37
src/frontend/templates/frontend/footer.html
View File

@ -1,30 +1,17 @@
{% load staticfiles %}
<footer>
<div class="red"></div>
{% if user.is_authenticated %}
{% else %}
{% endif %}
<footer>
<hr>
<style type="text/css">
.sep { color: silver; margin: 0.3em; }
</style>
<a href="/privacy">Privacy</a>
<span class="sep">|</span>
<a href="https://hps.vi4io.org/impressum">Impressum</a>
<span class="sep">|</span>
<a href="https://hps.vi4io.org/research/projects/hamburg/icp">Contact</a>
<span class="sep">|</span>
<a href="/attribution">Attribution</a>
</footer>
</div> <!-- /container -->
<a href="/privacy">Privacy</a>
<span class="sep">|</span>
<a href="https://hps.vi4io.org/impressum">Impressum</a>
<span class="sep">|</span>
<a href="https://hps.vi4io.org/research/projects/hamburg/icp">Contact</a>
<span class="sep">|</span>
<a href="/attribution">Attribution</a>
</footer>
</div> <!-- /container -->
<div class="red" id="element"></div>
<script src="{% static 'lib/jquery.min.js' %}"></script>
<script src="{% static 'lib/bootstrap/js/bootstrap.min.js' %}"></script>

4
src/frontend/templates/frontend/header.html
View File

@ -7,10 +7,10 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../favicon.ico">
<link rel="icon" href="/static/favicon.ico">
<title>Teaching @ HPS</title>

1
src/frontend/templates/frontend/index.html
View File

@ -1,5 +1,6 @@
{% load staticfiles %}
{% include "frontend/header.html" %}
<!-- Example row of columns -->
<div class="row">
{% for course in courses_list %}