From 9854f124f0ab6308554e6d859a119ee3dc014db2 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Sat, 5 Apr 2014 13:40:38 +0200
Subject: [PATCH] add login form and registration link to introduction page

---
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 5155 -> 5238 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  56 +++++++++++---------
 views/html/introduction/index.tpl           |  15 +++++-
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 0316091a023312436b2b5ba0812a310a08c95cbb..c7c0f88cbd25e2f99a9e433c21011571a283ba5a 100644
GIT binary patch
delta 1865
zcmZ3i@lB)to)F7a1_lO(AO;2o83qQ1HB1Z)xeN>pHmo2~28Iu83=BLB3=ALH7#M^Y
z7#RMsF)#=)Ffa(RGcbrVFfb^wGca&5FfdrLGcX7<Ffh2XGcfQoFfc?y=}dM825trh
zhDs>i%Fe*R%fP@ek)45olYyb0VLm$p1IVtG><|a6XNOpDhMj>yf`NhIE;|E*Bm)D(
zH>kV-2gE_T91wk091INX3=9koP`(FL-j9QUfsKKIA({i?z$B=6E(Zex2Ll5`6_~DP
zU})xmSlGkCz@Wmwz%ZACfkBmlf#DF;;1?VW49W})3?DckJ`>@D@Krb=>OD9i4$0+Y
zU=U<rU?}E<Slr6Vz`(-5z|g}9v2Y?M#No4`>X(D)dIkoDwVV(aZsufQ&}U#^*vHAh
zV8Fn@@QxD_bn;vf2WoRcd}_l5aexaK#6cNQegzlAL36ku79ZqdU{GLSU^vDFao}?<
z1_nL`28Op>5c~dcF)-AFf`XkJqEUbwVv#A7@5T)YiEM6&0Ta2wamFy68{)%-P<jP7
zB<|Nk`G>h74miclz`(@7z;K=$5;B*d=0AbTf8}PV2gm&{Zivf3DGd~7{5%kg#CRZa
zufPKdLMt8yh69WY49+|dhqCZ7Fo-fRFo^O&_}YAsL}|kZ@nHxb1A_<y14BF?BrTQj
zK@wjtAH+ek`RXBYvX&1Ll)LyKJ~_n)@!>r_1_o&c28O3l3mEws7?c<o7=-v47{nMD
z7)<#Y7}OaU7<~94QB}eZ38@Bthy&W7{E7Sw4Dt*N4Ac1;z=?7@Kg7O$^-zW9_#q*1
zlON*K7yJwiQlM<d&%mI?z`(#G0HMtVAZZ{;0Ag{L03?Ja2{15dg0e4^z9s;12q;B@
zvLl-y#9}c)h`6jE#N+kKf{-9FfGV(q(yma2K7tGkh71f0L4phnRtyXbErO7s-VdcO
z2tpkEP>_K^gMoqJl_137!a@)S>p|&AA&A3UgdmB$M+oeYdWJnhkf1vx1PPLJLJ*hT
z6JlV{VPIf*EyTbe$H2fKA<V#_$H2f~4yDtCAr?;+hUl9o3`sNVp!5!5NZL3ARd+)e
zk|-ZS>1V<qkJK|TycUKehCfh^d?Jvbk`RG7L|z2qavc#!S}=jq0U{6!b3_;z7#SEC
zm>~rwxU>T?EkFbVBwGETY*0xFDqCzBAa+=S@;|6}bz^||hLZsjpN>!sAj$?rFhD{9
zl$t?YI|hiay+Ir(c42^IH%|sg(1X$gR0>?M1u`%&I70<M1(h`e14BKiWCIm8AaPI%
z1<|@70tx$q%6SF`1}6qc_5wu<NE#I1Aljb+k{A_198ggVss|Vt7)%%#7-Sh37`zxD
zX#!Ng*n^^y0UY<BI;S3-s6gd6NUt^nB#1#-3siI(fdm;Kr5K0_N{FVQ{La9@pvC~n
zsvvO>21p_XRZ!qG!T?ERJ`4;D?hFhJ#tfjiW?%>aDTZP*5be166x&@Ek^CZtqSW-v
z;*!)Nh06TWqT<w?w8_i3mob`8_T^D$wA@_EW5O<)pOOkwSCpArl&X-DnVd0sg>W?h
DkSUnN

delta 1777
zcmeySu~?)2o)F7a1_lO(00ssI83qQ1IZO-;*&sG6NR)x$1RDbb4+8_kNj3%sAqED9
zYitY*0t^fcFWDFv#2FYEez7qya4|422(dFT2s1D+$g(pq@G~$l7(!`Bb_ND+1_p*e
zC>_hrz`)DEz>vw#z`)7CP|r}#&cFb&tC1bzfOd9>1xwf&7$g`N7`C!AFi0{mFr0(R
zzhH+rh?N7PPl$toft`VYK?2HG;DE@haWF8jF)%O~b3hzu1r>MYU|`^2U|<LW)AbAt
z(Hsy9Q#cqHR2Uc-N;w!9R2di;W<d=;z`?+v%)r2Kf&=2SH&Ff`sCorXh(laC85jf^
z7#O@cAr{ASGBB_(FfgQWLM+VWggC4Ss=gjX*E29Mv~ogR*v-knpwGa-FpZOe!GM8*
z;TR_*=)QA89LUTC@u>(G#6dD#5C=Ix`2k!I50r30ES|~5z@Wguz%Y*s;=uh}3=Dh>
z3=BuPAogA1VqmBT1;u@+#ur==i+H&q2FY<lLc*CFVn8N0IL;XIxgkERgwhS%khpJ$
z@@I2H9I%KRV%~Bne+Sf@z1$Fo9Oh=I2glJRsKGb6A#wef8xmxHxfvJ^FfuT(@jwhZ
z&db0c%D}*IgBQYo#|ue>|9K%k66a%J5Mf|oP~wB69dkZNVhiAdL`@tYBnk@nAR$-F
zR}XP{FCWB53;7rrq!}0(R`5YAIKs!kpv1tyaFvgNL5zWc;RhcBgE|8P13y0`YRvf|
zA>+&saeyb3AHvVTAkV<S5XBEMw~8NPVIx%CM1DvJ%&F&x_;fWt1A`O;1H%@61_mt#
z28Q!c`WHVW&Q%2<7V8Q?LMT*#fkBgjfgvAC&lG?-<gft5qLTs;i*G{39|%Bv{!9Q8
zBA=o1^^AfLg&cwq1Na3Q7z`O07(@jb7_1l=7~BORA<+b-CksLxyhM<JL4$#TVXYv<
z;nxHq4*v+HWrQFOcNc;rYJVY!`Sn7OkZTnJJG7o*q7cMo3xyaMbQl;I)(J5%$T2W5
z+!kVB&;u1PP+C(MVsV5pSR+HCFeEV+Lg{K@NZM$Hs+%ngNrX#;A#uMFs&2P1#KT90
zLH5=&Fq{#Fxb&tlB<>$V>Az47k|GQYj0_A69t;c&ilD^Bz`)=SDI8HqP?-TL2|=YG
zC<H-S52Qer0TSe(bY%t-U|?YIgVL6u{0}NdL5a$kfq}snDgny>pd#6t0TLRH43J=U
zVt}~b0jka&lo+9G5M=`*7$6}BVyZDPFqnfF3=9l*43H25B}{LqSiKhmBq4#yc#s$<
z3P33xRK|ni7bFHM_nkp?0s|x{-53}cbU_jfkT~^WfFw##)&wP9kQAsO1JNK1%91W1
z1_LAtK}=AQ4Jw5}YzBJ<1_lcT1_o0G1_n<C1_l$bC?pTNGC<-HR0M-cFD3>^0s<vY
sBL)TrW(G)MWee4#z4<NMBbLcexR){-Ozz@QXEfNniN}O}@*m+U0EZ`uuK)l5

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index d02466d2..3ea25979 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-04-05 13:30+0100\n"
-"PO-Revision-Date: 2014-04-05 13:30+0100\n"
+"POT-Creation-Date: 2014-04-05 13:37+0100\n"
+"PO-Revision-Date: 2014-04-05 13:39+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -133,6 +133,36 @@ msgstr "Errungenschaften"
 msgid "Introduction"
 msgstr "Einführung"
 
+#: views/html/introduction/index.tpl:4 views/html/introduction/index.tpl:12
+#: views/html/menu/index.tpl:7 views/html/users/login.tpl:3
+#: views/html/users/login.tpl:14
+msgid "Login"
+msgstr "Login"
+
+#: views/html/introduction/index.tpl:7 views/html/introduction/index.tpl:8
+#: views/html/users/create.tpl:6 views/html/users/create.tpl:7
+#: views/html/users/edit.tpl:6 views/html/users/edit.tpl:7
+#: views/html/users/login.tpl:9 views/html/users/login.tpl:10
+#: views/html/users/register.tpl:76 views/html/users/register.tpl:77
+msgid "Username"
+msgstr "Benutzername"
+
+#: views/html/introduction/index.tpl:9 views/html/introduction/index.tpl:10
+#: views/html/users/create.tpl:14 views/html/users/create.tpl:15
+#: views/html/users/edit.tpl:14 views/html/users/edit.tpl:15
+#: views/html/users/login.tpl:11 views/html/users/login.tpl:12
+#: views/html/users/register.tpl:84 views/html/users/register.tpl:85
+msgid "Password"
+msgstr "Passwort"
+
+#: views/html/introduction/index.tpl:13
+msgid "or"
+msgstr "oder"
+
+#: views/html/introduction/index.tpl:13
+msgid "register yourself"
+msgstr "registriere dich"
+
 #: views/html/menu/index.tpl:3 views/html/users/create.tpl:1
 #: views/html/users/delete.tpl:1 views/html/users/edit.tpl:1
 #: views/html/users/index.tpl:1 views/html/users/login.tpl:1
@@ -150,11 +180,6 @@ msgstr "Benutzergruppen"
 msgid "Seminaries"
 msgstr "Kurse"
 
-#: views/html/menu/index.tpl:7 views/html/users/login.tpl:3
-#: views/html/users/login.tpl:14
-msgid "Login"
-msgstr "Login"
-
 #: views/html/menu/index.tpl:9
 msgid "Logout"
 msgstr "Logout"
@@ -239,13 +264,6 @@ msgstr "Bibliothek"
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: views/html/users/create.tpl:6 views/html/users/create.tpl:7
-#: views/html/users/edit.tpl:6 views/html/users/edit.tpl:7
-#: views/html/users/login.tpl:9 views/html/users/login.tpl:10
-#: views/html/users/register.tpl:76 views/html/users/register.tpl:77
-msgid "Username"
-msgstr "Benutzername"
-
 #: views/html/users/create.tpl:8 views/html/users/create.tpl:9
 #: views/html/users/edit.tpl:8 views/html/users/edit.tpl:9
 #: views/html/users/register.tpl:78 views/html/users/register.tpl:79
@@ -264,13 +282,6 @@ msgstr "Nachname"
 msgid "E‑mail address"
 msgstr "E‑Mail-Adresse"
 
-#: views/html/users/create.tpl:14 views/html/users/create.tpl:15
-#: views/html/users/edit.tpl:14 views/html/users/edit.tpl:15
-#: views/html/users/login.tpl:11 views/html/users/login.tpl:12
-#: views/html/users/register.tpl:84 views/html/users/register.tpl:85
-msgid "Password"
-msgstr "Passwort"
-
 #: views/html/users/delete.tpl:2 views/html/users/user.tpl:5
 msgid "Delete user"
 msgstr "Benutzer löschen"
@@ -401,9 +412,6 @@ msgstr "Rollen"
 #~ msgid "Words"
 #~ msgstr "Wörter"
 
-#~ msgid "Word"
-#~ msgstr "Wort"
-
 #~ msgid "Go on"
 #~ msgstr "Hier geht es weiter"
 
diff --git a/views/html/introduction/index.tpl b/views/html/introduction/index.tpl
index 90ca59f7..007895e4 100644
--- a/views/html/introduction/index.tpl
+++ b/views/html/introduction/index.tpl
@@ -1,6 +1,19 @@
 <h1><?=_('Introduction')?></h1>
 <p>Ein Projekt zum Thema „Gamification im Lehrumfeld“ – basierend auf <a href="http://legende-von-zyren.de">Die Legende von Zyren</a>.</p>
-<p>Entwickler:</p>
+
+<h2><?=_('Login')?></h2>
+<form method="post" action="<?=$linker->link(array('users','login'))?>">
+	<fieldset>
+		<label for="username"><?=_('Username')?>:</label>
+		<input name="username" type="text" placeholder="<?=_('Username')?>" title="<?=_('Username')?>" required="required" /><br />
+		<label for="password"><?=_('Password')?>:</label>
+		<input name="password" type="password" placeholder="<?=_('Password')?>" title="<?=_('Password')?>" required="required" /><br />
+	</fieldset>
+	<input type="submit" name="login" value="<?=_('Login')?>" />
+	<?=_('or')?> <a href="<?=$linker->link(array('users','register'))?>"><?=_('register yourself')?></a>
+</form>
+
+<h2>Entwickler</h2>
 <ul>
 	<li itemscope itemtype="http://schema.org/Person">
 		<span itemprop="name">Oliver Hanraths</span><br />