Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin thumbnails #9

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions armstrong/apps/images/admin.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
from django.conf.urls.defaults import *
from django.contrib import admin
from django.views.generic import DetailView
from sorl.thumbnail.admin import AdminImageMixin

from armstrong.core.arm_content.admin import fieldsets

from .models import Image, ImageSet, ImageSetElement
from .views import BrowseImages, BrowseImageSets, UploadImage

class ImageAdmin(admin.ModelAdmin):

class ImageAdmin(AdminImageMixin, admin.ModelAdmin):
list_display = ('_admin_thumbnail', 'title', 'pub_date', 'pub_status', 'access')
search_fields = ('title', )
prepopulated_fields = {"slug": ("title", )}
fieldsets = (
(None, {
'fields': ('title', 'slug', 'image', 'summary'),
Expand Down Expand Up @@ -35,10 +40,12 @@ def get_urls(self):
)
return browse_urls + urls


class ImageSetElementInline(admin.TabularInline):
model = ImageSetElement
raw_id_fields = ('image', )



class ImageSetAdmin(admin.ModelAdmin):
fieldsets = (
(None, {
Expand All @@ -49,9 +56,9 @@ class ImageSetAdmin(admin.ModelAdmin):
fieldsets.PUBLICATION,
fieldsets.AUTHORS,
)

inlines = (ImageSetElementInline,)

def get_urls(self):
urls = super(ImageSetAdmin, self).get_urls()
browse_urls = patterns('',
Expand All @@ -60,6 +67,6 @@ def get_urls(self):
name='imagesets_admin_browse'),
)
return browse_urls + urls

admin.site.register(Image, ImageAdmin)
admin.site.register(ImageSet, ImageSetAdmin)
25 changes: 18 additions & 7 deletions armstrong/apps/images/models.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
from django.db import models
from sorl.thumbnail import get_thumbnail

from armstrong.core.arm_content.mixins.images import ImageMixin
from armstrong.core.arm_content.mixins.images import SorlThumbnailMixin
from armstrong.apps.content.models import Content


class Image(Content, ImageMixin, SorlThumbnailMixin):
pass
def _admin_thumbnail(self):
thumbnail = get_thumbnail(self.image, '250x250', crop='center', quality=80)
d = {'thumbnail_url': thumbnail.url, 'alt': self.title, 'original_img_url': self.image.url}
return """<div class="thumbnail" style="width: 250px;">
<img src="%(thumbnail_url)s" alt="%(alt)s" />
<div style="text-align: center"><a href="%(original_img_url)s" target="_blank">(View Origional Image)</a></div>
</div>""" % d
_admin_thumbnail.short_description = "Thumbnail"
_admin_thumbnail.allow_tags = True


class ImageSet(Content):
def first_element(self):
if self.imagesetelement_set.all().count() > 0:
return self.imagesetelement_set.all()[0]

return None



class ImageSetElement(models.Model):
image = models.ForeignKey(Image)
imageset = models.ForeignKey(ImageSet)
caption = models.CharField(blank=True, null=True, max_length=255)
order = models.IntegerField()
def __unicode__ (self):

def __unicode__(self):
return '%d - %s' % (self.order, self.caption[:35])

class Meta:
ordering = ('order',)