Merge branch 'improve-web'

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

1 files changed, 4 insertions, 4 deletions

diff --git a/kpov_judge/tasks/copy_rename_100_files/task.py b/kpov_judge/tasks/copy_rename_100_files/task.py
index 051f9f7..9dcf69a 100644
--- a/kpov_judge/tasks/copy_rename_100_files/task.py
+++ b/kpov_judge/tasks/copy_rename_100_files/task.py
@@ -6,20 +6,20 @@
 
 instructions = {
     'si':"""
-Ustvari dva navidezna računalnika. Za prvega uporabi sliko diska simpleArbiterDhcp. Na drugem računalniku
+<pre>Ustvari dva navidezna računalnika. Za prvega uporabi sliko diska simpleArbiterDhcp. Na drugem računalniku
 ustvari uporabnika test z geslom test.
 Na sliki diska simpleArbiterDhcp najdeš imenik s 100 datotekami. Prekopiraj vse datoteke na drugi računalnik v domači imenik uporabnika test.
 Spremeni vsebino datotek tako, da vse male črke spremeniš v velike.  Poskrbi, da se bo s prvega računalnika (simpleArbiterDhcp) mogoče prek
-ssh prijaviti na drugi računalnik in prebrati predelane datoteke.
+ssh prijaviti na drugi računalnik in prebrati predelane datoteke.</pre>
 """,
     'en': '''
-Create two virtual machines. For the first, use the `simpleArbiterDhcp' image.
+<pre>Create two virtual machines. For the first, use the `simpleArbiterDhcp' image.
 On the second machine, create a user `test' with the password `test'.
 The `simpleArbiterDhcp' disk image contains a folder with 100 files. Copy all
 of these files to the other computer into the home folder of theuser `test'.
 Modify the content of these files by converting all lowercase letters into
 uppercase. Make sure that the first machine (`simpleArbiterDhcp') can use ssh
-to access the second machine and read the processed files.
+to access the second machine and read the processed files.</pre>
 ''',
 }