From: Tollef Fog Heen Date: Sun, 24 May 2020 06:39:20 +0000 (+0200) Subject: zola WIP X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de3a3b2b736ddca3c2bb78d99074a23ee4b82464;p=wiki.err.no zola WIP --- diff --git a/TollefFogHeen.mdwn b/TollefFogHeen.mdwn deleted file mode 100644 index b11b84a..0000000 --- a/TollefFogHeen.mdwn +++ /dev/null @@ -1 +0,0 @@ -Jeg eier denne wikien. diff --git a/calendar/index.mdwn b/calendar/index.mdwn deleted file mode 100644 index ae26cb1..0000000 --- a/calendar/index.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -# Various links related to calendars - -* [Catalyst framework](http://www.catalystframework.org/), perl framework -* [Time zone and DST data](http://www.twinsun.com/tz/tz-link.htm) -* [Ruby on Rails API reference](http://api.rubyonrails.org/) -* [Current state](http://calendar.intern.err.no/) -* [Ical to RDF converter](http://inamidst.com/proj/cal/fromIcal.py) \ No newline at end of file diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..9571614 --- /dev/null +++ b/config.toml @@ -0,0 +1,108 @@ +# The base URL of the site; the only required configuration variable. +base_url = "wiki.err.no" + +# The site title and description; used in RSS by default. +title = "wiki.err.no" +description = "" + +# The default language; used in RSS. +default_language = "en" + +# The site theme to use. +theme = "hyde" + +# When set to "true", all code blocks are highlighted. +highlight_code = false + +# The theme to use for code highlighting. +# See below for list of allowed values. +highlight_theme = "base16-ocean-dark" + +# When set to "true", an RSS feed is automatically generated. +generate_rss = false + +# The number of articles to include in the RSS feed. All items are included if +# this limit is not set (the default). +# rss_limit = 20 + +# When set to "true", files in the `static` directory are hard-linked. Useful for large +# static files. Note that for this to work, both `static` and the +# output directory need to be on the same filesystem. Note that the theme's `static` +# files are always copied, regardles of this setting. +# hard_link_static = false + +# The taxonomies to be rendered for the site and their configuration. +# Example: +# taxonomies = [ +# {name = "tags", rss = true}, # each tag will have its own RSS feed +# {name = "tags", lang = "fr"}, # you can have taxonomies with the same name in multiple languages +# {name = "categories", paginate_by = 5}, # 5 items per page for a term +# {name = "authors"}, # Basic definition: no RSS or pagination +# ] +# +taxonomies = [] + +# The additional languages for the site. +# Example: +# languages = [ +# {code = "fr", rss = true}, # there will be a RSS feed for French content +# {code = "fr", search = true}, # there will be a Search Index for French content +# {code = "it"}, # there won't be a RSS feed for Italian content +# ] +# +languages = [] + +# When set to "true", the Sass files in the `sass` directory are compiled. +compile_sass = false + +# When set to "true", a search index is built from the pages and section +# content for `default_language`. +build_search_index = false + +# A list of glob patterns specifying asset files to ignore when the content +# directory is processed. Defaults to none, which means that all asset files are +# copied over to the `public` directory. +# Example: +# ignored_content = ["*.{graphml,xlsx}", "temp.*"] +ignored_content = [] + +# A list of directories used to search for additional `.sublime-syntax` files. +extra_syntaxes = [] + +# Optional translation object. The key if present should be a language code. +# Example: +# default_language = "fr" +# +# [translations] +# [translations.fr] +# title = "Un titre" +# +# [translations.en] +# title = "A title" + + +# Configuration of the link checker. +[link_checker] +# Skip link checking for external URLs that start with these prefixes +skip_prefixes = [ +# "http://[2001:db8::]/", +] + +# Skip anchor checking for external URLs that start with these prefixes +skip_anchor_prefixes = [ +# "https://caniuse.com/", +] + +# Various slugification strategies, see below for details +# Defauls to everything being a slug +[slugify] +paths = "safe" +taxonomies = "safe" +anchors = "safe" + +# Optional translation object. Keys should be language codes. +[translations] + +# You can put any kind of data here. The data +# will be accessible in all templates. +[extra] \ No newline at end of file diff --git a/content/TollefFogHeen.md b/content/TollefFogHeen.md new file mode 100644 index 0000000..3a199d7 --- /dev/null +++ b/content/TollefFogHeen.md @@ -0,0 +1,12 @@ ++++ +title = "Tollef Fog Heen" +date = 2020-04-08T13:29:16+02:00 +lastmod = 2020-04-13T06:20:05+00:00 ++++ + +Jeg eier denne siten. + + + + + diff --git a/index.mdwn b/content/_index.md similarity index 55% rename from index.mdwn rename to content/_index.md index 9b7f57a..2f720fb 100644 --- a/index.mdwn +++ b/content/_index.md @@ -1,16 +1,19 @@ -# Hovedside ++++ +template = "section.html" +title = "Hovedside" +page_title = "wiki" +description = "" ++++ ## Ønskelister -* [Tollef](http://err.no/personal/wishlist) -* [[Jørgen|JørgenFog/Ønskeliste]] +* [Tollef](https://err.no/personal/wishlist) ## Prosjekter -* [[Oppskrifter|Oppskrifter/index]] +* [Oppskrifter](@/oppskrifter/_index.md) * [[Baex|Baex/index]] * [[HDR|HDR/index]] -* [[Calendar|Calendar/index]] * [[Wireless_trigger|WirelessTrigger/index]] ## Planeter @@ -31,13 +34,10 @@ ## Hus -[[Disen]] +[Disen](@/disen.md) ---- Ansvarlig for denne wikien er [Tollef Fog Heen][TollefFogHeen] . -Syntaksen brukt er [Markdown][]. Wikien er [ikiwiki][]. - [Markdown]: http://daringfireball.net/projects/markdown/syntax - [ikiwiki]: http://ikiwiki.kitenet.net/ - [TollefFogHeen]: TollefFogHeen + [TollefFogHeen]: @/TollefFogHeen.md diff --git a/baex/index.mdwn b/content/baex/index.mdwn similarity index 100% rename from baex/index.mdwn rename to content/baex/index.mdwn diff --git a/baex/todo.mdwn b/content/baex/todo.mdwn similarity index 100% rename from baex/todo.mdwn rename to content/baex/todo.mdwn diff --git a/brygging/2012-06-10-hefeweizen.mdwn b/content/brygging/2012-06-10-hefeweizen.mdwn similarity index 100% rename from brygging/2012-06-10-hefeweizen.mdwn rename to content/brygging/2012-06-10-hefeweizen.mdwn diff --git a/brygging/baltisk-porter.mdwn b/content/brygging/baltisk-porter.mdwn similarity index 100% rename from brygging/baltisk-porter.mdwn rename to content/brygging/baltisk-porter.mdwn diff --git "a/brygging/gj\303\246r.mdwn" "b/content/brygging/gj\303\246r.mdwn" similarity index 100% rename from "brygging/gj\303\246r.mdwn" rename to "content/brygging/gj\303\246r.mdwn" diff --git a/brygging/usmaker.mdwn b/content/brygging/usmaker.mdwn similarity index 100% rename from brygging/usmaker.mdwn rename to content/brygging/usmaker.mdwn diff --git a/disen.mdwn b/content/disen.md similarity index 71% rename from disen.mdwn rename to content/disen.md index 46546b3..2276130 100644 --- a/disen.mdwn +++ b/content/disen.md @@ -1,6 +1,10 @@ -## Disengrenda 5b ++++ +title = "Disengrenda 5b" +date = 2008-11-21T00:00:00+00:00 ++++ -Disengrenda 5b er huset vi kjøpte 30. juni 2008. [Finn-annonsen](http://www.finn.no/finn/realestate/object?finnkode=13910725) + +Disengrenda 5b er huset vi kjøpte 30. juni 2008. [Finn-annonsen](https://www.finn.no/finn/realestate/object?finnkode=13910725) Ting vi trenger: @@ -14,7 +18,7 @@ Ting vi trenger: * Gardinkapper til stue (~hvit/grå?) og kjøkken (svart og grønn?) * Sovesofa (gjesterom) -[[disen/Vedlikehold]] +[Vedlikehold](@/disen/vedlikehold.md) [[disen/Hagen]] diff --git a/disen/hagen.mdwn b/content/disen/hagen.mdwn similarity index 100% rename from disen/hagen.mdwn rename to content/disen/hagen.mdwn diff --git a/disen/innflyttingsfest.mdwn b/content/disen/innflyttingsfest.mdwn similarity index 100% rename from disen/innflyttingsfest.mdwn rename to content/disen/innflyttingsfest.mdwn diff --git a/disen/nettverk.mdwn b/content/disen/nettverk.mdwn similarity index 100% rename from disen/nettverk.mdwn rename to content/disen/nettverk.mdwn diff --git a/disen/vedlikehold.mdwn b/content/disen/vedlikehold.md similarity index 89% rename from disen/vedlikehold.mdwn rename to content/disen/vedlikehold.md index fd893d6..33f95a3 100644 --- a/disen/vedlikehold.mdwn +++ b/content/disen/vedlikehold.md @@ -1,3 +1,8 @@ ++++ +title = "Vedlikehold Disen" +date = 2018-08-27T00:00:00+00:00 ++++ + #### Maling ute Malt sommer 2018 diff --git a/handlelistehus.mdwn b/content/handlelistehus.mdwn similarity index 100% rename from handlelistehus.mdwn rename to content/handlelistehus.mdwn diff --git a/hdr/index.mdwn b/content/hdr/index.mdwn similarity index 100% rename from hdr/index.mdwn rename to content/hdr/index.mdwn diff --git a/huskostnad.mdwn b/content/huskostnad.mdwn similarity index 100% rename from huskostnad.mdwn rename to content/huskostnad.mdwn diff --git a/innflytting.mdwn b/content/innflytting.mdwn similarity index 100% rename from innflytting.mdwn rename to content/innflytting.mdwn diff --git a/innflyttingsfest.mdwn b/content/innflyttingsfest.mdwn similarity index 100% rename from innflyttingsfest.mdwn rename to content/innflyttingsfest.mdwn diff --git a/julegaveliste.mdwn b/content/julegaveliste.mdwn similarity index 100% rename from julegaveliste.mdwn rename to content/julegaveliste.mdwn diff --git a/kravspechus.mdwn b/content/kravspechus.mdwn similarity index 100% rename from kravspechus.mdwn rename to content/kravspechus.mdwn diff --git a/content/oppskrifter/_index.md b/content/oppskrifter/_index.md new file mode 100644 index 0000000..3b04d82 --- /dev/null +++ b/content/oppskrifter/_index.md @@ -0,0 +1,8 @@ ++++ +title = "Oppskrifter" +[extra] +links = [ + { name = "Salted caramel apple crumble", url = "http://www.telegraph.co.uk/foodanddrink/recipes/10449883/Salted-caramel-applecrumble-recipe.html" }, + { name = "Classic apple crumble", url = "http://www.telegraph.co.uk/food-and-drink/recipes/classic-apple-crumble-with-groud-almond-and-oat-topping/" } +] ++++ diff --git "a/oppskrifter/grovt_br\303\270d_med_yoghurt.mdwn" "b/content/oppskrifter/grovt_br\303\270d_med_yoghurt.md" similarity index 74% rename from "oppskrifter/grovt_br\303\270d_med_yoghurt.mdwn" rename to "content/oppskrifter/grovt_br\303\270d_med_yoghurt.md" index 0b6959a..a22a939 100644 --- "a/oppskrifter/grovt_br\303\270d_med_yoghurt.mdwn" +++ "b/content/oppskrifter/grovt_br\303\270d_med_yoghurt.md" @@ -1,3 +1,8 @@ ++++ +title = "Grovt brød med yoghurt" +date = 2011-08-28T00:00:00+00:00 + ++++ * 400g hvetemel * 400g fint sammalt diff --git a/oppskrifter/kanelboller.mdwn b/content/oppskrifter/kanelboller.md similarity index 94% rename from oppskrifter/kanelboller.mdwn rename to content/oppskrifter/kanelboller.md index bee7da1..3ede23a 100644 --- a/oppskrifter/kanelboller.mdwn +++ b/content/oppskrifter/kanelboller.md @@ -1,4 +1,9 @@ -Kanelboller ++++ +title = "Kanelboller" +date = 2014-12-06T00:00:00+00:00 + ++++ + Fra [underskog](https://underskog.no/samtale/236933_har-knekt-koden-for-søte-gjærdeiger) diff --git a/oppskrifter/laks_og_pasta.mdwn b/content/oppskrifter/laks_og_pasta.md similarity index 93% rename from oppskrifter/laks_og_pasta.mdwn rename to content/oppskrifter/laks_og_pasta.md index 1c5fd74..492d88d 100644 --- a/oppskrifter/laks_og_pasta.mdwn +++ b/content/oppskrifter/laks_og_pasta.md @@ -1,4 +1,7 @@ -# Smoked and poached Salmon Pasta ++++ +title = "Smoked and poached Salmon Pasta" +date = 2012-01-02T00:00:00+00:00 ++++ Fra [forums.hexus.net](http://forums.hexus.net/141622-post2.html) diff --git "a/oppskrifter/rabrabra-og-stikkelsb\303\246rchutney_2012.mdwn" "b/content/oppskrifter/rabrabra-og-stikkelsb\303\246rchutney_2012.md" similarity index 86% rename from "oppskrifter/rabrabra-og-stikkelsb\303\246rchutney_2012.mdwn" rename to "content/oppskrifter/rabrabra-og-stikkelsb\303\246rchutney_2012.md" index 3533e4d..89a809b 100644 --- "a/oppskrifter/rabrabra-og-stikkelsb\303\246rchutney_2012.mdwn" +++ "b/content/oppskrifter/rabrabra-og-stikkelsb\303\246rchutney_2012.md" @@ -1,4 +1,7 @@ -# Rabarbrachutney 2012 ++++ +title = "Rabarbrachutney 2012" +date = 2012-06-25T00:00:00+00:00 ++++ ## Batch 1 diff --git a/oppskrifter/rabrabrachutney_2011.mdwn b/content/oppskrifter/rabrabrachutney_2011.md similarity index 54% rename from oppskrifter/rabrabrachutney_2011.mdwn rename to content/oppskrifter/rabrabrachutney_2011.md index 43a9498..6ebf391 100644 --- a/oppskrifter/rabrabrachutney_2011.mdwn +++ b/content/oppskrifter/rabrabrachutney_2011.md @@ -1 +1,6 @@ ++++ +title = "Rabarbrachutney vår 2011" +date = 2011-08-08T00:00:00+00:00 ++++ + Se [pickleandpreserve](http://www.pickleandpreserve.co.uk/index.php/blog/rhubarb-chutney.html) diff --git "a/oppskrifter/saus_til_r\303\270dt_kj\303\270tt.mdwn" "b/content/oppskrifter/saus_til_r\303\270dt_kj\303\270tt.md" similarity index 85% rename from "oppskrifter/saus_til_r\303\270dt_kj\303\270tt.mdwn" rename to "content/oppskrifter/saus_til_r\303\270dt_kj\303\270tt.md" index 46005df..91703b0 100644 --- "a/oppskrifter/saus_til_r\303\270dt_kj\303\270tt.mdwn" +++ "b/content/oppskrifter/saus_til_r\303\270dt_kj\303\270tt.md" @@ -1,4 +1,7 @@ -Saus til rødt kjøtt ++++ +title = "Saus til rødt kjøtt" +date = 2011-11-20T00:00:00+00:00 ++++ Basert på [artikkel fra rema](http://www.rema.no/kampanje/lam/Oppskrifter/Tilbeh_r/article52383.ece). diff --git a/oppskrifter/sjokoladekake.mdwn b/content/oppskrifter/sjokoladekake.md similarity index 92% rename from oppskrifter/sjokoladekake.mdwn rename to content/oppskrifter/sjokoladekake.md index 9de8fd0..010fe90 100644 --- a/oppskrifter/sjokoladekake.mdwn +++ b/content/oppskrifter/sjokoladekake.md @@ -1,4 +1,7 @@ -Sjokoladekake ++++ +title = "Sjokoladekake" +date = 2012-06-07T00:00:00+00:00 ++++ fra Bestemor Ducks kokebok, via [Kaja og Marius](http://dk.evang.no/oppskrifter/enopp.php3?opp=Hattemakerens+store+sjokoladekake+(remix\)) diff --git "a/oppskrifter/solb\303\246r_2012.mdwn" "b/content/oppskrifter/solb\303\246r_2012.md" similarity index 61% rename from "oppskrifter/solb\303\246r_2012.mdwn" rename to "content/oppskrifter/solb\303\246r_2012.md" index 27f9c03..d1b9455 100644 --- "a/oppskrifter/solb\303\246r_2012.mdwn" +++ "b/content/oppskrifter/solb\303\246r_2012.md" @@ -1,3 +1,7 @@ ++++ +title = "Solbærsyltetøy 2012" +date = 2012-09-11T00:00:00+00:00 ++++ * 2,5 kg solbær * 1,5 kg sukker diff --git "a/oppskrifter/stikkelsb\303\246r_2012.mdwn" "b/content/oppskrifter/stikkelsb\303\246r_2012.md" similarity index 67% rename from "oppskrifter/stikkelsb\303\246r_2012.mdwn" rename to "content/oppskrifter/stikkelsb\303\246r_2012.md" index 3743dcd..74300e6 100644 --- "a/oppskrifter/stikkelsb\303\246r_2012.mdwn" +++ "b/content/oppskrifter/stikkelsb\303\246r_2012.md" @@ -1,3 +1,8 @@ ++++ +title = "Stikkelsbærsyltetøy 2012" +date = 2012-09-11T00:00:00+00:00 ++++ + * 4,5kg stikkelsbær * 3,5 kg brunt sukker * 1kg rosiner diff --git "a/oppskrifter/stikkelsb\303\246rchutney_2011.mdwn" "b/content/oppskrifter/stikkelsb\303\246rchutney_2011.md" similarity index 82% rename from "oppskrifter/stikkelsb\303\246rchutney_2011.mdwn" rename to "content/oppskrifter/stikkelsb\303\246rchutney_2011.md" index 81dd288..6e370eb 100644 --- "a/oppskrifter/stikkelsb\303\246rchutney_2011.mdwn" +++ "b/content/oppskrifter/stikkelsb\303\246rchutney_2011.md" @@ -1,3 +1,8 @@ ++++ +title = "Stikkelsbærchutney 2011" +date = 2011-08-08T00:00:00+00:00 ++++ + Basert på [forumposting](http://boards.fool.co.uk/hi-ness-i-seem-to-recall-a-recipe-for-gooseberry-9435737.aspx) * ca 1 kg stikkelsbær diff --git "a/oppskrifter/stikkelsb\303\246rsyltet\303\270y_2011.mdwn" "b/content/oppskrifter/stikkelsb\303\246rsyltet\303\270y_2011.md" similarity index 54% rename from "oppskrifter/stikkelsb\303\246rsyltet\303\270y_2011.mdwn" rename to "content/oppskrifter/stikkelsb\303\246rsyltet\303\270y_2011.md" index 5240563..11b5d83 100644 --- "a/oppskrifter/stikkelsb\303\246rsyltet\303\270y_2011.mdwn" +++ "b/content/oppskrifter/stikkelsb\303\246rsyltet\303\270y_2011.md" @@ -1,3 +1,8 @@ ++++ +title = "Stikkelsbærsyltetøy 2011" +date = 2011-08-08T00:00:00+00:00 ++++ + Se [mat.espen.me](http://mat.espen.me/?cat=25) Brukte 40g pektin på 2 kg røde stikkelsbær diff --git a/pakkeliste.mdwn b/content/pakkeliste.mdwn similarity index 100% rename from pakkeliste.mdwn rename to content/pakkeliste.mdwn diff --git a/planet/beer/grove.mdwn b/content/planet/beer/grove.mdwn similarity index 100% rename from planet/beer/grove.mdwn rename to content/planet/beer/grove.mdwn diff --git a/tfheen/Beer.mdwn b/content/tfheen/Beer.mdwn similarity index 100% rename from tfheen/Beer.mdwn rename to content/tfheen/Beer.mdwn diff --git a/tfheen/TODO.mdwn b/content/tfheen/TODO.mdwn similarity index 100% rename from tfheen/TODO.mdwn rename to content/tfheen/TODO.mdwn diff --git "a/tollef/kj\303\270peliste.mdwn" "b/content/tollef/kj\303\270peliste.mdwn" similarity index 100% rename from "tollef/kj\303\270peliste.mdwn" rename to "content/tollef/kj\303\270peliste.mdwn" diff --git a/tollef/nettjenester.mdwn b/content/tollef/nettjenester.mdwn similarity index 100% rename from tollef/nettjenester.mdwn rename to content/tollef/nettjenester.mdwn diff --git a/tollef/webting.mdwn b/content/tollef/webting.mdwn similarity index 100% rename from tollef/webting.mdwn rename to content/tollef/webting.mdwn diff --git a/wirelesstrigger/index.mdwn b/content/wirelesstrigger/index.mdwn similarity index 100% rename from wirelesstrigger/index.mdwn rename to content/wirelesstrigger/index.mdwn diff --git a/oppskrifter/index.mdwn b/oppskrifter/index.mdwn deleted file mode 100644 index 8d3c027..0000000 --- a/oppskrifter/index.mdwn +++ /dev/null @@ -1,16 +0,0 @@ - * [[Solbærsyltetøy 2012|solbær_2012]] - * [[Stikkelsbærchutney 2012|stikkelsbær_2012]] - * [[Rabarbra- og stikkelsbærchutney sommer 2012|rabrabra-og-stikkelsbærchutney_2012]] - * [[Rabarbrachutney vår 2011|rabrabrachutney_2011]] - * [[Stikkelsbærchutney sommer 2011|stikkelsbærchutney_2011]] - * [[Stikkelsbærsyltetøy sommer 2011|stikkelsbærsyltetøy_2011]] - * [[Grovt brød med yoghurt|grovt_brød_med_yoghurt]] - * [[Saus til rødt kjøtt|saus_til_rødt_kjøtt]] - * [[Laks og pasta|laks_og_pasta]] - * [[Sjokoladekake|sjokoladekake]] - * [[Kanelboller|kanelboller]] - -Lenker - - * [Salted caramel apple crumble](http://www.telegraph.co.uk/foodanddrink/recipes/10449883/Salted-caramel-applecrumble-recipe.html) - * [Classic apple crumble](http://www.telegraph.co.uk/food-and-drink/recipes/classic-apple-crumble-with-groud-almond-and-oat-topping/) diff --git a/style.css b/sass/style.css similarity index 100% rename from style.css rename to sass/style.css diff --git a/templates/section.html b/templates/section.html new file mode 100644 index 0000000..d633544 --- /dev/null +++ b/templates/section.html @@ -0,0 +1,81 @@ + + + + + + + + + + + {% block title %}{{ config.title }}{% endblock title %} + + + + + + + + {% if config.generate_rss %} + + {% endif %} + + {% block extra_head %} + {% endblock extra_head %} + + + + {% block sidebar %} +
+
+
+ {% block sidebar_about %} +

{{ config.title }}

 + {% if config.description %} +

{{config.description}}

+ {% endif %} + {% endblock sidebar_about %} +
+ +
    + {% block sidebar_nav %} + {% for link in config.extra.hyde_links %} +
  • {{link.name}}
    • + {% endfor %} + {% endblock sidebar_nav %} +
+
+
+ {% endblock sidebar %} + +
+ {% block content %} +
+

{{ section.title }}

+ {{ section.content | safe}} + + {% if section.extra.links %} +

Lenker

+
    + {% for link in section.extra.links %} +
  • {{link.name}}
    • + {% endfor %} +
+ {% endif %} +
+ {% endblock content %} +
+ + + + + +