academic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876a078617bf34b4ec0059b05f85b733aecc2e07
-  data.tar.gz: 8db534703a9220279f8de5bc343bdb70a8f9e4de
+  metadata.gz: 991edbf3e58bbfe9bd0c89c2db06784fc0c1c4be
+  data.tar.gz: db85c85a0bd77849367ee064c9bc837efa5cc55c
 SHA512:
-  metadata.gz: 5544ca70d78d0b14eae435a8278da7f53c98fc7ff1dd8ecfa43c5b7debe2d67ca0f8f73fa3d1b4a6cf1f8b6b444063991f60dc5fcee3059edf337edd3271c691
-  data.tar.gz: 3f083fd73fb328c8b95d801002f6282dc22bab811ce7c310d9407a2326db4bbc1cb1bac02ef113a05cbc00cf7dbe78af3ccf82967048ed1fd9d88335bb2d2df9
+  metadata.gz: 7460430720697c0becccb84fcb436ace5d5ced5538fdb8c0de8b30fc5303f7da6495bc0783e4b5f9e5d97d30e01c513cdea8c4fe946587642fc4071e6e80556e
+  data.tar.gz: 869b761c96a1f65ea1823635b58ab1e9193bccb137fe6ead7ba13592189f9e5082ee558f0e1833536b65b4b886dbee19f40e9226f4b41e66a0915def329c75d6

data/README.md

@@ -1,6 +1,7 @@
 # academic
 
-Academic is a theme with a focus on simplicity, typography and flexibility. I originally designed for my personal blog during my PhD thesis.
+Academic is a [Jekyll](http://jekyllrb.com/) theme with a focus on simplicity, typography and flexibility.
+I originally designed it for my personal blog during my PhD thesis.
 
 ![Academic screenshot](screenshot.png)
 
@@ -28,6 +29,7 @@ Table of contents:
 		* [Page layout](#page-layout)
 		* [About layout](#about-layout)
 		* [Archive layout](#archive-layout)
+		* [404 layout](#404-layout)
 * [Contributing](#contributing)
 * [Release log](#release-log)
 * [License](#license)
@@ -116,9 +118,12 @@ title_html: "<b>hello</b>world"
 
 `cc`: [optional] choose among the [Creative Commons](https://creativecommons.org/licenses/) licenses (v4). Accepted values are : `by`, `by-sa`, `by-nd`, `by-nc`, `by-nc-sa`, `by-nc-nd`. Defining the `cc` variable will add a small sentence in the footer. If no value is given, a small copyright is added instead.
 
-
 `dateformat`: [optional] format the dates of the whole website. Default "%b %-d, %Y". Read [the documentation](https://help.shopify.com/themes/liquid/filters/additional-filters#date) to learn how you can customize the date format.
 
+`nb_posts_page`: [optional] number of posts to display on the homepage. By default, all posts are listed. Note that you should create a page with the archive layout.
+
+`archive_permalink`: [optional] permalink of the archive page. Set to `"/archive"` by default.
+
 #### Author
 
 `email`: [optional] add email address in about layout.
@@ -181,7 +186,17 @@ Will automatically put the content of the page on the right column. The left col
 
 #### Archive layout
 
-Pages with the archive layout will list all posts published in reverse chronological order.
+Create a `archive.md` page, choose the "archive" layout. You don't need to write anything in this file, all posts published will be listed in reverse chronological order.
+
+#### 404 layout
+
+Create a `404.md` page, set the layout:
+
+```
+layout: pagenotfound
+```
+
+The content of the page will be used in the 404 page.
 
 ## Contributing
 
@@ -189,7 +204,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/gaalca
 
 ## Release log
 
-+ 0.1.0 : first release of the theme.
++ 0.1.1 [2016-12]: bug fixes
++ 0.1.0 [2016-12]: first release of the theme.
 
 ## License
 

data/_includes/footer.html

@@ -3,9 +3,12 @@
   <div class="wrapper">
 
       <ul class="info-list footer-col">
-        {% if site.title %}
-        <li><a href="{{ "/" | relative_url}}">{{ site.title_html }}</a>
+        {% if site.title_html %}
+          {% assign title = site.title_html %}
+        {% else %}
+          {% assign title = site.title %}
         {% endif %}
+        <li><a href="{{ "/" | relative_url}}">{{ title }}</a>
 
         {% if site.author_display %}
         <span class="author"> par
@@ -43,7 +46,7 @@
 
     <div class="bottom">
       <div class="tech">
-        <a href="https://jekyllrb.com/">Jekyll</a> + Academic
+        <a target="_blank" href="https://jekyllrb.com/">Jekyll</a> + <a target="_blank" href="https://github.com/gaalcaras/academic">Academic</a>
       </div>
       <div class="legal">
       {% if site.cc == null %}©{% endif %}

data/_layouts/home.html

@@ -16,13 +16,22 @@ layout: default
   {{ content }}
 
   <ul class="post-list">
-    {% for post in site.posts limit:5 %}
+    {% for post in site.posts limit:site.nb_posts_page %}
       {% include post-li.html %}
     {% endfor %}
   </ul>
 
   {% include calltoaction.html message="Le blog vous intéresse ?" %}
 
-  <div class="archive">Voir <a href="/archive">tous les articles publiés</a>.</div>
+  {% assign nb_posts = site.posts | size %}
+  {% if site.archive_permalink %}
+    {% assign archive_link = site.archive_permalink %}
+  {% else %}
+    {% assign archive_link = "/archive" %}
+  {% endif %}
+
+  {% if nb_posts > site.nb_posts_page %}
+  <div class="archive">Voir <a href="{{ archive_link }}">tous les articles publiés</a>.</div>
+  {% endif %}
 
 </div>

data/_layouts/pagenotfound.html

@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+<div class="msg-404">
+  <div class="title">404</div>
+  <div class="description">Cette page a probablement déménagé vers une nouvelle adresse...</div>
+</div>
+
+{{ page.content }}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: academic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - gaalcaras
@@ -86,6 +86,7 @@ files:
 - _layouts/default.html
 - _layouts/home.html
 - _layouts/page.html
+- _layouts/pagenotfound.html
 - _layouts/post.html
 - _sass/academic.scss
 - _sass/academic/_base.scss