14 files changed, 113 insertions, 46 deletions

diff --git a/_config.yml b/_config.yml
index 0560f97..47cc15e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,6 +10,7 @@ url: "https://sijanec.eu"
 collections:
   authors:
     output: true
+    permalink: /blog/avtorji/:name
 
 defaults:
   - scope:
diff --git a/_data/navigation.yml b/_data/navigation.yml
index bbfad56..b37ee72 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -2,7 +2,11 @@
   link: /
 - name: o meni
   link: /o.html
-- name: blog
-  link: /blog.html
+- name: objave
+  link: /blog/objave.html
+- name: kategorije
+  link: /blog/kategorije.html
+- name: značke
+  link: /blog/znacke.html
 - name: avtorji
   link: /avtorji.html
diff --git a/_includes/navigation.html b/_includes/navigation.html
index eb836c7..3bb6f14 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -1,7 +1,7 @@
 <nav>
 	{% for item in site.data.navigation %}
 		[<a
-			href={{ item.link | remove: ".html" }}
+			href={{ item.link }}
 			{% if page.url == item.link %} class=current {% endif %}
 		>
 			{{ item.name}}
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 }}
diff --git a/_posts/2020-11-05-prva-objava.md b/_posts/2020-11-05-prva-objava.md
index a6ee19d..fedfc29 100644
--- a/_posts/2020-11-05-prva-objava.md
+++ b/_posts/2020-11-05-prva-objava.md
@@ -2,6 +2,7 @@
 author: anton
 title: prva objava
 categories: objava test
+tags: objava
 ---
 To je prva objava na tem blogu. Kmalu pričakujte več vsebine.
 
diff --git a/_posts/2020-11-06-druga-objava.md b/_posts/2020-11-06-druga-objava.md
index e4465ba..0275a72 100644
--- a/_posts/2020-11-06-druga-objava.md
+++ b/_posts/2020-11-06-druga-objava.md
@@ -2,6 +2,7 @@
 author: anton
 title: druga objava
 categories: test
+tags: objava test
 ---
 To je druga objava na tem blogu. Kmalu pričakujte več vsebine.
 
diff --git a/_sass/main.scss b/_sass/main.scss
index 324a3c0..dc1c296 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -2,6 +2,14 @@
 	color: red;
 }
 
+table {
+	border-collapse: collapse;
+}
+
+table, th, td, tr {
+	border: 1px solid black;
+}
+
 @media screen and (min-width: 600px) {
 	body {
 		margin-left: 10%;
diff --git a/avtorji.html b/blog/avtorji.html
index 70494f3..2cdfe59 100644
--- a/avtorji.html
+++ b/blog/avtorji.html
@@ -7,7 +7,7 @@ title: avtorji
 	{% for author in site.authors %}
 		<li>
 			<h2>
-				<a href="{{ author.url | remove: ".html"}}">
+				<a href="{{ author.url }}">
 					{{ author.name }}
 				</a>
 			</h2>
diff --git a/blog/kategorije.html b/blog/kategorije.html
new file mode 100644
index 0000000..97ea14c
--- /dev/null
+++ b/blog/kategorije.html
@@ -0,0 +1,37 @@
+---
+layout: default
+title: kategorije
+---
+<h1>
+	kategorije
+</h1>
+<h2>
+	{% assign argv = ",kategorij,kategorija,kategoriji,kategorije" | prepend: site.categories.size | split: "," %}
+	{{ site.categories.size }} {% include slnum.html %} {{ return }}
+</h2>
+<ul>
+	{% capture category_sizes %}{% for category in site.categories %}{{ category[1].size | plus: -1000 }} {{ category[0]}}^{% endfor %}{% endcapture %}
+	{% assign categories_sorted_by_number_of_posts = category_sizes | split: "^" | sort %}
+	{% for pre_processed_category in categories_sorted_by_number_of_posts %}
+		{% assign category_with_size = pre_processed_category | split: " " %}
+		{% assign key = category_with_size[1] %}
+		{% assign category = site.categories[key] %}
+		<li>
+			<h3 id="{{ key }}">
+				{{ key }}
+			</h3>
+			<p>
+				<b>
+					{% assign argv = ",objav,objava,objavi,objave" | prepend: category.size | split: "," %}
+					{{ category.size }} <!--{% include slnum.html %}-->{{ return }}:
+				</b>
+				{% assign i = 1 %}
+				{% for post in category %}
+					<a href="{{ post.url }}">{{ post.title }} @ {{ post.date | date: site.short_date_format }}</a>{% assign i = i | plus: 1 %}{% if i < category.size %},
+					{% elsif i == category.size %}
+						in
+					{% endif %}{% endfor %}.
+			</p>
+		</li>
+	{% endfor %}
+</ul>
diff --git a/blog.html b/blog/objave.html
index 05a2239..9c87194 100644
--- a/blog.html
+++ b/blog/objave.html
@@ -9,7 +9,7 @@ title: blog
 	{% for post in site.posts %}
 		<li>
 			<h3>
-				<a href="{{ post.url | remove: ".html" }}">
+				<a href="{{ post.url }}">
 					{{ post.title }} @ {{ post.date | date: site.short_date_format }}
 				</a>
 			</h3>
diff --git a/blog/znacke.html b/blog/znacke.html
new file mode 100644
index 0000000..f9bf486
--- /dev/null
+++ b/blog/znacke.html
@@ -0,0 +1,37 @@
+---
+layout: default
+title: značke
+---
+<h1>
+	značke
+</h1>
+<h2>
+	{% assign argv = ",značk,značka,znački,značke" | prepend: site.tags.size | split: "," %}
+	{{ site.tags.size }} {% include slnum.html %} {{ return }}
+</h2>
+<ul>  
+	{% capture tag_sizes %}{% for tag in site.tags %}{{ tag[1].size | plus: -1000 }} {{ tag[0]}}^{% endfor %}{% endcapture %}
+	{% assign tags_sorted_by_number_of_posts = tag_sizes | split: "^" | sort %}
+	{% for pre_processed_tag in tags_sorted_by_number_of_posts %}
+		{% assign tag_with_size = pre_processed_tag | split: " " %}
+		{% assign key = tag_with_size[1] %}
+		{% assign tag = site.tags[key] %}
+		<li>
+			<h3 id="{{ key }}">
+				{{ key }}
+			</h3>
+			<p>
+				<b>
+					{% assign argv = ",objav,objava,objavi,objave" | prepend: tag.size | split: "," %}
+					{{ tag.size }} <!--{% include slnum.html %}-->{{ return }}:
+				</b>
+				{% assign i = 1 %}
+				{% for post in tag %}
+					<a href="{{ post.url }}">{{ post.title }} @ {{ post.date | date: site.short_date_format }}</a>{% assign i = i | plus: 1 %}{% if i < tag.size %},
+					{% elsif i == tag.size %}
+						in
+					{% endif %}{% endfor %}.
+			</p>
+		</li>
+	{% endfor %}
+</ul>
diff --git a/kategorije.html b/kategorije.html
deleted file mode 100644
index f14da95..0000000
--- a/kategorije.html
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: default
-title: kategorije
----
-<h1>
-	kategorije
-</h1>
-<h2>
-	{% assign argv = ",kategorij,kategorija,kategoriji,kategorije" | prepend: site.categories.size | split: "," %}
-	{{ site.categories.size }} {% include slnum.html %} {{ return }}
-</h2>
-<ul>
-	{% assign cats = site.categories | sort %}
-	{% for category in cats reversed %} <!-- 0 je ime, 1 je array objav -->
-		<li>
-			<h3 id="{{ category[0] }}">
-				{{ category[0] }}
-			</h3>
-			<p>
-				<b>
-					{% assign argv = ",objav,objava,objavi,objave" | prepend: category[1].size | split: "," %}
-					{{ category[1].size }} <!--{% include slnum.html %}-->{{ return }}:
-				</b>
-				{% assign i = 1 %}
-				{% for post in category[1] %}
-					<a href="{{ post.url }}">{{ post.title }} @ {{ post.date | date: site.short_date_format }}</a>{% assign i = i | plus: 1 %}{% if i < category[1].size %},
-					{% elsif i == category[1].size %}
-						in
-					{% endif %}{% endfor %}.
-			</p>
-		</li>
-	{% endfor %}
-</ul>
diff --git a/o.md b/o.md
index d937743..f6bfe4c 100644
--- a/o.md
+++ b/o.md
@@ -20,11 +20,13 @@ Sem velik privrženec odprtokodne, proste in brezplačne programske opreme
 
 Kontaktirate me lahko:
 
-* prek elektronske pošte: [anton@šijanec.eu](mailto:anton@šijanec.eu)
-* prek telefona: [+38 6 64/176-345](tel:+38664176345)
-* prek XMPP ali SIP protokola: [anton@sijanec.eu](xmpp:anton@sijanec.eu)
+* prek elektronske pošte: [anton@šijanec.eu](mailto:anton@šijanec.eu),
+* prek telefona: [+38 6 64/176-345](tel:+38664176345),
+* prek XMPP ali SIP protokola: [anton@sijanec.eu](xmpp:anton@sijanec.eu),
 * prek IRC protokola:
-[ircs://irc.šijanec.eu:6697 v kanalu #](ircs://irc.šijanec.eu:6697/#)
+[ircs://irc.šijanec.eu:6697 v kanalu #](ircs://irc.šijanec.eu:6697/#).
+
+Mojo vizitko si lahko najdete na [https://šijanec.eu/vizitka](https://šijanec.eu/vizitka).
 
 Sporočila lahko šifrirate s PGP.
 Moj ključ ima zgoščeno vrednost