From 28739b95d00a4afb00754abc2b672a116ef81194 Mon Sep 17 00:00:00 2001
From: Konrad Mohrfeldt <konrad.mohrfeldt@farbdev.org>
Date: Fri, 4 Mar 2011 21:46:05 +0100
Subject: [PATCH] olol

---
 k4ever/k4ever.db                              | Bin 62464 -> 62464 bytes
 k4ever/main/templates/registration/login.html |  22 +-----------------
 .../templates/registration/loginForm.html     |  21 +++++++++++++++++
 .../main/templates/registration/logout.html   |   7 +++++-
 k4ever/media/css/style.css                    |   1 -
 5 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 k4ever/main/templates/registration/loginForm.html

diff --git a/k4ever/k4ever.db b/k4ever/k4ever.db
index 1c88490835c2c93c3dd29a7414014d3bd836008d..9b3007c052d6df5ed559282708512d0b2425c46c 100644
GIT binary patch
delta 1319
zcmaizUuauZ9LLZ3{cip&rcFxv(7H)8Xh&D*<(zxZy}3ylH98!2rYly|?LoQ8y;++r
zsU(?`?xCB$tJmOz;=>AK2>KE)jJ@w=J}n?vr?SZ^SaisQ;dBhPlbc0p9hkt6dk(+v
z=l4Co-#KTu@az_TxSOtfd!7%ilj&Pex1IBP6yPSoI^1k~-@w|rB*e++=$PK1l<NA4
zm0I0)4hONYvQ#g-C!J<*^Vw>DtvYUF$>!rFr(7<MTeib2UJ}AIGp6kdkzuS{vW&8+
zWs4?bc2VdS(_G2d80XVWpJpPhv7DC48N=3p_JrB0XFiGo-X?e(@A*T@Pxw>}M`_On
z`1fW8hGPKx2&P~k-E4as6e#n&*~xPiB~*B~l()E{3&-V-;I5g;TDo2`i=v!mLNL3W
zv05{WXXfVkOV#;`{8x`1np-MVj`G66(&~{zh12t^^Cx05R0`D>SC72%>hiJ5Q4#AK
z<yPN(R@LO81#hJm|A+y41U<Zjm!#wOaQ`?K=>Pdpx=F3wi)sJ+*QQ1=L2tAoZ#@I_
zM%%kgrzR62LL+&Y{rZ#c@6*14UiWl8$1GKsz2%l4tv{fcgib5c90TaIz0V;vlnhHb
zrHQ_tP=E97y;OE~li;7YDSd9>o*_`k1ikWE(XF3$mm8;Q$7z%*Bt@UgzwAFe6H>wy
zuM@m3v#+5(K_i6HJe3{aVTb1op_&<uS^5GQAcO$kA@~>Gk;0!b5te17Y9TDy@+SBX
zfB75J03nnM+D(tb2*GRkJ{EBdeuXcf0we1ltSv-$5m_%WN*8xjv~s$oGHzro0jNE`
z9p&YEqxojduDa<{H79-2?yru!S1!~Xx877|BR%2)I<SMt<(*Uw-P9O^!5(qVNl(h>
z&|GOW?V6KIGnMV92f{r<_DKYxW;wH@r$OFui}n-bdZ;I#*eTbtIi0DT8HO+*u62j9
z_Rm!EN>7!dGuv%T6*p8PV+kfzT+R&+yUR5<{epbFZaw|)$)~W7*m3eMf~gvpPnY))
zbQXeK|Kkr<4*JS>7ZD)Q`f}rSOyc=g<icJ#)^{-6onIo^y7<Ez+xFwZT$4czRK9Zc
zz9i7Et}4oK6gvd(<6Zn6x9}GJh~HvI;x6NOR{+r<MuHd=fKc$Q1QGqaza<|tI@>7$
cgLShoU<?L~!GIAD81aA+$8OH9;POT3BhdLm6951J

delta 241
zcmZp8!QAkId4e=!*F+g-)-DF!N75Tp78tWJG8Zv07i|_~$zYybWIhSV|IWbt9ms#n
zy!pE|uLuVtvoHg*Fw^Ia6JIhhG4f7yl$k6X{1GU;je&U^^KGEYRm?0Z%)X41rGphV
z-wM}~VCG}un9N=vyK&+Z#?2f>e;AqhnI2DOFOlCkaWB*6$7PC)i&+F%7PHg<u>cPT
z6LTK}^Lgezph->4oBR69T$uTo*Gy(#A`2AhV4l3-KI`O-*Mm2+Tv^6EdDZPGFoThC
i^6Kl6i&<81Y-Z{B!o2y%YaSLbi-VJim6?%|gAo9|Bu+vA

diff --git a/k4ever/main/templates/registration/login.html b/k4ever/main/templates/registration/login.html
index af1af16..42aac76 100644
--- a/k4ever/main/templates/registration/login.html
+++ b/k4ever/main/templates/registration/login.html
@@ -2,26 +2,6 @@
 
 {% block "content" %}
 
-{% if form.errors %}
-<div class="error">
-	<h2>Deine Logindaten sind fehlerhaft</h2>
-	<p>Versuch es nochmal, aber achte auf CAPSLOCK und tippe nicht so schnell.</p>
-	<p>Falls du dein Passwort vergessen haben solltest (oder es nicht geht..), 
-	dann melde dich bei deiner <a href="http://www.antifa.de/cms/">Local Antifa</a> 
-	oder einem Admin <a href="http://superfluousandsparse.blogspot.com/">
-	unserer Wahl</a>.</p>
-</div>
-{% endif %}
-
-<form class="login" method="post" action="/user/login/">
-{% csrf_token %}
-<fieldset>
-    <p>{{ form.username.label_tag }} {{ form.username }}</p>
-    <p>{{ form.password.label_tag }} {{ form.password }}</p>
-</fieldset>
-
-<input type="submit" value="Anmelden" />
-<input type="hidden" name="next" value="{{ next }}" />
-</form>
+{% include "registration/loginForm.html" %}
 
 {% endblock %}
diff --git a/k4ever/main/templates/registration/loginForm.html b/k4ever/main/templates/registration/loginForm.html
new file mode 100644
index 0000000..f379cb0
--- /dev/null
+++ b/k4ever/main/templates/registration/loginForm.html
@@ -0,0 +1,21 @@
+{% if form.errors %}
+<div class="error">
+	<h2>Deine Logindaten sind fehlerhaft</h2>
+	<p>Versuch es nochmal, aber achte auf CAPSLOCK und tippe nicht so schnell.</p>
+	<p>Falls du dein Passwort vergessen haben solltest (oder es nicht geht..), 
+	dann melde dich bei deiner <a href="http://www.antifa.de/cms/">Local Antifa</a> 
+	oder einem Admin <a href="http://superfluousandsparse.blogspot.com/">
+	unserer Wahl</a>.</p>
+</div>
+{% endif %}
+
+<form class="login" method="post" action="/user/login/">
+{% csrf_token %}
+	<fieldset>
+		<p>{{ form.username.label_tag }} {{ form.username }}</p>
+		<p>{{ form.password.label_tag }} {{ form.password }}</p>
+	</fieldset>
+
+	<input type="submit" value="Anmelden" />
+	<input type="hidden" name="next" value="{{ next }}" />
+</form>
\ No newline at end of file
diff --git a/k4ever/main/templates/registration/logout.html b/k4ever/main/templates/registration/logout.html
index 418f7ce..15ff040 100644
--- a/k4ever/main/templates/registration/logout.html
+++ b/k4ever/main/templates/registration/logout.html
@@ -1,5 +1,10 @@
 {% extends "base.html" %}
 
 {% block "content" %}
-FIXME: KKTHXBYE
+<div class="success">
+	<h2>Du hast dich erfolgreich abgemeldet</h2>
+</div>
+
+{% include "registration/loginForm.html" %}
+
 {% endblock %}
diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css
index ebbcdde..f89a96e 100644
--- a/k4ever/media/css/style.css
+++ b/k4ever/media/css/style.css
@@ -179,7 +179,6 @@ form.login input[type=submit] {
 
 .error, .notice, .success {
   border-top: 1px solid #DDD;
-  margin-bottom: 1em;
   padding: 0.6em 0.8em;
   position: fixed;
   bottom: 0;