Paginator der besser ins Design passt.

2014-12-10 00:23:36 +01:00
parent 2011d3ce25
commit 711c303f9a
75 changed files with 675 additions and 1599 deletions
--- a/gallery/forms.py
+++ b/gallery/forms.py
@@ -3,11 +3,13 @@ Created on 03.10.2011

@author: christian
 """
-from . import models
 from django import forms
 from django.utils.translation import ugettext as _
 from django.contrib.auth import get_user_model
-from utils.html5.widgets import DateTimeInput
+
+from . import models
+from events.models import Event
+

 user_query = get_user_model().objects.all()

@@ -15,8 +17,8 @@ user_query = get_user_model().objects.all()
 class PhotoUploadForm(forms.Form):
    error_css_class = 'error'
    required_css_class = 'required'
-    photographer = forms.ModelChoiceField(user_query, required=True,)
-    event = forms.ModelChoiceField(models.Event.objects.all(), required=True,)
+    photographer = forms.ModelChoiceField(user_query, required=True, )
+    event = forms.ModelChoiceField(Event.objects.all(), required=True, )
    upload = forms.FileField(
        label=_('Images'),
        required=True,
@@ -38,20 +40,3 @@ class EditPhotoForm(forms.ModelForm):
        fields = ('event', 'name', 'description', 'photographer',
                  'anchor_horizontal', 'anchor_vertical',
                  'created_date', 'on_startpage')
-
-
-class EventForm(forms.ModelForm):
-    error_css_class = 'error'
-    required_css_class = 'required'
-
-    start = forms.DateTimeField(
-        label=_('start'), required=True,
-        widget=DateTimeInput()  # widget=SplitDateTimeWidget()
-    )
-    end = forms.DateTimeField(
-        label=_('end'), required=False,
-        widget=DateTimeInput()  # widget=SplitDateTimeWidget()
-    )
-
-    class Meta(object):
-        model = models.Event
--- a/gallery/models.py
+++ b/gallery/models.py
@@ -5,29 +5,11 @@ import os
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db import models
-from django.template.defaultfilters import slugify
-from django.utils.timezone import now
 from django.utils.translation import ugettext as _
-from imagekit import ImageSpec
-import imagekit
-from imagekit.models import ImageSpecField
-from pilkit import processors
 import pyexiv2

-from utils import COUNTRIES, OverwriteStorage
-
-
-CHOICES_HORIZONTAL = (
-    (0.00000001, _('left')),
-    (0.5, _('center')),
-    (1, _('right'))
-)
-
-CHOICES_VERTICAL = (
-    (0.00000001, _('top')),
-    (0.5, _('middle')),
-    (1, _('bottom'))
-)
+from utils import OverwriteStorage
+from kasu import image_models


 def get_upload_path(instance, filename):
@@ -42,231 +24,10 @@ def get_upload_path(instance, filename):
    @type filename: String
    """
    extension = filename[filename.rfind('.') + 1:]
-    if isinstance(instance, Event):
-        if instance.id:
-            return "events/%s.%s" % (instance.id, extension)
-        else:
-            return "events/%s.%s" % (slugify(instance.name), extension)
-    elif isinstance(instance, Location):
-        if instance.id:
-            return "events/location/%s.%s" % (instance.id, extension)
-        else:
-            return "events/location/%s.%s" % (instance.id, extension)
-    elif isinstance(instance, Photo):
+    if isinstance(instance, Photo):
        return "events/%s/%s" % (instance.event.id, filename)


-def post_save_image(sender, instance=None, created=False, raw=False, **kwargs):
-    """
-    Reganerate the images.
-    """
-    os.remove(instance.display.path)
-    os.remove(instance.callout.path)
-    os.remove(instance.thumbnail.path)
-
-    """
-    instance.callout.generate(force=True)
-    instance.display.generate(force=True)
-    instance.thumbnail.generate(force=True)
-    """
-
-
-class CalloutImage(ImageSpec):
-    format = 'PNG'
-    width = 940
-    height = 300
-
-    @property
-    def processors(self):
-        model, field_name = imagekit.utils.get_field_info(self.source)  # @UnusedVariable @IgnorePep8
-        anchor = model.get_anchor()
-        if anchor:
-            return [processors.Transpose(), processors.ResizeToFill(
-                width=self.width,
-                height=self.height, anchor=anchor
-            )]
-        else:
-            return [processors.Transpose(), processors.SmartResize(
-                width=self.width,
-                height=self.height
-            )]
-
-
-class DisplayImage(ImageSpec):
-    format = 'PNG'
-    processors = [processors.Transpose(),
-                  processors.ResizeToFit(width=940, height=940, upscale=False)]
-
-
-class ThumbnailImage(CalloutImage):
-    format = 'PNG'
-    width = 140
-    height = 140
-
-
-imagekit.register.generator('kasu:image:callout', CalloutImage)
-imagekit.register.generator('kasu:image:display', DisplayImage)
-imagekit.register.generator('kasu:image:thumbnail', ThumbnailImage)
-
-
-class ImageModel(models.Model):
-    callout = ImageSpecField(source='image', id='kasu:image:callout')
-    display = ImageSpecField(source='image', id='kasu:image:display')
-    thumbnail = ImageSpecField(source='image', id='kasu:image:thumbnail')
-
-    def get_anchor(self):
-        try:
-            anchor_horizontal = getattr(self, 'anchor_horizontal')
-            anchor_vertical = getattr(self, 'anchor_vertical')
-        except AttributeError:
-            return None
-        if anchor_horizontal and anchor_vertical:
-            return self.anchor_horizontal, self.anchor_vertical
-        else:
-            return None
-
-    class Meta:
-        abstract = True
-
-
-class EventManager(models.Manager):
-    def current_event(self):
-        try:
-            current = self.filter(start__lte=now())
-            current = current.filter(end__gte=now())
-            return current.order_by('start', 'end')[0]
-        except:
-            return None
-
-    def next_event(self):
-        try:
-            return self.filter(start__gt=now()).order_by('start', 'end')[0]
-        except:
-            return None
-
-    def archive(self):
-        return self.filter(start__lt=now())
-
-    def upcoming(self, limit=3):
-        result = self.filter(start__gt=now()).order_by('start', 'end')
-        if limit:
-            return result[1:(limit + 1)]
-        else:
-            return result
-
-
-class Event(ImageModel):
-    name = models.CharField(_('Name'), max_length=255)
-    description = models.TextField(_("Description"), blank=True)
-    location = models.ForeignKey('Location')
-    start = models.DateTimeField(_('Start'))
-    end = models.DateTimeField(_('End'), blank=True, null=True)
-    url = models.URLField(_('Homepage'), blank=True)
-    image = models.ImageField(_("Image"), upload_to=get_upload_path,
-                              storage=OverwriteStorage(), blank=True, null=True)
-    is_tournament = models.BooleanField(_('Tournament'), default=False,
-                                        help_text=_(u'This event is a tournament, different rules apply for \
-        the kyu ranking.'))
-    photo_count = models.PositiveIntegerField(default=0, editable=False)
-    event_series = models.ForeignKey('Event', blank=True, null=True,
-                                     on_delete=models.SET_NULL, editable=False,
-                                     verbose_name=_('Event Series'),
-                                     help_text=_(u'Wenn dieser Event zu einer Veranstaltungsreihe gehört \
-        werden Ort, Beschreibung, Bild und Homepage von dem hier angegebenen \
-        Event übernommen.'))
-    objects = EventManager()
-
-    class Meta(object):
-        verbose_name = _('Event')
-        verbose_name_plural = _('Events')
-        ordering = ('-start', '-end',)
-
-    def __unicode__(self):
-        try:
-            return "%(name)s (%(date)s)" % {'name': self.name,
-                                            'date': self.start.date()}
-        except:
-            return "New Event Model"
-
-    def get_absolute_url(self):
-        kwargs = {
-            'pk': self.id,
-            'year': self.start.strftime('%Y'),
-            'month': self.start.strftime('%m')
-        }
-        return reverse('event-detail', kwargs=kwargs)
-
-    def get_edit_url(self):
-        kwargs = {
-            'pk': self.id,
-            'year': self.start.strftime('%Y'),
-            'month': self.start.strftime('%m')
-        }
-        return reverse('event-form', kwargs=kwargs)
-
-    def get_callout(self):
-        if self.image:
-            return self.callout
-        elif self.photo_set.count():
-            return self.photo_set.all().order_by('?')[0].callout
-        elif self.location.image:
-            return self.location.callout
-        else:
-            return None
-
-    def get_thumbnail(self):
-        if self.image:
-            return self.thumbnail
-        elif self.photo_set.count():
-            return self.photo_set.all().order_by('?')[0].thumbnail
-        elif self.location.image:
-            return self.location.thumbnail
-        else:
-            return None
-
-    def save(self, **kwargs):
-        if self.event_series:
-            master_event = self.event_series
-            self.description = master_event.description
-            self.location = master_event.location
-            self.url = master_event.url
-            self.image = master_event.image
-        self.photo_count = self.photo_set.count()
-        models.Model.save(self, **kwargs)
-
-        # Update the rest of the event series:
-        for sub_event in Event.objects.filter(event_series=self):
-            sub_event.save()
-
-        # Update the Hanchans if necesery:
-        for hanchan in self.hanchan_set.all():
-            hanchan.save()
-
-
-class Location(ImageModel):
-    name = models.CharField(_("Name"), max_length=200)
-    description = models.TextField(_("Description"), blank=True)
-    image = models.ImageField(_("Image"), upload_to=get_upload_path,
-                              storage=OverwriteStorage(), blank=True, null=True)
-    url = models.URLField(_('Homepage'), blank=True)
-    postal_code = models.CharField(_('Postal Code'), max_length=6)
-    street_address = models.CharField(_('Street Address'), max_length=127)
-    locality = models.CharField(_('Locality'), max_length=127)
-    country = models.CharField(_('Country'), max_length=2, choices=COUNTRIES)
-
-    class Meta(object):
-        verbose_name = _('Venue')
-        verbose_name_plural = _('Venues')
-
-    def __unicode__(self):
-        return self.name
-
-    @property
-    def address(self):
-        address = (self.street_address, self.locality, self.country,)
-        return ','.join(address)
-
-
 class PhotoManager(models.Manager):
    def get_random(self, startpage=True):
        if startpage:
@@ -279,26 +40,26 @@ class PhotoManager(models.Manager):
            return Photo()


-class Photo(ImageModel):
+class Photo(image_models.ImageModel):
    name = models.CharField(_("Name"), max_length=100, blank=True)
    image = models.ImageField(_("Image"), upload_to=get_upload_path,
                              storage=OverwriteStorage())
    anchor_horizontal = models.FloatField(
        _('horizontal Anchorpoint'),
-        choices=CHOICES_HORIZONTAL,
+        choices=image_models.CHOICES_HORIZONTAL,
        blank=True, null=True,
        help_text='Der Ankerpunkt ist der interessante Teil des Bildes,\
        welcher nie abgeschnitten werden darf'
    )
    anchor_vertical = models.FloatField(
        _('vertical Anchorpoint'),
-        choices=CHOICES_VERTICAL,
+        choices=image_models.CHOICES_VERTICAL,
        blank=True, null=True,
        help_text='Wenn kein Ankerpunkt von Hand (horizontal und vertikal)\
        festgelegt wird, versucht die Software diesen selbst zu erraten.'
    )

-    event = models.ForeignKey(Event)
+    event = models.ForeignKey('events.Event')
    description = models.TextField(
        _("Description"),
        max_length=300,
@@ -321,10 +82,12 @@ class Photo(ImageModel):
    orientation = 1

    class Meta:
+        get_latest_by = "created_date"
+        ordering = ["created_date"]
+        db_table = 'events_photo'
        verbose_name = _('Event Image')
        verbose_name_plural = _('Event Images')
-        ordering = ["created_date"]
-        get_latest_by = "created_date"
+

    def __unicode__(self):
        return os.path.basename(self.image.name)
@@ -395,9 +158,14 @@ class Photo(ImageModel):
        Triggers to save related Event to save. This should force an update for
        the denormalized Photo count.
        """
-        ImageModel.save(self, **kwargs)
+        super(Photo, self).save()
        self.save_metadata()
-        self.event.save()


-models.signals.post_save.connect(post_save_image, sender=Photo)
+def update_event(sender, instance=None, created=False, raw=False, **kwargs):
+    image_models.regenerate_image_cache(sender, instance=instance)
+    instance.event.save()
+
+
+models.signals.post_save.connect(update_event, sender=Photo)
+models.signals.post_delete.connect(update_event, sender=Photo)
--- a/gallery/templates/gallery/photo_confirm_delete.html
+++ b/gallery/templates/gallery/photo_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "events/event_detail.html" %}
 {% load i18n comments %}

 {% block maincontent %}
--- a/gallery/templates/gallery/photo_detail.html
+++ b/gallery/templates/gallery/photo_detail.html
@@ -1,4 +1,4 @@
-{% extends "events/photo_list.html" %}
+{% extends "gallery/photo_list.html" %}
 {% load i18n comments %}

 {% block title %} {{ photo.name }} - {{ photo.event.name }} {% endblock %}
@@ -22,35 +22,36 @@
    <a href="{{ photo.next_photo.get_absolute_url }}" class="next">Next</a>
   {% endif %}
  </div>
+    <p class="grid_10 push_1">{{ photo.description }}</p>
+  <div class="grid_12 more_link">
+    <a href="https://m.google.com/app/plus/x/?v=compose&amp;content={{photo.headline|urlencode}}+-+http%3A%2F%2Fwww.kasu.at/{{photo.get_absolute_url|urlencode}}" target="_blank"><img src="{{STATIC_URL}}img/google_plus.png" alt="Google+" title="{% trans 'Share on Google+'%}" /></a>
+    <a href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at/{{photo.get_absolute_url|urlencode}}" target='_blank'><img src="{{STATIC_URL}}img/twitter.png" alt="Twitter" title="{% trans 'Share on Twitter' %}" /></a>
+    <a href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{photo.get_absolute_url|urlencode}}" target="_blank"><img src="{{STATIC_URL}}img/facebook.png" alt="Facebook" title="{% trans 'Share on Facebook'%}" /></a>
+  </div>

-  {% if perms.events.change_photo %}
+<ul class="info grid_12">
+ 	<li class="user"><strong>{% trans 'Photographer' %}: </strong>{{ photo.photographer }}</li>
+ 	<li class="date"><strong>{% trans 'on' %}</strong> {{ photo.created_date }}</li>
+</ul>
+{% endblock %}
+
+{% block comment %}
+  {% render_comment_list for photo %}
+  {% render_comment_form for photo %}
+{% endblock %}
+
+{% block buttonbar %}
+{% if perms.events.change_photo %}
    <form method="post" enctype="multipart/form-data" class="grid_12">
    {% csrf_token %}
-    <fieldset>
-      {% include "form.html" %}
      <p class="buttonbar">
 	  	<a href="{{ photo.image.url }}" class="button" type="application/octet-stream"><img src="{{ STATIC_URL}}icons/drive_go.png" alt="{% trans 'download' %}" title="{% trans 'download' %}" /></a>
 		<button type="submit" name="rotate" value="counter-clockwise"><img src="{{STATIC_URL}}icons/shape_rotate_anticlockwise.png" title="Gegen den Uhrzeiger drehen"></button>
 		<button type="submit" name="rotate" value="clockwise"><img src="{{STATIC_URL}}icons/shape_rotate_clockwise.png" title="Im Uhrzeiger drehen"></button>
 		<button type="submit"><img src="{{STATIC_URL}}icons/disk.png" alt=""> {% trans "save" %}</button>
 	  </p>
-	</fieldset>
    </form>
-  {% else %}
- 	<p class="grid_10 push_1">{{ photo.description }}</p>
-
- 	<ul class="info grid_11 push_1">
- 	<li class="user"><strong>{% trans 'Photographer' %}: </strong>{{ photo.photographer }}</li>
- 	<li class="date"><strong>{% trans 'on' %}</strong> {{ photo.created_date }}</li>
- 	</ul>
-  {% endif %}
-  <div class="grid_12 more_link">
-    <a href="https://m.google.com/app/plus/x/?v=compose&amp;content={{photo.headline|urlencode}}+-+http%3A%2F%2Fwww.kasu.at/{{photo.get_absolute_url|urlencode}}" target="_blank"><img src="{{STATIC_URL}}img/google_plus.png" alt="Google+" title="{% trans 'Share on Google+'%}" /></a>
-    <a href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at/{{photo.get_absolute_url|urlencode}}" target='_blank'><img src="{{STATIC_URL}}img/twitter.png" alt="Twitter" title="{% trans 'Share on Twitter' %}" /></a>  
-    <a href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{photo.get_absolute_url|urlencode}}" target="_blank"><img src="{{STATIC_URL}}img/facebook.png" alt="Facebook" title="{% trans 'Share on Facebook'%}" /></a>
-  </div>
-  {% render_comment_list for photo %}
-  {% render_comment_form for photo %}
+{% endif %}
 {% endblock %}


--- a/gallery/templates/gallery/photo_upload.html
+++ b/gallery/templates/gallery/photo_upload.html
@@ -1,4 +1,4 @@
-{% extends "events/photo_gallery.html" %}
+{% extends "events/event_detail.html" %}
 {% load i18n comments %}

 {% block maincontent %}
--- a/gallery/urls.py
+++ b/gallery/urls.py
@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+from django.conf.urls import patterns, url
+
+from .views import *
+
+urlpatterns = patterns(
+    '',
+    url(r'^$', EventGallery.as_view(), name='event-gallery'),
+    url(r'^(?P<event>[\d]+)/$', EventPhotoList.as_view(),
+        name='event-photo-list'),
+    url(r'^(?P<event>[\d]+)/upload/$', EventPhotoUpload.as_view(),
+        name='event-photo-upload'),
+    url(r'^(?P<event>[\d]+)/(?P<pk>[\d]+)/$', EventPhoto.as_view(),
+        name='event-photo'),
+    url(r'^delete/(?P<pk>[\d]+)/$', DeleteEventPhoto.as_view(),
+        name='delete-event-photo'),
+    url(r'^upload/$', EventPhotoUpload.as_view(), name='event-photo-upload'),
+)
--- a/gallery/views.py
+++ b/gallery/views.py
@@ -5,159 +5,55 @@ from datetime import timedelta
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse, Http404
+from django.http import Http404
 from django.shortcuts import redirect
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext as _
 from django.views import generic
-from icalendar import Calendar, Event
 import pyexiv2

-from utils.mixins import PermissionRequiredMixin
-
-from . import models, forms
+from events.models import Event
+from .models import Photo
+from . import forms


 class DeleteEventPhoto(generic.DeleteView):
-    model = models.Photo
-    """
-    def get_object(self, queryset=None):
-        return models.Photo.objects.get(pk=self.kwargs['pk'])
-    """
+    model = Photo

    def get_success_url(self):
        return reverse('event-photo-list', args=[self.object.event.id])

+    def get_context_data(self, **kwargs):
+        context = super(DeleteEventPhoto, self).get_context_data()
+        context['event'] = self.object.event
+        return context
+
    @method_decorator(permission_required('events.delete_photo'))
    def dispatch(self, *args, **kwargs):
        return super(DeleteEventPhoto, self).dispatch(*args, **kwargs)


-class EventArchiveIndex(generic.ArchiveIndexView):
-    allow_empty = True
-    context_object_name = 'event_list'
-    date_field = 'start'
-    model = models.Event
-    queryset = model.objects.all()
-    paginate_by = 15
-
-
-    def get_context_data(self, **kwargs):
-        context = generic.ArchiveIndexView.get_context_data(self, **kwargs)
-        context['is_archive'] = True
-        return context
-
-
-class EventArchiveMonth(generic.MonthArchiveView):
-    date_field = 'start'
-    make_object_list = True
-    model = models.Event
-    month_format = '%m'
-    paginate_by = 15
-    template_name = 'events/event_archive.html'
-
-    def get_context_data(self, **kwargs):
-        context = generic.MonthArchiveView.get_context_data(self, **kwargs)
-        context['is_archive'] = True
-        return context
-
-
-class EventArchiveYear(generic.YearArchiveView):
-    date_field = 'start'
-    make_object_list = True
-    model = models.Event
-    paginate_by = 15
-    template_name = 'events/event_archive.html'
-    year_format = '%Y'
-
-    def get_context_data(self, **kwargs):
-        context = generic.YearArchiveView.get_context_data(self, **kwargs)
-        context['is_archive'] = True
-        return context
-
-
-class EventDetail(generic.DetailView):
-    model = models.Event
-
-    def get_context_data(self, **kwargs):
-        context = generic.DetailView.get_context_data(self, **kwargs)
-        context['form'] = forms.PhotoUploadForm(initial={'event': self.object, 'photographer': self.request.user})
-        return context
-
-
-class EventForm(PermissionRequiredMixin, generic.UpdateView):
-    form_class = forms.EventForm
-    permission_required = 'events.add_event'
-
-    def get_object(self, queryset=None):
-        """
-        If an id has been submitted, try return the existing Event for an update,
-        else creates a new one.
-        @param queryset:
-        """
-        if self.kwargs.get('pk'):
-            event = models.Event.objects.get(pk=self.kwargs['pk'])
-            if event.event_series:
-                return event.event_series
-            else:
-                return event
-        else:
-            return models.Event()
-
-
 class EventGallery(generic.ListView):
-    template_name = 'events/photo_gallery.html'
-    queryset = models.Event.objects.filter(start__lt=timezone.now(), photo_count__gt=0)
+    template_name = 'gallery/photo_gallery.html'
+    queryset = Event.objects.filter(start__lt=timezone.now(), photo_count__gt=0)
    paginate_by = 12


-class EventListIcal(generic.View):
-    """
-    Generates an returns an iCal File with all upcoming events.
-    """
-
-    def add_event(self, event):
-        ics_event = Event()
-        dtstart = timezone.localtime(event.start)
-        dtend = timezone.localtime(event.end)
-
-        ics_event.add('DTSTART', dtstart)
-        ics_event.add('SUMMARY', event.name)
-        ics_event.add('DESCRIPTION', event.description)
-        ics_event.add('LOCATION', event.location.address)
-        ics_event.add('URL', 'http://www.kasu.at' + event.get_absolute_url())
-        ics_event['UID'] = 'event-%d@www.kasu.at' % event.pk
-        ics_event.add('PRIORITY', 5)
-        if event.end:
-            ics_event.add('DTEND', dtend)
-        self.calendar.add_component(ics_event)
-
-    def get(self, request, *args, **kwargs):
-        response = HttpResponse(mimetype="text/calendar; charset=UTF-8")
-        self.calendar = Calendar()
-        self.calendar.add('prodid', 'http://www.kasu.at/')
-        self.calendar.add('version', '2.0')
-        for event in models.Event.objects.upcoming(limit=None):
-            self.add_event(event)
-        response.write(self.calendar.to_ical())
-        return response
-
-
 class EventPhoto(generic.UpdateView):
    form_class = forms.EditPhotoForm
-    model = models.Photo
-    template_name = 'events/photo_detail.html'
+    model = Photo
+    template_name = 'gallery/photo_detail.html'

    def get_context_data(self, **kwargs):
        context = super(EventPhoto, self).get_context_data()
-        event = models.Event.objects.get(id=self.kwargs['event'])
-        context['event'] = event
+        context['event'] = self.object.event
        return context

    def post(self, request, *args, **kwargs):
-        if request.POST.get('rotate') and request.user.has_perm('events.change_photo'):
-            photo = models.Photo.objects.get(pk=kwargs['pk'])
+        if request.POST.get('rotate') and request.user.has_perm(
+                'events.change_photo'):
+            photo = Photo.objects.get(pk=kwargs['pk'])
            photo.rotate(request.POST['rotate'])
            # return redirect(photo.get_absolute_url())
            return self.get(request)
@@ -172,20 +68,21 @@ class EventPhotoList(generic.ListView):
    def get_context_data(self, **kwargs):
        context = generic.ListView.get_context_data(self, **kwargs)
        context['event'] = self.event
-        context['form'] = forms.PhotoUploadForm(initial={'event': self.event, 'photographer': self.request.user})
+        context['form'] = forms.PhotoUploadForm(
+            initial={'event': self.event, 'photographer': self.request.user})
        return context

    def get_queryset(self):
        try:
-            self.event = models.Event.objects.get(id=self.kwargs['event'])
-            return models.Photo.objects.filter(event=self.event)
-        except models.Event.DoesNotExist:
+            self.event = Event.objects.get(id=self.kwargs['event'])
+            return Photo.objects.filter(event=self.event)
+        except Event.DoesNotExist:
            raise Http404(_('Event does not exist'))


 class EventPhotoUpload(generic.FormView):
    form_class = forms.PhotoUploadForm
-    template_name = 'events/photo_upload.html'
+    template_name = 'gallery/photo_upload.html'

    @method_decorator(permission_required('events.add_photo'))
    def dispatch(self, *args, **kwargs):
@@ -193,7 +90,7 @@ class EventPhotoUpload(generic.FormView):

    def get_context_data(self, **kwargs):
        context = generic.FormView.get_context_data(self, **kwargs)
-        context['event_list'] = models.Event.objects.archive()[:12]
+        context['event_list'] = Event.objects.archive()[:12]
        return context

    def get_initial(self):
@@ -208,14 +105,16 @@ class EventPhotoUpload(generic.FormView):
        """

        """
-        self.event = models.Event.objects.get(id=self.request.REQUEST.get('event'))
-        photographer = self.request.POST.get('photographer', self.request.user.id)
+        self.event = Event.objects.get(
+            id=self.request.REQUEST.get('event'))
+        photographer = self.request.POST.get('photographer',
+                                             self.request.user.id)
        photographer = get_user_model().objects.get(id=photographer)
        self.counter = 1
        for upload in self.request.FILES.getlist('upload'):
            name = upload.name
            created_date, description = self.read_exif(upload)
-            photo = models.Photo(
+            photo = Photo(
                event=self.event,
                photographer=photographer,
                image=upload,
@@ -241,7 +140,3 @@ class EventPhotoUpload(generic.FormView):
            description = ''
        return created_date, description

-
-class UpcomingEvents(generic.ListView):
-    queryset = models.Event.objects.upcoming(limit=None)
-    paginate_by = 16