HTMLize instructions and use jinja2 to render them

Only fixed tasks for the kpov_2018 class for now.

1 files changed, 25 insertions, 26 deletions

diff --git a/kpov_judge/tasks/set_motd/task.py b/kpov_judge/tasks/set_motd/task.py
index f2b65fb..ea5d686 100644
--- a/kpov_judge/tasks/set_motd/task.py
+++ b/kpov_judge/tasks/set_motd/task.py
@@ -1,41 +1,40 @@
 # kpov_util should be imported by add_assignment.py
 
 instructions = {
-    "si":"""
-Ustvari dva navidezna računalnika - imenujmo ju SimpleArbiterDhcpGW in
-Student. Za računalnik SimpleArbiterDhcpGW uporabite sliko diska, poimenovano
-SimpleArbiterDhcpGW. 
+    'si': '''\
+<p>
+Ustvari dva navidezna računalnika - imenujmo ju <em>SimpleArbiterDhcpGW</em> in <em>Student</em>.
+Na računalniku <em>Student</em> ustvarite uporabnika z uporabniškim imenom <code>{{peer_user}}</code>. IP navideznega računalnika <em>Student</em> ter geslo za uporabnika <code>{{peer_user}}</code> nastavite sami.
 
-Na računalniku Student ustvarite uporabnika z uporabniškim imenom {peer_user}.
+<p>
+Poskrbite, da se bo v sporočilu, ki se ob prijavi izpiše na računalniku <em>Student</em>, pojavil niz
 
-Poskrbite, da se bo v sporočilu, ki se ob prijavi izpiše na računalniku 
-Student, pojavil niz "{niz}". Temu sporočilu v angleščini rečemo 
-"message of the day" - MOTD.
+<pre><code>{{niz}}</code></pre>
 
-IP navideznega računalnika Student ter geslo za {peer_user} nastavite sami.
+<p>
+Temu sporočilu v angleščini rečemo <em lang="en">message of the day</em> oziroma <em>MOTD</em>. Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike
 
-Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna 
-vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . 
+<pre><code>username@hostname:~$ </code></pre>
 
-Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v
-teh navodilih.
-    """,
-    'en':"""
-Create two virtual machines - named SimpleArbiterDhcpGW and Student. 
-For the 'SimpleArbiterDhcpGW', use disc image named SimpleArbiterDhcpGW.
+Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v teh navodilih.
+    ''',
+    'en': '''\
+<p>
+Create two virtual machines named <em>SimpleArbiterDhcpGW</em> and <em>Student</em>. On <em>Student</em>, create a user with the username <code>{{peer_user}}</code>. Set the IP of <em>Student</em> and the password for <code>{{peer_user}}</code> yourself.
 
-On Student, create a user with the username {peer_user}.
+<p>
+Set the <em>message of the day</em> (MOTD) on <em>Student</em> to
 
-Set the message of the day (MOTD) on Student to "{niz}". This is the message
-which is displayed when you log in.
+<pre><code>{{niz}}</code></pre>
 
-Set the IP of Student and the password for {peer_user} yourself.
+<p>
+This is the message which is displayed when you log in. The grading system expects that after login a prompt similar to
 
-The grading system expects that at the end of login, 
-a prompt similar to username@name_of_computer:~$ appears. 
-Make sure that this line shows up only after the 
-string you got in these instructions.
-"""
+<pre><code>username@hostname:~$ </code></pre>
+
+<p>
+appears. Make sure that this line shows up only after the string you got in these instructions.
+'''
 }
 
 computers = {