From 2d0d5648dfabe4f178736ba512efc5b7e3b3cd94 Mon Sep 17 00:00:00 2001 From: SkyArrow Date: Tue, 24 Jan 2012 21:54:06 +0800 Subject: layout --- source/_includes/after_footer.html | 3 +-- source/_includes/article.html | 39 +++++++++++++------------------------ source/_includes/banner.html | 11 +---------- source/_includes/custom/footer.html | 2 +- source/_includes/disqus.html | 21 -------------------- source/_includes/footer.html | 7 +------ source/_includes/header.html | 7 ++++++- source/_layouts/default.html | 6 +++--- source/index.html | 30 +++++++++++++--------------- 9 files changed, 39 insertions(+), 87 deletions(-) delete mode 100644 source/_includes/disqus.html (limited to 'source') diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html index 20b9e4d..9e4e391 100644 --- a/source/_includes/after_footer.html +++ b/source/_includes/after_footer.html @@ -1,2 +1 @@ -{% include disqus.html %} -{% include custom/after_footer.html %} +{% include custom/after_footer.html %} \ No newline at end of file diff --git a/source/_includes/article.html b/source/_includes/article.html index 941dd86..d9c5139 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -1,34 +1,21 @@ -{% unless page.no_header %} -
- {% if index %} -
{{ post.date | date: "%e" }}{{ post.date | date: "%b" }}
-

{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}

- {% else %} -
{{ post.date | date: "%e" }}{{ post.date | date: "%b" }}
-

{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}

- {% endif %} -
-
-{% endunless %} {% if index %} +

{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}

{{ content | excerpt }} {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %} - + {% if excerpted == 'true' %}閱讀全文{% endif %} +
+
+
{% include post/date.html %}{{ time }}
+
{% include post/categories.html %}
+
{% else %} -
- {{ content }} -
- - 留言 -
- {% include post/categories.html %} -
+

{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}

+
{{ content }}
+
+
{% include post/date.html %}{{ time }}
+
{% include post/categories.html %}
+
{% endif %} \ No newline at end of file diff --git a/source/_includes/banner.html b/source/_includes/banner.html index 93286a8..7da6092 100644 --- a/source/_includes/banner.html +++ b/source/_includes/banner.html @@ -1,10 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/_includes/custom/footer.html b/source/_includes/custom/footer.html index f742b2f..488ea2f 100644 --- a/source/_includes/custom/footer.html +++ b/source/_includes/custom/footer.html @@ -1 +1 @@ -版權所有 © {{ site.time | date: "%Y" }} {{ site.title }} \ No newline at end of file +Copyright © {{ site.time | date: "%Y" }} {{ site.title }} \ No newline at end of file diff --git a/source/_includes/disqus.html b/source/_includes/disqus.html deleted file mode 100644 index eb30877..0000000 --- a/source/_includes/disqus.html +++ /dev/null @@ -1,21 +0,0 @@ -{% comment %} Load script if disquss comments are enabled and `page.comments` is either empty (index) or set to true {% endcomment %} -{% if site.disqus_short_name and page.comments != false %} - -{% endif %} diff --git a/source/_includes/footer.html b/source/_includes/footer.html index 2a5a0eb..aa81074 100644 --- a/source/_includes/footer.html +++ b/source/_includes/footer.html @@ -1,6 +1 @@ -
- {% include custom/footer.html %} - -
+{% include custom/footer.html %} \ No newline at end of file diff --git a/source/_includes/header.html b/source/_includes/header.html index 6c7e800..8e4297c 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -2,7 +2,12 @@ + {% include custom/header.html %} \ No newline at end of file diff --git a/source/_layouts/default.html b/source/_layouts/default.html index a9cffe9..ad02643 100644 --- a/source/_layouts/default.html +++ b/source/_layouts/default.html @@ -1,11 +1,11 @@ {% capture root_url %}{{ site.root | strip_slash }}{% endcapture %} {% include head.html %} - - + +
{% include header.html %}
{% include banner.html %}
{{ content | expand_urls: root_url }}
-
{% include footer.html %}
+
{% include footer.html %}
{% include after_footer.html %} \ No newline at end of file diff --git a/source/index.html b/source/index.html index 2614667..df4533d 100644 --- a/source/index.html +++ b/source/index.html @@ -2,20 +2,16 @@ layout: default --- -
- {% assign index = true %} - {% for post in paginator.posts %} - {% assign content = post.content %} -
{% include article.html %}
- {% endfor %} - -
-{% include asides.html %} -
\ No newline at end of file +{% assign index = true %} +{% for post in paginator.posts %} +{% assign content = post.content %} +
{% include article.html %}
+{% endfor %} + \ No newline at end of file -- cgit v1.2.3