Merge branch 'master' of https://git.vvvvvvaria.org/rra/wttf

theme/wttf/templates/index.html

@@ -4,14 +4,16 @@
 	{% for article in articles_page.object_list %}
 		{# First item #}
 		{% if loop.index <= 3 %}
-            <aside id="featured" class="body">
+			<div id="featured" class="body">
 				<article>
 					<h1 class="entry-title p-name">
 						<a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
 					</h1>
 					<div class="entry-subtitle">
 						A 
-                        <span class="entry-category">{{ article.category }}</span> 
+						<span class="entry-category">
+							<em>{{ article.category }}</em>
+						</span> 
 						about 
 						<span class="entry-tags">
 							{% for tag in article.tags %}
@@ -25,7 +27,7 @@
 					</div>
 					<div class="entry-content e-content">{{ article.content }}</div>
 				</article>
-            </aside><!-- /#featured -->
+			</div><!-- /#featured -->
 			{% if loop.index == 3 %}
 				<section id="content" class="body">
 					<h1>Other articles</h1>
@@ -44,12 +46,27 @@
 						<h1 class="p-name">
 							<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
 						</h1>
-                        <div class="entry-date dt-published">{{ article.date }}</div>
+						<div class="entry-subtitle">
+							A 
+							<span class="entry-category">
+								<em>{{ article.category }}</em>
+							</span> 
+							about 
+							<span class="entry-tags">
+								{% for tag in article.tags %}
+									<span itemprop="keywords">
+										<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+									</span> 
+								{% endfor %}
+							</span> 
+							published on 
+							<span class="entry-date dt-published">{{ article.date }}</span>
+						</div>
 					</header>
 
 					<div class="entry-content">
 						<p class="p-summary">{{ article.summary }}</p>
-                        <a class="readmore" href="{{ SITEURL }}/{{ article.url }}"> ... read more</a>
+						<span class="entry-readmore"><a class="readmore" href="{{ SITEURL }}/{{ article.url }}"> read more</a></span>
 					</div><!-- /.entry-content -->
 				</article>
 			</li>

theme/wttf/templates/tag.html

@@ -0,0 +1,5 @@
+{% extends "index.html" %}
+{% block content_title %}
+<h2>Articles in the {{ tag }} tag</h2>
+{% endblock %}
+