2 files changed, 13 insertions, 4 deletions

diff --git a/_layouts/author.html b/_layouts/author.html
index 44e62e5..226f1bb 100644
--- a/_layouts/author.html
+++ b/_layouts/author.html
@@ -15,7 +15,7 @@ layout: default
 	{% include posts_by_author.html %}
 	{% for post in return %}
 		<li>
-			<a href="{{ post.url | remove: ".html" }}">
+			<a href="{{ post.url }}">
 				{{ post.title }} @ {{ post.date | date: site.short_date_format }}
 			</a>
 		</li>
diff --git a/_layouts/post.html b/_layouts/post.html
index 0046908..84f6d39 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -10,18 +10,27 @@ layout: default
 	{% assign anon = site.authors | where: 'short_name', "anonymous" | first %}
 	-
 	{% if author %}
-		<a href="{{ author.url | remove: ".html" }}">{{ author.name }}</a>
+		<a href="{{ author.url }}">{{ author.name }}</a>
 	{% else %}
-		<a href="{{ anon.url | remove: ".html" }}">{{ anon.name }}</a>
+		<a href="{{ anon.url }}">{{ anon.name }}</a>
 	{% endif %}
 	- kategorije:
 	{% assign i = 1 %}
 	{% for category in page.categories %}
 		{% assign i = i | plus: 1 %}
-		<a href="/kategorije#{{ category }}">{{ category }}</a>{%
+		<a href="/blog/kategorije#{{ category }}">{{ category }}</a>{%
 		if i < page.categories.size %}, {% elsif i == page.categories.size %}
 			in
 		{% endif %}{% endfor %}.
+	- značke:
+	{% assign i = 1 %}
+	{% for tag in page.tags %}
+		{% assign i = i | plus: 1 %}
+		<a href="/blog/znacke#{{ tag }}">{{ tag }}</a>{%
+		if i < page.tags.size %}, {% elsif i == page.tags.size %}
+			in
+		{% endif %}{% endfor %}.
+
 </p>
 
 {{ content }}