Mercurial > hg > Blog

changeset 42:51d2ddc51e40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update the theme with the latest changes from upstream
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 30 Sep 2014 03:53:59 +0200
parents 47fa61e1845e
children 320e1b36eb7e
files pelicanconf.py themes/tuxlite_tbs/templates/article.html themes/tuxlite_tbs/templates/base.html themes/tuxlite_tbs/templates/metadata.html themes/tuxlite_tbs/templates/page.html
diffstat 5 files changed, 47 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pelicanconf.py	Tue Sep 30 03:37:41 2014 +0200
+++ b/pelicanconf.py	Tue Sep 30 03:53:59 2014 +0200
@@ -5,6 +5,7 @@
 AUTHOR = u'Dirk Olmes'
 SITENAME = u'Infoschnipsel und Wissenswertes'
 SITEURL = 'http://xanthippe.duckdns.org/blog'
+ARCHIVES_URL = 'archives.html'
 
 LOCALE = 'de_DE'
 TIMEZONE = 'Europe/Berlin'
--- a/themes/tuxlite_tbs/templates/article.html	Tue Sep 30 03:37:41 2014 +0200
+++ b/themes/tuxlite_tbs/templates/article.html	Tue Sep 30 03:53:59 2014 +0200
@@ -12,7 +12,9 @@
 
         <h2>Comments</h2>
     {% include "twitter.html" %}
-    {% include 'disqus.html' %}
-    {% include 'simple_comments.html' %}
+    {% if DISQUS_SITENAME %}
+		{% include "disqus.html" %}
+	{% endif %}
+    {% include "simple_comments.html" %}
     </div>
 {% endblock %}
--- a/themes/tuxlite_tbs/templates/base.html	Tue Sep 30 03:37:41 2014 +0200
+++ b/themes/tuxlite_tbs/templates/base.html	Tue Sep 30 03:53:59 2014 +0200
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ DEFAULT_LANG }}">
 <head>
     <meta charset="utf-8">
     <title>{% block windowtitle %}{{ SITENAME }}{% endblock %}</title>
@@ -18,6 +18,20 @@
     <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet">
     <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet">
 
+    <!-- So Firefox can bookmark->"abo this site" -->
+    {% if FEED_ALL_ATOM %}
+        <link href="{{ FEED_ALL_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml">
+    {% endif %}
+    {% if FEED_ATOM %}
+        <link href="{{ FEED_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml">
+    {% endif %}
+    {% if FEED_RSS %}
+        <link href="{{ FEED_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml">
+    {% endif %}
+    {% if FEED_ALL_RSS %}
+        <link href="{{ FEED_ALL_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml">
+    {% endif %}
+
 </head>
 
 <body>
@@ -68,10 +82,21 @@
                 Site
                 </li>
             
-                <li><a href="{{ SITEURL }}/archives.html">Archives</a>
+                <li><a href="{{ SITEURL }}/{{ ARCHIVES_URL }}">Archives</a>
                 <li><a href="{{ SITEURL }}/tags.html">Tags</a>
+
+
+
+                {% if FEED_ALL_ATOM %}
                 <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate">Atom feed</a></li>
+                {% endif %}
+                {% if FEED_ATOM %}
+                <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
+                {% endif %}
                 {% if FEED_RSS %}
+                <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>
+                {% endif %}
+                {% if FEED_ALL_RSS %}
                 <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" rel="alternate">RSS feed</a></li>
                 {% endif %}
             </ul>
--- a/themes/tuxlite_tbs/templates/metadata.html	Tue Sep 30 03:37:41 2014 +0200
+++ b/themes/tuxlite_tbs/templates/metadata.html	Tue Sep 30 03:53:59 2014 +0200
@@ -2,6 +2,12 @@
 
 {% if article.author %}
 by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
+    {% if article.translations %}
+        <a href="{{ SITEURL }}/{{ article.url }}" class="btn btn-info xsmall">{{ article.lang or DEFAULT_LANG }}</a>
+        {% for translation in article.translations %}
+            <a href="{{ SITEURL }}/{{ translation.url }}" class="btn btn-info xsmall">{{ translation.lang }}</a>&nbsp;
+        {% endfor %}
+    {% endif %}
 {% endif %} 
 
 {# Filed under <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> #}
--- a/themes/tuxlite_tbs/templates/page.html	Tue Sep 30 03:37:41 2014 +0200
+++ b/themes/tuxlite_tbs/templates/page.html	Tue Sep 30 03:53:59 2014 +0200
@@ -2,7 +2,15 @@
 {% block title %} {% endblock %}
 {% block content %}        
 <section id="content" class="body">    
-    <h2 class="content-title">{{ page.title }}</h2>
+    <h2 class="content-title">
+        {{ page.title }}
+        {% if page.translations %}
+            <a href="{{ SITEURL }}/{{ page.url }}" class="btn btn-info xsmall">{{ page.lang or DEFAULT_LANG }}</a>
+            {% for translation in page.translations %}
+                <a href="{{ SITEURL }}/{{ translation.url }}" class="btn btn-info xsmall">{{ translation.lang }}</a>&nbsp;
+            {% endfor %}
+        {% endif %}
+    </h2>
     {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
     the pdf</a>{% endif %}
     {{ page.content }}