about screen mockup; TODO: text&design -> Loni&Saša

6 files changed, 6 insertions, 2 deletions

diff --git a/res/MIZS_slo.png b/res/MIZS_slo.png
new file mode 100644
index 0000000..beb955a
--- /dev/null
+++ b/res/MIZS_slo.png
diff --git a/res/ai_lab_logo.png b/res/ai_lab_logo.png
new file mode 100644
index 0000000..31c5f0c
--- /dev/null
+++ b/res/ai_lab_logo.png
diff --git a/res/en.json b/res/en.json
index 2f65bab..6d96f22 100644
--- a/res/en.json
+++ b/res/en.json
@@ -65,5 +65,7 @@
   "upgrade_to_aai_body_text_1": "<p>User with this email address already exists.</p><p>Enter its password and select <span class=\"badge\">Yes</span> to upgrade it to AAI.</p>",
   "upgrade_to_aai_body_text_2": "<p>Select <span class=\"badge\">No</span> to do a separate account.</p>",
   "upgrade_to_aai_no_button": "No, make new",
-  "upgrade_to_aai_yes_button": "Yes, upgrade to AAI"
+  "upgrade_to_aai_yes_button": "Yes, upgrade to AAI",
+  "about": "About",
+  "about_html" : "<p>CodeQ™ is the ...<div class=\"about-logos\"><div style=\"width: 29%;\"><img src=\"res/fri_logo.png\"></div><div class=\"vertical-line\"></div><div style=\"width: 29%;\"><img src=\"res/ai_lab_logo.png\"></div></div><hr><p>Programming by Guru Ltd, Ljubljana, Slovenia. Design by Loni DBS Ltd, Ljubljana, Slovenia.</p><hr></p>The project was co-funded by European Regional Development Fund and Slovenian Ministry of Education, Science, and Sport.<p></p><div class=\"about-logos\"><div style=\"width: 45%;\"><img src=\"res/nalozba_v_vaso_prihodnost.png\" style=\"max-height: 80%;max-width: 80%;\"></div><div class=\"vertical-line\"></div><div style=\"width: 45%;\"><img src=\"res/MIZS_slo.png\" style=\"max-height: 60%;max-width: 60%;\"></div></div><hr><h3>Contact</h3><p>Aleksander Sadikov, PhD, project leader.</p><hr><h3>Minimal requirements</h3><p>Android: version 3.1, iOS: version 5, Windows Phone: version 8</p>"
 }
diff --git a/res/fri_logo.png b/res/fri_logo.png
new file mode 100644
index 0000000..fb57432
--- /dev/null
+++ b/res/fri_logo.png
diff --git a/res/nalozba_v_vaso_prihodnost.png b/res/nalozba_v_vaso_prihodnost.png
new file mode 100644
index 0000000..62035c1
--- /dev/null
+++ b/res/nalozba_v_vaso_prihodnost.png
diff --git a/res/sl.json b/res/sl.json
index d6bb0c5..bbfd71d 100644
--- a/res/sl.json
+++ b/res/sl.json
@@ -65,5 +65,7 @@
   "upgrade_to_aai_body_text_1": "<p>Uporabnik s tem e-poštnim naslovom že obstaja.</p><p> Vnesite geslo in izberite <span class=\"badge\">Da</span>, da ga nadgradite na AAI.</p>",
   "upgrade_to_aai_body_text_2": "<p>Izberite <span class=\"badge\">Ne</span>, če želite narediti poseben račun.</p>",
   "upgrade_to_aai_no_button": "Ne, naredite novega",
-  "upgrade_to_aai_yes_button": "Da, nadgradite na AAI"
+  "upgrade_to_aai_yes_button": "Da, nadgradite na AAI",
+  "about": "O aplikaciji",
+  "about_html" : "<h3>Naziv operacije</h3><p>Učenje programiranja s samodejno generiranimi namigi.</p><hr><h3>Kratek opis operacije</h3><p>Razvita je bila e-storitev in mobilno aplikacija za inteligentni sistem poučevanja. Samostojno učenju programiranja prek reševanja programerskih nalog smo nadgradili z ekspertnim modulom za opozarjanje na napake in samodejno generiranje namigov, ter modulom za testiranje programov (uporabnikovih rešitev) s samodejno generiranimi testnimi primeri. Poleg tega je bil razvit modul za povezavo z mobilnimi roboti, ki bo omogočil poganjanje programov na le-teh.</p><hr><h3>Upravičenci</h3><p>Univerza v Ljubljani (Fakulteta za računalništvo in informatiko, Laboratorij za umetno inteligenco)</p><div class=\"about-logos\"><div style=\"width: 29%;\"><img src=\"res/fri_logo.png\"></div><div class=\"vertical-line\"></div><div style=\"width: 29%;\"><img src=\"res/ai_lab_logo.png\"></div></div><hr><h3>Stroški operacije</h3><p>X EUR od tega Y EUR iz javnih virov financiranja (85% Evropska unija, 15% Ministrstvo za izobraževanje, znanost in šport).</p><hr><h3>Datum operacije</h3><p>Operacija je potekala od d.m.2015 do 30.9.20135</p><hr><h3>Kontaktna oseba</h3><p>dr. Aleksander Sadikov, vodja projekta.</p><p>Operacijo delno financira Evropska unija iz Evropskega sklada za regionalni razvoj ter Ministrstvo za izobraževanje, znanost in šport. Operacija se izvaja v okviru Operativnega programa krepitve regionalnih razvojnih potencialov v obdobju 2007-2013, razvojne prioritete: gospodarska razvojna infrastruktura; prednostne usmeritve: Informacijska družba.</p><div class=\"about-logos\"><div style=\"width: 45%;\"><img src=\"res/nalozba_v_vaso_prihodnost.png\" style=\"max-height: 80%;max-width: 80%;\"></div><div class=\"vertical-line\"></div><div style=\"width: 45%;\"><img src=\"res/MIZS_slo.png\" style=\"max-height: 60%;max-width: 60%;\"></div></div><hr><h3>Mobilna aplikacija - minimalne zahteve</h3><p>Android: verzija 3.1, iOS: verzija 5, Windows Phone: verzija 8.</p><hr><p>Razvoj aplikacije: Guru d.o.o. Oblikovanje: LONI DBS d.o.o.</p>"
 }