From 0069a58683b6404aff4ad9249cfb70397b073e55 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 11 Oct 2018 23:23:20 +0200 Subject: web: improve style --- kpov_judge/web/kpov_judge/static/style.css | 46 ++++++++++++++++----- .../web/kpov_judge/templates/class_tasks.html | 16 ++++++++ kpov_judge/web/kpov_judge/templates/index.html | 17 ++++---- .../web/kpov_judge/templates/task_greeting.html | 47 +++++++++------------- 4 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 kpov_judge/web/kpov_judge/templates/class_tasks.html diff --git a/kpov_judge/web/kpov_judge/static/style.css b/kpov_judge/web/kpov_judge/static/style.css index 9be13f8..ade0909 100644 --- a/kpov_judge/web/kpov_judge/static/style.css +++ b/kpov_judge/web/kpov_judge/static/style.css @@ -1,15 +1,37 @@ -.hover { - position:relative; +a.back { + text-decoration: none; +} + +body { + margin: 0 auto; + max-width: 60em; + padding: 1em 2em; +} + +h1 { + margin-bottom: 0.5em; +} + +p { + hyphens: auto; + margin-top: 0.5em; + margin-bottom: 0; + padding-top: 0; + text-align: justify; +} + +pre { + margin-left: 1em; } .tooltip { /* hide and position tooltip */ - top:1em; - left:1em; - background-color:black; - color:white; - border-radius:5px; - opacity:0; - position:absolute; + top: 1em; + left: 1em; + background-color: black; + color: white; + border-radius: 5px; + opacity: 0; + position: absolute; -webkit-transition: opacity 0.5s; -moz-transition: opacity 0.5s; -ms-transition: opacity 0.5s; @@ -17,6 +39,10 @@ transition: opacity 0.5s; } +.hover { + position: relative; +} + .hover:hover .tooltip { /* display tooltip on hover */ - opacity:1; + opacity: 1; } diff --git a/kpov_judge/web/kpov_judge/templates/class_tasks.html b/kpov_judge/web/kpov_judge/templates/class_tasks.html new file mode 100644 index 0000000..5a29ae7 --- /dev/null +++ b/kpov_judge/web/kpov_judge/templates/class_tasks.html @@ -0,0 +1,16 @@ + + + +

↩ {{clas.name}}

+ +

+Zdravo, {{student_id}}. + +

+Trenutno so na voljo naloge: + +

{{t}} +{% endfor %} +

diff --git a/kpov_judge/web/kpov_judge/templates/index.html b/kpov_judge/web/kpov_judge/templates/index.html index b5149ab..49895b0 100644 --- a/kpov_judge/web/kpov_judge/templates/index.html +++ b/kpov_judge/web/kpov_judge/templates/index.html @@ -1,20 +1,17 @@ - + + +

KPOV Judge

-Zdravo, {{student_id}} -

-{{env}} -

+Zdravo, {{student_id}}. +

Trenutno so na voljo predmeti: +

{{c.name}}

Navodila lahko najdete na strani LUSY. - - diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 217c0ca..20da231 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -1,14 +1,7 @@ + -

↩ {{task_id}}

Navodila

{{instructions}} @@ -56,25 +42,30 @@ section.disks > section > ul {

Računalniki

+Slike diskov za to nalogo: {% for c in computers %} -

{{c['name']}} {% if 'disk_urls' in c %}
- {{u['name']}}
- {{u['name']}} {% endfor %}
{% else %} Slike navideznih diskov so v izdelavi in bodo kmalu na voljo. {% endif %} -

+ {% endfor %}

{% if backing_images %}

Osnovne slike

+Te slike so enake za vse naloge in jih prenesete samo enkrat. +

{{b}}

Rezultati

Ogledate si lahko: +

rezultate (json)
parametre (json, opisi parametrov)

Ustvari