archive, category

3 files changed, 32 insertions, 33 deletions

diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html
index 5693f95..b30e5d8 100644
--- a/source/_includes/archive_post.html
+++ b/source/_includes/archive_post.html
@@ -1,8 +1,9 @@
 {% capture category %}{{ post.categories | size }}{% endcapture %}
-<h1><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1>
-<time datetime="{{ post.date | datetime | date_to_xmlschema }}" pubdate>{{ post.date | date: "<span class='month'>%b</span> <span class='day'>%d</span> <span class='year'>%Y</span>"}}</time>
-{% if category != '0' %}
-<footer>
-  <span class="categories">posted in {{ post.categories | category_links }}</span>
-</footer>
-{% endif %}
\ No newline at end of file
+<h1 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1>
+<div class="meta">
+	<span class="date">{{ post.date | date: "%b %e" }}</span>
+	<span class="tags">{% include post/categories.html %}</span>
+    {% if site.disqus_short_name and post.comments == true %}
+    <span class="comments"><a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">留言</a></span>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/source/_layouts/category_index.html b/source/_layouts/category_index.html
index 85a6307..7e64ebe 100644
--- a/source/_layouts/category_index.html
+++ b/source/_layouts/category_index.html
@@ -1,17 +1,16 @@
 ---
-layout: page
-footer: false
+layout: default
 ---
 
-<div id="blog-archives" class="category">
 {% for post in site.categories[page.category] %}
-{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
-{% unless year == this_year %}
-  {% assign year = this_year %}
-  <h2>{{ year }}</h2>
-{% endunless %}
-<article>
-  {% include archive_post.html %}
-</article>
+<section class="archive">
+	{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
+	{% unless year == this_year %}
+		{% assign year = this_year %}
+		<h1 class="archive-title">{{ year }}</h1>
+	{% endunless %}
+	<article class="archive">
+		{% include archive_post.html %}
+	</article>
+</section>
 {% endfor %}
-</div>
diff --git a/source/blog/archives/index.html b/source/blog/archives/index.html
index f1d9cee..043e163 100644
--- a/source/blog/archives/index.html
+++ b/source/blog/archives/index.html
@@ -1,18 +1,17 @@
 ---
-layout: page
-title: Blog Archive
-footer: false
+layout: default
+title: 文章彙整
 ---
 
-<div id="blog-archives">
 {% for post in site.posts reverse %}
-{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
-{% unless year == this_year %}
-  {% assign year = this_year %}
-  <h2>{{ year }}</h2>
-{% endunless %}
-<article>
-  {% include archive_post.html %}
-</article>
-{% endfor %}
-</div>
+<section class="archive">
+	{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
+	{% unless year == this_year %}
+		{% assign year = this_year %}
+		<h1 class="archive-title">{{ year }}</h1>
+	{% endunless %}
+	<article class="archive">
+		{% include archive_post.html %}
+	</article>
+</section>
+{% endfor %}
\ No newline at end of file