Merge 3fdeaca into 24e42d9

CHANGELOG.rst

@@ -1,5 +1,15 @@
-0.3 (2015-01-26)
-================
+CHANGELOG
+=========
+
+
+0.4.0 (2015-01-26)
+------------------
+
+* Added compatibility for other boilerplates.
+
+
+0.3.0 (2015-01-26)
+------------------
 
 * multi-boilerplate support
   new requirement: aldryn-boilerplates (needs configuration)

aldryn_gallery/__init__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.3.1'
+__version__ = '0.4.0'

aldryn_gallery/templates/aldryn_gallery/plugins/standard/gallery.html

@@ -0,0 +1,18 @@
+{% load i18n cms_tags shuffle %}
+
+<div id="gallery-{{ instance.pk }}" class="gallery-{{ instance.style }} {{ instance.extra_styles }}
+    {% if instance.engine == 'fade' %} gallery-fade{% endif %}
+    {% if instance.engine == 'slide' %} gallery-slide{% endif %}"
+    data-duration="{{ instance.duration }}"
+    data-timeout="{{ instance.timeout }}">
+
+    {% if instance.shuffle %}
+        {% for plugin in instance.child_plugin_instances|shuffle %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    {% else %}
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    {% endif %}
+</div>

aldryn_gallery/templates/aldryn_gallery/plugins/standard/image_slide.html

@@ -0,0 +1,2 @@
+{# Slide for a filer.Image instance #}
+<img src="{{ image.url }}" alt="{{ image.default_alt_text|default:image.label }}">

aldryn_gallery/templates/aldryn_gallery/plugins/standard/slide.html

@@ -0,0 +1,18 @@
+{# Slide for a SlideCMSPlugin instance #}
+{% with link=instance.get_link image=instance.image %}
+    {% if link %}
+        <a href="{{ link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
+            {% if image %}
+                <img src="{{ image.url }}" alt="{{ image.default_alt_text|default:image.label }}">
+            {% else %}
+                {{ instance.link_text }}
+            {% endif %}
+        </a>
+    {% elif image %}
+        <img src="{{ image.url }}" alt="{{ image.default_alt_text|default:image.label }}">
+    {% endif %}
+{% endwith %}
+
+{% if instance.content %}
+    {{ instance.content|safe }}
+{% endif %}

aldryn_gallery/templates/aldryn_gallery/plugins/standard/slide_folder.html

@@ -0,0 +1,3 @@
+{% for image in instance.folder.files %}
+    {% include slide_template %}
+{% endfor %}