Permalink
Browse files

gallery

  • Loading branch information...
1 parent d730703 commit ef71ed8a0c76a4cc17c21483cced505c175904bc @fivethreeo committed Sep 14, 2011
Showing with 5 additions and 3 deletions.
  1. +1 −1 docs/conf.py
  2. +1 −1 filer_gallery/templates/filer_gallery/gallery_list.html
  3. +3 −1 setup.py
View
@@ -49,7 +49,7 @@
# General information about the project.
project = u'django-filer-gallery'
-copyright = u'2011, \xc3yvind Saltvik'
+copyright = u'2011, Øyvind Saltvik'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -1 +1 @@
-{% load thumbnail adminmedia sekizai_tags %}{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}filer_gallery/orbit/jquery-1.5.1.min.js"></script>{% endaddtoblock %}{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}filer_gallery/orbit/jquery.orbit-1.2.3.min.js"></script>{% endaddtoblock %}{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}filer_gallery/orbit/orbit-1.2.3.css" media="all" />{% endaddtoblock %}{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}filer_gallery/filer_gallery.css" media="all" />{% endaddtoblock %}{% for gallery in object_list %}{% addtoblock "js" %}<script type="text/javascript">//<![CDATA[(function ($) { var config = {{ ORBIT_CONFIG|safe }} config.bulletThumbs = false // thumbnails for the bullets config.bulletThumbLocation = '' config.afterSlideChange = function(){} $(document).ready(function () { $('#filer-gallery-{{ instance.pk }}').orbit(config); });})(jQuery)//]]></script>{% endaddtoblock %}<div class="filer-gallery-wrapper"><div id="filer-gallery-{{ instance.pk }}"> {% for image in gallery.galleryimage_set.all %} <img src="{% thumbnail image.image FILER_GALLERY_DISPLAY_SIZE %}" alt="{{ image.title }}" data-caption="#filer-gallery-caption-{{ image.pk }}" /> {% endfor %}</div>{% for image in gallery.galleryimage_set.all %} <span class="orbit-caption" id="filer-gallery-caption-{{ image.pk }}">{{ image.title }}</span>{% endfor %}</div>{% endfor %}
+{% load thumbnail adminmedia sekizai_tags %}{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}filer_gallery/orbit/jquery-1.5.1.min.js"></script>{% endaddtoblock %}{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}filer_gallery/orbit/jquery.orbit-1.2.3.min.js"></script>{% endaddtoblock %}{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}filer_gallery/orbit/orbit-1.2.3.css" media="all" />{% endaddtoblock %}{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}filer_gallery/filer_gallery.css" media="all" />{% endaddtoblock %}{% for gallery in object_list %}{% addtoblock "js" %}<script type="text/javascript">//<![CDATA[(function ($) { var config = {{ ORBIT_CONFIG|safe }} config.bulletThumbs = false // thumbnails for the bullets config.bulletThumbLocation = '' config.afterSlideChange = function(){} $(document).ready(function () { $('#filer-gallery-{{ gallery.pk }}').orbit(config); });})(jQuery)//]]></script>{% endaddtoblock %}<div class="filer-gallery-wrapper"><div id="filer-gallery-{{ gallery.pk }}"> {% for image in gallery.galleryimage_set.all %} <img src="{% thumbnail image.image FILER_GALLERY_DISPLAY_SIZE %}" alt="{{ image.title }}" data-caption="#filer-gallery-caption-{{ image.pk }}" /> {% endfor %}</div>{% for image in gallery.galleryimage_set.all %} <span class="orbit-caption" id="filer-gallery-caption-{{ image.pk }}">{{ image.title }}</span>{% endfor %}</div>{% endfor %}
View
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
from setuptools import setup, find_packages
import os
import filer_gallery
@@ -17,7 +19,7 @@
version=filer_gallery.get_version(),
description='A gallery using django-filer',
long_description=open(os.path.join(os.path.dirname(__file__), 'README.rst')).read(),
- author='\xc3yvind Saltvik',
+ author='Oyvind Saltvik',
author_email='oyvind.saltvik@gmail.com',
url='http://github.com/fivethreeo/django-filer-gallery.git',
packages=find_packages(),

0 comments on commit ef71ed8

Please sign in to comment.