Merge branch 'improve-web'

Store instructions in HTML and render with jinja2. Add i18n with
gettext / pybabel. Improve styling.

1 files changed, 23 insertions, 23 deletions

diff --git a/kpov_judge/tasks/nat_vlc/task.py b/kpov_judge/tasks/nat_vlc/task.py
index ffcb6c1..5224495 100644
--- a/kpov_judge/tasks/nat_vlc/task.py
+++ b/kpov_judge/tasks/nat_vlc/task.py
@@ -7,29 +7,29 @@
 #TODO: finish this
 
 instructions = {
-    'si':"""
-Postavi dva navidezna računalnika - SimpleArbiter z diskom simpleArbiter
-ter NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo povezan
-na lokalno omrežje, na katerem naj bo tudi simpleArbiter, z drugim pa na 
-Internet. Na NATServer skonfiguriraj omrežne vmesnike tako, da bo imel dostop
-do Interneta in da bo imel na lokalnem omrežju {IP_NAT}. Na NATServer
-ustvarite še uporabnika {IP_NAT_user}.
-
-Poskrbi, da bo SimpleArbiter prek DHCP dobil naslov {IP_simple}.
-Poskrbi, da bo NATServer deloval kot prehod za SimpleArbiter in izvajal NAT.
-""",
-        'en':"""
-Set up two virtual machines - SimpleArbiter (using the disc simpleArbiter) and
-NATServer. NATServer should have two network adapters. Connect the first
-adapter to SimpleArbiter and the second adapter to the Internet. Configure the
-network in NATServer so that one interface is connected to the Internet while
-the other is connected to SimpleArbiter and has the address {IP_NAT}. Create
-a user called {IP_NAT_user} on NATServer.
-
-Configure a DHCP server on NATServer so that SimpleArbiter gets the IP
-{IP_simple}. Also, set up NAT on NATServer and set it as the gateway for 
-SimpleArbiter.
-"""
+    'si': '''\
+<p>
+Postavi dva navidezna računalnika: <em>SimpleArbiter</em> in <em>NATServer</em>. <em>NATServer</em> naj ima dva omrežna vmesnika - z enim naj bo povezan na lokalno omrežje, na katerem naj bo tudi simpleArbiter, z drugim pa na Internet.
+
+<p>
+Na <em>NATServer</em> skonfiguriraj omrežne vmesnike tako, da bo imel dostop do Interneta in da bo imel na lokalnem omrežju <code>{{IP_NAT}}</code>. Na <em>NATServer</em> ustvarite še uporabnika <code>{{IP_NAT_user}}</code>.
+
+<p>
+Poskrbi, da bo <em>SimpleArbiter</em> prek DHCP dobil naslov <code>{{IP_simple}}</code>. Poskrbi, da bo <em>NATServer</em> deloval kot prehod za <em>SimpleArbiter</em> in izvajal NAT.
+''',
+        'en': '''\
+<p>
+Set up two virtual machines: <em>SimpleArbiter</em> and
+<em>NATServer</em>. <em>NATServer</em> should have two network
+adapters. Connect the first adapter to <em>SimpleArbiter</em> and the
+second adapter to the Internet.
+
+<p>
+Configure the network in <em>NATServer</em> so that one interface is connected to the Internet while the other is connected to <em>SimpleArbiter</em> and has the address <code>{{IP_NAT}}</code>. Create a user called <code>{{IP_NAT_user}}</code> on <em>NATServer</em>.
+
+<p>
+Configure a DHCP server on <em>NATServer</em> so that <em>SimpleArbiter</em> gets the IP <code>{{IP_simple}}</code>. Also, set up NAT on <em>NATServer</em> and set it as the gateway for <em>SimpleArbiter</em>.
+''',
 }
 
 computers = {