redesign toki pona lessons

acousticrobot · Nov 24, 2015 · 58c0b28 · 58c0b28
1 parent 096003a
commit 58c0b28
Show file tree

Hide file tree

Showing 24 changed files with 547 additions and 2,772 deletions.
diff --git a/_includes/image_index.html b/_includes/image_index.html
@@ -15,18 +15,28 @@
 
 {% assign page = include.page %}
 
+{% if page.thumb == nil %}
+{% assign thumb = "/images/nav/web16_thumb.png" %}
+{% else %}
+{% assign thumb = page.thumb %}
+{% endif %}
+
 <article class="image-index__article">
   <div class="image-index__image">
     <a href="{{ page.url }}">
-     <img src="{{ page.thumb }}" alt="{{ page.title }}">
+     <img src="{{ thumb }}" alt="{{ page.title }}">
     </a>
   </div>
   <div class="image-index__description">
     <h2 class="image-index__description-title">
       <a href="{{ page.url }}">{{page.title}}</a>
     </h2>
     <div class="image-index__description-text small-text">
+      {% if page.excerpt != nil %}
+      {{ page.excerpt }}
+      {% else %}
       {{ page.content | strip_html | truncate: 240, '...' }}
+      {% endif %}
     </div>
   </div>
   <div class="clear"></div>

diff --git a/_pages/about.md b/_pages/about.md
@@ -1,11 +1,13 @@
 ---
-title: About This Site
+title: About
 permalink: /about/
 metapage: true
 nav_page: true
 layout: page
 ---
 
+#####  About This Site
+
 This is the website of Jonathan Gabel.
 
 This version was initialized on August 25, 2015, and replaces a WordPress site that ran from Jun 11, 2012 until ________.

diff --git a/_pages/roadmap.html b/_pages/roadmap.html
@@ -7,7 +7,6 @@
 <section>
   <header>Remaining Actions</header>
   <ul>
-    <li>Add navlinks for page_toki layout</li>
     <li>Add sitelen sitelen fanart from emails</li>
   </ul>
 </section>

diff --git a/_pages/toki-pona/index.md b/_pages/toki-pona/index.md
@@ -1,14 +1,16 @@
 ---
-title: "sitelen sitelen"
+title: sitelen sitelen
 layout: page
 sub_nav: false
 slug: t47_lessons_index
 permalink: /toki-pona/
 tags:
+- featured
 - toki pona
+excerpt: <em>O kama pona! sina ken kama sona e sitelen sitelen lon lipu ni.</em><br><p>Learn how to write in the hieroglyphic blocks known as sitelen sitelen. This is a system of non-linear writing you can use to free your mind or break from regular thought. Here you will find all the lessons for writing toki pona using sitelen sitelen, plus glyph dictionaries and plenty of examples, including sitelen sitelen drawn by others.</p>
 ---
 
-O kama pona! sina ken kama sona e sitelen sitelen lon lipu ni.
+_O kama pona! sina ken kama sona e sitelen sitelen lon lipu ni._
 
 Learn how to write in the hieroglyphic blocks known as sitelen sitelen.  This is a system of non-linear writing you can use to free your mind or break from regular thought.
 

diff --git a/_pages/toki-pona/lesson-1.md b/_pages/toki-pona/lesson-1.md
@@ -1,6 +1,6 @@
 ---
 title: 'Lesson 1: Welcome'
-layout: page_toki
+layout: page
 permalink: /toki-pona/lesson-1/
 
 sitelen_lessons_index: 0

diff --git a/_pages/toki-pona/lesson-2.md b/_pages/toki-pona/lesson-2.md
@@ -1,6 +1,6 @@
 ---
 title: 'Lesson 2: Writing Syllables'
-layout: page_toki
+layout: page
 permalink: /toki-pona/lesson-2/
 
 sitelen_lessons_index: 1 

diff --git a/_pages/toki-pona/lesson-3.md b/_pages/toki-pona/lesson-3.md
@@ -1,9 +1,12 @@
 ---
 title: 'Lesson 3: Basic Sentences'
-layout: page_toki
-sitelen_lessons_index: 2
+layout: page
 permalink: /toki-pona/lesson-3/
 
+sitelen_lessons_index: 2
+url_previous: /toki-pona/lesson-2/
+url_next: /toki-pona/lesson-4/
+
 new_vocab_definitions:
 - image: "/images/t47_tokipona/t47_nimi/t47_nimi_jan.jpg"
   text: jan