Merge branch 'feature/supporters' into develop

digitalglarus/cms_plugins.py

@@ -1,6 +1,6 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
-from .models import DGGalleryPlugin
+from .models import DGGalleryPlugin, DGSupportersPlugin, Supporter
 from django.utils.translation import ugettext as _
 
 class CMSGalleryPlugin(CMSPluginBase):
@@ -16,4 +16,18 @@ class CMSGalleryPlugin(CMSPluginBase):
         })
         return context
 
+class CMSSupportersPlugin(CMSPluginBase):
+    name = _("Digital Glarus Supporters")
+    model = DGSupportersPlugin
+    render_template = "digitalglarus/supporters_plugin.html"
+
+    def render(self, context, instance, placeholder):
+        context.update({
+            'supporters': Supporter.objects.all().order_by('name'),
+            'object': instance,
+            'placeholder':placeholder
+        })
+        return context
+
 plugin_pool.register_plugin(CMSGalleryPlugin)
+plugin_pool.register_plugin(CMSSupportersPlugin)

digitalglarus/migrations/0008_dgsupportersplugin.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0012_auto_20150607_2207'),
+        ('digitalglarus', '0007_auto_20160208_1031'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DGSupportersPlugin',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(primary_key=True, auto_created=True, parent_link=True, to='cms.CMSPlugin', serialize=False)),
+                ('dgSupporters', models.ManyToManyField(to='digitalglarus.Supporter')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+    ]

digitalglarus/migrations/0009_remove_dgsupportersplugin_dgsupporters.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0008_dgsupportersplugin'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dgsupportersplugin',
+            name='dgSupporters',
+        ),
+    ]

digitalglarus/models.py

@@ -22,6 +22,9 @@ class Supporter(models.Model):
     def __str__(self):
         return "%s" % (self.name)
 
+    def get_absolute_url(self):
+        return reverse('dgSupporters_view', args=[self.pk])
+
 
 class DGGallery(models.Model):
     parent = models.ForeignKey('self', blank=True, null=True)
@@ -46,3 +49,6 @@ class DGPicture(models.Model):
 
 class DGGalleryPlugin(CMSPlugin):
     dgGallery = models.ForeignKey(DGGallery)
+
+class DGSupportersPlugin(CMSPlugin):
+    pass

digitalglarus/templates/digitalglarus/supporters_plugin.html

@@ -0,0 +1,8 @@
+<div class="row">
+   {% for supporter in supporters.all %}
+    <div class="col-md-6">
+        <h3 class="text-center">{{supporter.name}}</h3>
+        <p class="text-center">{{supporter.description}}</p>
+    </div>
+   {% endfor %}
+</div>

templates/cms/digitalglarus/partials/menu.html

@@ -18,9 +18,6 @@
       <ul class="nav navbar-nav">
 	{% show_menu 0 0 0 1 %}
 	{% show_menu_below_id "digital-glarus-page" 0 %}
-	<li>
-	  <a href="{% url 'digitalglarus:supporters' %}">Supporters</a>
-	</li>
 	<li>
 	  <a href="{% url 'digitalglarus:blog' %}">Blog</a>
 	</li>

templates/cms/digitalglarus/two_columns.html

@@ -0,0 +1,21 @@
+{% extends "cms/digitalglarus/base.html" %}
+{% load staticfiles cms_tags %}
+{% block title %}About{% endblock %}
+
+{% block content %}
+<div class="row">
+  <div class="box">
+    <div class="col-lg-6">
+      {% placeholder 'two_columns_a' %}
+    </div>
+    <div class="col-lg-6">
+      {% placeholder 'two_columns_b' %}
+    </div>
+    <div class="clearfix"></div>
+  </div>
+</div>
+
+</div>
+<!-- /.container -->
+
+{% endblock %}