diff options
| -rw-r--r-- | config.toml | 3 | ||||
| -rw-r--r-- | content/blog/a-nas-tale.md | 1 | ||||
| -rw-r--r-- | content/blog/openbsd-firewall-and-securityrouter.org.md | 1 | ||||
| -rw-r--r-- | content/toolbox/_index.md | 9 | ||||
| -rw-r--r-- | themes/new_theme/layouts/_default/list.html | 6 | ||||
| -rw-r--r-- | themes/new_theme/layouts/_default/single.html | 33 | ||||
| -rw-r--r-- | themes/new_theme/layouts/partials/sidebar.html | 4 | ||||
| -rw-r--r-- | themes/new_theme/layouts/partials/widgets/categories.html | 4 | ||||
| -rw-r--r-- | themes/new_theme/layouts/taxonomy/category.terms.html | 16 |
9 files changed, 68 insertions, 9 deletions
diff --git a/config.toml b/config.toml index d8d0f65..83c45c0 100644 --- a/config.toml +++ b/config.toml @@ -21,6 +21,9 @@ SectionPagesMenu = "main" categories = true tags = true +[taxonomies] +category = "categories" + [[menu.main]] name = "Home" weight = 30 diff --git a/content/blog/a-nas-tale.md b/content/blog/a-nas-tale.md index 25a7600..ba39bb5 100644 --- a/content/blog/a-nas-tale.md +++ b/content/blog/a-nas-tale.md @@ -1,6 +1,7 @@ +++ title = "A NAS tale" date = "2017-01-21T14:10:11+01:00" +categories = [ "Hardware", "NAS", "Linux" ] +++ In August 2009 I decided it was time to replace my old Pentium II serving 5 old SUN storage disks (the white boxes, enormously noisy, for those who remember) with a modern NAS system. I bought a QNAP TS-439 Pro. The integrated firmware (aka customized Linux) gave me the creeps from a software design point of view, but it did the job. diff --git a/content/blog/openbsd-firewall-and-securityrouter.org.md b/content/blog/openbsd-firewall-and-securityrouter.org.md index 27f34d0..13a800e 100644 --- a/content/blog/openbsd-firewall-and-securityrouter.org.md +++ b/content/blog/openbsd-firewall-and-securityrouter.org.md @@ -1,6 +1,7 @@ +++ title = "OpenBSD firewall and securityrouter.org" date = "2017-01-08T12:01:22+01:00" +categories = [ "OpenBSD", "Security" ] +++ Found a really nice new router appliance based on OpenBSD 6.0, http://securityrouter.org. I’m still missing some features like a split-horizon DNS, so I will not abandon the script-based project http://github.com/andreasbaumann/OpenBSD-firewall just for now. diff --git a/content/toolbox/_index.md b/content/toolbox/_index.md index 77c616a..e69d467 100644 --- a/content/toolbox/_index.md +++ b/content/toolbox/_index.md @@ -23,16 +23,19 @@ Some things I found to be useful for daily programming. ## Database Modelling -* [dbmodel](http://oxygene.sk/lukas/projects/dbmodel/): a very neat +* [dbmodel](http://oxygene.sk/projects/dbmodel/): a very neat database modeller with PDF and image export. ## Infrastructure * [openSUSE Build Service](https://build.opensuse.org/): for building release packages in the cloud. +* [Travi CI](http://travis-ci.org/): for continuous integration on Mac OSX. * Using [libvirtd](http://libvirt.org) now instead of VirtualBox (sorry, Oracle). Main reason: it's still a little bit un-ready round the edges but hey, it's really open source. :-) +* [LXC](https://linuxcontainers.org): lightweight and surely nicer to + use than Docker (IMHO). Still a little bit alpha quality though. * [unison](https://www.cis.upenn.edu/~bcpierce/unison/): file synchronizer, I'm using it since years to sync my home directory between three or four machines, sort of a very easy backup. @@ -63,6 +66,8 @@ Some things I found to be useful for daily programming. viewer can possibly get. * [MuPDF](http://www.mupdf.com/): an equally fast PDF/XPS viewer. * [Trojitá](https://en.wikipedia.org/wiki/Trojit%C3%A1): a simplistic - and really fast mail reader (using this one if not using 'mutt'). + and really fast mail reader for IMAP accounts. For long-term archiving + of email I'm using a combination of [OfflineIMAP](http://www.offlineimap.org) + and good old [Mutt](http://mutt.org). * [Seamonkey](http://www.seamonkey-project.org/): back to old SeaMonkey, fast, no clue what they did to Firefox to make it so slow. diff --git a/themes/new_theme/layouts/_default/list.html b/themes/new_theme/layouts/_default/list.html index 68776c6..1657fd0 100644 --- a/themes/new_theme/layouts/_default/list.html +++ b/themes/new_theme/layouts/_default/list.html @@ -2,7 +2,7 @@ {{ $section := .Section }} -{{ if ne $section "blog" }} +{{ if and ( ne $section "blog" ) ( ne $section "" ) }} <div class="main-content content" role="main" itemprop="mainContentOfPage"> <article class="post"> <header class="post__header clearfix"> @@ -39,8 +39,8 @@ <time class="loop__meta-date" datetime="{{ .Date }}">{{.Date.Format "January 02, 2006"}}</time> </div> </header> - <div class="loop__excerpt"> - {{ .Summary }} + <div class="loop__excerpt post__content"> + {{ .Summary | markdownify }} </div> <div class="post__content"> <a href="{{ .URL }}">View full post</a> diff --git a/themes/new_theme/layouts/_default/single.html b/themes/new_theme/layouts/_default/single.html index a3e40bb..77fbd4a 100644 --- a/themes/new_theme/layouts/_default/single.html +++ b/themes/new_theme/layouts/_default/single.html @@ -1,15 +1,48 @@ {{ partial "header.html" . }} +{{ $section := .Section }} + +{{ if ne $section "blog" }} +<div class="main-content content" role="main" itemprop="mainContentOfPage"> + <article class="post"> + <header class="post__header clearfix"> + <h1 class="post__title">{{ .Title }}</h1> + </header> + <div class="post__content clearfix"> + {{ .Content }} + </div> + </article> +</div> +{{ else }} <div class="main-content content" role="main" itemprop="mainContentOfPage"> <article class="post"> <header class="post__header clearfix"> <h1 class="post__title">{{ .Title }}</h1> + <p class="post__meta meta"> + <svg class="icon icon-time" height="14" viewBox="0 0 16 16" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m8-.0000003c-4.4 0-8 3.6-8 8 0 4.4000003 3.6 8.0000003 8 8.0000003 4.4 0 8-3.6 8-8.0000003 0-4.4-3.6-8-8-8zm0 14.4000003c-3.52 0-6.4-2.88-6.4-6.4000003 0-3.52 2.88-6.4 6.4-6.4 3.52 0 6.4 2.88 6.4 6.4 0 3.5200003-2.88 6.4000003-6.4 6.4000003zm.4-10.4000003h-1.2v4.8l4.16 2.5600003.64-1.04-3.6-2.1600003z"/></svg> + <time class="post__meta-date" datetime="{{ .Date }}">{{.Date.Format "January 02, 2006"}}</time> + {{- if .Params.categories }} + <span class="post__meta-categories meta-categories"> + <svg class="icon icon-category" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 2l1 2h8v11h-16v-13z"/></svg> + {{ range $index, $category := .Params.categories }}{{ if gt $index 0 }}, {{ end }}<a class="meta-categories__link" href="{{ "/categories/" | relLangURL }}{{ . | urlize | lower }}" rel="category">{{ . }}</a>{{ end }}</span> + {{- end }} + </p> </header> <div class="post__content clearfix"> + {{- if .Params.thumbnail }} + <figure class="post__thumbnail"> + <img src="{{ .Params.thumbnail | absURL }}" alt="{{ .Title }}"> + </figure> + {{- end }} {{ .Content }} </div> + {{ partial "post_tags.html" . }} </article> + {{ partial "authorbox.html" . }} + {{ partial "post_nav.html" . }} + {{ partial "comments.html" . }} </div> +{{ end }} {{ partial "sidebar.html" . }} {{ partial "footer.html" . }} diff --git a/themes/new_theme/layouts/partials/sidebar.html b/themes/new_theme/layouts/partials/sidebar.html index ce306a0..0179264 100644 --- a/themes/new_theme/layouts/partials/sidebar.html +++ b/themes/new_theme/layouts/partials/sidebar.html @@ -3,7 +3,7 @@ {{ $section := .Section }} {{ if eq $section "blog" }} {{ partial "widgets/recent.html" . }} + {{ partial "widgets/categories.html" . }} + {{ partial "widgets/taglist.html" . }} {{ end }} - {{ partial "widgets/categories.html" . }} - {{ partial "widgets/taglist.html" . }} </aside> diff --git a/themes/new_theme/layouts/partials/widgets/categories.html b/themes/new_theme/layouts/partials/widgets/categories.html index d4ace88..506cb1f 100644 --- a/themes/new_theme/layouts/partials/widgets/categories.html +++ b/themes/new_theme/layouts/partials/widgets/categories.html @@ -2,7 +2,7 @@ {{- if isset .Site.Taxonomies "categories" }} {{- if not (eq (len .Site.Taxonomies.categories) 0) }} <div class="widget-categories widget"> - <h4 class="widget__title">Categories</h4> + <h4 class="widget__title"><a href="/categories/">Categories</a></h4> <div class="widget__content"> <ul class="widget__list"> {{- range $name, $items := .Site.Taxonomies.categories }} @@ -13,4 +13,4 @@ </div> {{- end }} {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/themes/new_theme/layouts/taxonomy/category.terms.html b/themes/new_theme/layouts/taxonomy/category.terms.html new file mode 100644 index 0000000..664a1b8 --- /dev/null +++ b/themes/new_theme/layouts/taxonomy/category.terms.html @@ -0,0 +1,16 @@ +{{ partial "header.html" . }} + +<section id="main"> + <div> + <h1 id="title">{{ .Title }}</h1> + + <ul> + {{ $data := .Data }} + {{ range $key, $value := .Data.Terms }} + <li><a href="/{{ $data.Plural }}/{{ $key | urlize }}">{{ $key }}</a> {{ len $value }}</li> + {{ end }} + </ul> + </div> +</section> + +{{ partial "footer.html" . }} |