Permalink
Browse files

Merge branch 'draft-posts' into gh-pages

Conflicts:
	_posts/2012-07-20-hello-world.md
	index.html
  • Loading branch information...
xiongchiamiov committed Jul 25, 2012
2 parents 11df122 + 9c77065 commit 1a4ee9a1f6c43bea1ae20c8d3b52558e606ed8bb
Showing with 21 additions and 17 deletions.
  1. +6 −4 archive/index.html
  2. +15 −13 index.html
View
@@ -4,9 +4,11 @@
---
{% for page in site.posts %}
- <div class="date">
- {{ page.date | date: "%Y-%m-%d" }}
- </div>
- <a href="{{ page.url }}">{{ page.title }}</a><br />
+ {% unless page.draft %}
+ <div class="date">
+ {{ page.date | date: "%Y-%m-%d" }}
+ </div>
+ <a href="{{ page.url }}">{{ page.title }}</a><br />
+ {% endunless %}
{% endfor %}
View
@@ -3,19 +3,21 @@
---
{% for page in paginator.posts %}
-<div class="date">
- {{ page.date | date: "%Y-%m-%d" }}
-</div>
-<h2>
- <a href="{{ page.url }}">{{ page.title }}</a>
-</h2>
-{% if page.summary %}
- {{ page.summary | markdownify }}
-{% else %}
- {{ page.content | truncatewords: 130 }}
-{% endif %}
-<a href="{{ page.url }}">more</a>
-<br /><br />
+ {% unless page.draft %}
+ <div class="date">
+ {{ page.date | date: "%Y-%m-%d" }}
+ </div>
+ <h2>
+ <a href="{{ page.url }}">{{ page.title }}</a>
+ </h2>
+ {% if page.summary %}
+ {{ page.summary | markdownify }}
+ {% else %}
+ {{ page.content | truncatewords: 130 }}
+ {% endif %}
+ <a href="{{ page.url }}">more</a>
+ <br /><br />
+ {% endunless %}
{% endfor %}
<br /><br />

0 comments on commit 1a4ee9a

Please sign in to comment.