From 585360fceb5fa63ed3dfdc9f5162d0bf0736e541 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 8 Jun 2016 10:46:39 -0400 Subject: [PATCH 01/27] Add model for AuthorPage. 1. Put a slug on author profiles so they can be looked up from a url. 2. Make an author page model that dynamically fetches author information based on the url. --- core/migrations/0046_auto_20160607_2126.py | 33 ++++++++++++++++++++++ core/models.py | 15 ++++++++++ 2 files changed, 48 insertions(+) create mode 100644 core/migrations/0046_auto_20160607_2126.py diff --git a/core/migrations/0046_auto_20160607_2126.py b/core/migrations/0046_auto_20160607_2126.py new file mode 100644 index 0000000..77ed71b --- /dev/null +++ b/core/migrations/0046_auto_20160607_2126.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-07 21:26 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.contrib.wagtailroutablepage.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0028_merge'), + ('core', '0045_auto_20160519_2307'), + ] + + operations = [ + migrations.CreateModel( + name='AuthorPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ], + options={ + 'abstract': False, + }, + bases=(wagtail.contrib.wagtailroutablepage.models.RoutablePageMixin, 'wagtailcore.page'), + ), + migrations.AddField( + model_name='authorprofile', + name='slug', + field=models.CharField(max_length=20, null=True), + ), + ] diff --git a/core/models.py b/core/models.py index 1c13ddb..b610efc 100644 --- a/core/models.py +++ b/core/models.py @@ -1,9 +1,11 @@ from django.db import models +from django.shortcuts import render from django.utils.six import text_type from modelcluster.fields import ParentalKey from modelcluster.contrib.taggit import ClusterTaggableManager from taggit.models import TaggedItemBase +from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route from wagtail.contrib.settings.models import BaseSetting, register_setting from wagtail.wagtailadmin.utils import send_mail from wagtail.wagtailcore import blocks @@ -161,6 +163,17 @@ class WorkPage(Page): ] +class AuthorPage(RoutablePageMixin, Page): + + @route(r'^name/([A-Za-z]+)/$') + def author_by_name(self, request, slug): + context = super(AuthorPage, self).get_context(request) + author = AuthorProfile.objects.get(slug=slug) + context['author'] = author + context['blog_posts'] = author.blogpage_set.order_by('-publication_date').all() + return render(request, self.template, context) + + class AboutPage(Page): body = RichTextField() banner_image = models.ForeignKey("wagtailimages.Image", null=True, blank=True, @@ -303,6 +316,7 @@ def get_context(self, request): @register_snippet class AuthorProfile(models.Model): name = models.CharField(max_length=100) + slug = models.CharField(max_length=20, null=True) picture = models.ForeignKey("wagtailimages.Image", blank=True, null=True, on_delete=models.SET_NULL, related_name='+') bio = RichTextField(blank=True) @@ -312,6 +326,7 @@ class AuthorProfile(models.Model): panels = [ FieldPanel('name'), + FieldPanel('slug'), ImageChooserPanel('picture'), FieldPanel('bio'), FieldPanel('is_member'), From 3fb684df184be69d61524c434cec9a1cde9c59db Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 8 Jun 2016 15:39:14 -0400 Subject: [PATCH 02/27] Modified templates to start integrating author pages --- core/models.py | 6 ++--- core/static/css/modules/_blog.sass | 3 +++ core/templates/core/_blog_author_bio.html | 2 ++ core/templates/core/_blog_summary_text.html | 2 ++ core/templates/core/about_page.html | 6 ++++- core/templates/core/blog_page.html | 4 +++- littleweaverweb/settings/base.py | 26 +++++++-------------- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/core/models.py b/core/models.py index b610efc..dc030c3 100644 --- a/core/models.py +++ b/core/models.py @@ -1,6 +1,6 @@ from django.db import models -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 from django.utils.six import text_type from modelcluster.fields import ParentalKey from modelcluster.contrib.taggit import ClusterTaggableManager @@ -165,10 +165,10 @@ class WorkPage(Page): class AuthorPage(RoutablePageMixin, Page): - @route(r'^name/([A-Za-z]+)/$') + @route(r'^([A-Za-z]+)/$') def author_by_name(self, request, slug): context = super(AuthorPage, self).get_context(request) - author = AuthorProfile.objects.get(slug=slug) + author = get_object_or_404(AuthorProfile, slug=slug) context['author'] = author context['blog_posts'] = author.blogpage_set.order_by('-publication_date').all() return render(request, self.template, context) diff --git a/core/static/css/modules/_blog.sass b/core/static/css/modules/_blog.sass index 30ab612..ba6a0c1 100644 --- a/core/static/css/modules/_blog.sass +++ b/core/static/css/modules/_blog.sass @@ -4,3 +4,6 @@ border-radius: $border-radius-sm .blog-post-title font-size: $font-size-base * 2.5 + +.entry-summary + margin-bottom: 1rem \ No newline at end of file diff --git a/core/templates/core/_blog_author_bio.html b/core/templates/core/_blog_author_bio.html index cf75b2d..24b161d 100644 --- a/core/templates/core/_blog_author_bio.html +++ b/core/templates/core/_blog_author_bio.html @@ -2,7 +2,9 @@ {% load wagtailcore_tags %}

+ {{ page.author.name }} + {% if page.author.github_username or page.author.twitter_username %} {% if page.author.github_username %} diff --git a/core/templates/core/_blog_summary_text.html b/core/templates/core/_blog_summary_text.html index dd08a22..7fb3e96 100644 --- a/core/templates/core/_blog_summary_text.html +++ b/core/templates/core/_blog_summary_text.html @@ -5,7 +5,9 @@

{% if entry.author %} + {{ entry.author.name }} + {% endif %} diff --git a/core/templates/core/about_page.html b/core/templates/core/about_page.html index ca99291..b60c431 100644 --- a/core/templates/core/about_page.html +++ b/core/templates/core/about_page.html @@ -24,7 +24,11 @@

Our Team

{% for member in members %}
{% if member.picture %}{% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %} -

{{ member.name }}

+

+ + {{ member.name }} + +

{% endfor %}
diff --git a/core/templates/core/blog_page.html b/core/templates/core/blog_page.html index 86a515b..c092c98 100644 --- a/core/templates/core/blog_page.html +++ b/core/templates/core/blog_page.html @@ -19,7 +19,9 @@

{{ page.title }}

{% if page.author %} - {{ page.author.name }} + + {{ page.author.name }} + {% endif %} diff --git a/littleweaverweb/settings/base.py b/littleweaverweb/settings/base.py index e8616df..6c35df1 100644 --- a/littleweaverweb/settings/base.py +++ b/littleweaverweb/settings/base.py @@ -71,26 +71,18 @@ # Database # https://docs.djangoproject.com/en/1.7/ref/settings/#databases -# SQLite (simplest install) +# PostgreSQL (Recommended, but requires the psycopg2 library and Postgresql development headers) DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': join(PROJECT_ROOT, 'db.sqlite3'), + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'webproject', + 'USER': 'postgres', + 'PASSWORD': 'admin', + 'HOST': '', # Set to empty string for localhost. + 'PORT': '', # Set to empty string for default. + 'CONN_MAX_AGE': 600, # number of seconds database connections should persist for + } } -} - -# PostgreSQL (Recommended, but requires the psycopg2 library and Postgresql development headers) -# DATABASES = { -# 'default': { -# 'ENGINE': 'django.db.backends.postgresql_psycopg2', -# 'NAME': 'littleweaverweb', -# 'USER': 'postgres', -# 'PASSWORD': '', -# 'HOST': '', # Set to empty string for localhost. -# 'PORT': '', # Set to empty string for default. -# 'CONN_MAX_AGE': 600, # number of seconds database connections should persist for -# } -# } # Internationalization From 78b3f68a4ccf3f8cf95ebce87d4d04d0e48c45f9 Mon Sep 17 00:00:00 2001 From: nmorduch Date: Thu, 9 Jun 2016 14:11:43 -0400 Subject: [PATCH 03/27] restore base settings --- littleweaverweb/settings/base.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/littleweaverweb/settings/base.py b/littleweaverweb/settings/base.py index 6c35df1..e8616df 100644 --- a/littleweaverweb/settings/base.py +++ b/littleweaverweb/settings/base.py @@ -71,18 +71,26 @@ # Database # https://docs.djangoproject.com/en/1.7/ref/settings/#databases -# PostgreSQL (Recommended, but requires the psycopg2 library and Postgresql development headers) +# SQLite (simplest install) DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'webproject', - 'USER': 'postgres', - 'PASSWORD': 'admin', - 'HOST': '', # Set to empty string for localhost. - 'PORT': '', # Set to empty string for default. - 'CONN_MAX_AGE': 600, # number of seconds database connections should persist for - } + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': join(PROJECT_ROOT, 'db.sqlite3'), } +} + +# PostgreSQL (Recommended, but requires the psycopg2 library and Postgresql development headers) +# DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.postgresql_psycopg2', +# 'NAME': 'littleweaverweb', +# 'USER': 'postgres', +# 'PASSWORD': '', +# 'HOST': '', # Set to empty string for localhost. +# 'PORT': '', # Set to empty string for default. +# 'CONN_MAX_AGE': 600, # number of seconds database connections should persist for +# } +# } # Internationalization From d22d7d745a3d888659a4602fbe06951c9361950d Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Thu, 9 Jun 2016 15:55:29 -0400 Subject: [PATCH 04/27] Converted author profile snippets to pages --- core/models.py | 61 +++++++++++----------------- core/templates/core/author_page.html | 28 +++++++++++++ 2 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 core/templates/core/author_page.html diff --git a/core/models.py b/core/models.py index dc030c3..11fc858 100644 --- a/core/models.py +++ b/core/models.py @@ -162,17 +162,28 @@ class WorkPage(Page): ], "Teaser Details"), ] +class AuthorPage(Page): + name = models.CharField(max_length=100) + picture = models.ForeignKey("wagtailimages.Image", blank=True, null=True, + on_delete=models.SET_NULL, related_name='+') + bio = RichTextField(blank=True) + is_member = models.BooleanField(default=False) + twitter_username = models.CharField(max_length=15, blank=True) + github_username = models.CharField(max_length=30, blank=True) -class AuthorPage(RoutablePageMixin, Page): - - @route(r'^([A-Za-z]+)/$') - def author_by_name(self, request, slug): + content_panels = Page.content_panels + [ + FieldPanel('name'), + ImageChooserPanel('picture'), + FieldPanel('bio'), + FieldPanel('is_member'), + FieldPanel('twitter_username'), + FieldPanel('github_username'), + ] + + def get_context(self, request): context = super(AuthorPage, self).get_context(request) - author = get_object_or_404(AuthorProfile, slug=slug) - context['author'] = author - context['blog_posts'] = author.blogpage_set.order_by('-publication_date').all() - return render(request, self.template, context) - + context['blog_entries'] = BlogPage.objects.filter(author=self) + return context class AboutPage(Page): body = RichTextField() @@ -186,7 +197,7 @@ class AboutPage(Page): def get_context(self, request): context = super(AboutPage, self).get_context(request) - context['members'] = AuthorProfile.objects.filter(is_member=True).order_by('?') + context['members'] = AuthorPage.objects.filter(is_member=True).order_by('?') return context @@ -241,9 +252,8 @@ class TechnologySection(Orderable): class BlogPageTag(TaggedItemBase): content_object = ParentalKey('core.BlogPage', related_name='tagged_items') - class BlogPage(Page): - author = models.ForeignKey('core.AuthorProfile', null=True, blank=True, + author = models.ForeignKey('core.AuthorPage', null=True, blank=True, on_delete=models.SET_NULL,) publication_date = models.DateField( help_text="Past or future date of publication") @@ -265,7 +275,7 @@ class BlogPage(Page): related_name="+") content_panels = Page.content_panels + [ - SnippetChooserPanel('author'), + PageChooserPanel('author'), FieldPanel('publication_date'), FieldPanel('summary'), StreamFieldPanel('body'), @@ -313,31 +323,6 @@ def get_context(self, request): return context -@register_snippet -class AuthorProfile(models.Model): - name = models.CharField(max_length=100) - slug = models.CharField(max_length=20, null=True) - picture = models.ForeignKey("wagtailimages.Image", blank=True, null=True, - on_delete=models.SET_NULL, related_name='+') - bio = RichTextField(blank=True) - is_member = models.BooleanField(default=False) - twitter_username = models.CharField(max_length=15, blank=True) - github_username = models.CharField(max_length=30, blank=True) - - panels = [ - FieldPanel('name'), - FieldPanel('slug'), - ImageChooserPanel('picture'), - FieldPanel('bio'), - FieldPanel('is_member'), - FieldPanel('twitter_username'), - FieldPanel('github_username'), - ] - - def __str__(self): # __unicode__ on Python 2 - return self.name - - class EmailFormField(AbstractFormField): page = ParentalKey('EmailFormPage', related_name='form_fields') diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html new file mode 100644 index 0000000..d4e2f26 --- /dev/null +++ b/core/templates/core/author_page.html @@ -0,0 +1,28 @@ +{% extends "core/layouts/small_header.html" %} +{% load wagtailcore_tags wagtailimages_tags %} + +{% block main %} + + {% image page.banner_image fill-1650x500 as banner_image %} + + +
+
+ {{ page.bio|richtext }} +
+
+ +
+ {% for entry in blog_entries %} + + {% include "core/_blog_summary_text.html" %} +
+ + {% endfor %} +
+ +{% endblock %} From c7d9d537737807cab6a462a2e867729d62d708a9 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Mon, 13 Jun 2016 13:26:08 -0400 Subject: [PATCH 05/27] Fixed broken links to author pages everywhere --- core/templates/core/_blog_author_bio.html | 2 +- core/templates/core/_blog_summary_text.html | 2 +- core/templates/core/about_page.html | 2 +- core/templates/core/blog_page.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/templates/core/_blog_author_bio.html b/core/templates/core/_blog_author_bio.html index 24b161d..cb0e07a 100644 --- a/core/templates/core/_blog_author_bio.html +++ b/core/templates/core/_blog_author_bio.html @@ -2,7 +2,7 @@ {% load wagtailcore_tags %}

- + {{ page.author.name }} {% if page.author.github_username or page.author.twitter_username %} diff --git a/core/templates/core/_blog_summary_text.html b/core/templates/core/_blog_summary_text.html index 7fb3e96..88b87c4 100644 --- a/core/templates/core/_blog_summary_text.html +++ b/core/templates/core/_blog_summary_text.html @@ -5,7 +5,7 @@

{% if entry.author %} - + {{ entry.author.name }} {% endif %} diff --git a/core/templates/core/about_page.html b/core/templates/core/about_page.html index b60c431..336509d 100644 --- a/core/templates/core/about_page.html +++ b/core/templates/core/about_page.html @@ -25,7 +25,7 @@

Our Team

{% if member.picture %}{% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %}

- + {{ member.name }}

diff --git a/core/templates/core/blog_page.html b/core/templates/core/blog_page.html index c092c98..5cce535 100644 --- a/core/templates/core/blog_page.html +++ b/core/templates/core/blog_page.html @@ -19,7 +19,7 @@

{{ page.title }}

{% if page.author %} - + {{ page.author.name }} {% endif %} From 19c9a77f1f36837cdca91c924a66a66ddb82fbb0 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Mon, 13 Jun 2016 17:21:05 -0400 Subject: [PATCH 06/27] Migrate author data to new schema. This migration (mostly written by @cheryllium) takes AuthorProfiles to AuthorPages and also updates the data from the older model and reconstructs the relationships between BlogPages and their author. --- core/migrations/0046_auto_20160607_2126.py | 33 --------- core/migrations/author_pages_migration.py | 83 ++++++++++++++++++++++ 2 files changed, 83 insertions(+), 33 deletions(-) delete mode 100644 core/migrations/0046_auto_20160607_2126.py create mode 100644 core/migrations/author_pages_migration.py diff --git a/core/migrations/0046_auto_20160607_2126.py b/core/migrations/0046_auto_20160607_2126.py deleted file mode 100644 index 77ed71b..0000000 --- a/core/migrations/0046_auto_20160607_2126.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-06-07 21:26 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.contrib.wagtailroutablepage.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtailcore', '0028_merge'), - ('core', '0045_auto_20160519_2307'), - ] - - operations = [ - migrations.CreateModel( - name='AuthorPage', - fields=[ - ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ], - options={ - 'abstract': False, - }, - bases=(wagtail.contrib.wagtailroutablepage.models.RoutablePageMixin, 'wagtailcore.page'), - ), - migrations.AddField( - model_name='authorprofile', - name='slug', - field=models.CharField(max_length=20, null=True), - ), - ] diff --git a/core/migrations/author_pages_migration.py b/core/migrations/author_pages_migration.py new file mode 100644 index 0000000..ec2e118 --- /dev/null +++ b/core/migrations/author_pages_migration.py @@ -0,0 +1,83 @@ +from __future__ import unicode_literals + +from django.utils.text import slugify +from django.db import migrations, models +import django.db.models.deletion +import wagtail.wagtailcore.fields + + +def migrate_data(apps, schema_editor): + from core.models import AuthorPage, AboutPage + + BlogPage = apps.get_model("core", "BlogPage") + AuthorProfile = apps.get_model("core", "AuthorProfile") + about_page = AboutPage.objects.get() + + for snippet in AuthorProfile.objects.all(): + page = AuthorPage(name=snippet.name, + title=snippet.name, + slug=slugify(snippet.name), + picture_id=snippet.picture.pk, + bio=snippet.bio, + is_member=snippet.is_member, + twitter_username=snippet.twitter_username, + github_username=snippet.github_username) + about_page.add_child(instance=page) + BlogPage.objects.filter(author_old=snippet).update(author=page) + + +class Migration(migrations.Migration): + + # Not sure what the dependency should be for this... + # Probably fill in with the last most recent migration file? + dependencies = [ + ('core', '0045_auto_20160519_2307'), + ] + + operations = [ + # Creates the AuthorPage in the database + migrations.CreateModel( + name='AuthorPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ('name', models.CharField(max_length=100)), + ('bio', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('is_member', models.BooleanField(default=False)), + ('twitter_username', models.CharField(blank=True, max_length=15)), + ('github_username', models.CharField(blank=True, max_length=30)), + ('picture', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + + # Rename BlogPage.author to BlogPage.author_old + migrations.RenameField( + model_name='BlogPage', + old_name='author', + new_name='author_old', + ), + + # Create a new field in BlogPage called author, linked to AuthorPage + migrations.AddField( + model_name='BlogPage', + name='author', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.AuthorPage'), + ), + + # migrates AuthorProfileData to the AuthorPage + migrations.RunPython(migrate_data), + + # Delete the BlogPage.author_old field + migrations.RemoveField( + model_name='BlogPage', + name='author_old', + ), + + # Delete AuthorProfile + migrations.DeleteModel( + name='AuthorProfile', + ), + ] From 6038fc67ebdf8d3eced518de73c185d1bd0288a8 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 15 Jun 2016 15:34:08 -0400 Subject: [PATCH 07/27] Added content and rudimentary design to author pages --- core/static/css/littleweaverweb.sass | 1 + core/static/css/modules/_profile.sass | 10 ++++++++++ core/templates/core/author_page.html | 27 +++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 core/static/css/modules/_profile.sass diff --git a/core/static/css/littleweaverweb.sass b/core/static/css/littleweaverweb.sass index 96b284d..c909eca 100644 --- a/core/static/css/littleweaverweb.sass +++ b/core/static/css/littleweaverweb.sass @@ -17,6 +17,7 @@ @import modules/margins @import modules/navs @import modules/pane +@import modules/profile @import modules/pygments @import modules/site-header diff --git a/core/static/css/modules/_profile.sass b/core/static/css/modules/_profile.sass new file mode 100644 index 0000000..a3ccc1d --- /dev/null +++ b/core/static/css/modules/_profile.sass @@ -0,0 +1,10 @@ +.author-summary + border: 1px solid #eee + box-shadow: 3px 3px 10px #888 + padding: 10px + +.author-bio + min-height: 150px + +.author-blogs + padding-bottom: 50px \ No newline at end of file diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index d4e2f26..57c08c7 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -10,13 +10,36 @@

{{ page.name }}

+
+
+
+ {{ page.bio|richtext }} +
+
+
+ {% if page.github_username %} + + {% endif %} + {% if page.twitter_username %} + + {% endif %} +
+
+
+ {% image page.picture fill-200x200 class="img-circle" %} +
+
+
+
+ +
- {{ page.bio|richtext }} +
-
+
{% for entry in blog_entries %} {% include "core/_blog_summary_text.html" %} From 18eb98726fe0bbab2ea051b09f635d346d9638c4 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Thu, 16 Jun 2016 11:16:00 -0400 Subject: [PATCH 08/27] Made this migration resilient to missing pages. 1. If there's no about page (or more than one), then no data is migrated. 2. Also fix the line endings. --- core/migrations/author_pages_migration.py | 171 +++++++++++----------- 1 file changed, 88 insertions(+), 83 deletions(-) diff --git a/core/migrations/author_pages_migration.py b/core/migrations/author_pages_migration.py index ec2e118..6734f31 100644 --- a/core/migrations/author_pages_migration.py +++ b/core/migrations/author_pages_migration.py @@ -1,83 +1,88 @@ -from __future__ import unicode_literals - -from django.utils.text import slugify -from django.db import migrations, models -import django.db.models.deletion -import wagtail.wagtailcore.fields - - -def migrate_data(apps, schema_editor): - from core.models import AuthorPage, AboutPage - - BlogPage = apps.get_model("core", "BlogPage") - AuthorProfile = apps.get_model("core", "AuthorProfile") - about_page = AboutPage.objects.get() - - for snippet in AuthorProfile.objects.all(): - page = AuthorPage(name=snippet.name, - title=snippet.name, - slug=slugify(snippet.name), - picture_id=snippet.picture.pk, - bio=snippet.bio, - is_member=snippet.is_member, - twitter_username=snippet.twitter_username, - github_username=snippet.github_username) - about_page.add_child(instance=page) - BlogPage.objects.filter(author_old=snippet).update(author=page) - - -class Migration(migrations.Migration): - - # Not sure what the dependency should be for this... - # Probably fill in with the last most recent migration file? - dependencies = [ - ('core', '0045_auto_20160519_2307'), - ] - - operations = [ - # Creates the AuthorPage in the database - migrations.CreateModel( - name='AuthorPage', - fields=[ - ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('name', models.CharField(max_length=100)), - ('bio', wagtail.wagtailcore.fields.RichTextField(blank=True)), - ('is_member', models.BooleanField(default=False)), - ('twitter_username', models.CharField(blank=True, max_length=15)), - ('github_username', models.CharField(blank=True, max_length=30)), - ('picture', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), - ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), - ), - - # Rename BlogPage.author to BlogPage.author_old - migrations.RenameField( - model_name='BlogPage', - old_name='author', - new_name='author_old', - ), - - # Create a new field in BlogPage called author, linked to AuthorPage - migrations.AddField( - model_name='BlogPage', - name='author', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.AuthorPage'), - ), - - # migrates AuthorProfileData to the AuthorPage - migrations.RunPython(migrate_data), - - # Delete the BlogPage.author_old field - migrations.RemoveField( - model_name='BlogPage', - name='author_old', - ), - - # Delete AuthorProfile - migrations.DeleteModel( - name='AuthorProfile', - ), - ] +from __future__ import unicode_literals + +from django.utils.text import slugify +from django.db import migrations, models +import django.db.models.deletion +import wagtail.wagtailcore.fields + + +def migrate_data(apps, schema_editor): + from core.models import AuthorPage, AboutPage + + BlogPage = apps.get_model("core", "BlogPage") + AuthorProfile = apps.get_model("core", "AuthorProfile") + try: + about_page = AboutPage.objects.get() + except (AboutPage.DoesNotExist, AboutPage.MultipleObjectsReturned): + # we can only programmatically migrate this data if there is + # exactly one about page + return + + for snippet in AuthorProfile.objects.all(): + page = AuthorPage(name=snippet.name, + title=snippet.name, + slug=slugify(snippet.name), + picture_id=snippet.picture.pk, + bio=snippet.bio, + is_member=snippet.is_member, + twitter_username=snippet.twitter_username, + github_username=snippet.github_username) + about_page.add_child(instance=page) + BlogPage.objects.filter(author_old=snippet).update(author=page) + + +class Migration(migrations.Migration): + + # Not sure what the dependency should be for this... + # Probably fill in with the last most recent migration file? + dependencies = [ + ('core', '0045_auto_20160519_2307'), + ] + + operations = [ + # Creates the AuthorPage in the database + migrations.CreateModel( + name='AuthorPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ('name', models.CharField(max_length=100)), + ('bio', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('is_member', models.BooleanField(default=False)), + ('twitter_username', models.CharField(blank=True, max_length=15)), + ('github_username', models.CharField(blank=True, max_length=30)), + ('picture', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + + # Rename BlogPage.author to BlogPage.author_old + migrations.RenameField( + model_name='BlogPage', + old_name='author', + new_name='author_old', + ), + + # Create a new field in BlogPage called author, linked to AuthorPage + migrations.AddField( + model_name='BlogPage', + name='author', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.AuthorPage'), + ), + + # migrates AuthorProfileData to the AuthorPage + migrations.RunPython(migrate_data), + + # Delete the BlogPage.author_old field + migrations.RemoveField( + model_name='BlogPage', + name='author_old', + ), + + # Delete AuthorProfile + migrations.DeleteModel( + name='AuthorProfile', + ), + ] From 398015d28007f6d2676af33bea7f53fd6b8f3094 Mon Sep 17 00:00:00 2001 From: nmorduch Date: Thu, 16 Jun 2016 15:45:05 -0400 Subject: [PATCH 09/27] update .gitignore to include local.py --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f49eab2..28f9b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ db.sqlite3 /media/ /pillar/ *.pyc +littleweaverweb/settings/local.py From c66ef54271f184d9551093f2d461b349264b0195 Mon Sep 17 00:00:00 2001 From: nmorduch Date: Tue, 28 Jun 2016 18:06:25 -0400 Subject: [PATCH 10/27] add dump to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 28f9b2a..2f8d753 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ db.sqlite3 /pillar/ *.pyc littleweaverweb/settings/local.py +*.dump From a7ef6f54fa2e384e41c6b4d23a2f5b71f6901e0c Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Tue, 5 Jul 2016 14:10:17 -0400 Subject: [PATCH 11/27] Removed name field and added field for portfolio link --- core/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/models.py b/core/models.py index 11fc858..35ca5b8 100644 --- a/core/models.py +++ b/core/models.py @@ -163,21 +163,21 @@ class WorkPage(Page): ] class AuthorPage(Page): - name = models.CharField(max_length=100) picture = models.ForeignKey("wagtailimages.Image", blank=True, null=True, on_delete=models.SET_NULL, related_name='+') bio = RichTextField(blank=True) is_member = models.BooleanField(default=False) twitter_username = models.CharField(max_length=15, blank=True) github_username = models.CharField(max_length=30, blank=True) + portfolio_link = models.CharField(max_length=50, blank=True) content_panels = Page.content_panels + [ - FieldPanel('name'), ImageChooserPanel('picture'), FieldPanel('bio'), FieldPanel('is_member'), FieldPanel('twitter_username'), FieldPanel('github_username'), + FieldPanel('portfolio_link') ] def get_context(self, request): From aa2b690866d54dff040cbad53f5d1b475930a4fd Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Tue, 5 Jul 2016 16:44:47 -0400 Subject: [PATCH 12/27] Attempted to style author pages --- core/static/css/littleweaverweb.sass | 1 - core/static/css/modules/_profile.sass | 10 -------- core/templates/core/author_page.html | 37 +++++++++++---------------- 3 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 core/static/css/modules/_profile.sass diff --git a/core/static/css/littleweaverweb.sass b/core/static/css/littleweaverweb.sass index c909eca..96b284d 100644 --- a/core/static/css/littleweaverweb.sass +++ b/core/static/css/littleweaverweb.sass @@ -17,7 +17,6 @@ @import modules/margins @import modules/navs @import modules/pane -@import modules/profile @import modules/pygments @import modules/site-header diff --git a/core/static/css/modules/_profile.sass b/core/static/css/modules/_profile.sass deleted file mode 100644 index a3ccc1d..0000000 --- a/core/static/css/modules/_profile.sass +++ /dev/null @@ -1,10 +0,0 @@ -.author-summary - border: 1px solid #eee - box-shadow: 3px 3px 10px #888 - padding: 10px - -.author-bio - min-height: 150px - -.author-blogs - padding-bottom: 50px \ No newline at end of file diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index 57c08c7..da6c72a 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -6,16 +6,16 @@ {% image page.banner_image fill-1650x500 as banner_image %} -
-
-
+
+
{{ page.bio|richtext }}
-
+
{% if page.github_username %} @@ -24,28 +24,21 @@

{{ page.name }}

{% endif %}
-
-
- {% image page.picture fill-200x200 class="img-circle" %} -
-
- -
-
- -
-
- -
-
+
+
+
+

Blog Entries

+
{% for entry in blog_entries %} - +
{% include "core/_blog_summary_text.html" %}
- +
{% endfor %} -
+
+
+ {% endblock %} From 3f354db2897812ddc8c266f6fa9a957824e0d7cd Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Tue, 5 Jul 2016 16:51:08 -0400 Subject: [PATCH 13/27] Modified styles --- core/templates/core/author_page.html | 31 ++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index da6c72a..a553a9c 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -6,12 +6,13 @@ {% image page.banner_image fill-1650x500 as banner_image %}
+
{{ page.bio|richtext }}
@@ -24,21 +25,25 @@

{{ page.title }}

{% endif %}
+
+
+ {% image page.picture fill-200x200 class="img-circle" %} +
-
-
-
-

Blog Entries

-
- {% for entry in blog_entries %} -
- {% include "core/_blog_summary_text.html" %} -
-
- {% endfor %} +
+
+
+

Blog Entries

+ {% for entry in blog_entries %} +
+ {% include "core/_blog_summary_text.html" %} +
+
+ {% endfor %}
+
-{% endblock %} + {% endblock %} From bbca9148d80cc9298e9fd89eeaab240c6d0e7cd1 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Tue, 5 Jul 2016 16:54:47 -0400 Subject: [PATCH 14/27] Added portfolio link to author page --- core/templates/core/author_page.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index a553a9c..01f0ab0 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -24,6 +24,9 @@

{{ page.title }}

{% if page.twitter_username %} {% endif %} + {% if page.portfolio_link %} + + {% endif %}
From 70cf43b199a35e73b37554097f8defa1cd66b338 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 14:18:47 -0400 Subject: [PATCH 15/27] Improved styles --- core/static/css/modules/_base.sass | 6 ++ core/templates/core/_blog_author_bio.html | 2 +- core/templates/core/_blog_summary_text.html | 2 +- core/templates/core/about_page.html | 2 +- core/templates/core/author_page.html | 85 ++++++++++----------- core/templates/core/blog_page.html | 4 +- 6 files changed, 53 insertions(+), 48 deletions(-) diff --git a/core/static/css/modules/_base.sass b/core/static/css/modules/_base.sass index 86836e1..0cc0551 100644 --- a/core/static/css/modules/_base.sass +++ b/core/static/css/modules/_base.sass @@ -6,6 +6,12 @@ h1, h2, h3, h4, h5, h6 font-weight: $normal color: $black-almost + +.lead--except-sm + @extend .lead + +media-breakpoint-only(sm) + font-size: inherit + // Sticky Footer (https://getbootstrap.com/examples/sticky-footer/) html position: relative diff --git a/core/templates/core/_blog_author_bio.html b/core/templates/core/_blog_author_bio.html index cb0e07a..19334a0 100644 --- a/core/templates/core/_blog_author_bio.html +++ b/core/templates/core/_blog_author_bio.html @@ -3,7 +3,7 @@

- {{ page.author.name }} + {{ page.author.title }} {% if page.author.github_username or page.author.twitter_username %} diff --git a/core/templates/core/_blog_summary_text.html b/core/templates/core/_blog_summary_text.html index 88b87c4..64e28da 100644 --- a/core/templates/core/_blog_summary_text.html +++ b/core/templates/core/_blog_summary_text.html @@ -6,7 +6,7 @@

{% if entry.author %} - {{ entry.author.name }} + {{ entry.author.title }} {% endif %} diff --git a/core/templates/core/about_page.html b/core/templates/core/about_page.html index 336509d..4636d0a 100644 --- a/core/templates/core/about_page.html +++ b/core/templates/core/about_page.html @@ -26,7 +26,7 @@

Our Team

{% if member.picture %}{% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %}

- {{ member.name }} + {{ member.title }}

diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index 01f0ab0..302bc2d 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -3,50 +3,49 @@ {% block main %} - {% image page.banner_image fill-1650x500 as banner_image %} - +
+
+
+ {% image page.picture fill-500x500 class="img-fluid img-circle" %} +
+
+
+ {{ page.bio|richtext }} +
+
    + {% if page.github_username %} +
  • Github
    • + {% endif %} + {% if page.twitter_username %} +
  • Twitter
    • + {% endif %} + {% if page.portfolio_link %} +
  • Portfolio
    • + {% endif %} +
+
+
+
-
-
-
- {{ page.bio|richtext }} -
-
-
- {% if page.github_username %} - - {% endif %} - {% if page.twitter_username %} - - {% endif %} - {% if page.portfolio_link %} - - {% endif %} -
-
-
- {% image page.picture fill-200x200 class="img-circle" %} -
-
+
+
+
+

Blog Entries

-
-
-
-

Blog Entries

-
- {% for entry in blog_entries %} -
- {% include "core/_blog_summary_text.html" %} -
-
- {% endfor %} -
-
+ {% for entry in blog_entries %} +
+ {% include "core/_blog_summary_text.html" %} +
+ {% endfor %} +
+
+
- - {% endblock %} + {% endblock %} diff --git a/core/templates/core/blog_page.html b/core/templates/core/blog_page.html index 5cce535..79cfea1 100644 --- a/core/templates/core/blog_page.html +++ b/core/templates/core/blog_page.html @@ -59,8 +59,8 @@

{{ page.title }}

{% if page.author.picture %} - {% image page.author.picture fill-150x150 as author_image %} - {{ page.author.picture.title }} + {% image page.author.picture fit-150 as author_image %} + {{ page.author.picture.title }} {% endif %}
From 86f0544d036369b4f21a128ef727aa1b35e71906 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 15:24:17 -0400 Subject: [PATCH 16/27] Added margin to photo on xs --- core/static/css/modules/_margins.sass | 4 ++++ core/templates/core/author_page.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/static/css/modules/_margins.sass b/core/static/css/modules/_margins.sass index 1ed8dcb..4f20209 100644 --- a/core/static/css/modules/_margins.sass +++ b/core/static/css/modules/_margins.sass @@ -12,3 +12,7 @@ .m-r-1-sm-only +media-breakpoint-only(sm) margin-right: 1*$spacer-x + +.m-b-2-xs-down + +media-breakpoint-only(xs) + margin-bottom: 2*$spacer-y diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index 302bc2d..1b4d637 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -12,7 +12,7 @@

{{ page.title }}

-
+
{% image page.picture fill-500x500 class="img-fluid img-circle" %}
From 9565141f8cf8c7f57829ca1046f52c5d68dfe5ed Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 15:28:29 -0400 Subject: [PATCH 17/27] Fixed blog page link and made image a link as well --- core/templates/core/blog_page.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/templates/core/blog_page.html b/core/templates/core/blog_page.html index 79cfea1..ce52acf 100644 --- a/core/templates/core/blog_page.html +++ b/core/templates/core/blog_page.html @@ -20,7 +20,7 @@

{{ page.title }}

{% if page.author %} - {{ page.author.name }} + {{ page.author.title }} {% endif %} @@ -59,8 +59,10 @@

{{ page.title }}

{% if page.author.picture %} - {% image page.author.picture fit-150 as author_image %} + {% image page.author.picture fill-150x150 as author_image %} + {{ page.author.picture.title }} + {% endif %}
From 17c0b079858ef138f2cfbbb2bf60f3eaabafc40f Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 15:31:47 -0400 Subject: [PATCH 18/27] Removed unnecessary CSS --- core/static/css/modules/_blog.sass | 3 --- core/templates/core/_blog_summary_text.html | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/static/css/modules/_blog.sass b/core/static/css/modules/_blog.sass index ba6a0c1..30ab612 100644 --- a/core/static/css/modules/_blog.sass +++ b/core/static/css/modules/_blog.sass @@ -4,6 +4,3 @@ border-radius: $border-radius-sm .blog-post-title font-size: $font-size-base * 2.5 - -.entry-summary - margin-bottom: 1rem \ No newline at end of file diff --git a/core/templates/core/_blog_summary_text.html b/core/templates/core/_blog_summary_text.html index 64e28da..4e7946a 100644 --- a/core/templates/core/_blog_summary_text.html +++ b/core/templates/core/_blog_summary_text.html @@ -15,7 +15,7 @@

-
+
{{ entry.summary }}
From 658f7d6e64f3dd043c1123f6e1b38b4e7d10b2ff Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 15:52:48 -0400 Subject: [PATCH 19/27] Added space between media links --- core/templates/core/author_page.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index 1b4d637..67dc411 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -21,13 +21,13 @@

{{ page.title }}

From a88b68442fa2f6ae1a4c7f119c5a761a3a66aa56 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 15:56:13 -0400 Subject: [PATCH 20/27] Removed media links from blog author bio --- core/templates/core/_blog_author_bio.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/templates/core/_blog_author_bio.html b/core/templates/core/_blog_author_bio.html index 19334a0..377d2a9 100644 --- a/core/templates/core/_blog_author_bio.html +++ b/core/templates/core/_blog_author_bio.html @@ -5,16 +5,6 @@

{{ page.author.title }} - {% if page.author.github_username or page.author.twitter_username %} - - {% if page.author.github_username %} - - {% endif %} - {% if page.author.twitter_username %} - - {% endif %} - - {% endif %}

{% if page.author.bio %} {{ page.author.bio|richtext }} From 0f943a771c849d4a40baa485714710d9ebeb8f74 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 16:03:36 -0400 Subject: [PATCH 21/27] Changed blog author bio images back to circles --- core/templates/core/blog_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/core/blog_page.html b/core/templates/core/blog_page.html index ce52acf..2715eb2 100644 --- a/core/templates/core/blog_page.html +++ b/core/templates/core/blog_page.html @@ -61,7 +61,7 @@

{{ page.title }}

{% if page.author.picture %} {% image page.author.picture fill-150x150 as author_image %} - {{ page.author.picture.title }} + {{ page.author.picture.title }} {% endif %}
From 4aba75dea13a97c8a7176e2b10b3259fc33809fe Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Wed, 6 Jul 2016 16:17:47 -0400 Subject: [PATCH 22/27] Added banner images to author pages --- core/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/models.py b/core/models.py index 35ca5b8..c54ca99 100644 --- a/core/models.py +++ b/core/models.py @@ -170,6 +170,8 @@ class AuthorPage(Page): twitter_username = models.CharField(max_length=15, blank=True) github_username = models.CharField(max_length=30, blank=True) portfolio_link = models.CharField(max_length=50, blank=True) + banner_image = models.ForeignKey("wagtailimages.Image", null=True, blank=True, + on_delete=models.SET_NULL) content_panels = Page.content_panels + [ ImageChooserPanel('picture'), @@ -177,7 +179,8 @@ class AuthorPage(Page): FieldPanel('is_member'), FieldPanel('twitter_username'), FieldPanel('github_username'), - FieldPanel('portfolio_link') + FieldPanel('portfolio_link'), + ImageChooserPanel('banner_image'), ] def get_context(self, request): From 70656bf16a2d2845b827aec9677b6d653f769034 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Thu, 7 Jul 2016 09:54:26 -0400 Subject: [PATCH 23/27] Added banner images migration --- .../0002_authorpage_banner_image.py | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 core/migrations/0002_authorpage_banner_image.py diff --git a/core/migrations/0002_authorpage_banner_image.py b/core/migrations/0002_authorpage_banner_image.py new file mode 100644 index 0000000..163ab14 --- /dev/null +++ b/core/migrations/0002_authorpage_banner_image.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-07-06 20:14 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0013_make_rendition_upload_callable'), + ('core', '0001_auto_20160705_1408'), + ] + + operations = [ + migrations.AddField( + model_name='authorpage', + name='banner_image', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='wagtailimages.Image'), + ), + ] From 17954304c3dd5d7803a52176d16d6226033ce2a5 Mon Sep 17 00:00:00 2001 From: Cherie Yang Date: Thu, 7 Jul 2016 09:55:23 -0400 Subject: [PATCH 24/27] Added migration for removing name field from author pages --- core/migrations/0001_auto_20160705_1408.py | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 core/migrations/0001_auto_20160705_1408.py diff --git a/core/migrations/0001_auto_20160705_1408.py b/core/migrations/0001_auto_20160705_1408.py new file mode 100644 index 0000000..1dfb116 --- /dev/null +++ b/core/migrations/0001_auto_20160705_1408.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-07-05 18:08 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', 'author_pages_migration'), + ] + + operations = [ + migrations.RemoveField( + model_name='authorpage', + name='name', + ), + migrations.AddField( + model_name='authorpage', + name='portfolio_link', + field=models.CharField(blank=True, max_length=50), + ), + ] From fce8134b6f09b80c6067e3887ac4f4e438210c05 Mon Sep 17 00:00:00 2001 From: nmorduch Date: Wed, 27 Jul 2016 15:08:49 -0400 Subject: [PATCH 25/27] Make migrations work Some models do not yet have migrations for the author pages. We should merge and deploy, _then_ change those fields. --- core/migrations/0001_auto_20160705_1408.py | 24 ----- .../0002_authorpage_banner_image.py | 22 ----- core/migrations/author_pages_migration.py | 88 ------------------- core/models.py | 15 ++-- 4 files changed, 8 insertions(+), 141 deletions(-) delete mode 100644 core/migrations/0001_auto_20160705_1408.py delete mode 100644 core/migrations/0002_authorpage_banner_image.py delete mode 100644 core/migrations/author_pages_migration.py diff --git a/core/migrations/0001_auto_20160705_1408.py b/core/migrations/0001_auto_20160705_1408.py deleted file mode 100644 index 1dfb116..0000000 --- a/core/migrations/0001_auto_20160705_1408.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-07-05 18:08 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', 'author_pages_migration'), - ] - - operations = [ - migrations.RemoveField( - model_name='authorpage', - name='name', - ), - migrations.AddField( - model_name='authorpage', - name='portfolio_link', - field=models.CharField(blank=True, max_length=50), - ), - ] diff --git a/core/migrations/0002_authorpage_banner_image.py b/core/migrations/0002_authorpage_banner_image.py deleted file mode 100644 index 163ab14..0000000 --- a/core/migrations/0002_authorpage_banner_image.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-07-06 20:14 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtailimages', '0013_make_rendition_upload_callable'), - ('core', '0001_auto_20160705_1408'), - ] - - operations = [ - migrations.AddField( - model_name='authorpage', - name='banner_image', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='wagtailimages.Image'), - ), - ] diff --git a/core/migrations/author_pages_migration.py b/core/migrations/author_pages_migration.py deleted file mode 100644 index 6734f31..0000000 --- a/core/migrations/author_pages_migration.py +++ /dev/null @@ -1,88 +0,0 @@ -from __future__ import unicode_literals - -from django.utils.text import slugify -from django.db import migrations, models -import django.db.models.deletion -import wagtail.wagtailcore.fields - - -def migrate_data(apps, schema_editor): - from core.models import AuthorPage, AboutPage - - BlogPage = apps.get_model("core", "BlogPage") - AuthorProfile = apps.get_model("core", "AuthorProfile") - try: - about_page = AboutPage.objects.get() - except (AboutPage.DoesNotExist, AboutPage.MultipleObjectsReturned): - # we can only programmatically migrate this data if there is - # exactly one about page - return - - for snippet in AuthorProfile.objects.all(): - page = AuthorPage(name=snippet.name, - title=snippet.name, - slug=slugify(snippet.name), - picture_id=snippet.picture.pk, - bio=snippet.bio, - is_member=snippet.is_member, - twitter_username=snippet.twitter_username, - github_username=snippet.github_username) - about_page.add_child(instance=page) - BlogPage.objects.filter(author_old=snippet).update(author=page) - - -class Migration(migrations.Migration): - - # Not sure what the dependency should be for this... - # Probably fill in with the last most recent migration file? - dependencies = [ - ('core', '0045_auto_20160519_2307'), - ] - - operations = [ - # Creates the AuthorPage in the database - migrations.CreateModel( - name='AuthorPage', - fields=[ - ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('name', models.CharField(max_length=100)), - ('bio', wagtail.wagtailcore.fields.RichTextField(blank=True)), - ('is_member', models.BooleanField(default=False)), - ('twitter_username', models.CharField(blank=True, max_length=15)), - ('github_username', models.CharField(blank=True, max_length=30)), - ('picture', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), - ], - options={ - 'abstract': False, - }, - bases=('wagtailcore.page',), - ), - - # Rename BlogPage.author to BlogPage.author_old - migrations.RenameField( - model_name='BlogPage', - old_name='author', - new_name='author_old', - ), - - # Create a new field in BlogPage called author, linked to AuthorPage - migrations.AddField( - model_name='BlogPage', - name='author', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.AuthorPage'), - ), - - # migrates AuthorProfileData to the AuthorPage - migrations.RunPython(migrate_data), - - # Delete the BlogPage.author_old field - migrations.RemoveField( - model_name='BlogPage', - name='author_old', - ), - - # Delete AuthorProfile - migrations.DeleteModel( - name='AuthorProfile', - ), - ] diff --git a/core/models.py b/core/models.py index c54ca99..e190f9f 100644 --- a/core/models.py +++ b/core/models.py @@ -167,11 +167,12 @@ class AuthorPage(Page): on_delete=models.SET_NULL, related_name='+') bio = RichTextField(blank=True) is_member = models.BooleanField(default=False) + name = models.CharField(max_length=200, blank=True) twitter_username = models.CharField(max_length=15, blank=True) github_username = models.CharField(max_length=30, blank=True) - portfolio_link = models.CharField(max_length=50, blank=True) - banner_image = models.ForeignKey("wagtailimages.Image", null=True, blank=True, - on_delete=models.SET_NULL) + # portfolio_link = models.CharField(max_length=50, blank=True) + # banner_image = models.ForeignKey("wagtailimages.Image", null=True, blank=True, + # on_delete=models.SET_NULL) content_panels = Page.content_panels + [ ImageChooserPanel('picture'), @@ -179,11 +180,11 @@ class AuthorPage(Page): FieldPanel('is_member'), FieldPanel('twitter_username'), FieldPanel('github_username'), - FieldPanel('portfolio_link'), - ImageChooserPanel('banner_image'), + # FieldPanel('portfolio_link'), + # ImageChooserPanel('banner_image'), ] - - def get_context(self, request): + + def get_context(self, request): context = super(AuthorPage, self).get_context(request) context['blog_entries'] = BlogPage.objects.filter(author=self) return context From 49b80b04913936d8138496a716c69f0605fc3317 Mon Sep 17 00:00:00 2001 From: nmorduch Date: Wed, 27 Jul 2016 15:10:03 -0400 Subject: [PATCH 26/27] Migration was missing in last commit --- .../migrations/0046_author_pages_migration.py | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 core/migrations/0046_author_pages_migration.py diff --git a/core/migrations/0046_author_pages_migration.py b/core/migrations/0046_author_pages_migration.py new file mode 100644 index 0000000..6734f31 --- /dev/null +++ b/core/migrations/0046_author_pages_migration.py @@ -0,0 +1,88 @@ +from __future__ import unicode_literals + +from django.utils.text import slugify +from django.db import migrations, models +import django.db.models.deletion +import wagtail.wagtailcore.fields + + +def migrate_data(apps, schema_editor): + from core.models import AuthorPage, AboutPage + + BlogPage = apps.get_model("core", "BlogPage") + AuthorProfile = apps.get_model("core", "AuthorProfile") + try: + about_page = AboutPage.objects.get() + except (AboutPage.DoesNotExist, AboutPage.MultipleObjectsReturned): + # we can only programmatically migrate this data if there is + # exactly one about page + return + + for snippet in AuthorProfile.objects.all(): + page = AuthorPage(name=snippet.name, + title=snippet.name, + slug=slugify(snippet.name), + picture_id=snippet.picture.pk, + bio=snippet.bio, + is_member=snippet.is_member, + twitter_username=snippet.twitter_username, + github_username=snippet.github_username) + about_page.add_child(instance=page) + BlogPage.objects.filter(author_old=snippet).update(author=page) + + +class Migration(migrations.Migration): + + # Not sure what the dependency should be for this... + # Probably fill in with the last most recent migration file? + dependencies = [ + ('core', '0045_auto_20160519_2307'), + ] + + operations = [ + # Creates the AuthorPage in the database + migrations.CreateModel( + name='AuthorPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ('name', models.CharField(max_length=100)), + ('bio', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('is_member', models.BooleanField(default=False)), + ('twitter_username', models.CharField(blank=True, max_length=15)), + ('github_username', models.CharField(blank=True, max_length=30)), + ('picture', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + + # Rename BlogPage.author to BlogPage.author_old + migrations.RenameField( + model_name='BlogPage', + old_name='author', + new_name='author_old', + ), + + # Create a new field in BlogPage called author, linked to AuthorPage + migrations.AddField( + model_name='BlogPage', + name='author', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.AuthorPage'), + ), + + # migrates AuthorProfileData to the AuthorPage + migrations.RunPython(migrate_data), + + # Delete the BlogPage.author_old field + migrations.RemoveField( + model_name='BlogPage', + name='author_old', + ), + + # Delete AuthorProfile + migrations.DeleteModel( + name='AuthorProfile', + ), + ] From db5e4ffb9f5c65d5956cd20bbd9b58e5b2e7deed Mon Sep 17 00:00:00 2001 From: nmorduch Date: Fri, 12 Aug 2016 19:51:22 -0400 Subject: [PATCH 27/27] minor design changes re authors --- core/templates/core/about_page.html | 9 ++++++--- core/templates/core/author_page.html | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/templates/core/about_page.html b/core/templates/core/about_page.html index 4636d0a..f30d334 100644 --- a/core/templates/core/about_page.html +++ b/core/templates/core/about_page.html @@ -23,9 +23,12 @@

Our Team

{% for member in members %}
- {% if member.picture %}{% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %} -

- + {% if member.picture %} + + {% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %} + +

+ {{ member.title }}

diff --git a/core/templates/core/author_page.html b/core/templates/core/author_page.html index 67dc411..73ddbe6 100644 --- a/core/templates/core/author_page.html +++ b/core/templates/core/author_page.html @@ -37,7 +37,7 @@

{{ page.title }}

-

Blog Entries

+

Blog Entries

{% for entry in blog_entries %}