PageBlock : corrected into Department and Team

diff --git a/app/organization/magazine/models.py b/app/organization/magazine/models.py
index 559d383b8636146c9837305a74c6d6dddf426ca2..5f9b234bc5a77474a21da3b68548f387f69bcf24 100644 (file)
--- a/app/organization/magazine/models.py
+++ b/app/organization/magazine/models.py
@@ -72,7 +72,5 @@ class Brief(Displayable, RichText): #Orderable
 class Topic(Page, RichText):
     """Topic for magazine menu"""
 
-    #articles = models.ManyToManyField(Article, verbose_name=_('articles'), related_name="topics", blank=True)
-
     class Meta:
         verbose_name = _('topic')

diff --git a/app/organization/network/admin.py b/app/organization/network/admin.py
index 9e9d15df7767fa60cde11c79c84acd4023b61eec..db5685c0352f4aa6ee8c2a598a8c097b201e540a 100644 (file)
--- a/app/organization/network/admin.py
+++ b/app/organization/network/admin.py
@@ -20,6 +20,11 @@ class OrganizationAdmin(BaseTranslationModelAdmin):
     inlines = [OrganizationImageInline,]
 
 
+class DepartmentPageBlockInline(StackedDynamicInlineAdmin):
+
+    model = PageBlock
+
+
 class DepartmentPageImageInline(TabularDynamicInlineAdmin):
 
     model = PageImage
@@ -27,7 +32,7 @@ class DepartmentPageImageInline(TabularDynamicInlineAdmin):
 
 class DepartmentPageAdmin(PageAdmin):
 
-    inlines = [DepartmentPageImageInline,]
+    inlines = [DepartmentPageImageInline, DepartmentPageBlockInline]
 
 
 class DepartmentAdmin(BaseTranslationModelAdmin):
@@ -44,10 +49,14 @@ class TeamPageImageInline(TabularDynamicInlineAdmin):
 
     model = PageImage
 
+class TeamPageBlockInline(StackedDynamicInlineAdmin):
+
+    model = PageBlock
+
 
 class TeamPageAdmin(PageAdmin):
 
-    inlines = [TeamPageImageInline,]
+    inlines = [TeamPageImageInline, TeamPageBlockInline]
 
 
 class PersonAdminBase(BaseTranslationModelAdmin):

diff --git a/app/templates/pages/departmentpage.html b/app/templates/pages/departmentpage.html
index 6bb47f0020834b31b2b3034f65b2f9e492409e68..6f3b242fb08d0cfe25198a1129f2333c35a31576 100644 (file)
--- a/app/templates/pages/departmentpage.html
+++ b/app/templates/pages/departmentpage.html
@@ -59,34 +59,9 @@
 {% endblock %}
 
 {% block page_sub_content %}
-
-    {% if page.departmentpage.pageblock_set.all %}
-        <div class="white-bg pb2">
-            <div class="container">
-                <div class="row">
-                    <div class="col-sm-12">
-                        <hr class="mt0" />
-                        {% for pageblock in page.departmentpage.pageblock_set.all %}
-                            {% if not forloop.first and pageblock.with_separator %}
-                                <hr />
-                            {% endif %}
-                            <div class="row" data-summary-content>
-                                <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg">
-                                    <h2 class="dotted">{{ pageblock.title }}</h2>
-                                    {% if pageblock.content %}
-                                         {{ pageblock.content|richtext_filters|safe }}
-                                    {% else %}
-                                        {% lorem 3 p %}
-                                    {% endif %}
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-
+    {% with page.departmentpage.blocks.all as blocks %}
+      {% include "core/inc/block.html" %}
+    {% endwith %}
 {% endblock %}
 
 {% block page_related_content %}

diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html
index 4a6db78f04dff9343a81817bd26032b2f3172db7..424e135ae578c444c3be5a302e61ac2f97e97cce 100644 (file)
--- a/app/templates/pages/teampage.html
+++ b/app/templates/pages/teampage.html
@@ -69,32 +69,7 @@
 {% endblock %}
 
 {% block page_sub_content %}
-
-    {% if page.teampage.pageblock_set.all %}
-        <div class="white-bg pb2">
-            <div class="container">
-                <div class="row">
-                    <div class="col-sm-12">
-                        <hr class="mt0" />
-                        {% for pageblock in page.teampage.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>
-                                    {% if pageblock.content %}
-                                         {{ pageblock.content|richtext_filters|safe }}
-                                    {% else %}
-                                        {% lorem 3 p %}
-                                    {% endif %}
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-
+  {% with page.teampage.blocks.all as blocks %}
+    {% include "core/inc/block.html" %}
+  {% endwith %}
 {% endblock %}