Merge branch 'improve-web'

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

1 files changed, 24 insertions, 24 deletions

diff --git a/kpov_judge/tasks/set_ip_static_dhcp/task.py b/kpov_judge/tasks/set_ip_static_dhcp/task.py
index aac93f7..0d11f43 100644
--- a/kpov_judge/tasks/set_ip_static_dhcp/task.py
+++ b/kpov_judge/tasks/set_ip_static_dhcp/task.py
@@ -1,30 +1,30 @@
 # kpov_util should be imported by add_assignment.py
 
 instructions = {
-    'si':"""
-Ustvari tri navidezne racunalnike. Za prvega
-uporabi sliko diska simpleArbiterDhcpGW, za drugega sliko diska
-maliNetworkManager, za tretjega sliko diska maliBrezNetworkManager.
-Racunalnike imenujmo enako kot slike diska.
-Na maliBrezNetworkManager poskrbi, da networkmanager ne bo več skrbel
-za omrežni vmesnik, temveč bosta delovala ukaza ifup in ifdown.
-
-Na maliNetworkManager nastavi IP naslov {IP_NM} ter DNS {DNS_NM}.
-Na maliBrezNetworkManager nastavi IP naslov {IP_static} ter DNS {DNS_static}.
-""",
-    'en':"""Create three virtual machines. Use simpleArbiterDhcpGW as the
-disk image for the first, maliNetworkManager as the disk image for the second
-and maliBrezNetworkManager for the third. The virtual machine names can match
-the disks.
-
-Make sure that on maliBrezNetworkManager ifup/ifdown can be used to configure
-the network and that NetworkManager, while still installed, will not manage 
-the network interface. The IP should be {IP_static} and the computer should 
-use the server {DNS_static} as it's DNS.
-
-On maliNetworkManager, set the IP address to {IP_NM} and use {DNS_NM}
-as the DNS.
-"""
+    'si': '''\
+<p>
+Ustvari tri navidezne računalnike. Za prvega uporabi sliko diska <em>simpleArbiterDhcpGW</em>, za drugega sliko diska
+<em>maliNetworkManager</em>, za tretjega sliko diska <em>maliBrezNetworkManager</em>. Računalnike imenujmo enako kot slike diska.
+
+<p>
+Na <em>maliBrezNetworkManager</em> poskrbi, da NetworkManager ne bo več skrbel za omrežni vmesnik, temveč bosta delovala ukaza <code>ifup</code> in <code>ifdown</code>.
+
+<p>
+Na <em>maliNetworkManager</em> nastavi naslov IP <code>{{IP_NM}}</code> ter DNS <code>{{DNS_NM}}</code>.
+
+<p>
+Na <em>maliBrezNetworkManager</em> nastavi naslov IP <code>{{IP_static}}</code> ter DNS <code>{{DNS_static}}</code>.
+''',
+    'en': '''\
+<p>
+Create three virtual machines. Use <em>simpleArbiterDhcpGW</em> as the disk image for the first, <em>maliNetworkManager</em> as the disk image for the second, and <em>maliBrezNetworkManager</em> for the third. The virtual machine names can match the disks.
+
+<p>
+Make sure that on <em> maliBrezNetworkManager</em> <code>ifup</code> and <code>ifdown</code> can be used to configure the network and that NetworkManager, while still installed, will not manage the network interface. The IP should be <code>{{IP_static}}</code> and the computer should  use the server <code>{{DNS_static}}</code> for DNS.
+
+<p>
+On <em>maliNetworkManager</em>, set the IP address to <code>{{IP_NM}}</code> and use <code>{{DNS_NM}}</code> for DNS.
+''',
 }
 
 computers = {