Recategorize elephpants

philipsharp · philipsharp · commit 504d874e269d · 2017-08-10T23:22:53.000-04:00
Use categories to group by decoration. Add common and latin names. Update section text.
diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
@@ -2,4 +2,61 @@
 # via `site.*`. So for example, {{ site.title }} can be used
 # in a template to get the contents of the `title` key.
 title: A Field Guide to Elephpants
-latinname: Elephpas hypertextus
+latinname: Elephpas hypertextus
+# Please keep the subspecies alphabetized
+subspecies:
+    amsterdamphp:
+        common: "AmsterdamPHP"
+        latin: "amstelodami"
+    confoo:
+        common: "ConFoo"
+        latin: "fooianum"
+    dpc:
+        common: "Dutch PHP Conference"
+        latin: "batavici"
+    gold:
+        common: "Gold"
+        latin: "auri"
+    globalis:
+        common: "Globalis"
+        latin: "globi"
+    laravel:
+        common: "Laravel"
+        latin: "laraveli"
+    oracle:
+        common: "Oracle"
+        latin: "oraculi"
+    phparch:
+        common: "PHP|Architect"
+        latin: "architecti"
+    phpwomen:
+        common: "PHP Women"
+        latin: "feminae"
+    sunshinephp:
+        common: "SunshinePHP"
+        latin: "solis"
+    haphpy:
+        common: "HaPHPy"
+        latin: "natalis"
+    rainbow:
+        common: "Rainbow"
+        latin: "arcus"
+    shopware:
+        common: "Shopware"
+        latin: "shopwari"
+    symfony:
+        common: "Symfony"
+        latin: "symphoniae"
+    zend:
+        common: "Zend"
+        latin: "zeevandi"
+    zf2:
+        common: "Zend Framework"
+        latin: "zendframeworki"
+relatedspecies:
+    hack:
+        common: "pHackyderm"
+        latin: "Elephpas cyberneticus"
+    truenorthphp:
+        common: "PHP Woolly Mammoth"
+        latin: "Elephpas mammuthus"
diff --git a/source/_elephpants/2007-12-00-blue-original.md b/source/_elephpants/2007-12-00-blue-original.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - original
 tags:
     - blue
 sponsor: Nexen / Alter Way
diff --git a/source/_elephpants/2008-03-12-blue-oracle.md b/source/_elephpants/2008-03-12-blue-oracle.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - oracle
 tags:
     - blue
 sponsor: Oracle Corporation
diff --git a/source/_elephpants/2010-11-01-blue-zend.md b/source/_elephpants/2010-11-01-blue-zend.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - zend
 tags:
     - blue
 sponsor: Zend Technologies
diff --git a/source/_elephpants/2011-10-00-pink-original.md b/source/_elephpants/2011-10-00-pink-original.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - original
 tags:
     - pink
 sponsor: Alter Way
diff --git a/source/_elephpants/2012-09-00-green-zf2.md b/source/_elephpants/2012-09-00-green-zf2.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - zf2
 tags:
     - green
 sponsor: Zend Technologies, Inc.
diff --git a/source/_elephpants/2013-10-07-red-chili.md b/source/_elephpants/2013-10-07-red-chili.md
@@ -1,5 +1,7 @@
 ---
 name: Chili
+categories:
+    - zend
 tags:
     - red
 sponsor: Zend Technologies
diff --git a/source/_elephpants/2014-01-16-orange-phparch.md b/source/_elephpants/2014-01-16-orange-phparch.md
@@ -1,5 +1,7 @@
 ---
 name: Archie
+categories:
+    - phparch
 tags:
     - orange
 sponsor: php[architect]
diff --git a/source/_elephpants/2014-02-06-purple-phpwomen.md b/source/_elephpants/2014-02-06-purple-phpwomen.md
@@ -1,5 +1,7 @@
 ---
 name: Umoja
+categories:
+    - phpwomen
 tags:
     - purple
 sponsor: PHP Women
diff --git a/source/_elephpants/2014-02-06-yellow-sunshinephp.md b/source/_elephpants/2014-02-06-yellow-sunshinephp.md
@@ -1,5 +1,7 @@
 ---
 name: Sonny
+categories:
+    - sunshinephp
 tags:
     - yellow
 sponsor: Sunshine PHP Conference, Zend Technologies
diff --git a/source/_elephpants/2014-09-05-red-laravel.md b/source/_elephpants/2014-09-05-red-laravel.md
@@ -1,5 +1,7 @@
 ---
 name: Liona
+categories:
+    - laravel
 tags:
     - red
 sponsor: Laravel community
diff --git a/source/_elephpants/2014-10-28-blue-apigility.md b/source/_elephpants/2014-10-28-blue-apigility.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - zend
 tags:
     - blue
 sponsor: Zend Technologies
diff --git a/source/_elephpants/2014-10-28-blue-zray.md b/source/_elephpants/2014-10-28-blue-zray.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - zend
 tags:
     - blue
 sponsor: Zend Technologies
diff --git a/source/_elephpants/2014-11-27-black-amsterdamphp.md b/source/_elephpants/2014-11-27-black-amsterdamphp.md
@@ -1,5 +1,7 @@
 ---
 name: MurPHPy
+categories:
+    - amsterdamphp
 tags:
     - black
 sponsor: AmsterdamPHP
diff --git a/source/_elephpants/2015-03-05-white-confoo.md b/source/_elephpants/2015-03-05-white-confoo.md
@@ -1,5 +1,7 @@
 ---
 name: Phil Snow
+categories:
+    - confoo
 tags:
     - white
 sponsor: ConFoo
diff --git a/source/_elephpants/2015-06-08-gold-opengoodies.md b/source/_elephpants/2015-06-08-gold-opengoodies.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - gold
 tags:
     - gold
 sponsor: OpenGoodies
diff --git a/source/_elephpants/2015-06-19-blue-opengoodies.md b/source/_elephpants/2015-06-19-blue-opengoodies.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - original
 tags:
     - blue
 sponsor: OpenGoodies
diff --git a/source/_elephpants/2015-06-19-pink-opengoodies.md b/source/_elephpants/2015-06-19-pink-opengoodies.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - original
 tags:
     - pink
 sponsor: OpenGoodies
diff --git a/source/_elephpants/2015-10-13-multicolored-haphpy.md b/source/_elephpants/2015-10-13-multicolored-haphpy.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - haphpy
 tags:
     - multicolored
 sponsor: AFUP - French PHP User Group
diff --git a/source/_elephpants/2015-10-19-teal-zend.md b/source/_elephpants/2015-10-19-teal-zend.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - zend
 tags:
     - teal
 sponsor: Zend Technologies
diff --git a/source/_elephpants/2015-11-06-black-symfony-10-years.md b/source/_elephpants/2015-11-06-black-symfony-10-years.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - symfony
 tags:
     - black
 sponsor: Sensio Labs
diff --git a/source/_elephpants/2016-01-01-black-symfony.md b/source/_elephpants/2016-01-01-black-symfony.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - symfony
 tags:
     - black
 sponsor: Sensio Labs
diff --git a/source/_elephpants/2016-02-19-blue-shopware.md b/source/_elephpants/2016-02-19-blue-shopware.md
@@ -1,5 +1,7 @@
 ---
 name: Cody Blou
+categories:
+    - shopware
 tags:
     - blue
 sponsor: shopware AG
diff --git a/source/_elephpants/2016-06-02-white-globalis.md b/source/_elephpants/2016-06-02-white-globalis.md
@@ -1,5 +1,7 @@
 ---
 name: Echo
+categories:
+    - globalis
 tags:
     - white
 sponsor: GLOBALIS
diff --git a/source/_elephpants/2016-06-24-white-dpc.md b/source/_elephpants/2016-06-24-white-dpc.md
@@ -1,4 +1,6 @@
 ---
+categories:
+    - dpc
 tags:
     - white
 sponsor: ibuildings
diff --git a/source/_elephpants/2016-10-18-white-zend.md b/source/_elephpants/2016-10-18-white-zend.md
@@ -1,5 +1,7 @@
 ---
 name: ElPHPis
+categories:
+    - zend
 tags:
     - white
 sponsor: Zend Technologies
diff --git a/source/_elephpants/2016-10-27-multicolored-phpdiversity.md b/source/_elephpants/2016-10-27-multicolored-phpdiversity.md
@@ -1,5 +1,7 @@
 ---
 name: Enfys
+categories:
+    - rainbow
 tags:
     - multicolored
 sponsor: PHPDiversity
diff --git a/source/_others/2015-06-02-brown-truenorthphp.md b/source/_others/2015-06-02-brown-truenorthphp.md
@@ -1,7 +1,8 @@
 ---
+categories:
+    - truenorthphp
 tags:
     - brown
-commonname: PHP Woolly Mammoth
 name: Molly
 sponsor: Peter Meth / Softer Software
 reverse: True North PHP logo
diff --git a/source/_others/2015-09-11-gray-hack.md b/source/_others/2015-09-11-gray-hack.md
@@ -1,7 +1,8 @@
 ---
+categories:
+    - hack
 tags:
     - gray
-commonname: pHackyderm
 sponsor: unknown
 reverse: unknown
 photos:
diff --git a/source/_sections/2-description.md b/source/_sections/2-description.md
@@ -11,18 +11,23 @@ smaller animals. Due to the larger resources needed to procure a jumbo variety,
 and the increased space requirements for keeping one, they are considerably more rare.
 Not all colors have been seen in the jumbo size.
 
-Blue is the original and traditional color, but elephpants have been seen in most
-primary and secondary colors, and new colors are appearing in the wild on a increasingly
-frequent basis. Except as otherwise noted below, differences between colors are
-largely cosmetic. All elephpants have the PHP logo on the obverse (left) side.
-The decoration on the reverse (right) side varies by generation.
+The first populations of elephants seen in the wild were blue. This included both the
+main species and the first few sub-species. Eventually other populations in have been
+identified in most primary and secondary colors, and new colors are seen in the
+wild on a increasingly frequent basis.
+
+All elephpants have the PHP logo on the obverse (left) side.
 
 #### Identification
 
 Most elephpants can be identified by color and decoration alone. Sometimes identical
 animals have been produced over multiple generations. The rear tag is the best
 way of distinguishing between generations.
 
+Sub-species of <em>{{ site.latinname }}</em> are generally identified by different
+markings on the reverse (right) side. Within the subspecies there may be variations
+of color.
+
 #### Habitat
 
 The elephpant's natural habitat is an work environment, and it is equally
diff --git a/source/_sections/3-variations.html b/source/_sections/3-variations.html
@@ -2,12 +2,27 @@
 title: Variations
 slug: variations
 use:
-    - elephpants_tags
+    - elephpants
+    - elephpants_categories
 ---
-<p>Sorted by color and date of first appearance.</p>
 
-{% for tag,variations in data.elephpants_tags %}
-    <h4>{{ tag|capitalize }}</h4>
+<p>A total of {{data.elephpants|length}} populations have been identified across
+<em>{{ site.latinname}}</em> and {{ data.elephpants_categories|length - 1}} subspecies. Sub-species are listed
+by date of first appearance. Within each group may be multiple populations which differ by color.</p>
+
+<p>|
+{% for category in data.elephpants_categories|keys %}
+    {% if site.subspecies[category] %}
+    <a href="#variation-{{ category|url_encode }}">{{ site.subspecies[category].common }}</a> |
+    {% endif %}
+{% endfor %}
+</p>
+
+{% for category,variations in data.elephpants_categories %}
+    {% if site.subspecies[category] %}
+    <h4 id="variation-{{ category }}">{{ site.subspecies[category].common }}</h4>
+    <p><em>{{ site.latinname}} {{ site.subspecies[category].latin }}</em></p>
+    {% endif %}
     {% for elephpant in variations %}
     {% include 'elephpant.html' %}
     {% endfor %}
diff --git a/source/_sections/4-relatedspecies.html b/source/_sections/4-relatedspecies.html
@@ -2,12 +2,23 @@
 title: Related Species
 slug: relatedspecies
 use:
-    - others_tags
+    - others_categories
 ---
 <p>Several animals that are similar to elephpants, but cannot be catogorized as such, have recently been seen in the wild.</p>
 
-{% for tag,variations in data.others_tags %}
-    <h4>{{ tag|capitalize }}</h4>
+<p>|
+{% for category in data.others_categories|keys %}
+    {% if site.relatedspecies[category] %}
+    <a href="#relatedspecies-variation-{{ category|url_encode }}">{{ site.relatedspecies[category].common }}</a> |
+    {% endif %}
+{% endfor %}
+</p>
+
+{% for category,variations in data.others_categories %}
+    {% if site.relatedspecies[category] %}
+    <h4 id="relatedspecies-{{ category }}">{{ site.relatedspecies[category].common }}</h4>
+    <p><em>{{ site.relatedspecies[category].latin }}</em></p>
+    {% endif %}
     {% for elephpant in variations %}
     {% include 'other.html' %}
     {% endfor %}

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 ---
 +categories:
 +    - oracle
 tags:
     - blue
 sponsor: Oracle Corporation