Merge branch 'improve-web'

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

1 files changed, 43 insertions, 38 deletions

diff --git a/kpov_judge/tasks/snmp_agent_uptime/task.py b/kpov_judge/tasks/snmp_agent_uptime/task.py
index 7b3143c..919fcb4 100644
--- a/kpov_judge/tasks/snmp_agent_uptime/task.py
+++ b/kpov_judge/tasks/snmp_agent_uptime/task.py
@@ -2,44 +2,49 @@
 
 # TODO: finish this.
 instructions = {
-    'si':"""
-Naloga: Postavi tri navidezne racunalnike: 
-- SimpleArbiter s sliko diska simpleArbiterDhcpGW,
-- SNMPServer in 
-- SNMPClient. 
-Napiši program upminutes, ki bo izpisal v minutah koliko casa je racunalnik 
-vklopljen.
-
-Postavi ga na SNMPClient v domaci imenik uporabnika test z geslom test. 
-
-Poskrbi, da bo SNMP strežnik prek SNMP pod 
-OID {SNMP_UPTIME_OID} sporočal, koliko casa je vklopljen 
-v sekundah.
-
-Napiši skripto, poimenovano beri.sh, ki prek SNMP prebere vrednost s 
-simpleArbiterDhcpGWSNMP na OID {SNMP_CLIENT_OID} kot član skupnosti
-"testers".
-
-Postavi jo na SNMP klienta, v domaci imenik uporabnika test z geslom test.
-
-Poskrbi, da bodo podatki na SNMPServer dostopni za skupino (community) studentje.
-""",
-    'en':"""
-Set up three virtual computers, SimpleArbiter with the disk image simpleArbiterDhcp,
-SNMPServer and SNMPClient. Write a program called upminutes. This program should output
-the uptime of the computer in minutes. Set it up on SNMPClient in the home directory
-of the user test with the password test.
-
-Make sure that the SNMP server reports it's uptime in seconds over SNMP under 
-OID {SNMP_UPTIME_OID}.
-
-Write a script called beri.sh that reads the value from the OID
-{SNMP_CLIENT_OID} on simpleArbiterDhcpGWSNMP as a member of the
-community "testers". 
-Set it up on SNMPClient in the home directory of the user test.
-
-Make all the data available over SNMP readable by the "studentje" community.
-"""
+    'si': '''\
+<p>
+Postavi tri navidezne računalnike: <em>SimpleArbiter</em>, <em>SNMPServer</em> in <em>SNMPClient</em>.
+
+<p>
+Napiši program <code>upminutes</code>, ki bo izpisal v minutah, koliko časa je racunalnik vklopljen. Postavi ga na <em>SNMPClient</em> v domači imenik uporabnika <code>test</code> z geslom <code>test</code>.
+
+<p>
+Poskrbi, da bo strežnik SNMP pod OID
+
+<pre><code>{{SNMP_UPTIME_OID}}</code></pre>
+
+<p>
+sporočal, koliko časa je vklopljen v sekundah.
+
+<p>
+Napiši skripto, poimenovano <code>beri.sh</code>, ki prek SNMP prebere vrednost s <em>simpleArbiterDhcpGWSNMP</em> na OID 
+
+<pre><code>{{SNMP_CLIENT_OID}}</code></pre>
+
+<p>
+kot član skupnosti <code>testers</code>. Postavi jo na <em>SNMPClient</em>, v domači imenik uporabnika <code>test</code>. Poskrbi, da bodo podatki na SNMPServer dostopni za skupino (angl. <em lang="en">community</em>) <code>studentje</code>.
+''',
+    'en': '''\
+<p>
+Set up three virtual computers: <em>SimpleArbiter</em>, <em>SNMPServer</em> and <em>SNMPClient</em>.
+
+<p>
+Write a program called <code>upminutes</code>. This program should output the uptime of the computer in minutes. Set it up on <em>SNMPClient</em> in the home directory of the user <code>test</code> with the password <code>test</code>.
+
+<p>
+Make sure that the SNMP server reports its uptime in seconds over SNMP under OID
+
+<pre><code>{{SNMP_UPTIME_OID}}</code></pre>
+
+<p>
+Write a script called <code>beri.sh</code> that reads the value from the OID
+
+<pre><code>{{SNMP_CLIENT_OID}}</code></pre>
+
+<p>
+on <em>simpleArbiterDhcpGWSNMP</em> as a member of the community <code>testers</code>. Set it up on <em>SNMPClient</em> in the home directory of the user <code>test</code>. Make all the data available over SNMP readable by the community <code>studentje</code>.
+''',
 }
 
 computers = {