Merge branch 'develop' of https://github.com/ic-labs/django-icekit in…

…to develop

icekit/plugins/oembed_with_caption/migrations/0005_auto_20161027_1711.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('icekit_plugins_oembed_with_caption', '0004_auto_20160919_2008'),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name='oembedwithcaptionitem',
+            table='contentitem_icekit_plugins_oembed_with_caption_oembedwithcaptionitem',
+        ),
+    ]

icekit/plugins/oembed_with_caption/migrations/0006_auto_20161027_2330.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('icekit_plugins_oembed_with_caption', '0005_auto_20161027_1711'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='oembedwithcaptionitem',
+            options={},
+        ),
+        migrations.AlterModelTable(
+            name='oembedwithcaptionitem',
+            table='contentitem_oembed_with_caption_item',
+        ),
+    ]

icekit/plugins/oembed_with_caption/models.py

@@ -2,4 +2,5 @@
 
 
 class OEmbedWithCaptionItem(abstract_models.AbstractOEmbedWithCaptionItem):
-    pass
+    class Meta:
+        db_table = "contentitem_oembed_with_caption_item"

icekit/plugins/quote/abstract_models.py

@@ -11,7 +11,8 @@ class AbstractQuoteItem(ContentItem):
     """
     quote = models.TextField()
     attribution = models.CharField(max_length=255, blank=True)
-    organisation = models.CharField(max_length=255, blank=True, help_text="only shown if attribution is given")
+    organisation = models.CharField(max_length=255, blank=True)
+    url = models.URLField(blank=True, help_text="link to the source")
 
     class Meta:
         abstract = True

icekit/plugins/quote/migrations/0004_auto_20161027_1717.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('icekit_plugins_quote', '0003_auto_20160912_2218'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quoteitem',
+            name='url',
+            field=models.URLField(help_text=b'link to the source', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='quoteitem',
+            name='organisation',
+            field=models.CharField(max_length=255, blank=True),
+        ),
+    ]

icekit/plugins/quote/templates/icekit/plugins/quote/default.html

@@ -1,6 +1,10 @@
 <blockquote>
 	<p>{{ instance.quote|safe }}</p>
-	{% if instance.attribution %}
-		<footer>{{ instance.attribution}}{% if instance.organisation %}, <cite>{{ instance.organisation }}</cite>{% endif %}</footer>
+	{% if instance.attribution or instance.organisation %}
+		<footer>
+			{% if instance.url %}<a href="{{ instance.url }}" target="_blank">{% endif %}
+				{{ instance.attribution}}{% if instance.attribution and instance.organisation %}, {% endif %}{% if instance.organisation %}<cite>{{ instance.organisation }}</cite>{% endif %}
+			{% if instance.url %}</a>{% endif %}
+		</footer>
 	{% endif %}
 </blockquote>