From 6d8c51e898288e153722d04d71cea546e9639532 Mon Sep 17 00:00:00 2001
From: phear <phear@systemausfall.org>
Date: Sun, 18 Apr 2010 10:41:41 +0000
Subject: [PATCH] slight changes on poll creation form; started brainstorming
 content

---
 wortschlucker/database.sqlite                 | Bin 7168 -> 7168 bytes
 .../media/images/poll_new_button.png          | Bin 1261 -> 1507 bytes
 .../media/images/poll_new_button.svg          |  48 ++++++++++++------
 wortschlucker/templates/media/style.css       |  23 +++++++--
 .../templates/nodes/brainstorming.html        |  34 ++++++++-----
 wortschlucker/templates/poll_new.html         |   5 +-
 6 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/wortschlucker/database.sqlite b/wortschlucker/database.sqlite
index a6a138d1e2bf5dd0883cc49d09dd7ae57771f7cb..2b113063b3b49b4044a9308f3834700b1d07d199 100644
GIT binary patch
delta 234
zcmY+-Jx&8b3_#)8tRU%Dp`d{x4P_*I?3uN<q($jcgXYI`ffSSpHvox?peWa&<^VYW
z2rBxg_Z{RQuQwfi+<x^}b9Z+Ad%v0;XLsGH+q(1H%jf=azHq~4GYpiXa^yf7wIO4R
z2{cNym<7o~m5_@G7vixXTMHQ)B^_(bl@+w6od<+9@ET=>ej=PepDq_}`S*W@qB%g;
vf=EnNQ-%AG493*Ndx)d9S`e&2Zl2AuYNcN`C9$7wXa5B+lh@<v;^F!mc>+Dd

delta 37
tcmZp$Xt0<d&1kq$<^?k!E8|uM<|)hyOq-ch8Mkg0<XFtOc`K{87y!ll3RwUE

diff --git a/wortschlucker/templates/media/images/poll_new_button.png b/wortschlucker/templates/media/images/poll_new_button.png
index 0feda7ae4d0c1924584488504cbe81f0010923db..0e9b940ae947b8943e61be4c521d0fc73e9c3ded 100644
GIT binary patch
delta 1430
zcmV;H1!?;23F8Zp7YZZ@1^@s6YXifaks(Zf1z<@;K~#90?VMjsQ&$|vKRvxb|3I;}
z&VgnV&72W8GTmV6CND$7G8}^~WWEp=gNYCNHnXw##KyAcEk5i4A^HG|*|JSz0*jma
zFsNp*40R!>8-Y$OMWF>+dT;k|<@N%KusCY#`6NwxPJcaon|$*-hjY*QSt6%jin9oR
zR1N+Z%%JZdg<x1P5*Cb32-HQ5B6(b~TEOMda62@XJ2f`s#n`xN3Sn8?ILbl;dj>M-
z=(XXyo=IqOk$**!(&X6Uys|dR&caDHt)5!YcPtOfSpByYj$Lr_+g}-vM5H9Od3jBg
z+SkS@SP`2y?t#WqHTe3MY)*CCm>uAM@pvdME+#)eAFtPo+wI0`wLU8Ck|d(4D#2io
zKp?>2;2=Jqk6<u3BgO)}y=8(AUJpNTioEYs7@D-uc*;f3--#?`wOZM=YZv9^<*Z-7
z9*adzhff0Wc$_O&uF&4z&Y3f3P*s&U@ZBXl1H)E6d~*zE*4*4QCu0S}g2Qcpx%lrS
zGSIed+o-FnBR@a?fBzwp$Csg@A&wqBN@r)M(YJcJ%IELhWtl^p5j(?JQ>ulJzRBgP
zUr%Hfi-p?STK4SOvqaJ*k2~>roR*drPMkPl^li+a;<I<}qL@}g!u+MLesUV7vRbVi
zIdVjrN-~4#WK&;Xj}W?jE)QjY@a0e0GvW+m{o0>NN3YHJ;J|?cY~Q|piR4OBjndLm
z>gwu@c1N#`OE)r&wgAxL(0svZbe5HsQBhH`gfb<mNL5u8rKP1t``85s@p}s^0npxS
zV<4zckaoMBef#z;y-G<+vVZ@6va+%OxPDvV=d1dA0dTq}F$LDt)Zli1yOSVMl8Sh}
zUaG6BjrOS?I{+dO67=8F7wn3nP+3`-6oHb|rK+mRSjhkB*PkH^-?hYotEi|5hr^L9
zeUcQ#<#JJ2SO`EI=(?7P_<bO;yS{bn)+9-jq&jBrTprBOr^0Cp3JQ{;Ns<Pby)zsV
zh~ZFTyVT?HBtw%V4e)w@y~g|DkU#`Y8O!{kM6wvnNohDN5ayGg^5~1?zhd@|rhza&
zl^z)xNrom#8esO$GKYrnW+#jl2n3R$Ns<Pbz2nKz5FV4UhK7ccp-GYkn7!l4))3FF
zOq^XdAK;Qm7K7P41zr_VvMy?LbaizRi_L#XULu)IBog7`#fwIN`_*+3#2Rmm6*>BJ
z7!HRyckW!W^hr{bvuDo|i9`U%Tc+}iN7YX^yiqu51T{A|%d90?Fwtm~mX;Qyz4M-z
z1i(96Cdjer8(Mz9pOYs~CPAVk6=`j4HU1-XJ2iH1HW|y28K<UX+z4)JYNETlI|(u+
zsf5qx<M{F8M*IDLl5w&WJwX}IbKWYNU_+ih1!|f`Lqmhyevmwnfq?-U8ykt=JBz#_
zFUHOn5=$z>Sc(<uD@K{#*BTui<>0}CGIL4h;Pd%7bm$PFPzZn(IU1kr9z`+T`I>WK
zweP0F;kI0&G5w~q5Q4pX_flP5jiM~LhKM8$iN#{HwYAZI+}vzrDqBXJFKX_xc2+Hi
z`_^vgyQ$Fdy^CSf$%nkWJZfue*|B4XG}se{s;Znnf1akMCj5TC(f^c7&s4Kb1@jaI
z83_wM{lR5iV4cS4bW&VgOi4+JEDDl_%q|Mj)zyX1=OY{r&xk8rHO0pjW8~Vk`;Iej
z8KamAKla#vY3+0{CTn6z&`&PZluS_m;>3(K)odPG9}8eSYT?^Ub~<`(+#Z`}G)daB
z(xp<iDMIDu32Ye;FW<NzW0|=TQ0VN>r0=G}a7Yjc3GR#w;|8oGwXs;h?a=UK>#ygZ
ko}zeNlxIEaqQ?0b4m$DJ&GC6}00000NkvXXu0mh|f>->(R{#J2

delta 1182
zcmV;P1Y!H*3+)Mz7YZW?1^@s6b_Vk#ks(Zf1Zqh{K~#90?c7Uf6I&d|@oy(hz1qZN
zl7ZOJZkqZkh#M`wKo?!OsL%(rkd39ZI|(AVlun^bsVjFXbfI9Wb)g%<g+dezB~XME
z`&uPd%b01KU@uK#@51)niPw5tZ*`j7^V!YG$?zZeF*BSw=Txk%t*x;QGcz;1e*Kz%
zxw$zE!@w{MOw(kWr;&E4ii!$URYlV@G)*HE3UTJl8A74Zc24uIVk^N~Sy^Fpbd+b$
zp0Tj7@bgtmB`XjJaPi_r+S}XNyLa!ub^md&^7%YZpFZXO{rfB}E$wWjQc3c9y@bPI
zT3TADtgPIu+vdSC41@muex|3Vi`uJytE)MA@+7BDogx?vqG=kcs^V}scK8w`I}{29
z(&;pYVUS9tc=P5Bu~>|im6f7?M~)mp*L8e8-}g@Q{a_^$2?hoRFilgm)z#I}-QCUU
z)2DxwRH+Q*^Le7tD8s|Uq*5u-?)UrAb)Cb94}bfYe+Da&NO1l7b#l2J01k(LgTB5#
zT3cID6y;Z6gS3kk3I)c-#<+X;E?>TU0btLbJq!&Eaq!?lYuDmn8HT}?D_2OT(*W$>
zzn>d7ZgBkg@!wg$w9CcgaRvtm$!4<vXqv|D+qY3wb)(DQ!CGBi<=VAtOifJzpsFgj
zZrvgn4BAn<w96%vNv>YK%JTAmG60Q@joiF>bK^DXop`oAe*9R3%IS2X>$(h;w5i(K
zTKfC@#rt+5k>JUbC*pSnAe+td@Zm$z*xTF7(W6IybE#6PId<$AmoHxy#}6Jn;PdCt
zz<RJoMn=T*G8hbU>Cz<|%9Kh`dwV;9KmdTHr6nFcdIYQo>&1%~qGL~gPmdf<khaX}
zbQayUo<DyMfHF5X$A=Fe0C2nAoIQKimI9^Hb^iQ$@tJ3SexBLc*(&ALt5>2!Q&W>1
zL6^48>2z}9#0ha6jYeIH^^;9gQ<EKaNoByAotc@LKNQ0-M1ve&kbagmJLz<~Qu*}h
zlW6e!{dUwOl>uvZOw+7?RIJlsyk4&zHA!W_nw?B0<4`;vk7!t2T(qMmsSH@N<953X
ziuD#|eJo1Sc388cs%l=*G)*+TfB)W&nxryd&5qCK%PZD-G_hFBj+&%0V9icLL&Kkn
zb)-EOi%}>P?5ImBVYyt6@$qqSeD2)2tWsZJ&w&F60LWxASV!W2C21>OzI-X>#Mji+
z5DJA>6@UvDE{IO|?%gAw&)ZU<RC;o`9K*xI;<&lF8Caj)(An9E%jE*TzJysPY)R6O
zjE#-)@#9ATJRT1n9UZ`Wuv{(|U0q$G^PM|)n4Fxnp-iciynXw&=x!AbhuODpAFv)Q
zfVQ?a4jnoKe7(JY>AEh5AEZqslSu{!2E=PqV`F2{1W^&Js;a7@1&F3;5{X2Zn3(v@
zB}=<qJRT<!iHL<1nx+-ae+Q833Z*Uk>2-x0<VtACYDZQ=Z;*R8{6GEDy&E>j-Dae3
w{pa0gtmOV!(vI$r^*wS&zw)+IJNo?vyvQP+Nh!Wl0000907*qoM6N<$g57~rAOHXW

diff --git a/wortschlucker/templates/media/images/poll_new_button.svg b/wortschlucker/templates/media/images/poll_new_button.svg
index c27c2e3..08801be 100644
--- a/wortschlucker/templates/media/images/poll_new_button.svg
+++ b/wortschlucker/templates/media/images/poll_new_button.svg
@@ -7,17 +7,18 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="150"
-   height="35.136715"
+   height="36"
    id="svg3659"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="poll_new_text.svg"
-   inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/poll_new_text.png"
-   inkscape:export-xdpi="71.400002"
-   inkscape:export-ydpi="71.400002">
+   sodipodi:docname="poll_new_button.svg"
+   inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/poll_new_button.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <defs
      id="defs3661">
     <inkscape:perspective
@@ -27,6 +28,13 @@
        inkscape:vp_z="744.09448 : 526.18109 : 1"
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
        id="perspective3667" />
+    <inkscape:perspective
+       id="perspective3811"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -35,9 +43,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="148.09314"
-     inkscape:cy="3.1882215"
+     inkscape:zoom="8"
+     inkscape:cx="74.194976"
+     inkscape:cy="16.419866"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -64,22 +72,30 @@
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-1.1980891,-1016.46)">
+     transform="translate(-1.1980891,-1015.5967)">
     <rect
-       y="1006.6364"
-       x="0.35714287"
-       height="46.000061"
-       width="150.69537"
+       y="1015.5967"
+       x="1.1980891"
+       height="36"
+       width="150"
        id="rect4181"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#f9b631;fill-opacity:1;stroke:none" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:#454545;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect3669"
        width="146.97169"
-       height="32.136658"
+       height="32.761658"
        x="2.6980891"
-       y="1017.96"
+       y="1017.335"
        rx="16.068357"
        ry="16.068329" />
+    <image
+       y="857.84674"
+       x="-123.30191"
+       id="image9792"
+       height="229"
+       width="71"
+       xlink:href="file:///home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/img04.jpg"
+       style="fill:#f9b631;fill-opacity:1" />
   </g>
 </svg>
diff --git a/wortschlucker/templates/media/style.css b/wortschlucker/templates/media/style.css
index e86ee29..60fbe06 100644
--- a/wortschlucker/templates/media/style.css
+++ b/wortschlucker/templates/media/style.css
@@ -262,6 +262,10 @@ hr { display: none; }
 	width: 610px;
 }
 
+#content h1 {
+margin-bottom: 15px;
+}
+
 #content  table
 {
 	margin-bottom: 1.5em;
@@ -348,6 +352,14 @@ hr { display: none; }
 	background: url(images/poll_new_small_button.png) no-repeat left top;
 }
 
+
+.poll_new form {
+border: 4px solid #f9b631;
+width:100%;
+margin-top:10px;
+padding-top:15px;
+}	
+
 .poll_new_text {
 	font-size: 12px;
 	border:none;
@@ -365,6 +377,8 @@ hr { display: none; }
 	padding-bottom:5px;
 }	
 
+
+
 .poll_new label {
 	font-size: 14px;
 	font-weight:bold;
@@ -378,14 +392,17 @@ hr { display: none; }
 .poll_new_buttons{
 	border:none;
 	width:100%;
-	text-align:left;
+	text-align:center;
 	float:both;
-	padding-left:20px;
+	pad ding-left:20px;
+	padding-top:15px;
+	padding-bottom:10px;
+	background: #f9b631;
 }
 
 .poll_new_button{
 	font-size: 20px;
-	margin-right:100px;
+	margi n-right:100px;
 	border:none;
 	width:150px;
 	height:36px;
diff --git a/wortschlucker/templates/nodes/brainstorming.html b/wortschlucker/templates/nodes/brainstorming.html
index cf09996..096072c 100644
--- a/wortschlucker/templates/nodes/brainstorming.html
+++ b/wortschlucker/templates/nodes/brainstorming.html
@@ -6,18 +6,24 @@
     <xi:include href="../layout.html" />
 
     <?python
-    from creoleparser import text2html
-    
-    #text can be creole-encoded, see http://www.wikicreole.org/imageServlet?page=CheatSheet%2Fcreole_cheat_sheet.png&width=340
-    title = "Brainstorming Online"
-    content01 = """
-         dieser mehrzeilige Text ist HTML-escaped und kann Umlaute enthalten.
-         Falls er <Umlaute> **enthält**, dann muss die Datei utf8-codiert sein und der Text
-         muss in unicode verwandelt werden (unicode(foo)).
-         """
-    # creoleparser returns an utf-8 encoded string by default, but this would cause "Markup" below to fail during decoding.
-    # The parameter "None" for "encoding" forces unicode output. This works with "Markup".
-    content01 = text2html(content01, encoding=None)
+from creoleparser import text2html
+#text can be creole-encoded, see http://www.wikicreole.org/imageServlet?page=CheatSheet%2Fcreole_cheat_sheet.png&width=340
+title = "Brainstorming Online"
+content01 = """
+== Was ist Brainstorming? ==
+Brainstorming ist ...
+
+== Mit dem Wortschlucker online brainstormen ==
+Mit dem Wortschlucker kann man jetzt auch einfach online brainstormen. Das hat mehrere Vorteile:
+ * Die Beteiligten können an verschiedenen Orten sein
+ * Die Teilnahme muss nicht gleichzeitig stattfinden
+ * Die Resultate sind sofort digital vefügbar, müssen also nicht mehr abgeschrieben werden.
+
+== Jetzt starten: ==
+"""
+# creoleparser returns an utf-8 encoded string by default, but this would cause "Markup" below to fail during decoding.
+# The parameter "None" for "encoding" forces unicode output. This works with "Markup".
+content01 = text2html(content01, encoding=None)
     ?>
 
 
@@ -29,9 +35,9 @@
     <div class="post">
     
     ${Markup(content01)}
-    </div>
+
     ${poll_new_small()}
-    
+    </div>
     </body>
 </html>
 
diff --git a/wortschlucker/templates/poll_new.html b/wortschlucker/templates/poll_new.html
index f36ab88..40b0fe4 100644
--- a/wortschlucker/templates/poll_new.html
+++ b/wortschlucker/templates/poll_new.html
@@ -8,7 +8,7 @@
         <title>Create a poll</title>
     </head>
     <body>
-        <h1>New poll</h1>
+        <h1>Neuen Wortschlucker starten</h1>
 	<div class="poll_new">
 		<form action="" method="post">
 		    <p>
@@ -27,8 +27,7 @@
 			<span py:if="'description' in errors" class="error">${errors.description}</span>
 		    </p>
 		    <div class="poll_new_buttons">
-			<input type="submit" name="submit" class="poll_new_button" value="Create poll" />
-			<input type="submit" name="cancel" class="poll_new_button" value="Cancel" />
+			<input type="submit" name="submit" class="poll_new_button" value="Los geht's!" />
 		    </div>
 		</form>
 	</div>