From 4eea296e6e63cb4671a7cc19f00cb85319899015 Mon Sep 17 00:00:00 2001
From: "gasperfele@fri1.uni-lj.si"
 <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>
Date: Wed, 14 Jan 2015 15:37:41 +0000
Subject: Adding howtos now works

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@190 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
---
 kpov_judge/tasks/set_motd/howtos/images/first.PNG  | Bin 3793 -> 0 bytes
 kpov_judge/tasks/set_motd/howtos/images/first.png  | Bin 0 -> 3793 bytes
 kpov_judge/tasks/set_motd/howtos/images/second.PNG | Bin 25542 -> 0 bytes
 kpov_judge/tasks/set_motd/howtos/images/second.png | Bin 0 -> 25542 bytes
 kpov_judge/tasks/set_motd/howtos/si/index.html     |  96 ++++++++++-----------
 kpov_judge/tasks/set_motd/task.py                  |   8 +-
 6 files changed, 51 insertions(+), 53 deletions(-)
 delete mode 100644 kpov_judge/tasks/set_motd/howtos/images/first.PNG
 create mode 100644 kpov_judge/tasks/set_motd/howtos/images/first.png
 delete mode 100644 kpov_judge/tasks/set_motd/howtos/images/second.PNG
 create mode 100644 kpov_judge/tasks/set_motd/howtos/images/second.png

(limited to 'kpov_judge/tasks/set_motd')

diff --git a/kpov_judge/tasks/set_motd/howtos/images/first.PNG b/kpov_judge/tasks/set_motd/howtos/images/first.PNG
deleted file mode 100644
index d3797d7..0000000
Binary files a/kpov_judge/tasks/set_motd/howtos/images/first.PNG and /dev/null differ
diff --git a/kpov_judge/tasks/set_motd/howtos/images/first.png b/kpov_judge/tasks/set_motd/howtos/images/first.png
new file mode 100644
index 0000000..d3797d7
Binary files /dev/null and b/kpov_judge/tasks/set_motd/howtos/images/first.png differ
diff --git a/kpov_judge/tasks/set_motd/howtos/images/second.PNG b/kpov_judge/tasks/set_motd/howtos/images/second.PNG
deleted file mode 100644
index 61bea73..0000000
Binary files a/kpov_judge/tasks/set_motd/howtos/images/second.PNG and /dev/null differ
diff --git a/kpov_judge/tasks/set_motd/howtos/images/second.png b/kpov_judge/tasks/set_motd/howtos/images/second.png
new file mode 100644
index 0000000..61bea73
Binary files /dev/null and b/kpov_judge/tasks/set_motd/howtos/images/second.png differ
diff --git a/kpov_judge/tasks/set_motd/howtos/si/index.html b/kpov_judge/tasks/set_motd/howtos/si/index.html
index 8c6a9a0..bbead62 100644
--- a/kpov_judge/tasks/set_motd/howtos/si/index.html
+++ b/kpov_judge/tasks/set_motd/howtos/si/index.html
@@ -1,49 +1,49 @@
-<!--
-Ustvari dva navidezna računalnika - imenujmo ju Test in Student. Za računalnik Test uporabite
-sliko diska, poimenovano Test. Na računalniku Test dobite kratek niz. Poskrbite, da se bo ta
-kratki niz pojavil v sporočilu, ki se ob prijavi izpiše na računalniku Student. Temu sporočilu v
-angleščini rečemo "message of the day" - MOTD.
-
-Poskrbite, da se bo ob prijavi uporabnika (v Message Of The Day, MOTD) prek ssh izpisal nek niz.
-Računalnik nastavite tako, da bo dostopen s testnega računalnika (Test).
-
-Uporabniško ime in niz dobite kot parametre ob zagonu run_test.py. Pri nizu pazite, saj utegne biti dovolj dolg, da brez premikanja kurzorja ne bo takoj viden.
-
-IP navideznega računalnika ter geslo nastavite sami.
-
-Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . 
-Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v navodilih.
-
-Create two virtual machines - named Test and Student. For the 'Test' use disc image named Test. 
-You receive short string on machine 'Test'. Make sure that this string appears in the message which is displayed 
-after you login to machine 'Student'. This is so called 'message of the day'MOTD.
-
-Make sure that when the user logins via ssh some string is displayed. Set the machine, so that you can reach it from test computer (Test)
-
-You get username and string as parameters when you run run_test.py. Pay attention to the string length, it might not be visible 
-right away without moving the cursor.
-
-Set up IP and password of virtual machine yourself.
-
-Grading system expects, that at the end of login, a command line similar to uporabnisko_ime@ime_racunalnika:~$ appears. 
-Make sure that this line shows up after the string you got in the instructions.
--->
-
-<h2>Naloga na hitro</h2>
-<p></p>
-
-<h2>Navodila</h2>
-<ul>
-	<li>Ustvari dva navidezna računalnika - imenujmo ju Test in Student. Za računalnik Test uporabite sliko diska, poimenovano Test. Na računalniku Test dobite kratek niz. Poskrbite, da se bo ta kratki niz pojavil v sporočilu, ki se ob prijavi izpiše na računalniku Student. Temu sporočilu v angleščini rečemo "message of the day" - MOTD.</li>
-	<li>Poskrbite, da se bo ob prijavi uporabnika (v Message Of The Day, MOTD) prek ssh izpisal nek niz. Računalnik nastavite tako, da bo dostopen s testnega računalnika (Test).</li>
-	<li>Uporabniško ime in niz dobite kot parametre ob zagonu run_test.py. Pri nizu pazite, saj utegne biti dovolj dolg, da brez premikanja kurzorja ne bo takoj viden.</li>
-	<li>IP navideznega računalnika ter geslo nastavite sami.</li>
-	<li>Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v navodilih.</li>
-</ul>
-
-<h2>How To</h2>
-<ol>
-	<li>Prijavi se v računalnik <br /> <img src="../images/first.png"></li>
-	<li>S poljubnim urejevalnikom besedila odpri <b>/etc/motd</b> <br /> <img src="../images/second.png"></li>
-	<li>Nastavite MOTD na vaš dodeljen String</li>
+<!--
+Ustvari dva navidezna raÄŤunalnika - imenujmo ju Test in Student. Za raÄŤunalnik Test uporabite
+sliko diska, poimenovano Test. Na raÄŤunalniku Test dobite kratek niz. Poskrbite, da se bo ta
+kratki niz pojavil v sporočilu, ki se ob prijavi izpiše na računalniku Student. Temu sporočilu v
+angleščini rečemo "message of the day" - MOTD.
+
+Poskrbite, da se bo ob prijavi uporabnika (v Message Of The Day, MOTD) prek ssh izpisal nek niz.
+RaÄŤunalnik nastavite tako, da bo dostopen s testnega raÄŤunalnika (Test).
+
+Uporabniško ime in niz dobite kot parametre ob zagonu run_test.py. Pri nizu pazite, saj utegne biti dovolj dolg, da brez premikanja kurzorja ne bo takoj viden.
+
+IP navideznega raÄŤunalnika ter geslo nastavite sami.
+
+Ocenjevalni program priÄŤakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . 
+Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v navodilih.
+
+Create two virtual machines - named Test and Student. For the 'Test' use disc image named Test. 
+You receive short string on machine 'Test'. Make sure that this string appears in the message which is displayed 
+after you login to machine 'Student'. This is so called 'message of the day'MOTD.
+
+Make sure that when the user logins via ssh some string is displayed. Set the machine, so that you can reach it from test computer (Test)
+
+You get username and string as parameters when you run run_test.py. Pay attention to the string length, it might not be visible 
+right away without moving the cursor.
+
+Set up IP and password of virtual machine yourself.
+
+Grading system expects, that at the end of login, a command line similar to uporabnisko_ime@ime_racunalnika:~$ appears. 
+Make sure that this line shows up after the string you got in the instructions.
+-->
+
+<h2>Naloga na hitro</h2>
+<p></p>
+
+<h2>Navodila</h2>
+<ul>
+	<li>Ustvari dva navidezna računalnika - imenujmo ju Test in Student. Za računalnik Test uporabite sliko diska, poimenovano Test. Na računalniku Test dobite kratek niz. Poskrbite, da se bo ta kratki niz pojavil v sporočilu, ki se ob prijavi izpiše na računalniku Student. Temu sporočilu v angleščini rečemo "message of the day" - MOTD.</li>
+	<li>Poskrbite, da se bo ob prijavi uporabnika (v Message Of The Day, MOTD) prek ssh izpisal nek niz. RaÄŤunalnik nastavite tako, da bo dostopen s testnega raÄŤunalnika (Test).</li>
+	<li>Uporabniško ime in niz dobite kot parametre ob zagonu run_test.py. Pri nizu pazite, saj utegne biti dovolj dolg, da brez premikanja kurzorja ne bo takoj viden.</li>
+	<li>IP navideznega raÄŤunalnika ter geslo nastavite sami.</li>
+	<li>Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v navodilih.</li>
+</ul>
+
+<h2>How To</h2>
+<ol>
+	<li>Prijavi se v raÄŤunalnik <br /> <img src="../images/first.png"></li>
+	<li>S poljubnim urejevalnikom besedila odpri <b>/etc/motd</b> <br /> <img src="../images/second.png"></li>
+	<li>Nastavite MOTD na vaš dodeljen String</li>
 </ol>
\ No newline at end of file
diff --git a/kpov_judge/tasks/set_motd/task.py b/kpov_judge/tasks/set_motd/task.py
index 99d9ec5..b60830c 100644
--- a/kpov_judge/tasks/set_motd/task.py
+++ b/kpov_judge/tasks/set_motd/task.py
@@ -1,5 +1,3 @@
-
-
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
@@ -23,8 +21,8 @@ Uporabniško ime in niz dobite kot parametre ob zagonu run_test.py. Pri nizu paz
 IP navideznega raÄŤunalnika ter geslo nastavite sami.
 
 Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v navodilih.
-
-
+    """,
+    'en':u"""
 Create two virtual machines - named Test and Student. For the 'Test' use disc image named Test. You receive short string on machine 'Test'. Make sure that this string appears in the message which is displayed after you login to machine 'Student'. This is so called 'message of the day'MOTD.
 
 Make sure that when the user logins via ssh some string is displayed. Set the machine, so that you can reach it from test computer (Test)
@@ -66,7 +64,7 @@ params_meta = {
     'peer_ip': {'descriptions': {'si': u'IP raÄŤunalnika'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False},
     'peer_user': {'descriptions': {'si': 'ime uporabnika'}, 'w': False, 'public': True, 'type': 'username', 'generated': True},
     'peer_passwd': {'descriptions': {'si': 'geslo uporabnika'}, 'w': True, 'public': True, 'type': 'alnumstr', 'generated': False},
-    'niz': {'w': False, 'public': True, 'type': 'short_text', 'generated': True},
+    'niz': {'descriptions':{'si': u'niz, ki naj se v motd pokaĹľe'}, 'w': False, 'public': True, 'type': 'short_text', 'generated': True},
 }
 
 def task(peer_ip, peer_user, peer_passwd, niz):
-- 
cgit v1.2.1