Merge pull request creativecommons#105 from creativecommons/add_author_info

kgodey · web-flow · commit 7729cf8baa0a · 2019-07-22T21:56:07.000-04:00
Added optional author information to the blog
diff --git a/.lektorproject b/.lektorproject
@@ -12,3 +12,4 @@ lektor-google-analytics = 0.1.3
 lektor-webpack-support = 0.5
 lektor-atom = 0.3
 lektor-disqus-comments = 0.4.1
+lektor-gravatar = 0.1.2
diff --git a/content/archives/old-tech-blog/authors/Matt-Lee/contents.lr b/content/archives/old-tech-blog/authors/Matt-Lee/contents.lr
@@ -1 +1 @@
-name: Matt Lee
+username: Matt Lee
diff --git a/content/archives/old-tech-blog/authors/akila87/contents.lr b/content/archives/old-tech-blog/authors/akila87/contents.lr
@@ -1 +1 @@
-name: akila87
+username: akila87
diff --git a/content/archives/old-tech-blog/authors/akozak/contents.lr b/content/archives/old-tech-blog/authors/akozak/contents.lr
@@ -1 +1 @@
-name: akozak
+username: akozak
diff --git a/content/archives/old-tech-blog/authors/alankelon/contents.lr b/content/archives/old-tech-blog/authors/alankelon/contents.lr
@@ -1 +1 @@
-name: alankelon
+username: alankelon
diff --git a/content/archives/old-tech-blog/authors/alex/contents.lr b/content/archives/old-tech-blog/authors/alex/contents.lr
@@ -1 +1 @@
-name: alex
+username: alex
diff --git a/content/archives/old-tech-blog/authors/ankitg/contents.lr b/content/archives/old-tech-blog/authors/ankitg/contents.lr
@@ -1 +1 @@
-name: ankitg
+username: ankitg
diff --git a/content/archives/old-tech-blog/authors/asheesh/contents.lr b/content/archives/old-tech-blog/authors/asheesh/contents.lr
@@ -1 +1 @@
-name: asheesh
+username: asheesh
diff --git a/content/archives/old-tech-blog/authors/blaise/contents.lr b/content/archives/old-tech-blog/authors/blaise/contents.lr
@@ -1 +1 @@
-name: blaise
+username: blaise
diff --git a/content/archives/old-tech-blog/authors/brian/contents.lr b/content/archives/old-tech-blog/authors/brian/contents.lr
@@ -1 +1 @@
-name: brian
+username: brian
diff --git a/content/archives/old-tech-blog/authors/cwebber/contents.lr b/content/archives/old-tech-blog/authors/cwebber/contents.lr
@@ -1 +1 @@
-name: cwebber
+username: cwebber
diff --git a/content/archives/old-tech-blog/authors/davemccabe/contents.lr b/content/archives/old-tech-blog/authors/davemccabe/contents.lr
@@ -1 +1 @@
-name: davemccabe
+username: davemccabe
diff --git a/content/archives/old-tech-blog/authors/erlehmann/contents.lr b/content/archives/old-tech-blog/authors/erlehmann/contents.lr
@@ -1 +1 @@
-name: erlehmann
+username: erlehmann
diff --git a/content/archives/old-tech-blog/authors/frank/contents.lr b/content/archives/old-tech-blog/authors/frank/contents.lr
@@ -1 +1 @@
-name: frank
+username: frank
diff --git a/content/archives/old-tech-blog/authors/greg/contents.lr b/content/archives/old-tech-blog/authors/greg/contents.lr
@@ -1 +1 @@
-name: greg
+username: greg
diff --git a/content/archives/old-tech-blog/authors/hugo/contents.lr b/content/archives/old-tech-blog/authors/hugo/contents.lr
@@ -1 +1 @@
-name: hugo
+username: hugo
diff --git a/content/archives/old-tech-blog/authors/igorlukanin/contents.lr b/content/archives/old-tech-blog/authors/igorlukanin/contents.lr
@@ -1 +1 @@
-name: igorlukanin
+username: igorlukanin
diff --git a/content/archives/old-tech-blog/authors/jakin/contents.lr b/content/archives/old-tech-blog/authors/jakin/contents.lr
@@ -1 +1 @@
-name: jakin
+username: jakin
diff --git a/content/archives/old-tech-blog/authors/john/contents.lr b/content/archives/old-tech-blog/authors/john/contents.lr
@@ -1 +1 @@
-name: john
+username: john
diff --git a/content/archives/old-tech-blog/authors/ksiomelo/contents.lr b/content/archives/old-tech-blog/authors/ksiomelo/contents.lr
@@ -1 +1 @@
-name: ksiomelo
+username: ksiomelo
diff --git a/content/archives/old-tech-blog/authors/lunpa/contents.lr b/content/archives/old-tech-blog/authors/lunpa/contents.lr
@@ -1 +1 @@
-name: lunpa
+username: lunpa
diff --git a/content/archives/old-tech-blog/authors/matthiassamwald/contents.lr b/content/archives/old-tech-blog/authors/matthiassamwald/contents.lr
@@ -1 +1 @@
-name: matthiassamwald
+username: matthiassamwald
diff --git a/content/archives/old-tech-blog/authors/mihai/contents.lr b/content/archives/old-tech-blog/authors/mihai/contents.lr
@@ -1 +1 @@
-name: mihai
+username: mihai
diff --git a/content/archives/old-tech-blog/authors/ml/contents.lr b/content/archives/old-tech-blog/authors/ml/contents.lr
@@ -1 +1 @@
-name: ml
+username: ml
diff --git a/content/archives/old-tech-blog/authors/nathan/contents.lr b/content/archives/old-tech-blog/authors/nathan/contents.lr
@@ -1 +1 @@
-name: nathan
+username: nathan
diff --git a/content/archives/old-tech-blog/authors/nimal/contents.lr b/content/archives/old-tech-blog/authors/nimal/contents.lr
@@ -1 +1 @@
-name: nimal
+username: nimal
diff --git a/content/archives/old-tech-blog/authors/nkinkade/contents.lr b/content/archives/old-tech-blog/authors/nkinkade/contents.lr
@@ -1 +1 @@
-name: nkinkade
+username: nkinkade
diff --git a/content/archives/old-tech-blog/authors/rejon/contents.lr b/content/archives/old-tech-blog/authors/rejon/contents.lr
@@ -1 +1 @@
-name: rejon
+username: rejon
diff --git a/content/archives/old-tech-blog/authors/steren/contents.lr b/content/archives/old-tech-blog/authors/steren/contents.lr
@@ -1 +1 @@
-name: steren
+username: steren
diff --git a/content/archives/old-tech-blog/authors/tannewt/contents.lr b/content/archives/old-tech-blog/authors/tannewt/contents.lr
@@ -1 +1 @@
-name: tannewt
+username: tannewt
diff --git a/content/archives/old-tech-blog/authors/thwang/contents.lr b/content/archives/old-tech-blog/authors/thwang/contents.lr
@@ -1 +1 @@
-name: thwang
+username: thwang
diff --git a/content/archives/old-tech-blog/authors/tpkennes/contents.lr b/content/archives/old-tech-blog/authors/tpkennes/contents.lr
@@ -1 +1 @@
-name: tpkennes
+username: tpkennes
diff --git a/content/blog/authors/TimidRobot/contents.lr b/content/blog/authors/TimidRobot/contents.lr
@@ -1 +1,3 @@
-name: TimidRobot
+username: TimidRobot
+---
+name: Timid Robot Zehta
diff --git a/content/blog/authors/ahmadbilaldev/contents.lr b/content/blog/authors/ahmadbilaldev/contents.lr
@@ -1 +1,3 @@
-name: ahmadbilaldev
+username: ahmadbilaldev
+---
+name: Ahmad Bilal
diff --git a/content/blog/authors/akmadian/contents.lr b/content/blog/authors/akmadian/contents.lr
@@ -1 +1,3 @@
-name: akmadian
+username: akmadian
+---
+name: Ari Madian
diff --git a/content/blog/authors/aldenpage/contents.lr b/content/blog/authors/aldenpage/contents.lr
@@ -1 +1,3 @@
-name: aldenpage
+username: aldenpage
+---
+name: Alden Page
diff --git a/content/blog/authors/bhumijgupta/contents.lr b/content/blog/authors/bhumijgupta/contents.lr
@@ -1 +1,3 @@
-name: bhumijgupta
+username: bhumijgupta
+---
+name: Bhumij Gupta
diff --git a/content/blog/authors/brenoferreira/contents.lr b/content/blog/authors/brenoferreira/contents.lr
@@ -1 +1,3 @@
-name: brenoferreira
+username: brenoferreira
+---
+name: Breno Ferreira
diff --git a/content/blog/authors/dhruvkb/contents.lr b/content/blog/authors/dhruvkb/contents.lr
@@ -1 +1,3 @@
-name: dhruvkb
+username: dhruvkb
+---
+name: Dhruv Bhanushali
diff --git a/content/blog/authors/hugosolar/contents.lr b/content/blog/authors/hugosolar/contents.lr
@@ -1 +1,3 @@
-name: HugoSolar
+username: HugoSolar
+---
+name: Hugo Solar
diff --git a/content/blog/authors/janeatcc/contents.lr b/content/blog/authors/janeatcc/contents.lr
@@ -1 +1,3 @@
-name: janeatcc
+username: janeatcc
+---
+name: Jane Park
diff --git a/content/blog/authors/kgodey/contents.lr b/content/blog/authors/kgodey/contents.lr
@@ -1 +1,8 @@
-name: kgodey
+username: kgodey
+---
+name: Kriti Godey
+---
+email: kriti@creativecommons.org
+---
+about:
+[Kriti](https://creativecommons.org/author/kriticreativecommons-org/) is Director of Engineering at Creative Commons. She's `kgodey` on IRC and `@kriti` on Slack.
diff --git a/content/blog/authors/makkoncept/contents.lr b/content/blog/authors/makkoncept/contents.lr
@@ -1 +1,3 @@
-name: makkoncept
+username: makkoncept
+---
+name: Mayank Nader
diff --git a/content/blog/authors/sclachar/contents.lr b/content/blog/authors/sclachar/contents.lr
@@ -1 +1,3 @@
-name: sclachar
+username: sclachar
+---
+name: Sophine Clachar
diff --git a/content/blog/authors/soccerdroid/contents.lr b/content/blog/authors/soccerdroid/contents.lr
@@ -1 +1,3 @@
-name: soccerdroid
+username: soccerdroid
+---
+name: María Belén Guaranda Cabezas
diff --git a/content/blog/entries/Pipfile b/content/blog/entries/Pipfile
diff --git a/content/blog/entries/meet-gsoc-2019-students/contents.lr b/content/blog/entries/meet-gsoc-2019-students/contents.lr
@@ -32,7 +32,7 @@ summer. Here they are!
       of my life. Cats are my weakness, and I am a sucker for well-engineered 
       cars.</em></p>
 
-      <p><a href="https://github.com/creativecommons/creativecommons-wordpress-plugin">Ahmad will be taking ownership of [the CC WordPress plugin</a>,
+      <p>Ahmad will be taking ownership of <a href="https://github.com/creativecommons/creativecommons-wordpress-plugin">the CC WordPress plugin</a>,
       which simplifies the process of applying CC licenses to content created
       using the popular WordPress blogging platform. He will be updating it 
       to use the latest WordPress best practices, resolving open issues, and 
diff --git a/models/author.ini b/models/author.ini
@@ -1,11 +1,23 @@
 [model]
 name = Author
-label = {{ this.name }}
+label = {{ this.username }}
 hidden = yes
 
 [children]
 replaced_with = site.query(this.parent.parent.path + '/entries').filter(F.author.contains(this))
 
+[fields.username]
+label = Username
+type = string
+
 [fields.name]
 label = Name
 type = string
+
+[fields.email]
+label = Email
+type = string
+
+[fields.about]
+label = About
+type = markdown
diff --git a/models/authors.ini b/models/authors.ini
@@ -6,4 +6,4 @@ protected = yes
 
 [children]
 model = author
-order_by = name
+order_by = name,username
diff --git a/models/blog-post.ini b/models/blog-post.ini
@@ -19,7 +19,11 @@ width = 1/2
 
 [fields.author]
 label = Author
-type = string
+type = select
+// TODO: this is far too opaque, fix this. basically it's finding authors by
+// going up to entries.blog, then getting everything in
+// the blog.authors.<author name> files
+source = record.parent.parent.children.get('authors').children.all()
 
 [fields.body]
 label = Body
diff --git a/templates/author.html b/templates/author.html
@@ -1,10 +1,20 @@
 {% extends "layout.html" %}
+
 {% from "macros/posts.html" import render_posts %}
-{% block title %}{{ this.name + ' - ' + this.parent.parent.children.get('entries').title  }}{% endblock %}
+{% from "macros/author_name.html" import render_author_name %}
+
+{% block title %}{{ render_author_name(this) + ' - ' + this.parent.parent.children.get('entries').title  }}{% endblock %}
 {% block header %}{{ this.parent.parent.children.get('entries').title }}{% endblock %}
 {% block body %}
-  <h2>Posts by {{ this.name }}</h2>
+  <h2>{{ render_author_name(this) }}</h2>
+  {% if this.about %}
+    {% if this.email %}
+      <img src="{{ this.email|gravatar }}size=120" alt="gravatar" style="float:right;" class="p-2" />
+    {% endif %}
+    {{ this.about }}
+  {% endif %}
+  <h3>Posts</h3>
     {{ render_posts(this.children) }}
-  <hr>
-  <strong><a href="{{ this.parent.path }}">All Authors</a></strong>
+  <hr/>
+  <p class="text-muted"><strong><a href="{{ this.parent|url }}">All Authors</a></strong></p>
 {% endblock %}
diff --git a/templates/authors.html b/templates/authors.html
@@ -1,5 +1,7 @@
 {% extends "layout.html" %}
+
 {% from "macros/authors.html" import render_authors %}
+
 {% block title %}{{ this.parent.children.get('entries').title + ' - Authors' }}{% endblock %}
 {% block header %}{{ this.parent.children.get('entries').title }}{% endblock %}
 {% block body %}
diff --git a/templates/blog-category.html b/templates/blog-category.html
@@ -1,10 +1,12 @@
 {% extends "layout.html" %}
+
 {% from "macros/posts.html" import render_posts %}
+
 {% block title %}{{ this.name + ' - ' + this.parent.parent.children.get('entries').title }}{% endblock %}
 {% block header %}{{ this.parent.parent.children.get('entries').title }}{% endblock %}
 {% block body %}
   <h2>All posts categorized "{{ this.name }}"</h2>
   {{ render_posts(this.children) }}
   <hr>
-  <strong><a href="{{ this.parent.path }}">All Categories</a></strong>
+  <strong><a href="{{ this.parent|url }}">All Categories</a></strong>
 {% endblock %}
diff --git a/templates/blog-post.html b/templates/blog-post.html
@@ -1,19 +1,25 @@
 {% extends "layout.html" %}
+
+{% from "macros/author_name.html" import render_author_name %}
+
+{% set author = this.parent.parent.children.get('authors').children.get(this.author) %}
+
 {% block title %}{{ this.title }}{% endblock %}
 {% block header %}{{ this.parent.title }}{% endblock %}
 {% block body %}
   <h2 class="mb-0">{{ this.title }}</h2>
   {{ check_file('content' + this.parent.parent.path + '/authors/' + this.author + '/contents.lr') }}
-  <p class="meta text-muted mt-0">by <a href="{{ this.parent.parent.children.get('authors').path + '/' + this.author }}">{{ this.author }}</a>
-  on {{ this.pub_date|dateformat('EEEE, yyyy ''MMMM d') }}</p>
+  <p class="meta text-muted mt-0">by <a href="{{ author|url }}">{{ render_author_name(author) }}</a>
+  on {{ this.pub_date|dateformat('EEEE, yyyy-''MM-d') }}</p>
   <div class="body">{{ this.body }}</div>
   <div class="card bg-light">
     <div class="card-body p-2">
       <p class="meta my-0"><span class="mr-2"><strong>Categories:</strong></span>
         {% if this.categories|length %}
           {% for category in this.categories %}
-          {{ check_file('content' + this.parent.parent.path + '/categories/' + category + '/contents.lr') }}
-          <a href=" {{ this.parent.parent.path + '/categories/' + category }} ">{{ category }}</a>{{ "," if not loop.last }}
+            {% set current_category = this.parent.parent.children.get('categories').children.get(category) %}
+            {{ check_file('content' + this.parent.parent.path + '/categories/' + category + '/contents.lr') }}
+            <a href=" {{ current_category|url }} ">{{ category }}</a>{{ "," if not loop.last }}
           {% endfor %}
         {% else %}
           none
diff --git a/templates/blog.html b/templates/blog.html
@@ -1,6 +1,8 @@
 {% extends "layout.html" %}
+
 {% from "macros/pagination.html" import render_pagination %}
 {% from "macros/posts.html" import render_posts %}
+
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
   {{ this.description }}
diff --git a/templates/macros/author_name.html b/templates/macros/author_name.html
@@ -0,0 +1,3 @@
+{% macro render_author_name(author) %}
+  {% if author.name %}{{ author.name }}{% else %}{{ author.username }}{% endif %}
+{% endmacro %}
diff --git a/templates/macros/authors.html b/templates/macros/authors.html
@@ -1,7 +1,9 @@
+{% from "macros/author_name.html" import render_author_name %}
+
 {% macro render_authors(authors) %}
-  <ul class="list-inline">
+  <ul class="list-unstyled">
     {% for author in site.query(authors.path) %}
-      <li class="list-inline-item"><a href="{{ author|url }}">{{ author.name }}</a></li>
+      <li><a href="{{ author|url }}">{{ render_author_name(author) }}</a></li>
     {% endfor %}
   </ul>
 {% endmacro %}
diff --git a/templates/macros/categories.html b/templates/macros/categories.html
@@ -1,9 +1,9 @@
 {% from "macros/posts.html" import render_posts %}
 
 {% macro render_categories(categories) %}
-<ul class="list-inline">
+<ul class="list-unstyled">
     {% for category in site.query(categories.path) %}
-      <li class="list-inline-item"><a href="{{ category|url }}">{{ category.name }}</a></li>
+      <li><a href="{{ category|url }}">{{ category.name }}</a></li>
     {% endfor %}
 </ul>
 {% endmacro %}
diff --git a/templates/macros/posts.html b/templates/macros/posts.html
@@ -1,11 +1,14 @@
+{% from "macros/author_name.html" import render_author_name %}
+
 {% macro render_posts(posts) %}
   <ul class="blog-index list-unstyled">
     {% for post in posts %}
-    <li>
-      <a href="{{ post|url }}">{{ post.title }}</a>
-      <p class="text-muted small">by <a href="{{ post.parent.parent.children.get('authors').path + '/' + post.author }}">{{ post.author }}</a>
-        on {{ post.pub_date|dateformat("YYYY-MM-dd") }}</p>
-    </li>
+      {% set author = post.parent.parent.children.get('authors').children.get(post.author) %}
+      <li>
+        <a href="{{ post|url }}">{{ post.title }}</a>
+        <p class="text-muted small">by <a href="{{ author|url }}">{{ render_author_name(author) }}</a>
+          on {{ post.pub_date|dateformat("YYYY-MM-dd") }}</p>
+      </li>
     {% endfor %}
   </ul>
 {% endmacro %}
