From c5a8b2c72841ad0b58fb36870624737634778056 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Sat, 13 Oct 2018 03:10:03 +0200
Subject: HTMLize instructions and use jinja2 to render them

Only fixed tasks for the kpov_2018 class for now.
---
 kpov_judge/tasks/smb_nfs/task.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'kpov_judge/tasks/smb_nfs/task.py')

diff --git a/kpov_judge/tasks/smb_nfs/task.py b/kpov_judge/tasks/smb_nfs/task.py
index a94d677..6d1e51d 100644
--- a/kpov_judge/tasks/smb_nfs/task.py
+++ b/kpov_judge/tasks/smb_nfs/task.py
@@ -2,24 +2,26 @@
 
 # TODO: dokoncaj!
 instructions = {
-    'si':"""
-Postavi dva navidezna računalnika (simpleArbiterDhcp in FileServer).
+    'si': '''\
+<p>
+Postavi dva navidezna računalnika: <em>simpleArbiterDhcp</em> in <em>FileServer</em>.
 
-Poskrbi, da bo imenik {NFS_MOUNT} na FileServer dostopen prek NFS in 
-prek SMB kot imenik v skupni rabi {SMB_SHARENAME}. 
-Ime SMB strežnika nastavite na {FILESERVER_NAME}.
+<p>
+Poskrbi, da bo imenik <code>{{NFS_MOUNT}}</code> na <em>FileServer</em> dostopen prek NFS in prek SMB kot imenik v skupni rabi <code>{{SMB_SHARENAME}}</code>. Ime strežnika SMB nastavite na <code>{{FILESERVER_NAME}}</code>.
 
-SimpleArbiterDhcp naj ima prek NFS pravico pisati po imeniku.
-""",
-'en':"""
-Set up two virtual computers (simpleArbiterDhcp and FileServer).
+<p>
+<em>SimpleArbiterDhcp</em> naj ima prek NFS pravico pisati po imeniku.
+''',
+    'en': '''\
+<p>
+Set up two virtual computers: <em>simpleArbiterDhcp</em> and <em>FileServer</em>.
 
-Make sure that the directory {NFS_MOUNT} on FileServer is accessible
-over NFS and over SMB under the sharename {SMB_SHARENAME}.
-Set the SMB server name to {FILESERVER_NAME}.
+<p>
+Make sure that the directory <code>{{NFS_MOUNT}}</code> on <em>FileServer</em> is accessible over NFS and over SMB under the sharename <code>{{SMB_SHARENAME}}</code>. Set the SMB server name to <code>{{FILESERVER_NAME}}</code>.
 
-SimpleArbiterDhcp should have write access to {NFS_MOUNT} over NFS.
-"""
+<p>
+<em>SimpleArbiterDhcp</em> should have write access to <code>{{NFS_MOUNT}}</code> over NFS.
+''',
 }
 
 computers = {
-- 
cgit v1.2.1