Refactor the page and basicpage templates

diff --git a/app/templates/pages/basicpage.html b/app/templates/pages/basicpage.html
index e3f0fd603919ad656de81f0cf6bb5d99316882e3..e0c36307d7ba18956f388d3c535f2ce7a46528b7 100644 (file)
--- a/app/templates/pages/basicpage.html
+++ b/app/templates/pages/basicpage.html
@@ -46,3 +46,22 @@
     {% endcomment %}
 
 {% endblock %}
+
+{% block main %}
+    {{ block.super }}
+
+    <div class="white-bg">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    {% block page_sub_content %}
+                        {% if page.get_ascendants|length == 0 %}
+                            <hr class="mt0" />
+                        {% endif %}
+                    {% endblock %}
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index 438c391b93e55b2d871cdf25698544f7e8db49d3..ac0b929c4cfd1f9f8355fd96aa4758196ae73f57 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -51,19 +51,5 @@
 
         </div>
 
-        <div class="white-bg">
-            <div class="container">
-                <div class="row">
-                    <div class="col-sm-12">
-                        {% block page_sub_content %}
-                            {% if page.get_ascendants|length == 0 %}
-                                <hr class="mt0" />
-                            {% endif %}
-                        {% endblock %}
-                    </div>
-                </div>
-            </div>
-        </div>
-
     </div>
 {% endblock %}