slight changes on poll creation form; started brainstorming content

This commit is contained in:
phear 2010-04-18 10:41:41 +00:00
parent 9ff7845e18
commit 6d8c51e898
6 changed files with 74 additions and 36 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -7,17 +7,18 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="150" width="150"
height="35.136715" height="36"
id="svg3659" id="svg3659"
version="1.1" version="1.1"
inkscape:version="0.47 r22583" inkscape:version="0.47 r22583"
sodipodi:docname="poll_new_text.svg" sodipodi:docname="poll_new_button.svg"
inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/poll_new_text.png" inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/poll_new_button.png"
inkscape:export-xdpi="71.400002" inkscape:export-xdpi="90"
inkscape:export-ydpi="71.400002"> inkscape:export-ydpi="90">
<defs <defs
id="defs3661"> id="defs3661">
<inkscape:perspective <inkscape:perspective
@ -27,6 +28,13 @@
inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective3667" /> 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> </defs>
<sodipodi:namedview <sodipodi:namedview
id="base" id="base"
@ -35,9 +43,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="15.839192" inkscape:zoom="8"
inkscape:cx="148.09314" inkscape:cx="74.194976"
inkscape:cy="3.1882215" inkscape:cy="16.419866"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@ -64,22 +72,30 @@
inkscape:label="Ebene 1" inkscape:label="Ebene 1"
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(-1.1980891,-1016.46)"> transform="translate(-1.1980891,-1015.5967)">
<rect <rect
y="1006.6364" y="1015.5967"
x="0.35714287" x="1.1980891"
height="46.000061" height="36"
width="150.69537" width="150"
id="rect4181" id="rect4181"
style="fill:#ffffff;fill-opacity:1;stroke:none" /> style="fill:#f9b631;fill-opacity:1;stroke:none" />
<rect <rect
style="fill:#ffffff;fill-opacity:1;stroke:#454545;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" style="fill:#ffffff;fill-opacity:1;stroke:#454545;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect3669" id="rect3669"
width="146.97169" width="146.97169"
height="32.136658" height="32.761658"
x="2.6980891" x="2.6980891"
y="1017.96" y="1017.335"
rx="16.068357" rx="16.068357"
ry="16.068329" /> 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> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View file

@ -262,6 +262,10 @@ hr { display: none; }
width: 610px; width: 610px;
} }
#content h1 {
margin-bottom: 15px;
}
#content table #content table
{ {
margin-bottom: 1.5em; margin-bottom: 1.5em;
@ -348,6 +352,14 @@ hr { display: none; }
background: url(images/poll_new_small_button.png) no-repeat left top; 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 { .poll_new_text {
font-size: 12px; font-size: 12px;
border:none; border:none;
@ -365,6 +377,8 @@ hr { display: none; }
padding-bottom:5px; padding-bottom:5px;
} }
.poll_new label { .poll_new label {
font-size: 14px; font-size: 14px;
font-weight:bold; font-weight:bold;
@ -378,14 +392,17 @@ hr { display: none; }
.poll_new_buttons{ .poll_new_buttons{
border:none; border:none;
width:100%; width:100%;
text-align:left; text-align:center;
float:both; float:both;
padding-left:20px; pad ding-left:20px;
padding-top:15px;
padding-bottom:10px;
background: #f9b631;
} }
.poll_new_button{ .poll_new_button{
font-size: 20px; font-size: 20px;
margin-right:100px; margi n-right:100px;
border:none; border:none;
width:150px; width:150px;
height:36px; height:36px;

View file

@ -6,18 +6,24 @@
<xi:include href="../layout.html" /> <xi:include href="../layout.html" />
<?python <?python
from creoleparser import text2html from creoleparser import text2html
#text can be creole-encoded, see http://www.wikicreole.org/imageServlet?page=CheatSheet%2Fcreole_cheat_sheet.png&width=340
#text can be creole-encoded, see http://www.wikicreole.org/imageServlet?page=CheatSheet%2Fcreole_cheat_sheet.png&width=340 title = "Brainstorming Online"
title = "Brainstorming Online" content01 = """
content01 = """ == Was ist Brainstorming? ==
dieser mehrzeilige Text ist HTML-escaped und kann Umlaute enthalten. Brainstorming ist ...
Falls er <Umlaute> **enthält**, dann muss die Datei utf8-codiert sein und der Text
muss in unicode verwandelt werden (unicode(foo)). == Mit dem Wortschlucker online brainstormen ==
""" Mit dem Wortschlucker kann man jetzt auch einfach online brainstormen. Das hat mehrere Vorteile:
# creoleparser returns an utf-8 encoded string by default, but this would cause "Markup" below to fail during decoding. * Die Beteiligten können an verschiedenen Orten sein
# The parameter "None" for "encoding" forces unicode output. This works with "Markup". * Die Teilnahme muss nicht gleichzeitig stattfinden
content01 = text2html(content01, encoding=None) * 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"> <div class="post">
${Markup(content01)} ${Markup(content01)}
</div>
${poll_new_small()} ${poll_new_small()}
</div>
</body> </body>
</html> </html>

View file

@ -8,7 +8,7 @@
<title>Create a poll</title> <title>Create a poll</title>
</head> </head>
<body> <body>
<h1>New poll</h1> <h1>Neuen Wortschlucker starten</h1>
<div class="poll_new"> <div class="poll_new">
<form action="" method="post"> <form action="" method="post">
<p> <p>
@ -27,8 +27,7 @@
<span py:if="'description' in errors" class="error">${errors.description}</span> <span py:if="'description' in errors" class="error">${errors.description}</span>
</p> </p>
<div class="poll_new_buttons"> <div class="poll_new_buttons">
<input type="submit" name="submit" class="poll_new_button" value="Create poll" /> <input type="submit" name="submit" class="poll_new_button" value="Los geht's!" />
<input type="submit" name="cancel" class="poll_new_button" value="Cancel" />
</div> </div>
</form> </form>
</div> </div>