From e6f3c75122c344a39953c551e1fe480222b23390 Mon Sep 17 00:00:00 2001
From: Alexander Jung-Loddenkemper <alexander.julo@googlemail.com>
Date: Sun, 18 Mar 2012 14:52:34 +0100
Subject: added bootlex theme.

---
 bootlex/templates/analytics.html  | 11 ++++++
 bootlex/templates/archives.html   | 15 ++++++++
 bootlex/templates/article.html    | 13 +++++++
 bootlex/templates/author.html     |  7 ++++
 bootlex/templates/base.html       | 80 +++++++++++++++++++++++++++++++++++++++
 bootlex/templates/categories.html |  8 ++++
 bootlex/templates/category.html   |  5 +++
 bootlex/templates/index.html      | 53 ++++++++++++++++++++++++++
 bootlex/templates/page.html       |  6 +++
 bootlex/templates/tag.html        |  2 +
 bootlex/templates/tags.html       | 17 +++++++++
 11 files changed, 217 insertions(+)
 create mode 100644 bootlex/templates/analytics.html
 create mode 100644 bootlex/templates/archives.html
 create mode 100644 bootlex/templates/article.html
 create mode 100644 bootlex/templates/author.html
 create mode 100644 bootlex/templates/base.html
 create mode 100644 bootlex/templates/categories.html
 create mode 100644 bootlex/templates/category.html
 create mode 100644 bootlex/templates/index.html
 create mode 100644 bootlex/templates/page.html
 create mode 100644 bootlex/templates/tag.html
 create mode 100644 bootlex/templates/tags.html

(limited to 'bootlex/templates')

diff --git a/bootlex/templates/analytics.html b/bootlex/templates/analytics.html
new file mode 100644
index 0000000..86c297c
--- /dev/null
+++ b/bootlex/templates/analytics.html
@@ -0,0 +1,11 @@
+{% if GOOGLE_ANALYTICS %}
+	<script type="text/javascript">
+	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+	</script>
+	<script type="text/javascript">
+	try {
+		var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
+	pageTracker._trackPageview();
+	} catch(err) {}</script>
+{% endif %}
\ No newline at end of file
diff --git a/bootlex/templates/archives.html b/bootlex/templates/archives.html
new file mode 100644
index 0000000..6e364d0
--- /dev/null
+++ b/bootlex/templates/archives.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% block title %}Archiv{%endblock%}
+{% block menu_entry_archive %}
+class="active"
+{% endblock %}
+{% block content %}
+<h1>Archiv {{ pagename }}</h1>
+
+<dl>
+{% for article in dates %}
+    <dt>{{ article.locale_date }}</dt>
+    <dd><a href='{{ SITEURL }}{{ article.url }}'>{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+{% endblock %}
diff --git a/bootlex/templates/article.html b/bootlex/templates/article.html
new file mode 100644
index 0000000..a407af8
--- /dev/null
+++ b/bootlex/templates/article.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title }}{%endblock%}
+{% block content %}        
+<div id="content">    
+    <div class="header">
+        <h1>{{ article.title }}</h2>
+    </div>
+    <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</small></p>
+        <div class="entry-content">
+        {{ article.content }}
+        </div><!-- /.entry-content -->
+</div>
+{% endblock %}
diff --git a/bootlex/templates/author.html b/bootlex/templates/author.html
new file mode 100644
index 0000000..664aad1
--- /dev/null
+++ b/bootlex/templates/author.html
@@ -0,0 +1,7 @@
+{% extends "index.html" %}
+
+{% block title %}Posts von {{ author }}{% endblock %}
+{% block content_title %}
+<h2>Posts von {{ author }}</h2>
+{% endblock %}
+
diff --git a/bootlex/templates/base.html b/bootlex/templates/base.html
new file mode 100644
index 0000000..a48f00b
--- /dev/null
+++ b/bootlex/templates/base.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<html lang="{{ DEFAULT_LANG }}">
+  <head>
+    {% block head %}
+    <title>{% block title %}{% endblock title %} - {{ SITENAME }}</title>
+    <meta http-equiv="content-type" content="charset=utf-8" />
+    <link href="http://fonts.googleapis.com/css?family=Arimo:400,700|Inika" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/bootstrap.css">
+    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/pastie.css">
+    {% endblock head %}
+  </head>
+
+  <body>
+    <div class="navbar">
+      <div class="navbar-inner">
+        <div class="container">
+          <h1><a class="brand" href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
+        </div>
+      </div>
+    </div>
+    <div class="container">
+      <div class="row">
+        <div class="span8">
+          {% block content %}
+          {% endblock %}
+        </div>
+        <div class="span3 offset1">
+          <div class="well">
+            <ul class="nav nav-list">
+              <li class="nav-header">Blog</li>
+              <li {% if page_name == 'index' %}class="active"{% endif %}><a href="{{ SITEURL }}">Index</a></li>
+              <li {% block menu_entry_tag %}{% endblock %}><a href="{{ SITEURL }}tags/">Tags</a></li>
+              <li {% block menu_entry_archive %}{% endblock %}><a href="{{ SITEURL }}archives/">Archiv</a></li>
+              {% if DISPLAY_PAGES_ON_MENU %}
+              {% if PAGES %}
+              <li class="nav-header">Seiten</li>
+              {% for p in PAGES %}
+              <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}{{ p.url }}">{{ p.title }}</a></li>
+              {% endfor %}
+              {% endif %}
+              {% else %}
+{#            {% for cat, null in categories %}
+              <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}category/{{ cat }}/">{{ cat }}</a></li>
+              {% endfor %}
+#}
+              {% endif %}
+              {% if MENUITEMS %}
+              <li class="nav-header">Anderes</li>
+              {% for title, link in MENUITEMS %}
+              <li><a href="{{ link }}">{{ title }}</a></li>
+              {% endfor %}
+              {% endif %}
+              {% if LINKS %}
+              <li class="nav-header">Links</li>
+              {% for title, link in LINKS %}
+              <li><a href="{{ link }}">{{ title }}</a></li>
+              {% endfor %}
+              {% endif %}
+            </ul>
+          </div><!-- /#menu --> 
+        </div>
+      </div>
+      
+      <hr>
+      
+      <div class="row">
+        <div class="span12">
+          <div id="about">
+            <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/pages/about">Alex</a>!</p>
+          </div><!-- /#about -->
+        </div><!-- /#contentinfo -->
+      </div>
+    </div>
+    
+    {% include 'analytics.html' %}
+    
+  </body>
+</html>
diff --git a/bootlex/templates/categories.html b/bootlex/templates/categories.html
new file mode 100644
index 0000000..7e4bd2c
--- /dev/null
+++ b/bootlex/templates/categories.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% block content %}
+<ul>
+{% for category, articles in categories %}
+    <li>{{ category }}</li>
+{% endfor %}
+</ul>
+{% endblock %}
diff --git a/bootlex/templates/category.html b/bootlex/templates/category.html
new file mode 100644
index 0000000..4e6fd24
--- /dev/null
+++ b/bootlex/templates/category.html
@@ -0,0 +1,5 @@
+{% extends "index.html" %}
+{% block content_title %}
+<h2>Articles in the {{ category }} category</h2>
+{% endblock %}
+
diff --git a/bootlex/templates/index.html b/bootlex/templates/index.html
new file mode 100644
index 0000000..8e56370
--- /dev/null
+++ b/bootlex/templates/index.html
@@ -0,0 +1,53 @@
+{% extends "base.html" %}
+{% block title %}Blog{%endblock%}
+{% block content %}        
+<div id="content">
+{% block content_title %}
+<h1>Blog</h2>
+{% endblock %}
+
+<ul class="unstyled">
+{% for article in articles_page.object_list %}        
+        <li>
+            <div>    
+                <div class="header">
+                    <h2>{{ article.title }}</h2>
+                </div>
+                <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</small></p>
+                <div class="entry-content">
+                    {{ article.summary }}
+                </div><!-- /.entry-content -->
+                <div class="row">
+                    <div class="span1 offset7">
+                        <a class="btn btn-small" href="{{ SITEURL }}{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">Mehr</a>
+                    </div>
+                </div>
+            </div>
+        </li>
+        
+        <hr>
+        
+        
+{% endfor %}
+</ul><!-- /#posts-list -->
+<div class="pagination pagination-centered">
+    <ul>
+    {% if articles_page.has_previous() %}
+        <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">←</a></li>
+    {% endif %}
+    {% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %}
+        <li><a href="{{ SITEURL }}">1</a></li>
+        <li class="disabled"><a href="#">...</a></li>
+    {% endif %}
+        <li class="active"><a href="#">{{ articles_page.number }}</a></li>
+    {% if articles_page.has_next() %}
+        <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">→</a></li>
+    {% endif %}
+    {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %}
+        <li class="disabled"><a href="#">...</a></li>
+        <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.num_pages }}/">{{ articles_paginator.num_pages }}</a></li>
+    {% endif %}
+    </ul>
+</div>
+</div><!-- /#content -->
+{% endblock content %}
diff --git a/bootlex/templates/page.html b/bootlex/templates/page.html
new file mode 100644
index 0000000..6308d58
--- /dev/null
+++ b/bootlex/templates/page.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{%endblock%}
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    {{ page.content }}
+{% endblock %}
diff --git a/bootlex/templates/tag.html b/bootlex/templates/tag.html
new file mode 100644
index 0000000..c4817d7
--- /dev/null
+++ b/bootlex/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}Tag {{ tag }}{% endblock %}
\ No newline at end of file
diff --git a/bootlex/templates/tags.html b/bootlex/templates/tags.html
new file mode 100644
index 0000000..87f134c
--- /dev/null
+++ b/bootlex/templates/tags.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% block title %}Tags{%endblock%}
+{% block menu_entry_tag %}
+class="active"
+{% endblock %}
+{% block content %}
+	<h1>Tags</h1>
+	{% if tags %}
+	<ul>
+		{% for tag, articles in tags %}
+		<li><a href="{{ SITEURL }}tag/{{ tag }}/">{{ tag }}</a></li>
+		{% endfor %}
+	</ul>
+	{% else %}
+		<p>Sorry, bisher gibt es keine Tags.</p>
+	{% endif %}
+{% endblock %}
-- 
cgit 


From f3060b4474f6364537b500713c4883ddf4002d9e Mon Sep 17 00:00:00 2001
From: Alexander Jung-Loddenkemper <alexander.julo@googlemail.com>
Date: Sun, 18 Mar 2012 20:04:02 +0100
Subject: merged analytics and changes to make bootlex xhtml strict

---
 bootlex/templates/analytics.html | 22 +++++++++++++---------
 bootlex/templates/article.html   |  4 ++--
 bootlex/templates/base.html      | 18 ++++++++----------
 bootlex/templates/index.html     |  6 +++---
 4 files changed, 26 insertions(+), 24 deletions(-)

(limited to 'bootlex/templates')

diff --git a/bootlex/templates/analytics.html b/bootlex/templates/analytics.html
index 86c297c..2d7b5f2 100644
--- a/bootlex/templates/analytics.html
+++ b/bootlex/templates/analytics.html
@@ -1,11 +1,15 @@
 {% if GOOGLE_ANALYTICS %}
-	<script type="text/javascript">
-	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-	document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-	</script>
-	<script type="text/javascript">
-	try {
-		var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
-	pageTracker._trackPageview();
-	} catch(err) {}</script>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']);
+  _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>
 {% endif %}
\ No newline at end of file
diff --git a/bootlex/templates/article.html b/bootlex/templates/article.html
index a407af8..5a533fe 100644
--- a/bootlex/templates/article.html
+++ b/bootlex/templates/article.html
@@ -3,9 +3,9 @@
 {% block content %}        
 <div id="content">    
     <div class="header">
-        <h1>{{ article.title }}</h2>
+        <h1>{{ article.title }}</h1>
     </div>
-    <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</small></p>
+    <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
         <div class="entry-content">
         {{ article.content }}
         </div><!-- /.entry-content -->
diff --git a/bootlex/templates/base.html b/bootlex/templates/base.html
index a48f00b..bbb8797 100644
--- a/bootlex/templates/base.html
+++ b/bootlex/templates/base.html
@@ -1,15 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-<html lang="{{ DEFAULT_LANG }}">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ DEFAULT_LANG }}">
   <head>
     {% block head %}
     <title>{% block title %}{% endblock title %} - {{ SITENAME }}</title>
-    <meta http-equiv="content-type" content="charset=utf-8" />
-    <link href="http://fonts.googleapis.com/css?family=Arimo:400,700|Inika" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/pastie.css">
+    <link href="http://fonts.googleapis.com/css?family=Arimo:400,700|Inika" rel="stylesheet" type="text/css" />
+    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/bootstrap.css" />
+    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/pastie.css" />
     {% endblock head %}
+    
+    {% include 'analytics.html' %}
+    
   </head>
 
   <body>
@@ -63,7 +64,7 @@
         </div>
       </div>
       
-      <hr>
+      <hr />
       
       <div class="row">
         <div class="span12">
@@ -73,8 +74,5 @@
         </div><!-- /#contentinfo -->
       </div>
     </div>
-    
-    {% include 'analytics.html' %}
-    
   </body>
 </html>
diff --git a/bootlex/templates/index.html b/bootlex/templates/index.html
index 8e56370..9da666a 100644
--- a/bootlex/templates/index.html
+++ b/bootlex/templates/index.html
@@ -3,7 +3,7 @@
 {% block content %}        
 <div id="content">
 {% block content_title %}
-<h1>Blog</h2>
+<h1>Blog</h1>
 {% endblock %}
 
 <ul class="unstyled">
@@ -13,7 +13,7 @@
                 <div class="header">
                     <h2>{{ article.title }}</h2>
                 </div>
-                <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</small></p>
+                <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
                 <div class="entry-content">
                     {{ article.summary }}
                 </div><!-- /.entry-content -->
@@ -25,7 +25,7 @@
             </div>
         </li>
         
-        <hr>
+        <li><hr /></li>
         
         
 {% endfor %}
-- 
cgit 


From 7dc4d494bd4a5dc5f81a0d2819bdedbcba4367b5 Mon Sep 17 00:00:00 2001
From: Alexander Jung-Loddenkemper <alexander.julo@googlemail.com>
Date: Wed, 28 Mar 2012 00:37:26 +0200
Subject: a bunch of bootlex fixes.

---
 bootlex/templates/article.html |  2 +-
 bootlex/templates/base.html    |  9 +--------
 bootlex/templates/index.html   | 22 +++++++++++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'bootlex/templates')

diff --git a/bootlex/templates/article.html b/bootlex/templates/article.html
index 5a533fe..18ba9a3 100644
--- a/bootlex/templates/article.html
+++ b/bootlex/templates/article.html
@@ -5,7 +5,7 @@
     <div class="header">
         <h1>{{ article.title }}</h1>
     </div>
-    <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
+    <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author.slug }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
         <div class="entry-content">
         {{ article.content }}
         </div><!-- /.entry-content -->
diff --git a/bootlex/templates/base.html b/bootlex/templates/base.html
index bbb8797..711bda6 100644
--- a/bootlex/templates/base.html
+++ b/bootlex/templates/base.html
@@ -14,13 +14,6 @@
   </head>
 
   <body>
-    <div class="navbar">
-      <div class="navbar-inner">
-        <div class="container">
-          <h1><a class="brand" href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
-        </div>
-      </div>
-    </div>
     <div class="container">
       <div class="row">
         <div class="span8">
@@ -69,7 +62,7 @@
       <div class="row">
         <div class="span12">
           <div id="about">
-            <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/pages/about">Alex</a>!</p>
+            <p>Proudly powered by <a href="http://twitter.github.com/bootstrap/">bootstrap</a>, <a href="http://docs.notmyidea.org/alexis/pelican/">pelican</a>, <a href="http://python.org">python</a> and <a href="http://www.julo.ch/about/">Alex</a>!</p>
           </div><!-- /#about -->
         </div><!-- /#contentinfo -->
       </div>
diff --git a/bootlex/templates/index.html b/bootlex/templates/index.html
index 9da666a..02ff0ee 100644
--- a/bootlex/templates/index.html
+++ b/bootlex/templates/index.html
@@ -13,7 +13,7 @@
                 <div class="header">
                     <h2>{{ article.title }}</h2>
                 </div>
-                <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
+                <p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author.slug }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
                 <div class="entry-content">
                     {{ article.summary }}
                 </div><!-- /.entry-content -->
@@ -32,20 +32,28 @@
 </ul><!-- /#posts-list -->
 <div class="pagination pagination-centered">
     <ul>
-    {% if articles_page.has_previous() %}
-        <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">←</a></li>
-    {% endif %}
     {% if articles_page.has_previous() and (articles_page.previous_page_number() != 1) %}
         <li><a href="{{ SITEURL }}">1</a></li>
+    {% endif %}
+    {% if articles_page.previous_page_number() - 1 == 2 %}
+        <li><a href="{{ articles_page.previous_page_number() - 1}}">{{ articles_page.previous_page_number() - 1}}</a></li>
+    {% elif articles_page.previous_page_number() - 1 > 1 %}
         <li class="disabled"><a href="#">...</a></li>
+    {% endif %}
+    {% if articles_page.has_previous() %}
+        <li><a href="{{ SITEURL }}{% if articles_page.previous_page_number() != 1 %}{{ page_name }}{{ articles_page.previous_page_number() }}/{% endif %}">{{ articles_page.previous_page_number() }}</a></li>
     {% endif %}
         <li class="active"><a href="#">{{ articles_page.number }}</a></li>
     {% if articles_page.has_next() %}
-        <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">→</a></li>
+        <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.next_page_number() }}/">{{ articles_page.next_page_number() }}</a></li>
     {% endif %}
-    {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %}
+    {% if articles_paginator.num_pages - articles_page.next_page_number() == 2 %}
+        <li><a href="{{ articles_page.next_page_number() + 1}}">{{ articles_page.next_page_number() + 1}}</a></li>
+    {% elif articles_paginator.num_pages - articles_page.next_page_number() > 2 %}
         <li class="disabled"><a href="#">...</a></li>
-        <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_page.num_pages }}/">{{ articles_paginator.num_pages }}</a></li>
+    {% endif %}
+    {% if articles_page.has_next() and (articles_page.next_page_number() != articles_paginator.num_pages) %}
+        <li><a href="{{ SITEURL }}{{ page_name }}{{ articles_paginator.num_pages }}/">{{ articles_paginator.num_pages }}</a></li>
     {% endif %}
     </ul>
 </div>
-- 
cgit