diff --git a/_includes/blog-post-list.html b/_includes/blog-post-list.html deleted file mode 100644 index 150a2a4..0000000 --- a/_includes/blog-post-list.html +++ /dev/null @@ -1,29 +0,0 @@ -
- -
-{% if counter == 'even' %} -
-{% endif %} diff --git a/_includes/blog-post.html b/_includes/blog-post.html new file mode 100644 index 0000000..58c12f2 --- /dev/null +++ b/_includes/blog-post.html @@ -0,0 +1,48 @@ +
+{% if page.post_listing %} + +{% endif %} +
diff --git a/_includes/head.html b/_includes/head.html index b7362f7..9a2e1e4 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,10 +1,10 @@ - + - Gergely Polonkai{% if page.title %}: {{ page.title }}{% endif %} + Gergely Polonkai{% if page.title %}: {{page.title}}{% endif %} - + diff --git a/_includes/header.html b/_includes/header.html index 1ef01e5..aff7463 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,29 +6,29 @@ - Gergely Polonkai + Gergely Polonkai +{% include disqus.html %} diff --git a/_layouts/posts_by_tag.html b/_layouts/posts-by-tag.html similarity index 55% rename from _layouts/posts_by_tag.html rename to _layouts/posts-by-tag.html index dbbc160..ba18a90 100644 --- a/_layouts/posts_by_tag.html +++ b/_layouts/posts-by-tag.html @@ -1,13 +1,13 @@ --- layout: default +post_listing: true --- {{content}}

Articles under this tag

+ {% if site.tags[page.tag] %} -{% for post in site.tags[page.tag] %} -{% include blog-post-list.html %} -{% endfor %} -
+{% assign posts = site.tags[page.tag] %} +{% include post-list.html %} {% else %} No posts with this tag. {% endif %} diff --git a/_make_tags.sh b/_make_tags.sh index 2eee779..fd31946 100644 --- a/_make_tags.sh +++ b/_make_tags.sh @@ -5,6 +5,8 @@ # or layout: keywords, the script will include them in the front # matter. +layout="posts-by-tag" + for tag in `grep -h ^tags: _posts/* | sed -e 's/^tags: \[//' -e 's/\]$//' -e 's/, /\n/g' | sort | uniq` do tag_file="blog/tag/${tag}.html" @@ -13,7 +15,7 @@ do then cat < $tag_file --- -layout: posts_by_tag +layout: $layout tag: $tag --- EOF @@ -25,7 +27,7 @@ EOF if ! grep "^layout: " $tag_file &> /dev/null then - sed -i "0,/---/! s/---/layout: posts_by_tag\\n---/" $tag_file + sed -i "0,/---/! s/---/layout: $layout\\n---/" $tag_file fi fi done diff --git a/blog/index.html b/blog/index.html index 88264f9..f1099f1 100644 --- a/blog/index.html +++ b/blog/index.html @@ -1,26 +1,12 @@ --- layout: page -title: Blog +title: Blog posts +post_listing: true --- - {% include pagination.html %} -{% for post in paginator.posts %} -
-
-

{{ post.title }}

-

{{ post.date | date: "%b %-d, %Y" }} :: {{ post.date | date: "%H:%M" }} by {{ site.name }}

-
- {{ post.excerpt }} -
-

- Tags: - {% for tag in post.tags %} - {{ tag }} - {% endfor%} -

-
-
-{% endfor %} +{% assign posts = paginator.posts %} + +{% include post-list.html %} {% include pagination.html %} diff --git a/blog/tag/active-directory.html b/blog/tag/active-directory.html index cd6458b..6c4417a 100644 --- a/blog/tag/active-directory.html +++ b/blog/tag/active-directory.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: active-directory --- diff --git a/blog/tag/apache.html b/blog/tag/apache.html index 935698b..6895f59 100644 --- a/blog/tag/apache.html +++ b/blog/tag/apache.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: apache --- diff --git a/blog/tag/astrology.html b/blog/tag/astrology.html index 47b6515..9e9b5f6 100644 --- a/blog/tag/astrology.html +++ b/blog/tag/astrology.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: astrology --- diff --git a/blog/tag/c.html b/blog/tag/c.html index e3c2ade..0e794cd 100644 --- a/blog/tag/c.html +++ b/blog/tag/c.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: c --- diff --git a/blog/tag/citrix-xenserver.html b/blog/tag/citrix-xenserver.html index 7958f53..d37a82b 100644 --- a/blog/tag/citrix-xenserver.html +++ b/blog/tag/citrix-xenserver.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: citrix-xenserver --- diff --git a/blog/tag/command-line.html b/blog/tag/command-line.html index 39f30a0..c20ac90 100644 --- a/blog/tag/command-line.html +++ b/blog/tag/command-line.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: command-line --- diff --git a/blog/tag/conference.html b/blog/tag/conference.html index bd0b949..d479558 100644 --- a/blog/tag/conference.html +++ b/blog/tag/conference.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: conference --- diff --git a/blog/tag/debian.html b/blog/tag/debian.html index 7d194d4..55ce064 100644 --- a/blog/tag/debian.html +++ b/blog/tag/debian.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: debian --- diff --git a/blog/tag/development.html b/blog/tag/development.html index 5367242..93afc45 100644 --- a/blog/tag/development.html +++ b/blog/tag/development.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: development --- diff --git a/blog/tag/django.html b/blog/tag/django.html index 6f67613..33087e8 100644 --- a/blog/tag/django.html +++ b/blog/tag/django.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: django --- diff --git a/blog/tag/emacs.html b/blog/tag/emacs.html index 462fcec..102dcf9 100644 --- a/blog/tag/emacs.html +++ b/blog/tag/emacs.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: emacs --- diff --git a/blog/tag/fedora.html b/blog/tag/fedora.html index 22c3851..4175cf5 100644 --- a/blog/tag/fedora.html +++ b/blog/tag/fedora.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: fedora --- diff --git a/blog/tag/gentoo.html b/blog/tag/gentoo.html index 862782e..f25bb94 100644 --- a/blog/tag/gentoo.html +++ b/blog/tag/gentoo.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: gentoo --- diff --git a/blog/tag/git.html b/blog/tag/git.html index 5a4d741..076ce36 100644 --- a/blog/tag/git.html +++ b/blog/tag/git.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: git --- diff --git a/blog/tag/glib.html b/blog/tag/glib.html index 4431bb8..9281903 100644 --- a/blog/tag/glib.html +++ b/blog/tag/glib.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: glib --- diff --git a/blog/tag/gnome3.html b/blog/tag/gnome3.html index 2f86c88..e68c9ea 100644 --- a/blog/tag/gnome3.html +++ b/blog/tag/gnome3.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: gnome3 --- diff --git a/blog/tag/heartbeat-cluster.html b/blog/tag/heartbeat-cluster.html index b7758c7..042d4c9 100644 --- a/blog/tag/heartbeat-cluster.html +++ b/blog/tag/heartbeat-cluster.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: heartbeat-cluster --- diff --git a/blog/tag/kerberos.html b/blog/tag/kerberos.html index 845e7c1..4380f36 100644 --- a/blog/tag/kerberos.html +++ b/blog/tag/kerberos.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: kerberos --- diff --git a/blog/tag/linux.html b/blog/tag/linux.html index 621e0e5..074b43b 100644 --- a/blog/tag/linux.html +++ b/blog/tag/linux.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: linux --- diff --git a/blog/tag/monitoring.html b/blog/tag/monitoring.html index 03eadd7..0f65f2a 100644 --- a/blog/tag/monitoring.html +++ b/blog/tag/monitoring.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: monitoring --- diff --git a/blog/tag/mysql.html b/blog/tag/mysql.html index 38a23d8..07876e5 100644 --- a/blog/tag/mysql.html +++ b/blog/tag/mysql.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: mysql --- diff --git a/blog/tag/oracle.html b/blog/tag/oracle.html index 7e78c3f..27dd039 100644 --- a/blog/tag/oracle.html +++ b/blog/tag/oracle.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: oracle --- diff --git a/blog/tag/otrs.html b/blog/tag/otrs.html index 8185855..9f43428 100644 --- a/blog/tag/otrs.html +++ b/blog/tag/otrs.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: otrs --- diff --git a/blog/tag/php.html b/blog/tag/php.html index 6162444..c4b3df3 100644 --- a/blog/tag/php.html +++ b/blog/tag/php.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: php --- diff --git a/blog/tag/ranting.html b/blog/tag/ranting.html index d4945d9..c245524 100644 --- a/blog/tag/ranting.html +++ b/blog/tag/ranting.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: ranting --- diff --git a/blog/tag/red-hat.html b/blog/tag/red-hat.html index 2360d47..8c99af4 100644 --- a/blog/tag/red-hat.html +++ b/blog/tag/red-hat.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: red-hat --- diff --git a/blog/tag/selinux.html b/blog/tag/selinux.html index d2f74fb..1d65247 100644 --- a/blog/tag/selinux.html +++ b/blog/tag/selinux.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: selinux --- diff --git a/blog/tag/ssh.html b/blog/tag/ssh.html index 3f72aa6..9eff635 100644 --- a/blog/tag/ssh.html +++ b/blog/tag/ssh.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: ssh --- diff --git a/blog/tag/symfony.html b/blog/tag/symfony.html index 2b8a7c1..ec5938b 100644 --- a/blog/tag/symfony.html +++ b/blog/tag/symfony.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: symfony --- diff --git a/blog/tag/technology.html b/blog/tag/technology.html index 1723aa6..ab3b6bf 100644 --- a/blog/tag/technology.html +++ b/blog/tag/technology.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: technology --- diff --git a/blog/tag/testing.html b/blog/tag/testing.html index e0849e9..9703a24 100644 --- a/blog/tag/testing.html +++ b/blog/tag/testing.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: testing --- diff --git a/blog/tag/windows.html b/blog/tag/windows.html index 8e9670c..ef6d1bf 100644 --- a/blog/tag/windows.html +++ b/blog/tag/windows.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: windows --- diff --git a/blog/tag/wordpress.html b/blog/tag/wordpress.html index f2221bd..988e96b 100644 --- a/blog/tag/wordpress.html +++ b/blog/tag/wordpress.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: wordpress --- diff --git a/blog/tag/zabbix.html b/blog/tag/zabbix.html index 7a5c3fe..77546b6 100644 --- a/blog/tag/zabbix.html +++ b/blog/tag/zabbix.html @@ -1,4 +1,4 @@ --- -layout: posts_by_tag +layout: posts-by-tag tag: zabbix --- diff --git a/disclaimer/index.md b/disclaimer/index.md index 9854598..e9547b7 100644 --- a/disclaimer/index.md +++ b/disclaimer/index.md @@ -13,7 +13,7 @@ you use anything, please put a backlink on your site to the given article(s) or the main page. The social media icons in the contact menu are from -[![komodomedia.com]({{site_url}}/images/komodomedia_azure_16.png) +[![komodomedia.com]({{'/images/komodomedia_azure_16.png' | prepend: site.baseurl}}) komodomedia.com](http://komodomedia.com). Some design ideas, like the arrows under the menu items are from a diff --git a/feed.xml b/feed.xml index fcc9102..bf3b2a4 100644 --- a/feed.xml +++ b/feed.xml @@ -3,17 +3,17 @@ - {{ site.title | xml_escape }} - {{ site.description | xml_escape }} - {{ site.url }}{{ site.baseurl }}/ - + {{site.title | xml_escape}} + {{site.description | xml_escape}} + {{site.url}}{{site.baseurl}}/ + {% for post in site.posts limit:10 %} - {{ post.title | xml_escape }} - {{ post.content | xml_escape }} - {{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} + {{post.title | xml_escape}} + {{post.content | xml_escape}} + {{post.date | date: "%a, %d %b %Y %H:%M:%S %z"}} + {{post.url | prepend: site.baseurl | prepend: site.url}} + {{post.url | prepend: site.baseurl | prepend: site.url}} {% endfor %} diff --git a/index.html b/index.html index b60f991..7887421 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,7 @@ --- layout: default title: Gergely Polonkai +post_listing: true ---
@@ -10,9 +11,6 @@ title: Gergely Polonkai
-
- {% for post in site.posts limit: 6 %} - {% capture counter %}{% cycle 'odd', 'even' %}{% endcapture %} - {% include blog-post-list.html %} - {% endfor %} -
+{% assign posts = site.posts %} +{% assign post_limit = 6 %} +{% include post-list.html %}