Author pages

.gitignore

@@ -3,3 +3,5 @@ db.sqlite3
 /media/
 /pillar/
 *.pyc
+littleweaverweb/settings/local.py
+*.dump

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',
+            ),
+        ]

core/models.py

@@ -1,9 +1,11 @@
 from django.db import models
 
+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
 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
@@ -160,6 +162,32 @@ class WorkPage(Page):
         ], "Teaser Details"),
     ]
 
+class AuthorPage(Page):
+    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)
+    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)
+
+    content_panels = Page.content_panels + [
+        ImageChooserPanel('picture'),
+        FieldPanel('bio'),
+        FieldPanel('is_member'),
+        FieldPanel('twitter_username'),
+        FieldPanel('github_username'),
+        # FieldPanel('portfolio_link'),
+        # ImageChooserPanel('banner_image'),
+    ]
+
+    def get_context(self, request):
+        context = super(AuthorPage, self).get_context(request)
+        context['blog_entries'] = BlogPage.objects.filter(author=self)
+        return context
 
 class AboutPage(Page):
     body = RichTextField()
@@ -173,7 +201,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
 
 
@@ -228,9 +256,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")
@@ -252,7 +279,7 @@ class BlogPage(Page):
                            related_name="+")
 
     content_panels = Page.content_panels + [
-        SnippetChooserPanel('author'),
+        PageChooserPanel('author'),
         FieldPanel('publication_date'),
         FieldPanel('summary'),
         StreamFieldPanel('body'),
@@ -300,29 +327,6 @@ def get_context(self, request):
         return context
 
 
-@register_snippet
-class AuthorProfile(models.Model):
-    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)
-
-    panels = [
-        FieldPanel('name'),
-        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')
 

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

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

core/templates/core/_blog_author_bio.html

@@ -2,17 +2,9 @@
 {% load wagtailcore_tags %}
 
 <h4>
-	{{ page.author.name }}
-	{% if page.author.github_username or page.author.twitter_username %}
-		<small class="m-l-1">
-			{% if page.author.github_username %}
-			<a href="http://github.com/{{ page.author.github_username }}" class="link-no-underline fa fa-fw fa-github" title="Github profile"></a>
-			{% endif %}
-			{% if page.author.twitter_username %}
-			<a href="http://twitter.com/{{ page.author.twitter_username }}" class="link-no-underline fa fa-fw fa-twitter" title="Twitter profile"></a>
-			{% endif %}
-		</small>
-	{% endif %}
+  <a href="/about/{{ page.author.slug }}">
+	{{ page.author.title }}
+  </a>
 </h4>
 {% if page.author.bio %}
 	{{ page.author.bio|richtext }}

core/templates/core/_blog_summary_text.html

@@ -5,15 +5,17 @@ <h2 class="blog-post-title card-title">
 	<div class="blog-post-byline-dateline m-b-1">
 		<span class="color-black-almost">
 			{% if entry.author %}
-				{{ entry.author.name }}
+            <a href="/about/{{ entry.author.slug }}">
+				{{ entry.author.title }}
+            </a>
 			{% endif %}
 		</span>
 		<span class="dateline">
 			<time datetime="{{ entry.publication_date|date:"c" }}">{{ entry.publication_date|date:"N n, Y" }}</time>
 		</span>
 	</div>
 </header>
-<div class="entry-summary">
+<div class="m-b-1">
 	{{ entry.summary }}
 </div>
 <footer>

core/templates/core/about_page.html

@@ -23,8 +23,15 @@ <h1 class="text-xs-center m-b-3">Our Team</h1>
 				<div class="grid-md-3 grid-sm-2">
 					{% for member in members %}
 						<div class="grid-item m-b-3">
-							{% if member.picture %}{% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %}
-							<h3 class="text-xs-center m-t-1 color-gray">{{ member.name }}</h3>
+							{% if member.picture %}
+							<a href="/about/{{ member.slug }}">
+								{% image member.picture fill-500x500 class="img-fluid img-circle" %}{% endif %}
+							</a>
+							<h3 class="text-xs-center m-t-1">
+							  <a href="/about/{{ member.slug }}" class="color-gray">
+							  {{ member.title }}
+							  </a>
+							</h3>
 						</div>
 					{% endfor %}
 				</div>

core/templates/core/author_page.html

@@ -0,0 +1,51 @@
+{% extends "core/layouts/small_header.html" %}
+{% load wagtailcore_tags wagtailimages_tags %}
+
+{% block main %}
+
+{% image page.banner_image fill-1650x500 as banner_image %}
+<div class="banner-image" style="background-image:url({{ banner_image.url }});background-position:top center;">
+  <div class="container banner-image-text">
+    <h1 class="color-white">{{ page.title }}</h1>
+  </div>
+</div>
+
+<div class="pane--light-gray p-y-3">
+  <div class="container">
+    <div class="col-sm-4 col-sm-push-8 col-md-3 col-md-push-7 m-b-2-xs-down">
+      {% image page.picture fill-500x500 class="img-fluid img-circle" %}
+    </div>
+    <div class="col-sm-8 col-sm-pull-4 col-md-5 col-md-offset-2 col-md-pull-3">
+      <div class="lead--except-sm">
+	{{ page.bio|richtext }}
+      </div>
+      <ul class="list-inline">
+	{% if page.github_username %}
+	<li class="list-inline-item m-r-2"><a href="http://github.com/{{ page.github_username }}" class="link-no-underline" title="Github profile">Github</a></li>
+	{% endif %}
+	{% if page.twitter_username %}
+	<li class="list-inline-item m-r-2"><a href="http://twitter.com/{{ page.twitter_username }}" class="link-no-underline" title="Twitter profile">Twitter</a></li>
+	{% endif %}
+	{% if page.portfolio_link %}
+	<li class="list-inline-item m-r-2"><a href="{{ page.portfolio_link }}" class="link-no-underline" title="Portfolio">Portfolio</a></li>
+	{% endif %}
+      </ul>
+    </div>
+  </div>
+</div>
+
+<div class="container p-y-3">
+  <div class="row">
+    <div class="col-md-8 col-md-offset-2">
+      <h1>Blog Entries</h1>
+
+      {% for entry in blog_entries %}
+      <div class="m-t-3">
+	{% include "core/_blog_summary_text.html" %}
+      </div>
+      {% endfor %}
+    </div>
+  </div>
+</div>
+
+  {% endblock %}

core/templates/core/blog_page.html

@@ -19,7 +19,9 @@ <h1 class="color-black-almost">{{ page.title }}</h1>
 				<div>
 					<span class="color-black-almost">
 						{% if page.author %}
-							{{ page.author.name }}
+                            <a href="/about/{{ page.author.slug }}">
+                                {{ page.author.title }}
+                            </a>
 						{% endif %}
 					</span>
 					<span class="dateline">
@@ -58,7 +60,9 @@ <h1 class="color-black-almost">{{ page.title }}</h1>
 							<div class="media-left p-r-1">
 								{% if page.author.picture %}
 									{% image page.author.picture fill-150x150 as author_image %}
-									<img src="{{ author_image.url }}" alt="{{ page.author.picture.title }}" width=100 height=100 class="media-object img-circle"/>
+								<a href="/about/{{ page.author.slug }}">
+									<img src="{{ author_image.url }}" alt="{{ page.author.picture.title }}" width=100 class="img-circle media-object"/>
+								</a>
 								{% endif %}
 							</div>
 							<div class="media-body">