8 年之前 · 14b5f47851
--- a/bakerydemo/templates/base/form_page.html
+++ b/bakerydemo/templates/base/form_page.html
@@ -1,15 +1,11 @@
 
				+{% extends "base.html" %}
			
 
				 {% load wagtailcore_tags %}
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <title>{{ page.title }}</title>
			
 
				-    </head>
			
 
				-    <body>
			
 
				-        <h1>{{ page.title }}</h1>
			
 
				-        {{ page.intro|richtext }}
			
 
				-        <form action="{% pageurl page %}" method="POST">
			
 
				-            {% csrf_token %}
			
 
				-            {{ form.as_p }}
			
 
				-            <input type="submit">
			
 
				-        </form>
			
 
				-    </body>
			
 
				-</html>
			
 
				+{% block content %}
			
 
				+    {{ page.intro|richtext }}
			
 
				+
			
 
				+    <form action="{% pageurl page %}" method="POST">
			
 
				+        {% csrf_token %}
			
 
				+        {{ form.as_p }}
			
 
				+        <input type="submit">
			
 
				+    </form>
			
 
				+{% endblock content %}
			
--- a/bakerydemo/templates/base/form_page_landing.html
+++ b/bakerydemo/templates/base/form_page_landing.html
@@ -1,9 +1,6 @@
 
				-<html>
			
 
				-    <head>
			
 
				-        <title>{{ page.title }}</title>
			
 
				-    </head>
			
 
				-    <body>
			
 
				-        <h1>{{ page.title }}</h1>
			
 
				-        <h2>Thanks for your submission!</h2>
			
 
				-    </body>
			
 
				-</html>
			
 
				+{% extends "base.html" %}
			
 
				+{% load wagtailcore_tags %}
			
 
				+{% block content %}
			
 
				+    <h1>{{ page.title }}</h1>
			
 
				+    {{ page.thank_you_text|richtext }}
			
 
				+{% endblock content %}
			
--- a/vagrant/provision.sh
+++ b/vagrant/provision.sh
@@ -32,8 +32,9 @@ su - vagrant -c "$PIP install -r $PROJECT_DIR/requirements.txt"
 
				 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 && \
			
 
				+                 $PYTHON $PROJECT_DIR/manage.py load_initial_data && \
			
 
				                  $PYTHON $PROJECT_DIR/manage.py update_index"