Home Explore Help
Sign In
CityApper
/
wagtail_bakerydemo
mirror of https://github.com/wagtail/bakerydemo.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch 'master' of https://github.com/wagtail/bakerydemo

Scot Hacker 8 years ago
parent
44ab2aab8e a5a4aac429
commit
14b5f47851
3 changed files with 18 additions and 24 deletions
Unified View Show Diff Stats
  1. 10 14
      bakerydemo/templates/base/form_page.html
  2. 6 9
      bakerydemo/templates/base/form_page_landing.html
  3. 2 1
      vagrant/provision.sh

+ 10 - 14
bakerydemo/templates/base/form_page.html
View File 

@@ -1,15 +1,11 @@
 
+{% extends "base.html" %}
 
 {% load wagtailcore_tags %}
 
 {% load wagtailcore_tags %}
 
-<html>
 
+{% block content %}
 
-    <head>
 
+    {{ page.intro|richtext }}
 
-        <title>{{ page.title }}</title>
 
+
 
-    </head>
 
+    <form action="{% pageurl page %}" method="POST">
 
-    <body>
 
+        {% csrf_token %}
 
-        <h1>{{ page.title }}</h1>
 
+        {{ form.as_p }}
 
-        {{ page.intro|richtext }}
 
+        <input type="submit">
 
-        <form action="{% pageurl page %}" method="POST">
 
+    </form>
 
-            {% csrf_token %}
 
+{% endblock content %}
 
-            {{ form.as_p }}
 
-            <input type="submit">
 
-        </form>
 
-    </body>
 
-</html>

+ 6 - 9
bakerydemo/templates/base/form_page_landing.html
View File 

@@ -1,9 +1,6 @@
 
-<html>
 
+{% extends "base.html" %}
 
-    <head>
 
+{% load wagtailcore_tags %}
 
-        <title>{{ page.title }}</title>
 
+{% block content %}
 
-    </head>
 
+    <h1>{{ page.title }}</h1>
 
-    <body>
 
+    {{ page.thank_you_text|richtext }}
 
-        <h1>{{ page.title }}</h1>
 
+{% endblock content %}
 
-        <h2>Thanks for your submission!</h2>
 
-    </body>
 
-</html>

+ 2 - 1
vagrant/provision.sh
View File 

@@ -32,8 +32,9 @@ su - vagrant -c "$PIP install -r $PROJECT_DIR/requirements.txt"
 
 chmod a+x $PROJECT_DIR/manage.py
 
 chmod a+x $PROJECT_DIR/manage.py
 
 
 
 
 
-# Run syncdb/migrate/update_index
 
+# Run syncdb/migrate/load_initial_data/update_index
 
 su - vagrant -c "$PYTHON $PROJECT_DIR/manage.py migrate --noinput && \
 
 su - vagrant -c "$PYTHON $PROJECT_DIR/manage.py migrate --noinput && \
 
+                 $PYTHON $PROJECT_DIR/manage.py load_initial_data && \
 
                  $PYTHON $PROJECT_DIR/manage.py update_index"
 
                  $PYTHON $PROJECT_DIR/manage.py update_index"