Merge pull request #7 from ghlecl/master

Add capacity to get yearly grouping for microposts.

6 files changed, 52 insertions, 34 deletions

diff --git a/README.md b/README.md
index d981823..40eeb07 100644
--- a/README.md
+++ b/README.md
@@ -88,9 +88,9 @@ You can then control the name and weight of these menus in your `config.toml` by
 
 If you aren't sure of how this should look, see how [jnjosh.com uses this in it's config.toml](https://github.com/jnjosh/jnjosh.com/blob/master/config.toml).
 
-**Recommendation:** Add `SectionPagesMenu` to your `config.toml` file.  
-**Recommendation:** Don't set a `menu` in your post's Front Matter unless you want it to display on the navigation.  
-**Recommendation:** Customize the menus that get an RSS icon by adding the `RSSSections` parameter to your `config.toml` file.  
+**Recommendation:** Add `SectionPagesMenu` to your `config.toml` file.
+**Recommendation:** Don't set a `menu` in your post's Front Matter unless you want it to display on the navigation.
+**Recommendation:** Customize the menus that get an RSS icon by adding the `RSSSections` parameter to your `config.toml` file.
 **Recommendation:** Configure the menu items by adding `menu.main` sections to your `config.toml` file.
 
 #### Defining yourself as the Author
@@ -141,11 +141,12 @@ These posts are rendered slightly different with an → to signify that it is re
 | `[author]` - `LastName` | Your last name | Not really. It is used in some places to identify you as the author. |
 | `[author]` - `AboutPage` | `/about` or `http://about.othersite.com` | Only if you want an about page. This is exposed to allow you to link to an external about page as well. If you have a local page it can just be something relative. |
 | `[author]` - `Location` | `Your City` | No. If set, this is added to the Copyright in the footer so you can give some love to your hometown. |
-| `[author]` - `FlickrID` | `Your Flickr ID` | Kind of. The footer shows your photo stream from flickr. If you don't set it you'll see random photos that Flickr serves you. |
-| `[params]` - `Description` | `Describe your site` | No. If set this is added to your pages metadata. |
+| `[author]` - `FlickrID` | `Your Flickr ID` | No. The footer shows your photo stream from flickr. If you don't set it, nothing will be displayed. |
+| `[params]` - `Description` | `Describe your site` | No. If set, this is added to your pages metadata. |
 | `[params]` - `ShowCopyright` | `true` or `false` | No. If true, Copyright text will be added to the footer. |
 | `[params]` - `RSSEnabled` | `true` or `false` | No. If true, RSS pages will be generated. |
-| `[params]` - `RSSSections` | `[ "Posts", "Microposts", "Photos" ]` | If you want RSS links in the menu, Yes. These strings need to be the display name of the section where you want to have an RSS icon displayed. ![rss](https://github.com/jnjosh/internet-weblog/blob/master/images/rss.png) |
+| `[params]` - `RSSSections` | `[ "Posts", "Microposts", "Photos" ]` | If you want RSS links in the menu, yes. These strings need to be the display name of the section where you want to have an RSS icon displayed. ![rss](https://github.com/jnjosh/internet-weblog/blob/master/images/rss.png) |
+| `[params]` - `YearlyMicroposts` | `true` or `false` | No. If true, Microposts will have a page with a yearly grouping just like the posts.  If not present or false, nothing happens. |
 
 Here is an example `config.toml`:
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 14fc135..2e128cf 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,9 +1,7 @@
 {{ partial "site_header.html" . }}
 {{ partial "page_header.html" . }}
 
-  <main class="content list">
-    {{ partial "preview_list.html" . }}
-  </main>
+{{ partial "default_list.html" . }}
 
 {{ partial "page_footer.html" . }}
 {{ partial "site_footer.html" . }}
diff --git a/layouts/partials/default_list.html b/layouts/partials/default_list.html
new file mode 100644
index 0000000..4923191
--- /dev/null
+++ b/layouts/partials/default_list.html
@@ -0,0 +1,3 @@
+<main class="content list">
+   {{ partial "preview_list.html" . }}
+</main>
diff --git a/layouts/partials/yearly_grouping.html b/layouts/partials/yearly_grouping.html
new file mode 100644
index 0000000..0cccf9e
--- /dev/null
+++ b/layouts/partials/yearly_grouping.html
@@ -0,0 +1,25 @@
+<main class="content">
+  <article class="post-groups">
+    <div class="post-group">
+    {{ range .Data.Pages.GroupByDate "2006" }}
+      <div class="post-group-item">
+        <h3>{{ .Key }}</h3>
+        <ul>
+          {{ range .Pages }}
+            <li>
+              {{ if (not (isset .Params "externalurl")) }}
+                <a rel="full-article" href="{{ .Permalink }}">{{ .Title }}</a>
+                on <time datetime="{{ .Date }}" pubdate="">{{ .Date.Format "January 2" }}</time>
+              {{ else }}
+                <a rel="remote-article" href="{{ .Params.externalurl }}">{{ .Title }} →</a>
+                on
+                <a href="{{ .Permalink }}"> <time datetime="{{ .Date }}" pubdate="">{{ .Date.Format "January 2" }}</time> </a>
+              {{ end }}
+            </li>
+          {{ end }}
+        </ul>
+      </div>
+    {{ end }}
+    </div>
+  </article>
+</main>
diff --git a/layouts/section/microposts.html b/layouts/section/microposts.html
new file mode 100644
index 0000000..c825505
--- /dev/null
+++ b/layouts/section/microposts.html
@@ -0,0 +1,15 @@
+{{ partial "site_header.html" . }}
+{{ partial "page_header.html" . }}
+
+{{ if isset .Site.Params "yearlymicroposts" | and ( .Site.Params.yearlymicroposts ) }}
+
+{{ partial "yearly_grouping.html" . }}
+
+{{ else }}
+
+{{ partial "default_list.html" . }}
+
+{{ end }}
+
+{{ partial "page_footer.html" . }}
+{{ partial "site_footer.html" . }}
\ No newline at end of file
diff --git a/layouts/section/posts.html b/layouts/section/posts.html
index aca6cfa..24510ab 100644
--- a/layouts/section/posts.html
+++ b/layouts/section/posts.html
@@ -1,31 +1,7 @@
 {{ partial "site_header.html" . }}
 {{ partial "page_header.html" . }}
 
-  <main class="content">
-    <article class="post-groups">
-      <div class="post-group">
-      {{ range .Data.Pages.GroupByDate "2006" }}
-        <div class="post-group-item">
-          <h3>{{ .Key }}</h3>
-          <ul>
-            {{ range .Pages }}
-              <li>
-                {{ if (not (isset .Params "externalurl")) }}
-                  <a rel="full-article" href="{{ .Permalink }}">{{ .Title }}</a>
-                  on <time datetime="{{ .Date }}" pubdate="">{{ .Date.Format "January 2" }}</time>
-                {{ else }}
-                  <a rel="remote-article" href="{{ .Params.externalurl }}">{{ .Title }} →</a>
-                  on
-                  <a href="{{ .Permalink }}"><time datetime="{{ .Date }}" pubdate="">{{ .Date.Format "January 2" }}</time></a>
-                {{ end }}
-              </li>
-            {{ end }}
-          </ul>
-        </div>
-      {{ end }}
-      </div>
-    </article>
-  </main>
+{{ partial "yearly_grouping.html" . }}
 
 {{ partial "page_footer.html" . }}
 {{ partial "site_footer.html" . }}