fixes #540: load all sponsors at once

diff --git a/apps/sponsors/migrations/0002_auto__add_field_sponsorpage_sprite.py b/apps/sponsors/migrations/0002_auto__add_field_sponsorpage_sprite.py
new file mode 100644 (file)
index 0000000..15b51b7
--- /dev/null
+++ b/apps/sponsors/migrations/0002_auto__add_field_sponsorpage_sprite.py
@@ -0,0 +1,40 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'SponsorPage.sprite'
+        db.add_column('sponsors_sponsorpage', 'sprite', self.gf('django.db.models.fields.files.ImageField')(default='', max_length=100, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'SponsorPage.sprite'
+        db.delete_column('sponsors_sponsorpage', 'sprite')
+
+
+    models = {
+        'sponsors.sponsor': {
+            'Meta': {'object_name': 'Sponsor'},
+            '_description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'sponsors.sponsorpage': {
+            'Meta': {'object_name': 'SponsorPage'},
+            '_html': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'sponsors': ('sponsors.fields.JSONField', [], {'default': '{}'}),
+            'sprite': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['sponsors']

diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py
index a2e3e08..c7ecc6f 100644 (file)
--- a/apps/sponsors/models.py
+++ b/apps/sponsors/models.py
@@ -2,13 +2,19 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+import time
+from StringIO import StringIO

 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string

+from PIL import Image

 
 from sorl.thumbnail.fields import ImageWithThumbnailsField
 from sponsors.fields import JSONField
 
 from sorl.thumbnail.fields import ImageWithThumbnailsField
 from sponsors.fields import JSONField

+from django.core.files.base import ContentFile

 
 

+THUMB_WIDTH=120
+THUMB_HEIGHT=120

 
 class Sponsor(models.Model):
     name = models.CharField(_('name'), max_length=120)
 
 class Sponsor(models.Model):
     name = models.CharField(_('name'), max_length=120)


@@ -17,7 +23,7 @@ class Sponsor(models.Model):
         _('logo'),
         upload_to='sponsorzy/sponsor/logo',
         thumbnail={
         _('logo'),
         upload_to='sponsorzy/sponsor/logo',
         thumbnail={

-            'size': (120, 120),
+            'size': (THUMB_WIDTH, THUMB_HEIGHT),

             'extension': 'png',
             'options': ['pad', 'detail'],
         })
             'extension': 'png',
             'options': ['pad', 'detail'],
         })


@@ -37,27 +43,48 @@ class SponsorPage(models.Model):
     name = models.CharField(_('name'), max_length=120)
     sponsors = JSONField(_('sponsors'), default={})
     _html = models.TextField(blank=True, editable=False)
     name = models.CharField(_('name'), max_length=120)
     sponsors = JSONField(_('sponsors'), default={})
     _html = models.TextField(blank=True, editable=False)

+    sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True)

 
     def populated_sponsors(self):
         result = []
 
     def populated_sponsors(self):
         result = []

+        offset = 0

         for column in self.get_sponsors_value():
             result_group = {'name': column['name'], 'sponsors': []}
             sponsor_objects = Sponsor.objects.in_bulk(column['sponsors'])
             for sponsor_pk in column['sponsors']:
                 try:
         for column in self.get_sponsors_value():
             result_group = {'name': column['name'], 'sponsors': []}
             sponsor_objects = Sponsor.objects.in_bulk(column['sponsors'])
             for sponsor_pk in column['sponsors']:
                 try:

-                    result_group['sponsors'].append(sponsor_objects[sponsor_pk])
+                    result_group['sponsors'].append((offset, sponsor_objects[sponsor_pk]))
+                    offset -= THUMB_HEIGHT

                 except KeyError:
                     pass
             result.append(result_group)
         return result
 
                 except KeyError:
                     pass
             result.append(result_group)
         return result
 

+    def render_sprite(self):
+        sponsor_ids = []
+        for column in self.get_sponsors_value():
+            sponsor_ids.extend(column['sponsors'])
+        sponsors = Sponsor.objects.in_bulk(sponsor_ids)
+        sprite = Image.new('RGB', (THUMB_WIDTH, len(sponsors)*THUMB_HEIGHT))
+        for i, sponsor_id in enumerate(sponsor_ids):
+            simg = Image.open(sponsors[sponsor_id].logo.thumbnail.dest)
+            sprite.paste(simg, (0, i*THUMB_HEIGHT))
+        imgstr = StringIO()
+        sprite.save(imgstr, 'png')
+
+        if self.sprite:
+            self.sprite.delete(save=False)
+        self.sprite.save('sponsorzy/sprite/%s-%d.png' % (self.name, time.time()), ContentFile(imgstr.getvalue()), save=False)
+

     def html(self):
         return self._html
     html = property(fget=html)
 
     def save(self, *args, **kwargs):
     def html(self):
         return self._html
     html = property(fget=html)
 
     def save(self, *args, **kwargs):

+        self.render_sprite()

         self._html = render_to_string('sponsors/page.html', {
             'sponsors': self.populated_sponsors(),
         self._html = render_to_string('sponsors/page.html', {
             'sponsors': self.populated_sponsors(),

+            'page': self

         })
         return super(SponsorPage, self).save(*args, **kwargs)
 
         })
         return super(SponsorPage, self).save(*args, **kwargs)
 

diff --git a/apps/sponsors/templates/sponsors/page.html b/apps/sponsors/templates/sponsors/page.html
index d0adbbf..94f6c30 100644 (file)
--- a/apps/sponsors/templates/sponsors/page.html
+++ b/apps/sponsors/templates/sponsors/page.html
@@ -3,10 +3,10 @@
         <div class="sponsors-column">
             <p class="sponsors-column-name">{{ column.name|default:"&nbsp;" }}</p>
             <div class='sponsors'>
         <div class="sponsors-column">
             <p class="sponsors-column-name">{{ column.name|default:"&nbsp;" }}</p>
             <div class='sponsors'>

-                {% for sponsor in column.sponsors %}
-                    {% if sponsor.url %}<a href="{{ sponsor.url }}" title="{{ sponsor.description }}" >{% endif %}
-                    <img src="{{ sponsor.logo.thumbnail }}" alt="{{ sponsor.name }}"/>
-                    {% if sponsor.url %}</a>{% endif %}
+                {% for offset, sponsor in column.sponsors %}
+                    <a href="{{ sponsor.url }}" title="{{ sponsor.description }}" 
+                        style='display:block; background: url({{ page.sprite.url }}) 0px {{ offset }}px no-repeat; width: 120px; height: 120px;'>
+                    </a>

                 {% endfor %}
             </div>
         </div>
                 {% endfor %}
             </div>
         </div>