summaryrefslogtreecommitdiffstats
path: root/source/_includes
diff options
context:
space:
mode:
Diffstat (limited to 'source/_includes')
-rw-r--r--source/_includes/after_footer.html3
-rw-r--r--source/_includes/archive_post.html28
-rw-r--r--source/_includes/article.html40
-rw-r--r--source/_includes/fancybox.html6
-rw-r--r--source/_includes/google_analytics.html20
-rw-r--r--source/_includes/head.html29
-rw-r--r--source/_includes/header.html33
-rw-r--r--source/_includes/post/categories.html12
8 files changed, 97 insertions, 74 deletions
diff --git a/source/_includes/after_footer.html b/source/_includes/after_footer.html
index b7beed2..09d93b7 100644
--- a/source/_includes/after_footer.html
+++ b/source/_includes/after_footer.html
@@ -1,4 +1,5 @@
-<script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script>
<script src="{{ root_url }}/javascripts/slash.js"></script>
+{% include fancybox.html %} <!-- Delete or comment this line to disable Fancybox -->
{% include disqus.html %}
+{% include google_analytics.html %}
{% include custom/after_footer.html %} \ No newline at end of file
diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html
index 8ceae91..2b006f6 100644
--- a/source/_includes/archive_post.html
+++ b/source/_includes/archive_post.html
@@ -1,9 +1,19 @@
-{% capture category %}{{ post.categories | size }}{% endcapture %}
-<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="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span>
- {% endif %}
-</div> \ No newline at end of file
+{% capture date %}{{ post.date }}{% endcapture %}
+{% capture this_year %}{{ date | date: "%Y" }}{% endcapture %}
+{% unless year == this_year %}
+ {% assign year = this_year %}
+ {% unless forloop.first %}
+ </section>
+ {% endunless %}
+ <section class="archives"><h1 class="year">{{ date | date: "%Y" }}</h1>
+{% endunless %}
+<article>
+ <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1>
+ <div class="meta">
+ <span class="date">{{ date | date: "%b %e" }}</span>
+ <span class="tags">{% include post/categories.html %}</span>
+ {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %}
+ <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span>
+ {% endif %}
+ </div>
+</article> \ No newline at end of file
diff --git a/source/_includes/article.html b/source/_includes/article.html
index a766bb7..1e1c835 100644
--- a/source/_includes/article.html
+++ b/source/_includes/article.html
@@ -1,25 +1,19 @@
{% if index %}
- <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
- <div class="entry">
- {{ content | excerpt }}
- {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
- {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %}
- </div>
- <div class="meta">
- <div class="date">{% include post/date.html %}{{ time }}</div>
- <div class="tags">{% include post/categories.html %}</div>
- {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %}
- <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span>
- {% endif %}
- </div>
+ <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
+ <div class="entry-content">
+ {{ content | excerpt }}
+ {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
+ {% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %}
+ </div>
{% else %}
- <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
- <div class="entry">{{ content }}</div>
- <div class="meta">
- <div class="date">{% include post/date.html %}{{ time }}</div>
- <div class="tags">{% include post/categories.html %}</div>
- {% if site.disqus_short_name and page.comments == true and site.disqus_show_comment_count == true %}
- <span class="comments"><a href="{{ root_url }}{{ post.url }}#disqus_thread">Comments</a></span>
- {% endif %}
- </div>
-{% endif %} \ No newline at end of file
+ <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
+ <div class="entry-content">{{ content }}</div>
+{% endif %}
+
+<div class="meta">
+ <div class="date">{% include post/date.html %}{{ time }}</div>
+ <div class="tags">{% include post/categories.html %}</div>
+ {% if site.disqus_short_name and site.disqus_show_comment_count == true %}
+ <span class="comments"><a href="{{ root_url }}{{ post.url }}{{ page.url }}#disqus_thread">Comments</a></span>
+ {% endif %}
+</div> \ No newline at end of file
diff --git a/source/_includes/fancybox.html b/source/_includes/fancybox.html
new file mode 100644
index 0000000..fd5bcfd
--- /dev/null
+++ b/source/_includes/fancybox.html
@@ -0,0 +1,6 @@
+<script src="{{ root_url }}/javascripts/jquery.fancybox.pack.js"></script>
+<script type="text/javascript">
+(function($){
+ $('.fancybox').fancybox();
+})(jQuery);
+</script> \ No newline at end of file
diff --git a/source/_includes/google_analytics.html b/source/_includes/google_analytics.html
index 4d4d596..2950c76 100644
--- a/source/_includes/google_analytics.html
+++ b/source/_includes/google_analytics.html
@@ -1,13 +1,13 @@
{% if site.google_analytics_tracking_id %}
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '{{ site.google_analytics_tracking_id }}']);
- _gaq.push(['_trackPageview']);
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '{{ site.google_analytics_tracking_id }}']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
{% endif %}
diff --git a/source/_includes/head.html b/source/_includes/head.html
index f24ddca..29d99b5 100644
--- a/source/_includes/head.html
+++ b/source/_includes/head.html
@@ -1,21 +1,20 @@
<!DOCTYPE HTML>
<html>
<head>
- <meta charset="utf-8">
- <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
- <meta name="author" content="{{ site.author }}">
+ <meta charset="utf-8">
+ <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
+ <meta name="author" content="{{ site.author }}">
- {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
- <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
- {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
- <meta name="viewport" content="width=device-width; initial-scale=1; maximum-scale=1">
+ {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
+ <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
+ {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
+ <meta name="viewport" content="width=device-width; initial-scale=1; maximum-scale=1">
- <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
- <link rel="canonical" href="{{ canonical }}">
- <link href="{{ root_url }}/favicon.png" rel="shortcut icon">
- <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
- <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
- {% include custom/head.html %}
- {% include google_analytics.html %}
+ <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
+ <link rel="canonical" href="{{ canonical }}">
+ <link href="{{ root_url }}/favicon.png" rel="shortcut icon">
+ <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
+ <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+ {% include custom/head.html %}
</head> \ No newline at end of file
diff --git a/source/_includes/header.html b/source/_includes/header.html
index e5026c2..0dba635 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -1,11 +1,22 @@
-<h1 class="left"><a href="{{ root_url }}/">{{ site.title }}</a></h1>
-<nav class="menu left">{% include navigation.html %}</nav>
-<div class="right">
- <form class="search right" action="{{ site.simple_search }}" method="get">
- <input class="left" type="text" name="q" results="0">
- <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}">
- </form>
- <div class="social right">
+<h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
+<nav id="main-nav">{% include navigation.html %}</nav>
+<nav id="mobile-nav">
+ <div class="alignleft menu">
+ <a class="button">Menu</a>
+ <div class="container">{% include navigation.html %}</div>
+ </div>
+ <div class="alignright search">
+ <a class="button"></a>
+ <div class="container">
+ <form action="{{ site.simple_search }}" method="get">
+ <input type="text" name="q" results="0">
+ <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}">
+ </form>
+ </div>
+ </div>
+</nav>
+<nav id="sub-nav" class="alignright">
+ <div class="social">
{% if site.facebook_user %}
<a class="facebook" href="http://www.facebook.com/{{ site.facebook_user }}" title="Facebook">Facebook</a>
{% endif %}
@@ -31,5 +42,9 @@
<a class="rss" href="{{ site.subscribe_rss }}" title="RSS">RSS</a>
{% endif %}
</div>
-</div>
+ <form class="search" action="{{ site.simple_search }}" method="get">
+ <input class="alignright" type="text" name="q" results="0">
+ <input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}">
+ </form>
+</nav>
{% include custom/header.html %}
diff --git a/source/_includes/post/categories.html b/source/_includes/post/categories.html
index 2ec7896..8c1c81f 100644
--- a/source/_includes/post/categories.html
+++ b/source/_includes/post/categories.html
@@ -1,10 +1,8 @@
{% capture category %}{% if post %}{{ post.categories | category_links | size }}{% else %}{{ page.categories | category_links | size }}{% endif %}{% endcapture %}
{% unless category == '0' %}
-<div class="cat">
- {% if post %}
- {{ post.categories | category_links }}
- {% else %}
- {{ page.categories | category_links }}
- {% endif %}
-</div>
+{% if post %}
+ {{ post.categories | category_links }}
+{% else %}
+ {{ page.categories | category_links }}
+{% endif %}
{% endunless %}
generated by cgit v1.1-2-g2b99 at 2024-11-21 22:21:53 +0100