Merge lp:~mboehn/lancms/lc2-organization-logo into lp:lancms

[Mathias Bøhn Grytemark]

Merging basic organization logo support.

Support for organization logo in model, admin and some templates.

[Mathias Bøhn Grytemark (mboehn)]

Works for me.

review: Approve (self-review)

=== modified file '.bzrignore'
--- .bzrignore	2014-01-11 22:24:01 +0000
+++ .bzrignore	2015-01-11 18:42:44 +0000
@@ -2,3 +2,5 @@
 *.py[co]
 lancms2/local_settings.py
 .bzr_rev
+media/uploads/*
+static/

=== added file 'core/migrations/0002_organization_logo.py'
--- core/migrations/0002_organization_logo.py	1970-01-01 00:00:00 +0000
+++ core/migrations/0002_organization_logo.py	2015-01-11 18:42:44 +0000
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='logo',
+            field=models.ImageField(upload_to='', null=True),
+            preserve_default=True,
+        ),
+    ]

=== added file 'core/migrations/0003_auto_20150104_0007.py'
--- core/migrations/0003_auto_20150104_0007.py	1970-01-01 00:00:00 +0000
+++ core/migrations/0003_auto_20150104_0007.py	2015-01-11 18:42:44 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import core.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_organization_logo'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organization',
+            name='logo',
+            field=models.ImageField(null=True, upload_to=core.models.logo_rename),
+            preserve_default=True,
+        ),
+    ]

=== modified file 'core/models.py'
--- core/models.py	2014-12-29 22:09:09 +0000
+++ core/models.py	2015-01-11 18:42:44 +0000
@@ -8,6 +8,8 @@
 from django.contrib.auth.models import User, Group
 from django_countries.fields import CountryField
 
+from uuid import uuid4
+import os
 
 CHOICES_GENDER = (
 	('female', _('Female')),
@@ -44,6 +46,11 @@
 			pass
 
 
+def logo_rename (instance, filename):
+	path = 'uploads/logo/'
+	filename = uuid4().hex
+	return os.path.join(path, filename)
+
 class Organization (models.Model):
 	name = models.CharField (max_length=64, verbose_name=_('Name'))
 	about = models.TextField (null=True, verbose_name=_('About'))
@@ -51,6 +58,7 @@
 	is_active = models.BooleanField (default=False, verbose_name=_('Activated'))
 	urlslug = models.SlugField (unique=True, verbose_name=_('URL-slug'))
 	externalurl = models.URLField (null=True, verbose_name=_('External website'))
+	logo = models.ImageField (null=True, upload_to=logo_rename)
 
 
 	def __unicode__ (self):

=== modified file 'lancms2/settings.py'
--- lancms2/settings.py	2015-01-03 16:03:29 +0000
+++ lancms2/settings.py	2015-01-11 18:42:44 +0000
@@ -47,6 +47,7 @@
 	 'bootstrapform',
 	 'ticket',
 	 'crew',
+	 'easy_thumbnails',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -96,7 +97,7 @@
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
 STATIC_URL = '/static/'
-
+MEDIA_URL = '/media/'
 
 #####
 MEDIA_ROOT = os.path.join (BASE_DIR, 'media/')

=== modified file 'lancms2/urls.py'
--- lancms2/urls.py	2014-10-11 15:47:37 +0000
+++ lancms2/urls.py	2015-01-11 18:42:44 +0000
@@ -1,4 +1,6 @@
 from django.conf.urls import patterns, include, url
+from django.conf import settings
+from django.conf.urls.static import static
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
@@ -32,4 +34,4 @@
 	url(r'^\+admin/doc/', include('django.contrib.admindocs.urls')),
 	# Uncomment the next line to enable the admin:
 	url(r'^\+admin/', include(admin.site.urls)),
-)
+) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

=== added directory 'media/uploads'
=== modified file 'requirements.txt'
--- requirements.txt	2015-01-03 16:53:49 +0000
+++ requirements.txt	2015-01-11 18:42:44 +0000
@@ -1,9 +1,11 @@
 Django==1.7.2
+Pillow==2.7.0
 defusedxml==0.4.1
 django-allauth==0.18.0
 django-bootstrap-form==3.1
 django-countries==3.0.2
 django-debug-toolbar==1.2.2
+easy-thumbnails==2.2
 oauthlib==0.7.2
 python3-openid==3.0.5
 requests==2.5.1

=== modified file 'templates/event/front.html'
--- templates/event/front.html	2014-01-18 20:06:43 +0000
+++ templates/event/front.html	2015-01-11 18:42:44 +0000
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load thumbnail %}
 
 {% block content %}
 <div class="jumbotron">
@@ -46,7 +47,12 @@
 			<div class="panel panel-default">
 				<div class="panel-heading">{% trans "Organized by" %}</div>
 				<div class="panel-body">
-					{{event.organization.name}}
+					{% if organization.logo %}
+						{% thumbnail organization.logo 100x100 upscale as thumb %}
+						<a href="{% url 'organization_front' slug=organization.urlslug %}"><img src="{{thumb.url}}" height="{{thumb.height}}" width="{{thumb.width}}" alt="Organization logo" class="img-responsive center-block"></a>
+					{% else %}
+						{{event.organization.name}}
+					{% endif %}
 				</div>
 			</div>
 		</div>

=== modified file 'templates/organization/admin.html'
--- templates/organization/admin.html	2014-07-22 15:47:58 +0000
+++ templates/organization/admin.html	2015-01-11 18:42:44 +0000
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load owns_org %}
+{% load thumbnail %}
 
 {% block content %}
 
@@ -26,7 +27,10 @@
 					{% trans "Logo/Image" %}<a class="fa fa-edit pull-right" href="#FIXME"></a>
 				</div>
 				<div class="panel-body">
-					{{organization.image}}
+					{% if organization.logo %}
+					{% thumbnail organization.logo 100x100 upscale as thumb %}
+					<img src="{{thumb.url}}" height="{{thumb.height}}" width="{{thumb.width}}" alt="Organization logo" class="img-responsive center-block">
+					{% endif %}
 				</div>
 			</div>
 		</div>