diff --git a/themes/cosin-theme/static/css/custom.css b/assets/sass/custom.css similarity index 100% rename from themes/cosin-theme/static/css/custom.css rename to assets/sass/custom.css diff --git a/config.toml b/config.toml index f92205b..923e746 100644 --- a/config.toml +++ b/config.toml @@ -1,12 +1,15 @@ baseURL = "https://www.cosin.ch/" - +languageCode = "de-CH" title = "CoSin - Chaos Singularity" -theme = "cosin-theme" +disableHugoGeneratorInject = true +enableRobotsTXT = true DefaultContentLanguage = "de" DefaultContentLanguageInSubdir = true +disableKinds = ["taxonomy", "term"] + [Languages] [Languages.de] weight = 1 diff --git a/content/fahrplan.de.md b/content/fahrplan.de.md index 8b726d5..6613ea2 100644 --- a/content/fahrplan.de.md +++ b/content/fahrplan.de.md @@ -12,7 +12,7 @@ Die CoSin {{< cosin "date_year" >}} findet leider nicht statt! ## Ältere Fahrpläne -![Infoscreen](/images/fahrplan.jpg "Infoscreen am Cosin 2017") +![Infoscreen](/pictures/fahrplan.jpg "Infoscreen am Cosin 2017") * [Cosin 2019](https://fahrplan.cosin.ch/fahrplan/2019/index.html) * [Cosin 2018](https://fahrplan.cosin.ch/fahrplan/2018/index.html) diff --git a/content/fahrplan.en.md b/content/fahrplan.en.md index 2b77000..74c17f1 100644 --- a/content/fahrplan.en.md +++ b/content/fahrplan.en.md @@ -12,7 +12,7 @@ The CoSin {{< cosin "date_year" >}} is cancelled! ## Older schedules -![Infoscreen](/images/fahrplan.jpg "Infoscreen at Cosin 2017") +![Infoscreen](/pictures/fahrplan.jpg "Infoscreen at Cosin 2017") * [Cosin 2019](https://fahrplan.cosin.ch/fahrplan/2019/index.html) * [Cosin 2018](https://fahrplan.cosin.ch/fahrplan/2018/index.html) diff --git a/content/fahrplan.fr.md b/content/fahrplan.fr.md index 9884640..867768c 100644 --- a/content/fahrplan.fr.md +++ b/content/fahrplan.fr.md @@ -12,7 +12,7 @@ La CoSin {{< cosin "date_year" >}} est annulé! ## Anciens programmes -![Infoscreen](/images/fahrplan.jpg "Infoscreen am Cosin 2017") +![Infoscreen](/pictures/fahrplan.jpg "Infoscreen am Cosin 2017") * [Cosin 2019](https://fahrplan.cosin.ch/fahrplan/2019/index.html) * [Cosin 2018](https://fahrplan.cosin.ch/fahrplan/2018/index.html) diff --git a/content/fahrplan.it.md b/content/fahrplan.it.md index 08736b4..a2a4acd 100644 --- a/content/fahrplan.it.md +++ b/content/fahrplan.it.md @@ -12,7 +12,7 @@ La CoSin {{< cosin "date_year" >}} è annullato! ## Tabelle di marcia precedenti -![Infoscreen](/images/fahrplan.jpg "Infoscreen della Cosin 2017") +![Infoscreen](/pictures/fahrplan.jpg "Infoscreen della Cosin 2017") * [Cosin 2019](https://fahrplan.cosin.ch/fahrplan/2019/index.html) * [Cosin 2018](https://fahrplan.cosin.ch/fahrplan/2018/index.html) diff --git a/content/infos.de.md b/content/infos.de.md index 67cb59f..e64233e 100644 --- a/content/infos.de.md +++ b/content/infos.de.md @@ -71,7 +71,7 @@ den Besitzern. Da der Veranstaltungsort nur über begrenzte Stromversorgung verfügt ist es besser, den Supercomputer zu Hause zu lassen und statt dessen mit einem Notebook anzureisen. -![Computer](/images/computer.jpg "Ältere Computer an CoSin 2006.") +![Computer](/pictures/computer.jpg "Ältere Computer an CoSin 2006.") ### Internet diff --git a/content/infos.en.md b/content/infos.en.md index 15e0b9b..d21c56f 100644 --- a/content/infos.en.md +++ b/content/infos.en.md @@ -71,7 +71,7 @@ for such material is taken by its owner. There is only limited electric supply, so please leave your supercomputer at home and bring your notebook. -![Computer](/images/computer.jpg "Older machines at CoSin 2006") +![Computer](/pictures/computer.jpg "Older machines at CoSin 2006") ### Using the internet diff --git a/content/infos.fr.md b/content/infos.fr.md index 5e5015f..4bd5c3a 100644 --- a/content/infos.fr.md +++ b/content/infos.fr.md @@ -52,7 +52,7 @@ propriétaire. Comme le lieu de la manifestation dispose d’une alimentation électrique limitée, il est préférable de laisser le Super-ordinateur à la maison et de venir avec un Notebook. -
![Computer](/images/computer.jpg "Ältere Computer an CoSin 2006.") +![Computer](/pictures/computer.jpg "Ältere Computer an CoSin 2006.") ### Internet diff --git a/content/infos.it.md b/content/infos.it.md index d7d1b83..3fd354a 100644 --- a/content/infos.it.md +++ b/content/infos.it.md @@ -50,7 +50,7 @@ può contribuire a rendere l'evento più piacevole. Non possiamo però assumerci responsabilità per il materiale che portate. L'edificio dispone di un allacciamento modesto alla rete elettrica, dunque sconsigliamo di lasciare super computer e simili a casa. -![Computer](/images/computer.jpg "Vecchi Computer alla CoSin 2006.") +![Computer](/pictures/computer.jpg "Vecchi Computer alla CoSin 2006.") ### Internet diff --git a/content/projekte.de.md b/content/projekte.de.md index b8d9094..a1acb7e 100644 --- a/content/projekte.de.md +++ b/content/projekte.de.md @@ -26,4 +26,4 @@ verteilen können. ## Flüssigstickstoffglace am CoSin -![IceCream](/images/icecream.jpg "Flüssigstickstoffglace am CoSin 2008") +![IceCream](/pictures/icecream.jpg "Flüssigstickstoffglace am CoSin 2008") diff --git a/content/projekte.en.md b/content/projekte.en.md index 0c9d3c2..a5f1c66 100644 --- a/content/projekte.en.md +++ b/content/projekte.en.md @@ -24,4 +24,4 @@ equitable. ## IceCream Workshop at CoSin -![IceCream](/images/icecream.jpg "IceCream Workshop at CoSin 2008") +![IceCream](/pictures/icecream.jpg "IceCream Workshop at CoSin 2008") diff --git a/content/projekte.fr.md b/content/projekte.fr.md index be1050f..d90b3d9 100644 --- a/content/projekte.fr.md +++ b/content/projekte.fr.md @@ -24,4 +24,4 @@ distribuer les ressources de manière équitable. ## Flüssigstickstoffglace am CoSin -![IceCream](/images/icecream.jpg "Flüssigstickstoffglace am CoSin 2008") +![IceCream](/pictures/icecream.jpg "Flüssigstickstoffglace am CoSin 2008") diff --git a/content/projekte.it.md b/content/projekte.it.md index 18e23cd..074589c 100644 --- a/content/projekte.it.md +++ b/content/projekte.it.md @@ -23,4 +23,4 @@ distribuire le nostre risorse. ## Flüssigstickstoffglace am CoSin -![IceCream](/images/icecream.jpg "Flüssigstickstoffglace am CoSin 2008") +![IceCream](/pictures/icecream.jpg "Flüssigstickstoffglace am CoSin 2008") diff --git a/themes/cosin-theme/layouts/_default/baseof.html b/layouts/_default/baseof.html similarity index 75% rename from themes/cosin-theme/layouts/_default/baseof.html rename to layouts/_default/baseof.html index 63b9307..19378d0 100644 --- a/themes/cosin-theme/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,18 +1,19 @@ + {{ .Site.Title }} | {{ .Page.Title }} - - {{ hugo.Generator }} - - + + {{ $options := dict "targetPath" "custom.css" "outputStyle" "compressed" }} + {{ $style := resources.Get "/sass/custom.css" | resources.ToCSS $options | resources.Fingerprint }} + - + diff --git a/themes/cosin-theme/layouts/_default/single.html b/layouts/_default/single.html similarity index 100% rename from themes/cosin-theme/layouts/_default/single.html rename to layouts/_default/single.html diff --git a/themes/cosin-theme/layouts/alias.html b/layouts/alias.html similarity index 88% rename from themes/cosin-theme/layouts/alias.html rename to layouts/alias.html index 78a7e0a..620a178 100644 --- a/themes/cosin-theme/layouts/alias.html +++ b/layouts/alias.html @@ -13,10 +13,10 @@ - + - + diff --git a/themes/cosin-theme/layouts/index.html b/layouts/index.html similarity index 100% rename from themes/cosin-theme/layouts/index.html rename to layouts/index.html diff --git a/themes/cosin-theme/layouts/partials/fahrplan.de.html b/layouts/partials/fahrplan.de.html similarity index 100% rename from themes/cosin-theme/layouts/partials/fahrplan.de.html rename to layouts/partials/fahrplan.de.html diff --git a/themes/cosin-theme/layouts/partials/fahrplan.en.html b/layouts/partials/fahrplan.en.html similarity index 100% rename from themes/cosin-theme/layouts/partials/fahrplan.en.html rename to layouts/partials/fahrplan.en.html diff --git a/themes/cosin-theme/layouts/partials/fahrplan.fr.html b/layouts/partials/fahrplan.fr.html similarity index 100% rename from themes/cosin-theme/layouts/partials/fahrplan.fr.html rename to layouts/partials/fahrplan.fr.html diff --git a/themes/cosin-theme/layouts/partials/fahrplan.it.html b/layouts/partials/fahrplan.it.html similarity index 100% rename from themes/cosin-theme/layouts/partials/fahrplan.it.html rename to layouts/partials/fahrplan.it.html diff --git a/themes/cosin-theme/layouts/partials/site-footer.html b/layouts/partials/site-footer.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-footer.html rename to layouts/partials/site-footer.html diff --git a/themes/cosin-theme/layouts/partials/site-header.html b/layouts/partials/site-header.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-header.html rename to layouts/partials/site-header.html diff --git a/themes/cosin-theme/layouts/partials/site-menu.html b/layouts/partials/site-menu.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-menu.html rename to layouts/partials/site-menu.html diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/layouts/partials/site-sidebar.de.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-sidebar.de.html rename to layouts/partials/site-sidebar.de.html diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/layouts/partials/site-sidebar.en.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-sidebar.en.html rename to layouts/partials/site-sidebar.en.html diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/layouts/partials/site-sidebar.fr.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-sidebar.fr.html rename to layouts/partials/site-sidebar.fr.html diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/layouts/partials/site-sidebar.it.html similarity index 100% rename from themes/cosin-theme/layouts/partials/site-sidebar.it.html rename to layouts/partials/site-sidebar.it.html diff --git a/layouts/shortcodes/gallery.html b/layouts/shortcodes/gallery.html index 8792ab2..a5dba89 100644 --- a/layouts/shortcodes/gallery.html +++ b/layouts/shortcodes/gallery.html @@ -1,7 +1,7 @@ {{ $year := string (.Get 0) }} -{{ $images := index .Site.Data.photos $year }} +{{ $photos := index .Site.Data.photos $year }} -{{ range $images }} +{{ range $photos }} CoSin {{ $year }} diff --git a/themes/cosin-theme/static/images/contentbg.png b/static/images/contentbg.png similarity index 100% rename from themes/cosin-theme/static/images/contentbg.png rename to static/images/contentbg.png diff --git a/themes/cosin-theme/static/images/header.png b/static/images/header.png similarity index 100% rename from themes/cosin-theme/static/images/header.png rename to static/images/header.png diff --git a/themes/cosin-theme/static/images/menubg.png b/static/images/menubg.png similarity index 100% rename from themes/cosin-theme/static/images/menubg.png rename to static/images/menubg.png diff --git a/themes/cosin-theme/static/images/cosin_icon_2018.png b/static/images/ogp/cosin_icon_2018.png similarity index 100% rename from themes/cosin-theme/static/images/cosin_icon_2018.png rename to static/images/ogp/cosin_icon_2018.png diff --git a/themes/cosin-theme/static/images/cosin_icon_2019.png b/static/images/ogp/cosin_icon_2019.png similarity index 100% rename from themes/cosin-theme/static/images/cosin_icon_2019.png rename to static/images/ogp/cosin_icon_2019.png diff --git a/static/images/ogp/cosin_icon_2020.png b/static/images/ogp/cosin_icon_2020.png new file mode 100644 index 0000000..028afd6 Binary files /dev/null and b/static/images/ogp/cosin_icon_2020.png differ diff --git a/static/images/ogp/cosin_icon_2021.png b/static/images/ogp/cosin_icon_2021.png new file mode 100644 index 0000000..028afd6 Binary files /dev/null and b/static/images/ogp/cosin_icon_2021.png differ diff --git a/themes/cosin-theme/static/images/sitebg.png b/static/images/sitebg.png similarity index 100% rename from themes/cosin-theme/static/images/sitebg.png rename to static/images/sitebg.png diff --git a/static/images/computer.jpg b/static/pictures/computer.jpg similarity index 100% rename from static/images/computer.jpg rename to static/pictures/computer.jpg diff --git a/static/images/electrolab.jpg b/static/pictures/electrolab.jpg similarity index 100% rename from static/images/electrolab.jpg rename to static/pictures/electrolab.jpg diff --git a/static/images/fahrplan.jpg b/static/pictures/fahrplan.jpg similarity index 100% rename from static/images/fahrplan.jpg rename to static/pictures/fahrplan.jpg diff --git a/static/images/icecream.jpg b/static/pictures/icecream.jpg similarity index 100% rename from static/images/icecream.jpg rename to static/pictures/icecream.jpg diff --git a/static/images/kuzeb.jpg b/static/pictures/kuzeb.jpg similarity index 100% rename from static/images/kuzeb.jpg rename to static/pictures/kuzeb.jpg diff --git a/themes/cosin-theme/layouts/_default/terms.html b/themes/cosin-theme/layouts/_default/terms.html deleted file mode 100644 index e69de29..0000000