Merge branch 'improve-web'

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

1 files changed, 18 insertions, 21 deletions

diff --git a/kpov_judge/tasks/vlc_stream_rtp/task.py b/kpov_judge/tasks/vlc_stream_rtp/task.py
index bfdfb4f..427fc0e 100644
--- a/kpov_judge/tasks/vlc_stream_rtp/task.py
+++ b/kpov_judge/tasks/vlc_stream_rtp/task.py
@@ -4,31 +4,28 @@
 # TODO: finish this
 
 instructions = {
-    'si':"""
-Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter
-ter StudentVLC z diska student-VLC. Poskrbi, da bosta na istem omrežju, od
-koder bosta imela dostop tudi do Interneta Na StudentVLC posodobi datoteko 
-/etc/apt/sources.list, preveri posodobitve in naloži VLC.
+    'si': '''\
+<p>
+Postavi navidezni računalnik <em>SimpleArbiter</em> in <em>StudentVLC</em>. Poskrbi, da bosta na istem omrežju, od koder bosta imela dostop tudi do interneta.
 
-Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na 
-lokalnem omrežju prek RTP z imenom toka {TOK} na naslovu {NASLOV}, vrata {PORT}.
-Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic
-je pri reševanju te naloge strogo prepovedano.
-""",
-     'en':"""
-Set up a virtual computer called SimpleArbiter using the simpleArbiter disk and
-a virtual computer called StudentVLC using the student-VLC disk. Make sure they
+<p>
+Na <em>StudentVLC</em> posodobi datoteko <code>/etc/apt/sources.list</code>, preveri posodobitve in naloži VLC.
+
+<p>
+Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na lokalnem omrežju prek RTP z imenom toka <code>{{TOK}}</code> na naslovu <code>{{NASLOV}}</code>, vrata <code>{{PORT}}</code>. Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic je pri reševanju te naloge strogo prepovedano.
+''',
+     'en': '''\
+<p>
+Set up a virtual computer called <em>SimpleArbiter</em> using the simpleArbiter disk and
+a virtual computer called <em>StudentVLC</em> using the student-VLC disk. Make sure they
 are on the same network and that they have access to the Internet.
-On StundentVLC, update /etc/apt/sources.list, check the for updates and install
-VLC.
 
-Record or otherwise create a movie and make sure the movie is avaliable
-on your local network via RTP with the name of the stream {TOK} at the address
-{NASLOV} on port {PORT}.
-Take into account that the movie may be seen by your classmates. 
-Copyright infrigement while solving this task is strictly prohibited.  
+<p>
+On StundentVLC, update /etc/apt/sources.list, check the for updates and install VLC.
 
-"""
+<p>
+Record or otherwise create a movie and make sure the movie is avaliable on your local network via RTP with the name of the stream <code>{{TOK}}</code> at the address <code>{{NASLOV}}</code> on port <code>{{PORT}}</code>. Take into account that the movie may be seen by your classmates. Copyright infrigement while solving this task is strictly prohibited.
+''',
 }
 
 computers = {