Fix project topic list

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 1000ea1aa4d695ec80814780852f1db195f206cf..693d9c80d39d5436c67a72b6a8d0e9757ab1dda8 100644 (file)
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -111,4 +111,4 @@ def in_category(objects, category):
 
 @register.filter
 def sub_topics(topic):
-    return Topic.objects.filter(parent=topic)
+    return ProjectTopic.objects.filter(parent=topic)

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index bbe572728c06fe25afc1859bde1746810af59093..6cea623929148a3f73eac784da667fa236dd833c 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -16,6 +16,7 @@
 {% endmetablock %}{% endblock %}
 
 {% block main %}
+
     <div class="page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
         <div class="container">
 

diff --git a/app/templates/pages/projectopicpage.html b/app/templates/pages/projectopicpage.html
deleted file mode 100644 (file)
index ff57699..0000000
--- a/app/templates/pages/projectopicpage.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "pages/custompage.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 %}
-    department
-{% endblock %}
-
-{% block body_class %}
-    {% with page.get_ascendants|last as top_level_parent %}
-        {% if top_level_parent.get_content_model.weaving_css_class %}
-        pattern pattern-bg {{ top_level_parent.get_content_model.weaving_css_class }}
-        {% endif %}
-    {% endwith %}
-{% endblock %}
-
-{% block page_title %}
-    {% editable page.projecttopicpage.title %}
-        <h1 class="dotted">{{ page.projecttopicpage.title }}</h1>
-    {% endeditable %}
-{% endblock %}
-
-{% block page_content %}
-
-    {% if page.projecttopicpage.sub_title %}
-        {% editable page.projecttopicpage.sub_title %}
-            <div class="chapo">
-                {{ page.projecttopicpage.sub_title }}
-            </div>
-        {% endeditable %}
-    {% endif %}
-
-    {% with page.projecttopicpage.project_topic as topic %}
-      {% for sub_topic in topic|sub_topics %}
-        {{ sub_topic }}
-          {% trans "European and national projects" %}<br>
-          {% for project in sub_topic.projects.all|get_type:"external project" %}
-            {{ project }}
-          {% enfor %}
-          {% trans "Internal projects" %}<br>
-          {% for project in sub_topic.projects.all|get_type:"internal project" %}
-            {{ project }}
-          {% enfor %}
-      {% endfor %}
-
-{% endblock %}

diff --git a/app/templates/pages/projecttopicpage.html b/app/templates/pages/projecttopicpage.html
new file mode 100644 (file)
index 0000000..4bbae4d
--- /dev/null
+++ b/app/templates/pages/projecttopicpage.html
@@ -0,0 +1,60 @@
+{% 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 %}
+    department
+{% endblock %}
+
+{% block body_class %}
+    {% with page.get_ascendants|last as top_level_parent %}
+        {% if top_level_parent.get_content_model.weaving_css_class %}
+        pattern pattern-bg {{ top_level_parent.get_content_model.weaving_css_class }}
+        {% endif %}
+    {% endwith %}
+{% endblock %}
+
+{% block page_title %}
+    {% editable page.projecttopicpage.title %}
+        <h1 class="dotted">{{ page.projecttopicpage.title }}</h1>
+    {% endeditable %}
+{% endblock %}
+
+{% block page_content %}
+
+    {% if page.projecttopicpage.sub_title %}
+        {% editable page.projecttopicpage.sub_title %}
+            <div class="chapo">
+                {{ page.projecttopicpage.sub_title }}
+            </div>
+        {% endeditable %}
+    {% endif %}
+
+    {% with page.projecttopicpage.project_topic as topic %}
+      {% for sub_topic in topic|sub_topics %}
+        {{ sub_topic }}<br>
+          {% trans "European and national projects" %}<br>
+          {% for project in sub_topic.projects.all|get_type:"external project" %}
+            {{ project }}<br>
+          {% endfor %}
+          {% trans "Internal projects" %}<br>
+          {% for project in sub_topic.projects.all|get_type:"internal project" %}
+            {{ project }}<br>
+          {% endfor %}
+      {% endfor %}
+    {% endwith %}
+
+{% endblock %}