Commits

Peter Ward committed 3f5344d

better urls

  • Participants
  • Parent commits f1c6d71

Comments (0)

Files changed (2)

File pelicanconf.py

 
 DISQUS_SITENAME = 'flowbloksblog'
 
+ARTICLE_URL = '{date:%Y}-{date:%m}/{slug}.html'
+ARTICLE_SAVE_AS = '{date:%Y}-{date:%m}/{slug}.html'
+ARTICLE_LANG_URL = '{date:%Y}-{date:%m}/{slug}.{lang}.html'
+ARTICLE_LANG_SAVE_AS = '{date:%Y}-{date:%m}/{slug}.{lang}.html'
+PAGE_URL = '{slug}'
+PAGE_SAVE_AS = '{slug}/index.html'
+PAGE_LANG_URL = '{slug}/index-{lang}.html'
+PAGE_LANG_SAVE_AS = '{slug}/index-{lang}.html'
+
 LINKS = (
     ('code', 'http://hg.flowblok.id.au/'),
     ('photos', 'http://flickr.com/photos/flowblok'),

File theme/templates/index.html

 {% extends "base.html" %}
 {% block content_title %}{% endblock %}
-{% block content %}        
+{% block content %}
 
 {% if articles %}
-{% for article in articles_page.object_list %}        
+{% for article in articles_page.object_list %}
 
 {# First item #}
 {% if loop.first and not articles_page.has_previous() %}
     <div class='article'>
         <div class="content-title">
             <a href="{{ SITEURL }}/{{ article.url }}"><h1>{{ article.title }}</h1></a>
-            {% include "metadata.html" %} 
+            {% include "metadata.html" %}
         </div>
-        
+
         <div>{{ article.content }}</div>
         <hr />
     </div>
-		
+
     {% if loop.length == 1 %}
         {% include 'pagination.html' %}
     {% endif %}
 
 {# other items #}
-{% else %} 
+{% else %}
 
     <div class='article'>
         <a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a>
         <div class= "well small"> {% include "metadata.html" %} </div>
         <div class="summary">{{ article.summary }} <a class="btn btn-info xsmall" href="{{ SITEURL }}/{{ article.url }}">read more</a></div>
-    </div>	
-				
+    </div>
+
     {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}
         {% include 'pagination.html' %}
     {% endif %}