From 211039dbd41080b9870da043b639fdb8410d4993 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 24 May 2020 09:06:41 +0200 Subject: [PATCH] WIP --- content/_index.md | 24 +++---- ...{handlelistehus.mdwn => handlelistehus.md} | 5 +- content/{huskostnad.mdwn => huskostnad.md} | 5 +- content/{innflytting.mdwn => innflytting.md} | 5 +- .../{julegaveliste.mdwn => julegaveliste.md} | 5 ++ content/{kravspechus.mdwn => kravspechus.md} | 5 +- content/{pakkeliste.mdwn => pakkeliste.md} | 7 +- "content/tollef/kj\303\270peliste.mdwn" | 15 ---- .../{nettjenester.mdwn => nettjenester.md} | 5 +- content/tollef/webting.mdwn | 12 ---- templates/index.html | 72 +++++++++++++++++++ 11 files changed, 111 insertions(+), 49 deletions(-) rename content/{handlelistehus.mdwn => handlelistehus.md} (51%) rename content/{huskostnad.mdwn => huskostnad.md} (80%) rename content/{innflytting.mdwn => innflytting.md} (93%) rename content/{julegaveliste.mdwn => julegaveliste.md} (55%) rename content/{kravspechus.mdwn => kravspechus.md} (93%) rename content/{pakkeliste.mdwn => pakkeliste.md} (92%) delete mode 100644 "content/tollef/kj\303\270peliste.mdwn" rename content/tollef/{nettjenester.mdwn => nettjenester.md} (62%) delete mode 100644 content/tollef/webting.mdwn create mode 100644 templates/index.html diff --git a/content/_index.md b/content/_index.md index 8f96ae1..b5ac10a 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,5 +1,5 @@ +++ -template = "section.html" +template = "index.html" title = "Hovedside" page_title = "wiki" description = "" @@ -12,24 +12,16 @@ description = "" ## Prosjekter * [Oppskrifter](@/oppskrifter/_index.md) -* [[HDR|HDR/index]] -* [[Wireless_trigger|WirelessTrigger/index]] - -## Planeter - -* [[Planet/Beer]] ## Lister av ymse slag -* [[Pakkeliste]] -* [[Tollef/Kjøpeliste]] -* [[Tollef/Webting]] -* [[Tollef/Nettjenester]] -* [[KravSpecHus]] -* [[HusKostnad]] -* [[Innflytting]] -* [[HandlelisteHus]] -* [[JulegaveListe]] +* [Pakkeliste](@/pakkeliste.md) +* [Tollef/Nettjenester](@/tollef/nettjenester.md) +* [KravSpecHus](@/kravspechus.md) +* [HusKostnad](@/huskostnad.md) +* [Innflytting](@/innflytting.md) +* [HandlelisteHus](@/handlelistehus.md) +* [JulegaveListe](@/julegaveliste.md) ## Hus diff --git a/content/handlelistehus.mdwn b/content/handlelistehus.md similarity index 51% rename from content/handlelistehus.mdwn rename to content/handlelistehus.md index 698c853..c06eb6c 100644 --- a/content/handlelistehus.mdwn +++ b/content/handlelistehus.md @@ -1,4 +1,7 @@ -# Handleliste hus ++++ +title = "Handleliste hus" +date = 1970-01-01T00:00:00+00:00 ++++ Uprioritert rekkefølge. diff --git a/content/huskostnad.mdwn b/content/huskostnad.md similarity index 80% rename from content/huskostnad.mdwn rename to content/huskostnad.md index 8c681e8..92b71ab 100644 --- a/content/huskostnad.mdwn +++ b/content/huskostnad.md @@ -1,4 +1,7 @@ -# Så mye koster det å ha et hus ++++ +title = "Så mye koster det å ha et hus" +date = 1970-01-01T00:00:00+00:00 ++++ ## Faste utgifter * Renholdsavgift diff --git a/content/innflytting.mdwn b/content/innflytting.md similarity index 93% rename from content/innflytting.mdwn rename to content/innflytting.md index 9c77a39..38dd4d5 100644 --- a/content/innflytting.mdwn +++ b/content/innflytting.md @@ -1,4 +1,7 @@ -# Innflytting ++++ +title = "Innflytting" +date = 1970-01-01T00:00:00+00:00 ++++ ## Rekkefølge diff --git a/content/julegaveliste.mdwn b/content/julegaveliste.md similarity index 55% rename from content/julegaveliste.mdwn rename to content/julegaveliste.md index d0dab88..4261b36 100644 --- a/content/julegaveliste.mdwn +++ b/content/julegaveliste.md @@ -1,3 +1,8 @@ ++++ +title = "Julegavemottagere" +date = 1970-01-01T00:00:00+00:00 ++++ + Mulige forslag til veldedige formål som kan få årets julegave: * Norsk Luftambulanse diff --git a/content/kravspechus.mdwn b/content/kravspechus.md similarity index 93% rename from content/kravspechus.mdwn rename to content/kravspechus.md index ecb51f1..c02e6ec 100644 --- a/content/kravspechus.mdwn +++ b/content/kravspechus.md @@ -1,4 +1,7 @@ -# Ønskeliste for ny kåk ++++ +title = "Ønskeliste for hus" +date = 1970-01-01T00:00:00+00:00 ++++ * Varmekabler som virker på badet og i dusjen (veggene) * Mulighet for 5.1-anlegg i stuen, og prosjektøroppheng/Hjemmekinomulighet (kjellerstue?) diff --git a/content/pakkeliste.mdwn b/content/pakkeliste.md similarity index 92% rename from content/pakkeliste.mdwn rename to content/pakkeliste.md index d87a487..9215d38 100644 --- a/content/pakkeliste.mdwn +++ b/content/pakkeliste.md @@ -1,4 +1,9 @@ -# Pakkeliste og gjøreliste for lange og korte turer ++++ +title = "Pakkeliste og gjøreliste for lange og korte turer" +date = 1970-01-01T00:00:00+00:00 ++++ + +# Primært er dette ymse jobbreiser til siviliserte strøk, men andre innslag er velkomne. diff --git "a/content/tollef/kj\303\270peliste.mdwn" "b/content/tollef/kj\303\270peliste.mdwn" deleted file mode 100644 index d28db08..0000000 --- "a/content/tollef/kj\303\270peliste.mdwn" +++ /dev/null @@ -1,15 +0,0 @@ -# Handleliste, Tollef - -## Fotoutstyr - -* [20mm f2.8](http://www.bhphotovideo.com/bnh/controller/home?O=Search&A=details&Q=&sku=82946&is=GREY) - -## Bryggeutstyr - -* Termometer -* Ekstra humlepose -* Matkvalitet slanger -* Øchselvekt - -## Ymse - diff --git a/content/tollef/nettjenester.mdwn b/content/tollef/nettjenester.md similarity index 62% rename from content/tollef/nettjenester.mdwn rename to content/tollef/nettjenester.md index a8aab4e..bac5ce8 100644 --- a/content/tollef/nettjenester.mdwn +++ b/content/tollef/nettjenester.md @@ -1,4 +1,7 @@ -# Tjenester vi trenger ++++ +title = "Tjenester vi trenger" +date = 1970-01-01T00:00:00+00:00 ++++ ## Internt eller eksternt diff --git a/content/tollef/webting.mdwn b/content/tollef/webting.mdwn deleted file mode 100644 index b6c6b76..0000000 --- a/content/tollef/webting.mdwn +++ /dev/null @@ -1,12 +0,0 @@ -# Ymse webting - - * [Hamburgerpresse][hamburger] - * [iphone toolchain](http://www.google.no/search?q=linux+toolchain+iphone) - * [systemtestrammeverk, crucible](http://crucible.sourceforge.net/docs/tutorial.php) - -# Strobist-stuff - - * [Strobist-stuff i Europa](http://lightingmods.blogspot.com/2007/11/strobist-gear-where-can-i-find-it-in_19.html) - * [Strobist-stuff i Europa](http://lightingmods.blogspot.com/2007/11/strobist-gear-where-can-i-find-it-in.html) - - [hamburger]: http://www.trend-in.no/cc/index.php?act=viewProd&productId=251 diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..eb94dba --- /dev/null +++ b/templates/index.html @@ -0,0 +1,72 @@ + + + + + + + + + + + {% 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 %} +
+ + + + + + -- 2.39.5