Fix custompage template

diff --git a/app/settings.py b/app/settings.py
index 4b7fe38590f1eaa6e794ac1f9f634f233ad980a3..15ccf8ac76ce6eb1e3ccb76cfc123b78951274fc 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -176,7 +176,6 @@ STATIC_ROOT = '/srv/static/'
 
 STATICFILES_DIRS = [
     '/srv/app/static',
-
 ]
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a

diff --git a/app/templates/pages/basicpage.html b/app/templates/pages/basicpage.html
deleted file mode 100644 (file)
index 2710b00..0000000
--- a/app/templates/pages/basicpage.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "pages/page.html" %}
-{% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
-
-{% block meta_title %}{{ page.meta_title }}{% endblock %}
-
-{% block meta_keywords %}{% metablock %}
-{% keywords_for page as keywords %}
-{% for keyword in keywords %}
-    {% if not forloop.first %}, {% endif %}
-    {{ keyword }}
-{% endfor %}
-{% endmetablock %}{% endblock %}
-
-{% block meta_description %}{% metablock %}
-{{ page.description }}
-{% endmetablock %}{% endblock %}
-
-{% block page_class %}
-    custompage
-{% endblock %}
-
-{% block page_title %}
-
-    {% editable page.custompage.title %}
-        <h1 class="dotted">{{ page.custompage.title }}</h1>
-    {% endeditable %}
-
-{% endblock %}
-
-{% block page_content %}
-
-    {% if page.custompage.sub_title %}
-        {% editable page.custompage.sub_title %}
-            <div class="chapo">
-                {{ page.custompage.sub_title }}
-            </div>
-        {% endeditable %}
-    {% endif %}
-
-    {% editable page.custompage.content %}
-        {{ page.custompage.content|richtext_filters|safe }}
-    {% endeditable %}
-
-    {% if page.get_ascendants|length == 1 %}
-        {% children_pages page.id as childrens %}
-        {% if childrens %}
-            <div class="page__childrens">
-                {% for children in childrens %}
-                    {% with children as object %}
-                        {% include "pages/includes/page_card.html" %}
-                    {% endwith %}
-                {% endfor %}
-            </div>
-        {% endif %}
-    {% endif %}
-
-{% endblock %}
-
-{% block page_sub_content %}
-    {% if page.custompage.pageblock_set.all %}
-        <div class="white-bg">
-            <div class="container">
-                <div class="row">
-                    <div class="col-sm-12">
-                        <hr class="mt0" />
-                        {% for pageblock in page.custompage.pageblock_set.all %}
-                            <div class="row" data-summary-content>
-                                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
-                                    {% if not forloop.first and pageblock.with_separator %}
-                                        <hr />
-                                    {% endif %}
-                                    <h2 class="dotted">{{ pageblock.title }}</h2>
-                                    {{ pageblock.content|richtext_filters|safe }}
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-{% endblock %}

diff --git a/app/templates/pages/custompage.html b/app/templates/pages/custompage.html
new file mode 100644 (file)
index 0000000..2710b00
--- /dev/null
+++ b/app/templates/pages/custompage.html
@@ -0,0 +1,82 @@
+{% extends "pages/page.html" %}
+{% load i18n mezzanine_tags keyword_tags  pages_tags organization_tags %}
+
+{% block meta_title %}{{ page.meta_title }}{% endblock %}
+
+{% block meta_keywords %}{% metablock %}
+{% keywords_for page as keywords %}
+{% for keyword in keywords %}
+    {% if not forloop.first %}, {% endif %}
+    {{ keyword }}
+{% endfor %}
+{% endmetablock %}{% endblock %}
+
+{% block meta_description %}{% metablock %}
+{{ page.description }}
+{% endmetablock %}{% endblock %}
+
+{% block page_class %}
+    custompage
+{% endblock %}
+
+{% block page_title %}
+
+    {% editable page.custompage.title %}
+        <h1 class="dotted">{{ page.custompage.title }}</h1>
+    {% endeditable %}
+
+{% endblock %}
+
+{% block page_content %}
+
+    {% if page.custompage.sub_title %}
+        {% editable page.custompage.sub_title %}
+            <div class="chapo">
+                {{ page.custompage.sub_title }}
+            </div>
+        {% endeditable %}
+    {% endif %}
+
+    {% editable page.custompage.content %}
+        {{ page.custompage.content|richtext_filters|safe }}
+    {% endeditable %}
+
+    {% if page.get_ascendants|length == 1 %}
+        {% children_pages page.id as childrens %}
+        {% if childrens %}
+            <div class="page__childrens">
+                {% for children in childrens %}
+                    {% with children as object %}
+                        {% include "pages/includes/page_card.html" %}
+                    {% endwith %}
+                {% endfor %}
+            </div>
+        {% endif %}
+    {% endif %}
+
+{% endblock %}
+
+{% block page_sub_content %}
+    {% if page.custompage.pageblock_set.all %}
+        <div class="white-bg">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-12">
+                        <hr class="mt0" />
+                        {% for pageblock in page.custompage.pageblock_set.all %}
+                            <div class="row" data-summary-content>
+                                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
+                                    {% if not forloop.first and pageblock.with_separator %}
+                                        <hr />
+                                    {% endif %}
+                                    <h2 class="dotted">{{ pageblock.title }}</h2>
+                                    {{ pageblock.content|richtext_filters|safe }}
+                                </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}