From f276c11aeb54900a82d82561ff7e5f266abc0ace Mon Sep 17 00:00:00 2001
From: phear <phear@systemausfall.org>
Date: Thu, 15 Apr 2010 15:44:53 +0000
Subject: [PATCH] im wortschlucker.py rumgesaut, damit das mit den statischen
 Objekten klappt. Und angefangen, dass layout anzupassen.

---
 wortschlucker/database.sqlite                 | Bin 4096 -> 4096 bytes
 wortschlucker/templates/layout.html           |   8 +-
 .../templates/media/images/form-entry.png     | Bin 0 -> 1185 bytes
 .../templates/media/images/form-entry.svg     |  73 ++++++++++++++++++
 wortschlucker/templates/media/style.css       |  20 +++--
 wortschlucker/templates/poll_details.html     |   4 +-
 wortschlucker/templates/poll_new.html         |   7 +-
 wortschlucker/wortschlucker.py                |  45 +++++++++++
 8 files changed, 142 insertions(+), 15 deletions(-)
 create mode 100644 wortschlucker/templates/media/images/form-entry.png
 create mode 100644 wortschlucker/templates/media/images/form-entry.svg

diff --git a/wortschlucker/database.sqlite b/wortschlucker/database.sqlite
index caa7467e77cea1f1c5ea1c6f804545a64bec8037..a4b7dddc78f53aa3bd36b2f0c9ff94e25f0e0a8e 100644
GIT binary patch
delta 179
zcmZorXi%6S%_zB1<^?kk3zI4X^Au(Urp-*Mn*~`!nd%$4SvVMkeSL)!jT4JgQcaW1
z%#2bjQY_69O_CCmk}Olr%q^0Qjm^^1%nghUfwC#4#;N88CMgCcsg_2G#z_Vy#s*11
vZd#I&r6tgaq?|;;C^07~F~`Wj(12gpz(m*3RKd{P%Gkon&}{Q&HeXHv*8?)*

delta 40
wcmZorXi%6S%_y-^<^?kkGt*`U<|)hyOq-d4Hw*H(F)=1gY>e5wna!6I0NMTu?f?J)

diff --git a/wortschlucker/templates/layout.html b/wortschlucker/templates/layout.html
index 6e3db17..ca5d89c 100644
--- a/wortschlucker/templates/layout.html
+++ b/wortschlucker/templates/layout.html
@@ -7,7 +7,7 @@
       <title py:with="title = list(select('title/text()'))">
         WortSchlucker<py:if test="title">: ${title}</py:if>
       </title>
-      <link rel="stylesheet" href="${base_url}static/media/style.css" type="text/css" />
+      <link rel="stylesheet" href="${base_url}media/style.css" type="text/css" />
       <script type="text/javascript" src="${base_url}media/jquery.js"></script>
       ${select('*[local-name()!="title"]')}
     </head>
@@ -26,11 +26,11 @@
 			</ul>
 		</div>
 		<!-- end #menu -->
-		<div id="search">
+		<div class="search">
 			<form method="get" action="">
 				<fieldset>
-					<input type="text" name="s" id="search-text" size="15" />
-					<input type="submit" id="search-submit" value="GO" />
+					<input type="text" name="s" class="search-text" size="15" />
+					<input type="submit" class="search-submit" value="GO" />
 				</fieldset>
 			</form>
 		</div>
diff --git a/wortschlucker/templates/media/images/form-entry.png b/wortschlucker/templates/media/images/form-entry.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f0384c808fe24e127c8c30c595adcc67c16a9f2
GIT binary patch
literal 1185
zcmV;S1YY}zP)<h;3K|Lk000e1NJLTq007(o000~a1^@s63bN5P00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11RhC5K~#90?c7Z$G!GmH@bAu!*UJ*itfiD9v*hBq$xBjVm6KBT
zpm1<;@RC9~xJbD;qeNm`(nge=yp0^xikygjq4i$YT7Lh7{?GHs+rR#gXEM+4bDa78
zrtchnHB&P`9T5>eaejUdm&=9K)m3=CUif@I1cSlP+8EO;y<QKa(Fl{t1X-3*RaJ$|
z%*;>wbRP}e@$oU5o15WsxeyMAk&uvp)YMc+l7#5!=-+w+jD07MkB>MzJA=>X!_m<Z
zhzPPQV{mW~rKP3sH_|(Xhlj~vFi>o4EVZ__(&pyod!>y1)lN=MXlQ7NWLYKv)Y#Za
zH#awL*1j4zuh&bJm6Zg5tX3->92|UkV8*l{7z|Q-dpqg%dP+}Er{(44S2ZsN&hPhA
zQc@Dd#>Ud%;2=FdKK`+=jA_N%+8SkLWsy#&qv`4C7w2BQ!&O&TV_{(d8yg$Q&CUJ#
z2VurE>hA6i1qB5-JUoQk?S|241ON#C7EDY`!0B|Nudk1Xjj{hJCME`>qocUKzD841
z(~sjiA|k)v4~xYDS(dS~vI0R6KDZQP?7!;o??+o(8^*@QP+MF3JaBb&b#OQw*xA`Z
zMn;C(85z@zr>7@atyb*q?ZM;mKnR6Ga5|l^+wDATjQwVUAfUIm7Z(>7SXx?wu(Gm(
z+uK`IR8**)jWJCsEG$HPd^~1nXCWwx0-a8WqM{<Tb1|k#q9~%Epa6=ZKsY`=hS6w5
zOiYa0xfs(dv)TOo4(IWBkdl(3b{@twEjc+Efj|I4I2?v3ifZR!Ow;swJ%|W`BuVi5
z{c7i7Ow&$JPhl_^AehZ&c)eacJw2(Ni80Occs!6K34$!k2#3Si+}u<<6JwgCC<?N(
zvmum~l|d9m%+AiLory6`+S=N};o%`{Hrw;3T_q(Y*xlX5?(Qz)<KxxN$C#$n)YQP?
zaKP*JKL0H+Fff2XAb^&Z7PYf6rYTOR6O)sZ=<Mu7Vq)UYohCg!J?QQ2h0Enad3m|o
zIT`!*0)YT577HXvf}$vhh=}+(a1Rd;$j{G5AP|7t?S{c%P&+SU-&$>LEvBZXpePFR
z^6~)u@&jr_L<B}gM&S4RVYOPZwY8;MP{zKq%gamH?RJchkE5%r>&LJGc)hi2adDAS
zQ&UM4Me6MAr2G5(uU!AYn5N9n&y(3~CQ%frr>BR);qZ&|Z?4I^yu2j4-A(`~Cntwo
zE*FJDp+6FsvG2(3c2j+QJprKH++5n;-hQ+0!$q)jb8~2DXn@b>LtI=Oii?YpmX^kg
zVA)^q*F~`F>+9Ix--lkWM@L5oy1Tm(85#Lz--iPS0Ks4oOG`_bnVG@b+8R6_53a7R
zzT_qt`%a>wqF^$aV6j+Wv)N#?*&s>MhduuQ0g@Dkg%fFD00000NkvXXu0mjfXMQ_l

literal 0
HcmV?d00001

diff --git a/wortschlucker/templates/media/images/form-entry.svg b/wortschlucker/templates/media/images/form-entry.svg
new file mode 100644
index 0000000..faa20a8
--- /dev/null
+++ b/wortschlucker/templates/media/images/form-entry.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="220"
+   height="28"
+   id="svg8460"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="Neues Dokument 20">
+  <defs
+     id="defs8462">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective8468" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="102.05522"
+     inkscape:cy="-28.643527"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1276"
+     inkscape:window-height="976"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1024.3622)">
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect8470"
+       width="218.24493"
+       height="26.380983"
+       x="1.0407906"
+       y="0.93110955"
+       ry="12.811685"
+       transform="translate(0,1024.3622)" />
+  </g>
+</svg>
diff --git a/wortschlucker/templates/media/style.css b/wortschlucker/templates/media/style.css
index 7f9332e..758baa0 100644
--- a/wortschlucker/templates/media/style.css
+++ b/wortschlucker/templates/media/style.css
@@ -134,29 +134,29 @@ hr { display: none; }
 }
 /* Search */
 
-#search {
+.search {
 	float: right;
 	padding: 10px 10px 0px 0px;
 }
 
-#search form {
+.search form {
 	float: right;
 	margin: 0;
 	padding: 4px 0px 0 0;
 }
 
-#search fieldset {
+.search fieldset {
 	margin: 0;
 	padding: 0;
 	border: none;
 }
 
-#search input {
+.search input {
 	float: left;
 	font: 12px Georgia, "Times New Roman", Times, serif;
 }
 
-#search-text {
+.search-text {
 	width: 213px;
 	height: 28px;
 	padding: 6px 0 0 7px;
@@ -165,7 +165,15 @@ hr { display: none; }
 	color: #000000;
 }
 
-#search-submit {
+.form-entry {
+	width: 213px;
+	height: 28px;
+	padding: 6px 0 0 7px;
+	border: none;
+	background: url(images/form-entry.png) no-repeat left top;
+	color: #000000;
+}
+.search-submit {
 	width: 82px;
 	height: 28px;
 	margin-left: 10px;
diff --git a/wortschlucker/templates/poll_details.html b/wortschlucker/templates/poll_details.html
index 249d1a4..e2a5457 100644
--- a/wortschlucker/templates/poll_details.html
+++ b/wortschlucker/templates/poll_details.html
@@ -21,9 +21,9 @@
             <h2>Submit something</h2>
             <form action="${poll.get_submit_url()}" method="post">
                 <ul>
-                    <li><label for="submitter">Submitter:</label><input type="text" id="submitter" name="submitter" />
+                    <li><label for="submitter">Submitter:</label><input type="text" id="submitter" class="form-entry" name="submitter" />
                         <span py:if="'submitter' in errors" class="error">${errors.submitter}</span></li>
-                    <li><label for="content">New content:</label><input type="text" id="content" name="content" />
+                    <li><label for="content">New content:</label><input type="text" id="content" class="form-entry"  name="content" />
                         <span py:if="'content' in errors" class="error">${errors.content}</span></li>
                 </ul>
                 <input type="submit" name="submit" value="Submit" />
diff --git a/wortschlucker/templates/poll_new.html b/wortschlucker/templates/poll_new.html
index ca27017..c6878f3 100644
--- a/wortschlucker/templates/poll_new.html
+++ b/wortschlucker/templates/poll_new.html
@@ -9,20 +9,21 @@
     </head>
     <body>
         <h1>New poll</h1>
+
         <form action="" method="post">
             <p>
                 <label for="author">Your name:</label>
-                <input type="text" id="author" name="author" />
+                <input type="text" id="author" class="form-entry" name="author" />
                 <span py:if="'author' in errors" class="error">${errors.author}</span>
             </p>
             <p>
                 <label for="title">Poll name:</label>
-                <input type="text" id="title" name="title" />
+                <input type="text" id="title" class="form-entry" name="title" />
                 <span py:if="'title' in errors" class="error">${errors.title}</span>
             </p>
             <p>
                 <label for="description">Description:</label>
-                <input type="text" id="description" name="description" />
+                <input type="text" id="description" class="form-entry" name="description" />
                 <span py:if="'description' in errors" class="error">${errors.description}</span>
             </p>
             <p>
diff --git a/wortschlucker/wortschlucker.py b/wortschlucker/wortschlucker.py
index 3f83ed4..905703c 100755
--- a/wortschlucker/wortschlucker.py
+++ b/wortschlucker/wortschlucker.py
@@ -14,6 +14,8 @@ import formencode
 import uuid
 import datetime
 import os
+import mimetypes
+import webob
 
 db_filename = "database.sqlite"
 db_filename = os.path.abspath(db_filename)
@@ -326,6 +328,49 @@ for table in (Poll, ContentSubmission, PollSetting):
 for poll in Poll.select():
     print poll
 
+####### Ab hier hat m rumgesaut
+### das ist natuerlich voellig falsch, aber so kann ich schnell mit dem Layout anfangen.
+### Aender es also ruhig ab!
+
+@bobo.query('/media/:pathname')
+def statische_sachen(pathname):
+     response = webob.Response()
+     content_type = mimetypes.guess_type(pathname)[0]
+     if content_type is not None:
+         response.content_type = content_type
+     try:
+	 response.body = open("templates/media/"+pathname).read()
+	 
+     except IOError:
+
+         raise bobo.NotFound
+     return response
+     
+     
+@bobo.query('/media/images/:pathname')
+def statische_sachen2(pathname):
+     response = webob.Response()
+     content_type = mimetypes.guess_type(pathname)[0]
+     if content_type is not None:
+         response.content_type = content_type
+     try:
+	 response.body = open("templates/media/images/"+pathname).read()
+	 
+     except IOError:
+
+         raise bobo.NotFound
+     return response
+
+
+
+
+
+
+
+
+
+####### bis hier hier hat m rumgesaut
+
 # this line allows to use wortschlucker with mod_wsgi
 # see: http://groups.google.com/group/bobo-web/msg/2ba55fc381658cd1
 #application = bobo.Application(bobo_resources=__name__)