From 4c580f2f7c1637ebb400b315c6e8c153ce77228e Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Thu, 8 Aug 2019 18:44:34 +0200 Subject: [PATCH 1/2] agenda --- ...leasefest-för-kloaksajterna-i-stockholm.md | 2 +- _includes/coming-events.html | 21 ++++++++++++ _includes/hero.html | 33 +++++++++++++++++-- _includes/past-events.html | 5 ++- events.html | 25 +++++--------- index.html | 3 ++ 6 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 _includes/coming-events.html diff --git a/_events/releasefest-för-kloaksajterna-i-stockholm.md b/_events/releasefest-för-kloaksajterna-i-stockholm.md index 43ee319..df1dba7 100644 --- a/_events/releasefest-för-kloaksajterna-i-stockholm.md +++ b/_events/releasefest-för-kloaksajterna-i-stockholm.md @@ -3,7 +3,7 @@ title: Releasefest för Kloaksajterna i Stockholm description: >- Kom och fira utgivningen av Kolbjörn Guwallius roman oss på momangen i Stockholm! -date: 2019-08-08 07:00:00 +0200 +date: 2019-08-08 10:00:00 +0200 event_data: start_datetime: 2019-08-30 19:00:00 +0200 end_datetime: 2019-08-30 22:00:00 +0200 diff --git a/_includes/coming-events.html b/_includes/coming-events.html new file mode 100644 index 0000000..e2968da --- /dev/null +++ b/_includes/coming-events.html @@ -0,0 +1,21 @@ +{% assign now = site.time %} +{% assign upcoming = site.events | sort: 'event_data.start_datetime' %} +{% for event in upcoming %} +{% if event.event_data.end_datetime >= now %} +
+

Komande

+ + +{% for event in upcoming %} +{% if event.event_data.end_datetime >= now %} +
+

{{ event.event_data.start_datetime | date: '%Y-%m-%d' }}
+ {{ event.title }} +

+
{% endif %} {% endfor %} +Mer Events +
+{% break %} + + +{% endif %} {% endfor %} \ No newline at end of file diff --git a/_includes/hero.html b/_includes/hero.html index d9cb4bd..3af4f01 100644 --- a/_includes/hero.html +++ b/_includes/hero.html @@ -7,18 +7,45 @@ {% if page.url == "/" %}
- {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %} {% for event in site.events %} {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} {% if now <= endtime %} + + +{% assign now = site.time %} +{% assign upcoming = site.events | sort: 'event_data.start_datetime' %} +{% for event in upcoming %} +{% if event.event_data.end_datetime >= now %} + +
På gång: Redigera Event

{{ event.title }}

- {% assign d = event.event_data.start_datetime | date: "%-d" %}{% case d %}{% when '1' or '21' or '31' or '2' or '22' %}{{ d }}:a {% else %}{{ d }}:e{% endcase %} {% assign m = event.event_data.start_datetime | date: "%-m" %} {% case m %} {% when '1' %}Januar {% when '2' %}Februari {% when '3' %}Mars {% when '4' %}April {% when '5' %}Maj {% when '6' %}Juni {% when '7' %}Juli {% when '8' %}Augusti {% when '9' %}September {% when '10' %}October {% when '11' %}November {% when '12' %}December {% endcase %} {{ event.event_data.start_datetime | date: "%Y" }} kl. {{ event.event_data.start_datetime | date: "%R"}}
+ {% assign d = event.event_data.start_datetime | date: "%-d" %} + {% case d %} + {% when '1' or '21' or '31' or '2' or '22' %}{{ d }}:a + {% else %}{{ d }}:e + {% endcase %} + + {% assign m = event.event_data.start_datetime | date: "%-m" %} + {% case m %} + {% when '1' %}Januar + {% when '2' %}Februari + {% when '3' %}Mars + {% when '4' %}April + {% when '5' %}Maj + {% when '6' %}Juni + {% when '7' %}Juli + {% when '8' %}Augusti + {% when '9' %}September {% when '10' %}October {% when '11' %}November {% when '12' %}December + {% endcase %} + {{ event.event_data.start_datetime | date: "%Y" }} + kl. {{ event.event_data.start_datetime | date: "%R"}} +
Typ av konst: {{ event.category }}
{{ event.description | truncatewords: 10 }}

Läs mer

- {% break %} {% endif %} {% endfor %} + {% break %} {% endif %} {% endfor %}
{% else %} diff --git a/_includes/past-events.html b/_includes/past-events.html index 327fad2..4ffc00e 100644 --- a/_includes/past-events.html +++ b/_includes/past-events.html @@ -1,5 +1,8 @@

Förflutna events

-{% capture now -%} {{ site.time | date: '%s' }} {%- endcapture %} {% assign events = site.events | reverse %} {% for event in events | limit: 8 %} {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} {% if now >= endtime %} +{% assign now = site.time %} +{% assign upcoming = site.events | sort: 'event_data.start_datetime' | reverse %} +{% for event in upcoming limit: 10 %} +{% if event.event_data.end_datetime <= now %}

{{ event.event_data.start_datetime | date: '%Y-%m-%d' }}
{{ event.title }} diff --git a/events.html b/events.html index b09765c..56adfdb 100644 --- a/events.html +++ b/events.html @@ -6,20 +6,14 @@ image: /uploads/stickerwall.jpg --- -{% for event in site.events %} - {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %} - {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} - {% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %} - {% if now <= endtime %} {% unless now <= postdate %}

Kommande event

- {% for event in site.events %} - {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %} - {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} - {% capture postdate -%} {{ event.date | date: '%s' }} {%- endcapture %} - {% if now <= endtime %} {% unless now <= postdate %} + {% assign now = site.time %} +{% assign upcoming = site.events | sort: 'event_data.start_datetime' %} +{% for event in upcoming %} +{% if event.event_data.end_datetime >= now %}
Redigera Event @@ -39,17 +33,16 @@ image: /uploads/stickerwall.jpg Typ av konst: {{ event.category }}

{{ event.description | truncatewords: 10 }}

Läs mer

-
{% endunless %}{% endif %} {% endfor %} +
{% endif %} {% endfor %}
-{% break %} -{% endunless %}{% endif %} {% endfor %}

Förflutna events

- {% capture now -%} {{ site.time | date: '%s' }} {%- endcapture %} {% assign events = site.events | reverse %} - {% for event in events %} {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} - {% if now >= endtime %} + {% assign now = site.time %} +{% assign upcoming = site.events | sort: 'event_data.start_datetime' | reverse %} +{% for event in upcoming %} +{% if event.event_data.end_datetime <= now %}
Redigera Event diff --git a/index.html b/index.html index cf4d537..08c8a67 100644 --- a/index.html +++ b/index.html @@ -20,6 +20,9 @@ layout: default
Om Momangen
+ + {% include coming-events.html %} +
{% include past-events.html %}
From 198e9605e47ded3adc761318db96dff6e18a489f Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Thu, 8 Aug 2019 18:47:36 +0200 Subject: [PATCH 2/2] typo --- _includes/coming-events.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_includes/coming-events.html b/_includes/coming-events.html index e2968da..5554575 100644 --- a/_includes/coming-events.html +++ b/_includes/coming-events.html @@ -3,9 +3,7 @@ {% for event in upcoming %} {% if event.event_data.end_datetime >= now %}
-

Komande

- - +

Kommande Events

{% for event in upcoming %} {% if event.event_data.end_datetime >= now %}
@@ -16,6 +14,4 @@ Mer Events
{% break %} - - {% endif %} {% endfor %} \ No newline at end of file