From d5e6fefb6fad0048c80ac1a5c7cd8abb96e79c77 Mon Sep 17 00:00:00 2001 From: infl00p Date: Wed, 26 Jun 2024 15:26:13 +0300 Subject: [PATCH] =?UTF-8?q?=CE=B1=CE=BB=CE=BB=CE=B1=CE=B3=CE=AD=CF=82=20?= =?UTF-8?q?=CF=83=CF=84=CE=B1=20events?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.toml | 4 +- ...η-σχεδίαση-και-εκτύπωση-3oek-peiraia-hellug-gfoss-uni-w-a-2024-06-26.md | 8 ++-- static/admin/config.yml | 13 ++++--- .../layouts/_default/events.html | 37 ++++++++++++------- ...event.html => draseis.event.html.disabled} | 0 themes/hellug-bootstrap/layouts/index.html | 2 +- .../layouts/partials/column2.html | 14 ++++--- 7 files changed, 48 insertions(+), 30 deletions(-) rename themes/hellug-bootstrap/layouts/draseis/{draseis.event.html => draseis.event.html.disabled} (100%) diff --git a/config.toml b/config.toml index 1494afb..310b4ef 100644 --- a/config.toml +++ b/config.toml @@ -1,5 +1,7 @@ baseURL = "https://www.hellug.gr/" -languageCode = "en-us" +languageCode = "el-GR" +defaultContentLanguage = "el" +timeZone = "Europe/Athens" title = "HELLUG" theme = "hellug-bootstrap" disableHugoGeneratorInject = true diff --git a/content/posts/events/θερινο-σχολειο-με-θέμα-τρισδιάστατη-σχεδίαση-και-εκτύπωση-3oek-peiraia-hellug-gfoss-uni-w-a-2024-06-26.md b/content/posts/events/θερινο-σχολειο-με-θέμα-τρισδιάστατη-σχεδίαση-και-εκτύπωση-3oek-peiraia-hellug-gfoss-uni-w-a-2024-06-26.md index 9e9af27..bbe7a2d 100644 --- a/content/posts/events/θερινο-σχολειο-με-θέμα-τρισδιάστατη-σχεδίαση-και-εκτύπωση-3oek-peiraia-hellug-gfoss-uni-w-a-2024-06-26.md +++ b/content/posts/events/θερινο-σχολειο-με-θέμα-τρισδιάστατη-σχεδίαση-και-εκτύπωση-3oek-peiraia-hellug-gfoss-uni-w-a-2024-06-26.md @@ -1,10 +1,12 @@ --- title: "ΘΕΡΙΝΟ ΣΧΟΛΕΙΟ με θέμα: Τρισδιάστατη Σχεδίαση και Εκτύπωση (3oEK Peiraia-Hellug-GFOSS-UNI.W.A.)" -layout: news +layout: events bannertemplate: hellug-banner.html -date: 2024-06-26T10:06:58.086Z -eventdate: 2024-06-25T15:00:00.779Z +date: "2024-06-26T10:09:58.086" +eventdate: "2024-06-25T18:00:00.000" +eventend: "2024-07-05T21:00:00.000" +eventlocation: "Μάρκου Μπότσαρη 124, Δραπετσώνα" category_title: Δράσεις draseis: - news diff --git a/static/admin/config.yml b/static/admin/config.yml index 3958304..ea96cc2 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -22,7 +22,7 @@ collections: - {label: "Title", name: "title", widget: "string"} - {label: "Layout", name: "layout", widget: "hidden", default: "news"} - {label: "Banner template", name: "bannertemplate", widget: "hidden", default: "hellug-banner.html"} - - {label: "Ημερομηνία Δημοσίευσης", name: "date", widget: "datetime"} + - {label: "Ημερομηνία Δημοσίευσης", name: "date", widget: "datetime", picker_utc: "false"} - {label: "Τίτλος κατηγορίας", name: "category_title", widget: "string", default: "Δράσεις"} - {label: "Ετικέτες", name: "tags", widget: "list", min: 1, default: ["Νέα"]} - {label: "Περίληψη", name: "summary", required: false, widget: "string"} @@ -38,8 +38,8 @@ collections: - {label: "Title", name: "title", widget: "string"} - {label: "Layout", name: "layout", widget: "hidden", default: "meetups"} - {label: "Banner template", name: "bannertemplate", widget: "hidden", default: "hellug-banner.html"} - - {label: "Ημερομηνία Δημοσίευσης", name: "date", widget: "datetime"} - - {label: "Ημερομηνία Συνάντησης", name: "meetupdate", widget: "datetime"} + - {label: "Ημερομηνία Δημοσίευσης", name: "date", widget: "datetime"}, picker_utc: "false" + - {label: "Ημερομηνία Συνάντησης", name: "meetupdate", widget: "datetime", picker_utc: "false"} - {label: "Τοποθεσία", name: "meetuplocation", widget: "string"} - {label: "Τίτλος κατηγορίας", name: "category_title", widget: "string", default: "Δράσεις"} - {label: "Ετικέτες κατηγορίας", name: "draseis", widget: "list", allow_add: false, default: [meetups]} @@ -55,10 +55,11 @@ collections: slug: "{{slug}}-{{year}}-{{month}}-{{day}}" # Filename template, e.g., YYYY-MM-DD-title.md fields: # The fields for each document, usually in front matter - {label: "Title", name: "title", widget: "string"} - - {label: "Layout", name: "layout", widget: "hidden", default: "news"} + - {label: "Layout", name: "layout", widget: "hidden", default: "events"} - {label: "Banner template", name: "bannertemplate", widget: "hidden", default: "hellug-banner.html"} - - {label: "Ημερομηνία Δημοσίευσης", name: "date", widget: "datetime"} - - {label: "Ημερομηνία εκδήλωσης", name: "eventdate", widget: "datetime"} + - {label: "Ημερομηνία Δημοσίευσης", name: "date", widget: "datetime", picker_utc: "false"} + - {label: "Ημερομηνία εκδήλωσης", name: "eventdate", widget: "datetime", picker_utc: "false"} + - {label: "Ημερομηνία λήξης εκδήλωσης", name: "eventend", required: "false", widget: "datetime", picker_utc: "false"} - {label: "Τίτλος κατηγορίας", name: "category_title", widget: "string", default: "Δράσεις"} - {label: "Ετικέτες κατηγορίας", name: "draseis", widget: "list", allow_add: false, default: [news,event]} - {label: "Ετικέτες", name: "tags", widget: "list", allow_add: false, default: ["Εκδηλώσεις","Νέα"]} diff --git a/themes/hellug-bootstrap/layouts/_default/events.html b/themes/hellug-bootstrap/layouts/_default/events.html index 198b2f1..3356b38 100644 --- a/themes/hellug-bootstrap/layouts/_default/events.html +++ b/themes/hellug-bootstrap/layouts/_default/events.html @@ -3,39 +3,50 @@ {{ partial "header.html" . }} -
-
-{{ partial .Params.bannertemplate . }} +
+ {{ if .Params.bannertemplate }} + {{ partial .Params.bannertemplate . }} + {{else}} + {{ partial "hellug-banner.html" . }} + {{end}}
-
- {{ partial "breadcrump.html"}} +{{ partial "breadcrump.html"}} -

{{ .Title }}

+
+
+
+
+

{{ .Title }}

{{ dateFormat "02/01/2006" .Date }}
    {{ if .Params.eventdate }} -
  • 📅 {{ dateFormat "Monday" .Params.eventdate }}
    • +
  • 📅 {{ .Params.eventdate | time.Format ":date_full" }} + {{ if .Params.eventend }} + - {{ .Params.eventend | time.Format ":date_full" }} + {{ end }}
    • {{ end }} {{ if .Params.eventdate }} -
  • ⏰ {{ dateFormat "15:04" .Params.eventdate }}
    • +
  • ⏰ {{ .Params.eventdate | time.Format ":time_short" }} + {{ if .Params.eventend }} + - {{ .Params.eventend | time.Format ":time_short" }} + {{ end }}
    • {{ end }} {{ if .Params.eventlocation }}
  • 🏛 {{ .Params.eventlocation }}
    • {{ end }}
-
+ {{.Content | safeHTML }} - - {{.Content}} - -
+
{{ partial "column2.html" . }}
+
+ {{ partial "footer.html" . }} diff --git a/themes/hellug-bootstrap/layouts/draseis/draseis.event.html b/themes/hellug-bootstrap/layouts/draseis/draseis.event.html.disabled similarity index 100% rename from themes/hellug-bootstrap/layouts/draseis/draseis.event.html rename to themes/hellug-bootstrap/layouts/draseis/draseis.event.html.disabled diff --git a/themes/hellug-bootstrap/layouts/index.html b/themes/hellug-bootstrap/layouts/index.html index 21d61e4..05ad972 100644 --- a/themes/hellug-bootstrap/layouts/index.html +++ b/themes/hellug-bootstrap/layouts/index.html @@ -52,7 +52,7 @@

{{- .Summary | plainify | safeHTML }}

- Περισσότερα... + Περισσότερα...
{{- end}} diff --git a/themes/hellug-bootstrap/layouts/partials/column2.html b/themes/hellug-bootstrap/layouts/partials/column2.html index 2c3fdbd..9a9b421 100644 --- a/themes/hellug-bootstrap/layouts/partials/column2.html +++ b/themes/hellug-bootstrap/layouts/partials/column2.html @@ -27,16 +27,18 @@ {{- range first 5 (index .Site.Taxonomies.draseis "event") }} {{- if .Params.eventdate }} {{- $eventtime := time .Params.eventdate }} - {{- if ge $eventtime.Unix now.Unix }} + {{- if .Params.eventend }} + {{- $eventtime = time .Params.eventend }} + {{- end }} + {{- if ge $eventtime.Unix (sub now.Unix 86400) }} {{- $counter = add $counter 1 }} - {{- if lt .Date.Unix $newlimit }} - Nέο - {{- end }} - {{- dateFormat "02/01/2006" $eventtime }} - {{ .Title }} + {{- .Params.eventdate | time.Format ":date_short" }} + {{- if .Params.eventend }}-{{- .Params.eventend | time.Format ":date_short" }} + {{- end}} # {{ .Title }} {{- end }} - {{- end }} + {{- end }} {{- end }} {{- if eq $counter 0 }} Δεν υπάρχουν