From 29b3c1846b413987064c5c83726dd3e8119f4b5b Mon Sep 17 00:00:00 2001 From: octospacc Date: Tue, 27 Aug 2024 17:21:32 +0200 Subject: [PATCH] Lista sottosezioni in sezioni, fix bianco header --- Assets/Assets/Global.css.SelfBuild.js | 18 ------------ Scripts/Build.PC.sh | 23 ---------------- Scripts/Build.sh | 7 +++-- Scripts/Deploy.GitHub.sh | 9 ------ Scripts/Deploy.GitLab.sh | 19 ------------- Scripts/Translate/Main.py | 2 +- content/it/_index.md | 26 ++++++++++++++++-- content/it/miscellanea/Chi-Sono.md | 6 ++-- .../Raccolta-Videogiochi/_index.md | 10 +++---- hugo.toml | 5 ++++ i18n/fr.toml | 2 ++ layouts/shortcodes/assetsRoot.html | 2 +- {Assets => static}/BingSiteAuth.xml | 0 {Assets => static}/favicon.ico | Bin {Assets => static}/favicon.png | Bin .../google8de0365e64e01a17.html | 0 {Assets => static}/vuesweeper-core/LICENSE | 0 {Assets => static}/vuesweeper-core/app.js | 0 {Assets => static}/vuesweeper-core/index.html | 0 {Assets => static}/vuesweeper-core/style.css | 0 {Assets => static}/vuesweeper-core/vendor.js | 0 themes/ananke/assets/ananke/css/_styles.css | 9 ++++-- themes/ananke/i18n/fr.toml | 4 +-- themes/ananke/layouts/_default/list.html | 2 +- .../ananke/layouts/partials/site-header.html | 6 ++-- themes/hugo-notice/i18n/fr.yaml | 4 +++ 26 files changed, 60 insertions(+), 94 deletions(-) delete mode 100755 Scripts/Build.PC.sh delete mode 100755 Scripts/Deploy.GitHub.sh delete mode 100755 Scripts/Deploy.GitLab.sh create mode 100644 i18n/fr.toml rename {Assets => static}/BingSiteAuth.xml (100%) rename {Assets => static}/favicon.ico (100%) rename {Assets => static}/favicon.png (100%) rename {Assets => static}/google8de0365e64e01a17.html (100%) rename {Assets => static}/vuesweeper-core/LICENSE (100%) rename {Assets => static}/vuesweeper-core/app.js (100%) rename {Assets => static}/vuesweeper-core/index.html (100%) rename {Assets => static}/vuesweeper-core/style.css (100%) rename {Assets => static}/vuesweeper-core/vendor.js (100%) diff --git a/Assets/Assets/Global.css.SelfBuild.js b/Assets/Assets/Global.css.SelfBuild.js index c6f5a79..9ef3aa2 100644 --- a/Assets/Assets/Global.css.SelfBuild.js +++ b/Assets/Assets/Global.css.SelfBuild.js @@ -45,22 +45,4 @@ ${Where('li >', CssAllHeadings, '')} { .ListNoInMargin > * > li > p { margin-bottom: 0; } /* Strange
s are sometimes formed */ /*.ListNoInMargin > * > li > p > br:last-of-type { display: none; }*/ - -/* Animazioni per le desinenze */ -.BlinkA { - Animation: BlinkerA 0.25s Step-Start Infinite; -} -@Keyframes BlinkerA { - 0% {Position: Absolute; Visibility: Hidden;} - 50% {Position: Static; Visibility: Visible;} - 100% {Position: Absolute; Visibility: Hidden;} -} -.BlinkO { - Animation: BlinkerO 0.25s Step-Start Infinite; -} -@Keyframes BlinkerO { - 0% {Position: Static; Visibility: Visible;} - 50% {Position: Absolute; Visibility: Hidden;} - 100% {Position: Static; Visibility: Visible;} -} `); diff --git a/Scripts/Build.PC.sh b/Scripts/Build.PC.sh deleted file mode 100755 index c89fa09..0000000 --- a/Scripts/Build.PC.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -[ -e ./.env ] && . ./.env - -python3 ../staticoso/App/Source/Build.py \ - --SiteDomain="https://sitoctt.octt.eu.org" \ - --FolderRoots="{'*':'https://octtspacc.gitlab.io', 'Assets':'https://sitoctt-assets.octt.eu.org'}" \ - --DynamicParts="{'Foot':['Eruda.html']}" \ - --MinifyOutput="False" \ - --MinifyAssets="False" \ - --GemtextHeader="\ -# Spacc - -" \ - --MastodonURL="https://poliversity.it" \ - --MastodonToken="$MastodonToken;Debug=True" \ - --ActivityPubHoursLimit="0" \ - --GemtextOutput=False - #--DiffBuild="True" \ - #--GemtextOutput=True #\ - #--MastodonURL="https://botsin.space" \ - #--MastodonToken="$MastodonToken" - -sh ./Scripts/PostBuild.Common.sh diff --git a/Scripts/Build.sh b/Scripts/Build.sh index 759ba3e..459ddd8 100755 --- a/Scripts/Build.sh +++ b/Scripts/Build.sh @@ -5,9 +5,10 @@ cd "${swd}/.." mkdir -p ./build cd ./build cp -r \ - ../hugo.toml ../i18n \ - ../archetypes ../content \ - ../layouts ../themes \ + ../archetypes ../i18n \ + ../content ../static \ + ../layouts ../themes \ + ../hugo.toml \ ./ sh "${swd}/Translate/Get.sh" diff --git a/Scripts/Deploy.GitHub.sh b/Scripts/Deploy.GitHub.sh deleted file mode 100755 index 4045bc8..0000000 --- a/Scripts/Deploy.GitHub.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -python3.10 ./staticoso/App/Source/Build.py \ - --SiteDomain="https://sitoctt.octt.eu.org" \ - --FolderRoots="{'*':'https://octtspacc.gitlab.io', 'Assets':'http://http.sitoctt-assets.octt.eu.org/public'}" \ - --DynamicParts="{'Head':['Twemoji.html'], 'Footer':['StatCounter.html'], 'Other':['CountWindow.html']}" - -sh ./Scripts/PostBuild.Common.sh -sh ./Scripts/Prepare.NoStyle.sh diff --git a/Scripts/Deploy.GitLab.sh b/Scripts/Deploy.GitLab.sh deleted file mode 100755 index ad5db95..0000000 --- a/Scripts/Deploy.GitLab.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -python3 ./staticoso/App/Source/Build.py \ - --SiteDomain="https://sitoctt.octt.eu.org" \ - --FolderRoots="{'*':'https://octtspacc.gitlab.io', 'Assets':'https://sitoctt-assets.octt.eu.org'}" \ - --DynamicParts="{'Head':['Twemoji.html'], 'Footer':['StatCounter.html'], 'Other':['CountWindow.html']}" \ - --MastodonURL="https://poliversity.it" \ - --MastodonToken="$MastodonToken" \ - --ActivityPubHoursLimit=96 \ - --GemtextOutput=True \ - --GemtextHeader="\ -# sitoctt -Alcune informazioni importanti sono disponibili su: -=> /octt/index.gmi octocapsula/index - -" - -sh ./Scripts/PostBuild.Common.sh -sh ./Scripts/Prepare.NoStyle.sh diff --git a/Scripts/Translate/Main.py b/Scripts/Translate/Main.py index 511dffb..82c3f44 100755 --- a/Scripts/Translate/Main.py +++ b/Scripts/Translate/Main.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -DestinationLanguages = ["it", "en"] # "de", "eo", "es", "fr" +DestinationLanguages = ["it", "en"] # "fr", "de", "eo", "es" IncludePaths = ["/"] ExcludePaths = ["/Categories"] diff --git a/content/it/_index.md b/content/it/_index.md index 52e8959..fcb016b 100644 --- a/content/it/_index.md +++ b/content/it/_index.md @@ -5,9 +5,29 @@ description = "Octt sono io... e questo è letteralmente il mio sito (uwu)." Una volta qui era tutta campagn— ehm, volevo dire... era tutta una lista di parole ammassate alla male e peggio. Non solo non piaceva più nemmeno a me, ma non è proprio buona creanza nell'anno del Signore 2024 (e oltre), quindi... -Ora c'è questa lista di tutti i miei ultimissimi articoli, e pagine sfuse che ho aggiornato di recente, mentre la vecchia home è a ["Sul sitoctt"](/miscellanea/Sul-sitoctt/) finché non avrò riorganizzato tutto. Benvenuta/o nel ✨sitoctt✨! +-->/o nel ✨sitoctt✨! (Lavori in corso per ancora qualche giorno, quindi forse link rotti e pagine sformate, mi dispiace!!!) + + diff --git a/content/it/miscellanea/Chi-Sono.md b/content/it/miscellanea/Chi-Sono.md index b0f21b2..2c0d5c9 100644 --- a/content/it/miscellanea/Chi-Sono.md +++ b/content/it/miscellanea/Chi-Sono.md @@ -80,8 +80,6 @@ Qui sul sito, comunque, non ho ancora avuto le idee abbastanza chiare, né la pa --- -
-![Me su Animal Crossing Wild World.]({{ ASSETS_ROOT }}/Media/Animal-Crossing/ACWW-Me-2022-08-01.avif) -_Io? Cute. Assolutamente indiscutibile._ +![Me su Animal Crossing Wild World.]({{< assetsRoot >}}/Media/Animal-Crossing/ACWW-Me-2022-08-01.avif) +_Io? Cutie. Assolutamente indiscutibile._ _Voi? Meh, forse.. penso???_ -
diff --git a/content/it/miscellanea/Raccolta-Videogiochi/_index.md b/content/it/miscellanea/Raccolta-Videogiochi/_index.md index a953cf9..ad61c44 100644 --- a/content/it/miscellanea/Raccolta-Videogiochi/_index.md +++ b/content/it/miscellanea/Raccolta-Videogiochi/_index.md @@ -28,7 +28,7 @@ _In costruzione..._ Questo è il posto per i titoli migliori, **quelli epici e unici nel loro genere**, punto. E qui, non importa assolutamente che un dato gioco sia popolare o meno: conta solo quanto per me è importante. -### 🔢️ 2048 ↗️ +### 🔢️ 2048 ↗️ ### 🎩 A Hat in Time Platformer 3D vivace e frenetico, proveniente senza dubbio dalla scuola di Super Mario 64. La difficoltà della storia principale è giusta, e il gioco scorre piacevolmente con un alternarsi di temi e ambienti che sa sempre di fresco. @@ -39,11 +39,11 @@ Le premesse erano si creative, ma noiose: sei un essere umano che, per qualche m Animal Crossing è uno di quei giochi che va banalmente provato per essere capito: la permanenza in quel mondo riesce ad indurre calma ed allegria per motivi che, apparentemente, vanno al di là della logica. • Animal Crossing: New Horizons: Ottieni: {[:MdTgtBlankNofw:]} -### ⛏️ Minecraft ↗️ +### ⛏️ Minecraft ↗️ -### 💣 Minesweeper ↗️ +### 💣 Minesweeper ↗️ -### 🏃‍♀️ Mirror's Edge ↗️ +### 🏃‍♀️ Mirror's Edge ↗️ -### #️⃣️ Nonogram ↗️ +### #️⃣️ Nonogram ↗️ ### 🐙 Splatoon Sparatutto in terza persona che dire diverso dagli altri è poco. Splatoon rompe le aspettative di realismo di guerra del genere, e presenta un gameplay simpatico, fatto di colori accecanti, che non si ferma mai. Non ci sono umani a sparare proiettili con il ferro, ma calamari che spargono inchiostro. diff --git a/hugo.toml b/hugo.toml index b70ff8b..e9d815d 100644 --- a/hugo.toml +++ b/hugo.toml @@ -24,6 +24,11 @@ defaultContentLanguageInSubdir = true languageDirection = "ltr" languageName = "English" weight = 2 + #[languages.fr] + # contentDir = "content/fr" + # languageDirection = "ltr" + # languageName = "Français" + # weight = 3 [markup] [markup.goldmark] diff --git a/i18n/fr.toml b/i18n/fr.toml new file mode 100644 index 0000000..67ac5e3 --- /dev/null +++ b/i18n/fr.toml @@ -0,0 +1,2 @@ +[noticeAutomaticTranslation] +other = "Le contenu de cette page a été entièrement et automatiquement traduit en français, à partir de {{ .languageName }}. Il peut donc contenir toutes sortes d'erreurs." diff --git a/layouts/shortcodes/assetsRoot.html b/layouts/shortcodes/assetsRoot.html index 55d0572..be5f6c6 100644 --- a/layouts/shortcodes/assetsRoot.html +++ b/layouts/shortcodes/assetsRoot.html @@ -1 +1 @@ -{{ partial "assetsRoot.html" }} +{{- partial "assetsRoot.html" -}} diff --git a/Assets/BingSiteAuth.xml b/static/BingSiteAuth.xml similarity index 100% rename from Assets/BingSiteAuth.xml rename to static/BingSiteAuth.xml diff --git a/Assets/favicon.ico b/static/favicon.ico similarity index 100% rename from Assets/favicon.ico rename to static/favicon.ico diff --git a/Assets/favicon.png b/static/favicon.png similarity index 100% rename from Assets/favicon.png rename to static/favicon.png diff --git a/Assets/google8de0365e64e01a17.html b/static/google8de0365e64e01a17.html similarity index 100% rename from Assets/google8de0365e64e01a17.html rename to static/google8de0365e64e01a17.html diff --git a/Assets/vuesweeper-core/LICENSE b/static/vuesweeper-core/LICENSE similarity index 100% rename from Assets/vuesweeper-core/LICENSE rename to static/vuesweeper-core/LICENSE diff --git a/Assets/vuesweeper-core/app.js b/static/vuesweeper-core/app.js similarity index 100% rename from Assets/vuesweeper-core/app.js rename to static/vuesweeper-core/app.js diff --git a/Assets/vuesweeper-core/index.html b/static/vuesweeper-core/index.html similarity index 100% rename from Assets/vuesweeper-core/index.html rename to static/vuesweeper-core/index.html diff --git a/Assets/vuesweeper-core/style.css b/static/vuesweeper-core/style.css similarity index 100% rename from Assets/vuesweeper-core/style.css rename to static/vuesweeper-core/style.css diff --git a/Assets/vuesweeper-core/vendor.js b/static/vuesweeper-core/vendor.js similarity index 100% rename from Assets/vuesweeper-core/vendor.js rename to static/vuesweeper-core/vendor.js diff --git a/themes/ananke/assets/ananke/css/_styles.css b/themes/ananke/assets/ananke/css/_styles.css index 5f35193..61e2207 100644 --- a/themes/ananke/assets/ananke/css/_styles.css +++ b/themes/ananke/assets/ananke/css/_styles.css @@ -15,7 +15,12 @@ } -.nested-links a{ - overflow-wrap: break-word; +main > article a, +main > .div > section a, +.nested-links a { color: #990099; } + +.nested-links a { + overflow-wrap: break-word; +} diff --git a/themes/ananke/i18n/fr.toml b/themes/ananke/i18n/fr.toml index 3393844..c02a246 100644 --- a/themes/ananke/i18n/fr.toml +++ b/themes/ananke/i18n/fr.toml @@ -14,7 +14,7 @@ other = "lire plus" other = "Par" [whatsInThis] -other = "Ce qui est dans {{ .Type }}" +other = "Ce qu'il y a ici" [related] other = "Lié" @@ -46,4 +46,4 @@ one = "Un mot" other = "{{ .Count }} mots" [pageTitle] -other = "{{ .Name }} page" \ No newline at end of file +other = "{{ .Name }} page" diff --git a/themes/ananke/layouts/_default/list.html b/themes/ananke/layouts/_default/list.html index 961bc5c..86c753e 100644 --- a/themes/ananke/layouts/_default/list.html +++ b/themes/ananke/layouts/_default/list.html @@ -4,7 +4,7 @@ {{- .Content -}}
- {{ range .Paginator.Pages }} + {{ range (append .Sections .Paginator.Pages) }}
{{ .Render "summary" }}
diff --git a/themes/ananke/layouts/partials/site-header.html b/themes/ananke/layouts/partials/site-header.html index cd9e1ce..e278fbe 100644 --- a/themes/ananke/layouts/partials/site-header.html +++ b/themes/ananke/layouts/partials/site-header.html @@ -9,7 +9,7 @@ {{ .Title | default .Site.Title }} {{ with .Params.description }} -

+

{{ . }}

{{ end }} @@ -21,11 +21,11 @@
{{ partial "site-navigation.html" . }}
-

+

{{ .Title | default .Site.Title }}

{{ with .Params.description }} -

+

{{ . }}

{{ end }} diff --git a/themes/hugo-notice/i18n/fr.yaml b/themes/hugo-notice/i18n/fr.yaml index 4c5ed90..704f59a 100644 --- a/themes/hugo-notice/i18n/fr.yaml +++ b/themes/hugo-notice/i18n/fr.yaml @@ -1,5 +1,9 @@ +- id: caution + translation: "Prudence" - id: warning translation: "Avertissement" +- id: danger + translation: "Danger" - id: note translation: "Remarque" - id: info