[dev-random] resolved conflicts

7 files changed, 17 insertions, 9 deletions

diff --git a/bootstrap/static/local.css b/bootstrap/static/local.css
index 42318b9..c933851 100644
--- a/bootstrap/static/local.css
+++ b/bootstrap/static/local.css
@@ -29,7 +29,7 @@ div.highlight pre {
 .social a[href*='github.com']:before {content: url('./images/icons/github.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='google.com/reader']:before {content: url('./images/icons/reader.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='jamendo.com']:before {content: url('./images/icons/jamendo.png'); margin-right: 2px; vertical-align: -3px;}
-.social a[href*='last.fm']:before, .social a[href*='lastfm.']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;}
+.social a[href*='last.fm']:before, .social a[href*='lastfm.']:before {content: url('./images/icons/lastfm.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='linkedin.com']:before {content: url('./images/icons/linkedin.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='rss.xml']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;}
 .social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png'); margin-right: 2px; vertical-align: -3px;}
diff --git a/bootstrap/templates/archives.html b/bootstrap/templates/archives.html
index 2d02e12..6dee8ed 100644
--- a/bootstrap/templates/archives.html
+++ b/bootstrap/templates/archives.html
@@ -7,7 +7,7 @@
 <h3>{{ articles[ 0 ].date.strftime( '%B' ) }}</h3>
 <ul>
 {% for article in articles %}
-	<li><a href="{{ article.url }}">{{ article.title }}</li>
+	<li><a href="{{ article.url }}">{{ article.title }}</a></li>
 {% endfor %}
 </ul>
 {% endfor %}
diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html
index 5710a5e..9458d6e 100644
--- a/bootstrap/templates/base.html
+++ b/bootstrap/templates/base.html
@@ -35,7 +35,7 @@
 					{% endfor %}
 				{% endif %}
 				{% for cat, null in categories %}
-					<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+					<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
 				{% endfor %}
 			</ul>
 			<p class="pull-right"><a href="{{ SITEURL }}/archives.html">[archives]</a> <a href="{{ SITEURL }}/tags.html">[tags]</a></p>
@@ -73,4 +73,4 @@
    
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/bootstrap/templates/categories.html b/bootstrap/templates/categories.html
index 36b57bc..de7cbc3 100644
--- a/bootstrap/templates/categories.html
+++ b/bootstrap/templates/categories.html
@@ -3,7 +3,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-	<li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</li>
+	<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/bootstrap/templates/metadata.html b/bootstrap/templates/metadata.html
index 876df8f..8c9f261 100644
--- a/bootstrap/templates/metadata.html
+++ b/bootstrap/templates/metadata.html
@@ -1,4 +1,4 @@
 Permalink: <a class="more" href="{{ SITEURL }}/{{ article.url }}">{{ article.date }}</a>
-{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>{% endif %}
-in <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
-{% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> {% endfor %}{% endif %}
+{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>{% endif %}
+in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+{% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}{% endif %}
diff --git a/bootstrap/templates/page.html b/bootstrap/templates/page.html
new file mode 100644
index 0000000..15015ff
--- /dev/null
+++ b/bootstrap/templates/page.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+{% block indextitle %}{% endblock %}
+{% block content %}
+	<div class='page'>
+		<div class="page-header"><h1>{{ page.title }}</h1></div>
+		<div>{{ page.content }}</div>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/bootstrap/templates/tags.html b/bootstrap/templates/tags.html
index 592cd0d..d481bc3 100644
--- a/bootstrap/templates/tags.html
+++ b/bootstrap/templates/tags.html
@@ -3,7 +3,7 @@
 {% block content %}
 <ul>
 {% for tag, articles in tags %}
-	<li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</li>
+	<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}