diff --git a/wortschlucker/database.sqlite b/wortschlucker/database.sqlite
index a6a138d..2b11306 100644
Binary files a/wortschlucker/database.sqlite and b/wortschlucker/database.sqlite differ
diff --git a/wortschlucker/templates/media/images/poll_new_button.png b/wortschlucker/templates/media/images/poll_new_button.png
index 0feda7a..0e9b940 100644
Binary files a/wortschlucker/templates/media/images/poll_new_button.png and b/wortschlucker/templates/media/images/poll_new_button.png differ
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">
+
+ transform="translate(-1.1980891,-1015.5967)">
+ style="fill:#f9b631;fill-opacity:1;stroke:none" />
+
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 @@
**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 @@
${Markup(content01)}
-
+
${poll_new_small()}
-
+