Add ProjectTopicPage

diff --git a/app/organization/projects/admin.py b/app/organization/projects/admin.py
index 2a2512676dce7c8449ed4490fa029d786f13ce4c..bd9eb4a3bdcde2426f3d6085be263fcc10a2452d 100644 (file)
--- a/app/organization/projects/admin.py
+++ b/app/organization/projects/admin.py
@@ -4,6 +4,7 @@ from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 
 from mezzanine.core.admin import *
+from mezzanine.pages.admin import PageAdmin
 
 from organization.projects.models import *
 from organization.pages.models import *
@@ -67,3 +68,4 @@ admin.site.register(Project, ProjectAdminDisplayable)
 admin.site.register(ProjectProgram, ProjectProgramAdmin)
 admin.site.register(ProjectProgramType, ProjectProgramTypeAdmin)
 admin.site.register(ProjectTopic, ProjectTopicAdmin)
+admin.site.register(ProjectTopicPage, PageAdmin)

diff --git a/app/organization/projects/migrations/0012_projecttopicpage.py b/app/organization/projects/migrations/0012_projecttopicpage.py
new file mode 100644 (file)
index 0000000..7cf34fd
--- /dev/null
+++ b/app/organization/projects/migrations/0012_projecttopicpage.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-22 14:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pages', '0004_auto_20160804_1547'),
+        ('organization-projects', '0011_auto_20160922_1438'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectTopicPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
+                ('sub_title', models.TextField(blank=True, max_length=1024, verbose_name='sub title')),
+                ('project_topic', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='pages', to='organization-projects.ProjectTopic', verbose_name='project topic')),
+            ],
+            options={
+                'ordering': ('_order',),
+                'verbose_name': 'team page',
+            },
+            bases=('pages.page', models.Model),
+        ),
+    ]

diff --git a/app/organization/projects/migrations/0013_auto_20160922_1633.py b/app/organization/projects/migrations/0013_auto_20160922_1633.py
new file mode 100644 (file)
index 0000000..2f93d74
--- /dev/null
+++ b/app/organization/projects/migrations/0013_auto_20160922_1633.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-22 14:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0012_projecttopicpage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='projecttopicpage',
+            name='sub_title_en',
+            field=models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title'),
+        ),
+        migrations.AddField(
+            model_name='projecttopicpage',
+            name='sub_title_fr',
+            field=models.TextField(blank=True, max_length=1024, null=True, verbose_name='sub title'),
+        ),
+    ]

diff --git a/app/organization/projects/migrations/0014_auto_20160922_1642.py b/app/organization/projects/migrations/0014_auto_20160922_1642.py
new file mode 100644 (file)
index 0000000..8129b6f
--- /dev/null
+++ b/app/organization/projects/migrations/0014_auto_20160922_1642.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-22 14:42
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0013_auto_20160922_1633'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='projecttopicpage',
+            options={'ordering': ('_order',), 'verbose_name': 'project topic page'},
+        ),
+    ]

diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py
index 7ca69d699ea1cfd4952318f58e810f83d693c75f..9c82bddb792847f0dcb080c0386b7818557be67a 100644 (file)
--- a/app/organization/projects/models.py
+++ b/app/organization/projects/models.py
@@ -92,3 +92,11 @@ class ProjectImage(Image):
 class ProjectBlock(Block):
 
     project = models.ForeignKey(Project, verbose_name=_('project'), related_name='blocks', blank=True, null=True, on_delete=models.SET_NULL)
+
+
+class ProjectTopicPage(Page, SubTitled):
+
+    project_topic = models.ForeignKey('ProjectTopic', verbose_name=_('project topic'), related_name="pages", blank=True, null=True, on_delete=models.SET_NULL)
+
+    class Meta:
+        verbose_name = _('project topic page')

diff --git a/app/organization/projects/translation.py b/app/organization/projects/translation.py
index 9830cf0b176b269a9f1754979dbfd22ddb548525..302cbeeaf8bfb0ece226075e30a4b6bf453e6c99 100644 (file)
--- a/app/organization/projects/translation.py
+++ b/app/organization/projects/translation.py
@@ -55,3 +55,9 @@ class ProjectProgramTypeTranslationOptions(TranslationOptions):
 class ProjectTopicTranslationOptions(TranslationOptions):
 
     fields = ('name', 'description')
+
+
+@register(ProjectTopicPage)
+class ProjectTopicPageTranslationOptions(TranslationOptions):
+
+    fields = ('sub_title',)

diff --git a/app/templates/projects/project_list.html b/app/templates/projects/project_list.html
deleted file mode 100644 (file)
index c6b89ff..0000000
--- a/app/templates/projects/project_list.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% for project in projects %}
-  <h5><a href="{{ project.get_absolute_url }}" title="">{{ project.title }}</a></h5>
-  <p>{{ project.description|slice:":500" }}</p>
-{% endfor %}