1 files changed, 64 insertions, 21 deletions
diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html
index 422f14b..217c0ca 100644
--- a/kpov_judge/web/kpov_judge/templates/task_greeting.html
+++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html
@@ -1,23 +1,65 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<body>
+<html lang="{{lang}}">
+
+<style>
+body {
+    margin: 0 auto;
+    max-width: 60em;
+    padding: 1em 2em;
+}
+body > h1 {
+    margin-bottom: 0.5em;
+}
+img.setup {
+    border: 1px solid black;
+    border-radius: 0.2em;
+    float: right;
+    margin-left: 1.5em;
+    max-width: 20em;
+}
+p {
+    hyphens: auto;
+    margin-top: 0;
+    padding-top: 0;
+    text-align: justify;
+}
+pre {
+    margin-left: 1em;
+}
+section.data {
+    columns: 2;
+}
+section.data > section {
+    display: inline-block;
+}
+section.disks > section > h1 {
+    margin-bottom: 0;
+}
+section.disks > section > ul {
+    list-style-position: inside;
+    margin: 0.5em;
+    padding-left: 0;
+}
+</style>
+
 <h1>{{task_id}}</h1>
-<h2>Navodila</h2>
-<pre>
+
+<section>
+<h1>Navodila</h1>
+
+<a href="setup.png"><img src="setup.png" class="setup"></a>
 {{instructions}}
-</pre>
-<p>
+
 <p>
-<a href='howto/'>Podrobna navodila (HOWTO)</a>
-</p>
+<a href="howto/">Podrobna navodila (HOWTO)</a>
+</section>
 
-<section class="images">
-<h2>Računalniki v vaji</h2>
+<section class="data">
+<section class="disks">
+<h1>Računalniki</h1>
 
-<section>
 {% for c in computers %}
-  <h3>{{c['name']}}</h3>
+  <section>
+  <h1>{{c['name']}}</h1>
   {% if 'disk_urls' in c %}
   <ul>
     {% for u in c['disk_urls'] %}
@@ -27,16 +69,12 @@
   {% else %}
   Slike navideznih diskov so v izdelavi in bodo kmalu na voljo.
   {% endif %}
+  </section>
 {% endfor %}
 
-<p>
-<img src="setup.png">
-</p>
-</section>
-
 <section>
 {% if backing_images %}
-<h3>Osnovne slike</h3>
+<h1>Osnovne slike</h1>
 <ul>
 {% for b in backing_images %}
   <li><a href={{disk_base_url+b}}>{{b}}</a></li>
@@ -46,8 +84,10 @@
 </section>
 </section>
 
+<section>
+<h1>Rezultati</h1>
 <p>
-Lahko si ogledate surove:
+Ogledate si lahko:
 <ul>
 <li><a href='results.html'>rezultate</a> (<a href='../results.json'>json</a>)</li>
 <li><a href='params.html'>parametre</a> (<a href='../params.json'>json</a>, <a href='../params_meta.json'>opisi parametrov</a>)</li>
@@ -55,11 +95,14 @@ Lahko si ogledate surove:
 </ul>
 </p>
 
+{#
 <p>
 {% if openstack %}
 Openstack projekt za to vajo je že ustvarjen ali v izdelavi (funkcionalnost še ne deluje).
 {% else %}
 <a href='?narediStack=true'>Ustvari</a> Openstack projekt za to vajo (funkcionalnost še ne deluje).
 {% endif %}
+#}
+
 </body>
 </html>