cleanup files, initial data

example/fixtures/initial_data.yaml

@@ -1,107 +1,127 @@
-- fields: {domain: example.com, name: example.com}
+- fields: {admin_access_only: false, html: '', name: example, parse_html: false, redirect_url: /}
-  model: sites.site
-  pk: 1
-- fields: {email: test@example.com, formtype: email, gender: unset, givenname: Test,
-    language: de, nextrun: 2011-05-16, state: active, surname: Test}
-  model: questionnaire.subject
-  pk: 1
-- fields: {email: null, formtype: email, gender: unset, givenname: Anonymous, language: en,
-    nextrun: null, state: inactive, surname: User}
-  model: questionnaire.subject
-  pk: 2
-- fields: {name: example, redirect_url: /}
   model: questionnaire.questionnaire
   pk: 1
-- fields: {checks: '', heading: Page 1, questionnaire: 1, sortid: 1, text_de: h1. Biervorlieben,
+- fields: {checks: '', heading: Page 1, parse_html: true, questionnaire: 1, sortid: 1,
-    text_en: h1. Beer Preferences}
+    text_de: <h2> Biervorlieben</h2>, text_en: <h2>Beer Preferences</h2>}
   model: questionnaire.questionset
   pk: 1
-- fields: {checks: '', heading: Page 2, questionnaire: 1, sortid: 2, text_de: h1. Python
+- fields: {checks: '', heading: Page 2, parse_html: false, questionnaire: 1, sortid: 2,
-      Web Frameworks, text_en: h1. Python Web Frameworks}
+    text_de: h1. Python Web Frameworks, text_en: h1. Python Web Frameworks}
   model: questionnaire.questionset
   pk: 2
-- fields: {checks: '', heading: Thankyou, questionnaire: 1, sortid: 99, text_de: "h1. Vielen Dank \n \n Wir hoffen, dass Sie uns in Zukunft wieder besuchen!", text_en: "h1. Thank you! \n \n We hope that you visit us again in the future!"}
+- fields: {checks: '', heading: Finished!, parse_html: true, questionnaire: 1, sortid: 99,
+    text_de: "<h2> Vielen Dank </h2>\r\n \r\n Wir hoffen, dass Sie uns in Zukunft
+      wieder besuchen!", text_en: "<h2>Thank you! </h2>\r\n \r\n We hope that you
+      visit us again in the future!"}
   model: questionnaire.questionset
   pk: 3
-- fields: {checks: '', extra_de: '', extra_en: '', number: '1', questionset: 1, text_de: 'Trinken
+- fields: {checks: '', extra_de: '', extra_en: '', footer_de: null, footer_en: '',
+    number: '1', parse_html: false, questionset: 1, sort_id: null, text_de: 'Trinken
       Sie Bier?', text_en: 'Do you drink beer?', type: choice-yesno}
   model: questionnaire.question
   pk: 1
-- fields: {checks: 'requiredif="1,yes"', extra_de: '', extra_en: '', number: '2',
+- fields: {checks: 'requiredif="1,yes"', extra_de: '', extra_en: '', footer_de: null,
-    questionset: 1, text_de: 'Was Art von Bier trinken Sie am meisten?', text_en: 'What
+    footer_en: '', number: '2', parse_html: false, questionset: 1, sort_id: null,
-      type of beer do you drink predominantly?', type: choice-freeform}
+    text_de: 'Was Art von Bier trinken Sie am meisten?', text_en: 'What type of beer
+      do you drink predominantly?', type: choice-freeform}
   model: questionnaire.question
   pk: 2
-- fields: {checks: '', extra_de: '', extra_en: '', number: '3', questionset: 1, text_de: 'Welche
+- fields: {checks: '', extra_de: '', extra_en: '', footer_de: null, footer_en: '',
+    number: '3', parse_html: false, questionset: 1, sort_id: null, text_de: 'Welche
       von dieser Bieren haben Sie probiert?', text_en: 'Which of these brands of beer
       have you tried?', type: choice-multiple}
   model: questionnaire.question
   pk: 3
-- fields: {checks: '', extra_de: '', extra_en: '', number: '4', questionset: 2, text_de: 'Which
+- fields: {checks: '', extra_de: '', extra_en: '', footer_de: null, footer_en: '',
+    number: '4', parse_html: false, questionset: 2, sort_id: null, text_de: 'Which
       Python Web Frameworks have you tried?', text_en: 'Which Python Web Frameworks
       have you tried?', type: choice-multiple-freeform}
   model: questionnaire.question
   pk: 4
-- fields: {checks: '', extra_de: '', extra_en: '', number: '5', questionset: 2, text_de: "Welche\
+- fields: {checks: '', extra_de: '', extra_en: '', footer_de: null, footer_en: '',
-      \ m\xF6gen Sie am liebsten?", text_en: 'Which do you like the most?', type: choice-freeform}
+    number: '5', parse_html: false, questionset: 2, sort_id: null, text_de: "Welche
+      m\xF6gen Sie am liebsten?", text_en: 'Which do you like the most?', type: choice-freeform}
   model: questionnaire.question
   pk: 5
-- fields: {question: 2, sortid: 1, text_de: Pils, text_en: Pils/Bitter, value: pils}
+- fields: {question: 2, sortid: 1, tags: '', text_de: Pils, text_en: Pils/Bitter,
+    value: pils}
   model: questionnaire.choice
   pk: 1
-- fields: {question: 2, sortid: 2, text_de: Helles, text_en: Lager, value: helles}
+- fields: {question: 2, sortid: 2, tags: '', text_de: Helles, text_en: Lager, value: helles}
   model: questionnaire.choice
   pk: 2
-- fields: {question: 2, sortid: 3, text_de: Weizen, text_en: Wheat-beer, value: weizen}
+- fields: {question: 2, sortid: 3, tags: '', text_de: Weizen, text_en: Wheat-beer,
+    value: weizen}
   model: questionnaire.choice
   pk: 3
-- fields: {question: 3, sortid: 1, text_de: Heineken, text_en: Heineken, value: heineken}
+- fields: {question: 3, sortid: 1, tags: '', text_de: Heineken, text_en: Heineken,
+    value: heineken}
   model: questionnaire.choice
   pk: 4
-- fields: {question: 3, sortid: 2, text_de: Becks, text_en: Becks, value: becks}
+- fields: {question: 3, sortid: 2, tags: '', text_de: Becks, text_en: Becks, value: becks}
   model: questionnaire.choice
   pk: 5
-- fields: {question: 3, sortid: 3, text_de: "L\xF6wenbr\xE4u", text_en: "L\xF6wenbr\xE4\
+- fields: {question: 3, sortid: 3, tags: '', text_de: "L\xF6wenbr\xE4u", text_en: "L\xF6wenbr\xE4u",
-      u", value: lowenbrau}
+    value: lowenbrau}
   model: questionnaire.choice
   pk: 6
-- fields: {question: 2, sortid: 4, text_de: "Altbier/D\xFCssel", text_en: Altbier,
+- fields: {question: 2, sortid: 4, tags: '', text_de: "Altbier/D\xFCssel", text_en: Altbier,
     value: altbier}
   model: questionnaire.choice
   pk: 7
-- fields: {question: 2, sortid: 5, text_de: "K\xF6lsch", text_en: "K\xF6lsch", value: koelsch}
+- fields: {question: 2, sortid: 5, tags: '', text_de: "K\xF6lsch", text_en: "K\xF6lsch",
+    value: koelsch}
   model: questionnaire.choice
   pk: 8
-- fields: {question: 4, sortid: 1, text_de: Django, text_en: Django, value: django}
+- fields: {question: 4, sortid: 1, tags: '', text_de: Django, text_en: Django, value: django}
   model: questionnaire.choice
   pk: 9
-- fields: {question: 4, sortid: 2, text_de: Pylons, text_en: Pylons, value: pylons}
+- fields: {question: 4, sortid: 2, tags: '', text_de: Pylons, text_en: Pylons, value: pylons}
   model: questionnaire.choice
   pk: 10
-- fields: {question: 4, sortid: 3, text_de: Turbogears, text_en: Turbogears, value: turbogears}
+- fields: {question: 4, sortid: 3, tags: '', text_de: Turbogears, text_en: Turbogears,
+    value: turbogears}
   model: questionnaire.choice
   pk: 11
-- fields: {question: 4, sortid: 4, text_de: CherryPy, text_en: CherryPy, value: cherrypy}
+- fields: {question: 4, sortid: 4, tags: '', text_de: CherryPy, text_en: CherryPy,
+    value: cherrypy}
   model: questionnaire.choice
   pk: 12
-- fields: {question: 5, sortid: 1, text_de: Django, text_en: Django, value: django}
+- fields: {question: 5, sortid: 1, tags: '', text_de: Django, text_en: Django, value: django}
   model: questionnaire.choice
   pk: 13
-- fields: {question: 5, sortid: 2, text_de: Pylons, text_en: Pylons, value: pylons}
+- fields: {question: 5, sortid: 2, tags: '', text_de: Pylons, text_en: Pylons, value: pylons}
   model: questionnaire.choice
   pk: 14
-- fields: {question: 5, sortid: 3, text_de: Turbogears, text_en: Turbogears, value: turbogears}
+- fields: {question: 5, sortid: 3, tags: '', text_de: Turbogears, text_en: Turbogears,
+    value: turbogears}
   model: questionnaire.choice
   pk: 15
-- fields: {question: 5, sortid: 4, text_de: CherryPy, text_en: CherryPy, value: cherrypy}
+- fields: {question: 5, sortid: 4, tags: '', text_de: CherryPy, text_en: CherryPy,
+    value: cherrypy}
   model: questionnaire.choice
   pk: 16
-- fields: {body_de: "Wilkommen zu der Fragebogenbeispielseite!\r\n\r\nWenn Sie einen\
+- fields: {answer: '["yes"]', question: 1, run: 9, subject: 11}
-      \ einfachen Fragebogen sehen wollen, \"tun Sie's!\":/take/1\r\n\r\nSie k\xF6\
+  model: questionnaire.answer
-      nnen das \"Admin Interface\":/admin/ benutzen, um den Fragebogen zu \xE4ndern.",
+  pk: 1
-    body_en: "Welcome to the example Questionnaire website!\r\n\r\nIf you wish to\
+- fields: {answer: '["weizen"]', question: 2, run: 9, subject: 11}
-      \ take a sample questionnaire, \"go for it!\":/take/1\r\n\r\nUse the \"Admin\
+  model: questionnaire.answer
-      \ Interface\":/admin/, to change the questionnaire.", public: true, title_de: '',
+  pk: 2
-    title_en: Welcome}
+- fields: {answer: '["becks", "heineken"]', question: 3, run: 9, subject: 11}
+  model: questionnaire.answer
+  pk: 3
+- fields: {answer: '["django", "pylons", ["rails"]]', question: 4, run: 9, subject: 11}
+  model: questionnaire.answer
+  pk: 4
+- fields: {answer: '["django"]', question: 5, run: 9, subject: 11}
+  model: questionnaire.answer
+  pk: 5
+- fields: {body_de: "Wilkommen zu der Fragebogenbeispielseite!\r\n\r\nWenn Sie einen
+      einfachen Fragebogen sehen wollen, <a href=\"take/1\"> \"tun Sie's!</a>\r\n\r\nSie
+      k\xF6nnen das <a href=\"/admin/\">Admin Interface</a> benutzen, um den Fragebogen
+      zu \xE4ndern.", body_en: "Welcome to the example Questionnaire website!\r\n\r\nIf
+      you wish to take a sample questionnaire, <a href=\"take/1\">go for it!</a>\r\n\r\nUse
+      the <a href=\"/admin/\">Admin Interface</a> to change the questionnaire.", public: true,
+    title_de: '', title_en: Welcome}
   model: page.page
   pk: index

example/manage.py

@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
-
-    from django.core.management import execute_from_command_line
-    execute_from_command_line(sys.argv)

questionnaire/templates/base-questionnaire.html

@@ -35,9 +35,8 @@
                     {% endfor %}
                 {% endblock language %}
             </div>
-
             <div class="page-header">
-                <h1>Sample Django Questionnaire</h1>
+                <h1>{% block h1 %}Questionnaire{% endblock h1 %}</h1>
             </div>
 
             <div class="row">