diff --git a/mhackspace/base/migrations/0006_added_excerpt.py b/mhackspace/base/migrations/0006_added_excerpt.py new file mode 100644 index 0000000..b551355 --- /dev/null +++ b/mhackspace/base/migrations/0006_added_excerpt.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.6 on 2017-03-29 18:04 +from __future__ import unicode_literals + +from django.db import migrations +import stdimage.models +import stdimage.utils +import stdimage.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0005_auto_20170228_2210'), + ] + + operations = [ + migrations.AlterField( + model_name='bannerimage', + name='image', + field=stdimage.models.StdImageField(upload_to=stdimage.utils.UploadToAutoSlugClassNameDir('title'), validators=[stdimage.validators.MinSizeValidator(2400, 600)]), + ), + ] diff --git a/mhackspace/blog/migrations/0005_added_excerpt.py b/mhackspace/blog/migrations/0005_added_excerpt.py new file mode 100644 index 0000000..ab8eb5c --- /dev/null +++ b/mhackspace/blog/migrations/0005_added_excerpt.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.6 on 2017-03-29 18:04 +from __future__ import unicode_literals + +from django.db import migrations, models +import stdimage.models +import stdimage.utils +import stdimage.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0004_auto_20170228_2210'), + ] + + operations = [ + migrations.AlterModelOptions( + name='post', + options={'ordering': ('-published_date',)}, + ), + migrations.AddField( + model_name='post', + name='excerpt', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='post', + name='image', + field=stdimage.models.StdImageField(blank=True, null=True, upload_to=stdimage.utils.UploadToAutoSlugClassNameDir('title'), validators=[stdimage.validators.MinSizeValidator(730, 410)]), + ), + ] diff --git a/mhackspace/blog/models.py b/mhackspace/blog/models.py index d6fc6cb..6579bf7 100644 --- a/mhackspace/blog/models.py +++ b/mhackspace/blog/models.py @@ -1,12 +1,14 @@ from django.db import models from django.utils import timezone from django.urls import reverse -from draceditor.models import DraceditorField -from mhackspace.users.models import User +from draceditor.models import DraceditorField +from stdimage.validators import MinSizeValidator from stdimage.models import StdImageField from stdimage.utils import UploadToAutoSlugClassNameDir +from mhackspace.users.models import User + class Category(models.Model): name = models.CharField(max_length=100) @@ -33,9 +35,24 @@ class Post(models.Model): 'home': { "width": 530, "height": 220, - "crop": True}}) + "crop": True}, + 'mobilethumb': { + "width": 580, + "height": 150, + "crop": True}, + 'thumbnail': { + "width": 250, + "height": 150, + "crop": True}, + 'full': { + "width": 730, + "height": 410, + "crop": True}}, + validators=[ + MinSizeValidator(730, 410)]) description = DraceditorField() + excerpt = models.TextField(blank=True, null=True) published_date = models.DateTimeField(default=timezone.now) updated_date = models.DateTimeField(default=timezone.now) active = models.BooleanField(default=True) diff --git a/mhackspace/templates/base.html b/mhackspace/templates/base.html index ddf6b0a..3dba8a6 100644 --- a/mhackspace/templates/base.html +++ b/mhackspace/templates/base.html @@ -8,7 +8,7 @@