From f5320c3717c54f79787d8d66f27ad2664fb1ff88 Mon Sep 17 00:00:00 2001
From: Anna Wiggins <annabunches@gmail.com>
Date: Sun, 22 May 2016 21:49:37 -0400
Subject: [PATCH] A bunch of layout changes to support a new category and make
 everything work better.

---
 .ruby-gemset                  |  1 +
 .ruby-version                 |  1 +
 _config.yml                   | 21 +++++++++++++--------
 _includes/post_list_main.html | 18 ++++++++++++++++++
 _layouts/category_index.html  |  3 +++
 _plugins/category_page.rb     | 13 ++++++++++---
 index.html                    | 10 +++++-----
 religion/index.html           |  4 ----
 8 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 .ruby-gemset
 create mode 100644 .ruby-version
 create mode 100644 _includes/post_list_main.html
 delete mode 100644 religion/index.html

diff --git a/.ruby-gemset b/.ruby-gemset
new file mode 100644
index 0000000..6f47107
--- /dev/null
+++ b/.ruby-gemset
@@ -0,0 +1 @@
+annabunches
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..2bf1c1c
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.3.1
diff --git a/_config.yml b/_config.yml
index 14247b5..d0ff763 100644
--- a/_config.yml
+++ b/_config.yml
@@ -23,14 +23,19 @@ timezone: America/New_York
 markdown: kramdown
 
 # Category settings
-main_categories:
-  - technology
-  - media
-
-category_titles:
-  technology: "The Technologist"
-  media: "The Player of Games"
-  religion: "The Mystic"
+category_metadata:
+  technology:
+    title: "The Technologist"
+    description: This section of the blog is where I talk about technology. Tutorials, rants, and discussions about programming languages, operating systems, hardware, and more.
+    main: true
+  media:
+    title: "The Player of Games"
+    description: Here I talk about media. Video games, tabletop games, movies, TV.
+    main: true
+  religion:
+    title: "The Mystic"
+    description: Discussions of my adventures with faith, spirituality, truth, and magic. Lots of woo here.
+    main: false
 
 defaults:
   - scope:
diff --git a/_includes/post_list_main.html b/_includes/post_list_main.html
new file mode 100644
index 0000000..e3bdda3
--- /dev/null
+++ b/_includes/post_list_main.html
@@ -0,0 +1,18 @@
+<ul class="post-list">
+  {% for post in site.posts limit:include.limit %}
+    {% if post.main != false && (site.category_metadata[post.category][main] || post.main == true) %}
+      <li style="margin-top: 30px">
+        <h2 style="line-height: 1">
+          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">
+            {{ post.title }}
+          </a>
+          <span class="post-meta">{{ post.date | date: "%Y-%m-%d" }}</span>
+        </h2>
+        {{ post.excerpt }}
+        <p>
+          <a href="{{ post.url | prepend: site.baseurl }}">Read More...</a>
+        </p>
+      </li>
+    {% endif %}
+  {% endfor %}
+</ul>
diff --git a/_layouts/category_index.html b/_layouts/category_index.html
index c5efad2..e8e95c2 100644
--- a/_layouts/category_index.html
+++ b/_layouts/category_index.html
@@ -8,6 +8,9 @@ layout: default
   </header>
 
   <div class="post-content">
+    <div class="category-description">
+      {{ page.description }}
+    </div>
     {% include post_list.html categories=page.category limit=1000000 %}
   </div>
 
diff --git a/_plugins/category_page.rb b/_plugins/category_page.rb
index 528531a..2bad0f3 100644
--- a/_plugins/category_page.rb
+++ b/_plugins/category_page.rb
@@ -9,8 +9,15 @@ class CategoryPage < Jekyll::Page
     self.read_yaml(File.join(base, '_layouts'), 'category_index.html')
     self.data['category'] = category
 
-    category_title = site.config["category_titles"][category] || category.capitalize
-    self.data['title'] = "#{category_title}"
+    config = site.config['category_metadata'][category]
+
+    if config.nil?
+      self.data['title'] = category.capitalize
+      self.data['description'] = ''
+    else
+      self.data['title'] = config['title']
+      self.data['description'] = config['description']
+    end
   end
 end
 
@@ -22,7 +29,7 @@ class CategoryPageGenerator < Jekyll::Generator
       return
     end
 
-    site.categories.each_key do |category|
+    site.config['category_metadata'].each_key do |category|
       site.pages << CategoryPage.new(site, site.source, category)
     end
   end
diff --git a/index.html b/index.html
index c249f6d..672f9c7 100644
--- a/index.html
+++ b/index.html
@@ -3,10 +3,10 @@ layout: default
 ---
 <div class="home">
   <div class="category-menu">
-    {% for category in site.category_titles %}
+    {% for category in site.category_metadata %}
         <span class="category-link">
           <a href="{{category.first | prepend: site.baseurl}}">
-            {{ category.last }}
+            {{ category.last["title"] }}
           </a>
         </span>
     {% endfor %}
@@ -22,15 +22,15 @@ layout: default
     </div>
   {% endif %}
     
-  {% include post_list.html categories=site.main_categories limit=10 %}
+  {% include post_list_main.html limit=10 %}
 
   <p class="post-meta" style="margin-top: 40px">
     For more posts, choose a category:
     <ul>
-      {% for category in site.category_titles %}
+      {% for category in site.category_metadata %}
       <li>
         <a href="{{category.first | prepend: site.baseurl}}">
-          {{category.last}}
+          {{ category.last["title"]}}
         </a>
       </li>
       {% endfor %}
diff --git a/religion/index.html b/religion/index.html
deleted file mode 100644
index cc725af..0000000
--- a/religion/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: default
----
-Sorry, there is nothing here yet.