Simplify events news

README.md

@@ -23,53 +23,47 @@ You'd like to maintain the content of the website? Thank you!
 
 ### events page
 
-The events page, found in file `events.html`, is coded up and built from other content, like the contents of the `_events` and `_news` folders. If you want to change the content shown, you'll want to change the content in these two folders.
+The events page, found in file `events.html`, is coded up and built from other content, like the contents of the `_events` and `_announcements` folders. If you want to change the content shown, you'll want to change the content in these two folders.
 
-The events shown as upcoming can be found in the `_events` folder. We use Jekyll's support of `collections` for events and news. To ensure the file name is unique, the filename should be in the form `yyyy-mm-dd-title.md`. The rest of the information that can be customized to provide titles, images, and ticket links is in the "front matter," or the section at the top between the lines with three dashes `---`; these three dashes are required, and tell Jekyll to compile and process the page.
+The events shown as upcoming can be found in the `_events` folder. We use Jekyll's support of `collections` for events and announcements. To ensure the file name is unique, the filename should be in the form `yyyy-mm-dd-title.md`. The rest of the information that can be customized to provide titles, images, and ticket links is in the "front matter," or the section at the top between the lines with three dashes `---`; these three dashes are required, and tell Jekyll to compile and process the page.
 
-An preconfigured template of a markdown file can be found in `_templates/event-template.md`. 
+An preconfigured template of a markdown file can be found in `_templates/entry-template.md`. 
 
 ```
 ---                           (1)
-layout: event                 (2)
+layout: entry                 (2)
 title:                        (3)
 subtitle:                     (4)
 main_image:                   (5)
 description:                  (6)
-start_date:                   (17)
-end_date:                     (18)
-quote:                        (7)
-quote_author:                 (8)
-quote_author_role:            (9)
-images:                       (10)
-  - file:                     (11)
-    caption:                  (12)
+date:                         (14)
+end_date:                     (15)
+images:                       (7)
+  - file:                     (8)
+    caption:                  (9)
   - file: 
     caption: 
-link:                         (13)
-link_text:                    (14)
-tags: portfolio               (15)
+link:                         (10)
+link_text:                    (11)
+tags: portfolio               (12)
 ---                           (1)
-Add your content here.        (16)
+Add your content here.        (13)
 ```
 - (1) delineates the front matter, is required
 - (2) required configuration for the framework (Jekyll)
 - (3) shown in list view, and as title of event page
 - (4) shown in list view, and as subtitle of event page
 - (5) location of the main image, shown in list view, and on event page
 - (6) description of event shown in list view, text the describes the page for search engines
-- (7) event pages supports a quote as header
-- (8) you can attribute the quote to an author
-- (9) the quote author can also have a further descriptor
-- (10) all images you wish to show at the bottom of the page should be listed here
-- (11) the location of the image file. It's important that there are two spaces at the beginning of the line
-- (12) the text of the image caption
-- (13) a link for ticket sales, or registration, which will show as a button
-- (14) the text of the button, that clicks to the link
-- (15) tags are used for labeling if an event will be shown in the portfolio, with text `portfolio`. if it should not be shown in the portfolio, don't put a tag
-- (16) text content for the vent
-- (17) the start date of the event, in the format YYYY-MM-DD.
-- (18) the end date date of the event, in the format YYYY-MM-DD. If the event is only one day, use the same date for both start and end date.
+- (7) all images you wish to show at the bottom of the page should be listed here
+- (8) the location of the image file. It's important that there are two spaces at the beginning of the line
+- (9) the text of the image caption
+- (10) a link for ticket sales, or registration, which will show as a button
+- (11) the text of the button, that clicks to the link
+- (12) tags are used for labeling if an event will be shown in the portfolio, with text `portfolio`. if it should not be shown in the portfolio, don't put a tag
+- (13) text content for the vent
+- (14) the (start) date of the event, in the format YYYY-MM-DD.
+- (15) the end date date of the event, in the format YYYY-MM-DD. If the event is only one day, can omit, or use the same date for both date and end date.
 
 ### home page
 
@@ -197,18 +191,18 @@ The way tailwind works is that it only builds and includes the css that you are
 
 ### Design considerations
 
-The way the website has been developed is it has anticipated that the files that non-technical contributors will want to work with are in markdown, for relative ease of editing. These pages are individual event pages, individual news pages, individual member pages, the about page, and the home page. 
+The way the website has been developed is it has anticipated that the files that non-technical contributors will want to work with are in markdown, for relative ease of editing. These pages are individual event pages, individual announcements pages, individual member pages, the about page, and the home page. 
 
 Specifically:
-- events are in the `/events/_posts` folder. The means that events are Jekyll posts (which have a special function in Jekyll) with the category of `events`. Event pages use the `_layouts/event.html` layout. More about Jekyll posts: https://jekyllrb.com/docs/posts/
-- news items are in the `/news/_posts` folder. This means that news are Jekyll posts, with the category of `news`. The intention is to put any announcements, such as open calls and event reports, in `news`. News pages use the `_layouts/news.html` layout.
+- events are in the `_events` folder. `events` is a collection in Jekyll, defined in the `_config.yml` file. This means that all the data in the `_events` folder can be accessed via `site.events`. Each event has its own markdown file, which uses the `_layouts/entry.html` layout.
+- announcements items are in the `_announcements` folder. `announcements` is a collection in Jekyll, defined in the `_config.yml` file. This means that all the data in the `_announcements` folder can be accessed via `site.announcements`. Each announcement has its own markdown file, which uses the `_layouts/entry.html` layout.
 - member pages are in the `_members` folder. `members` is a collection in Jekyll, defined in the `_config.yml` file. This means that all the data in the `_members` folder can be accessed via `site.members`. Each member has their own markdown file, which uses the `_layouts/member.html` layout.
 - the about page is an example of a generic text only page, which uses the `_layouts/page.html` layout.
 - the home page is a custom page, but because there is a little bit of text in it, it is a layout, that can be called by the `index.md` file. That way, the text for the home page, and the titles, can be changed relatively easily.
 
 What's not in markdown are the events and people pages, which compile information in other files, and layouts, which are html templates that markdown files will use, named in the front matter with the key `layout`. These html files are mostly Liquid templating language, html, and tailwind css classes. 
 
-The events page has two sections, an upcoming events section, and an events portfolio. The upcoming events section is filtered by the `events` category (no `news` items will be considered), by date at build time (only future dates are considered), and then at load time, javascript (`/assets/js/future_events.js`) will further remove events that are in the past. The events portfolio section filters all posts (including the `news` category) on the tag `portfolio`. If a future event has been labeled with the tag `portfolio`, it will be shown in the events porfolio section.
+The events page has two sections, an upcoming events section, and an events portfolio. by date at build time (only future dates are considered), and then at load time, javascript (`/assets/js/future_events.js`) will further remove events that are in the past. The events portfolio section filters all posts (including the `announcements` category) on the tag `portfolio`. If a future event has been labeled with the tag `portfolio`, it will be shown in the events porfolio section.
 
 All the pages use the layout `default.html` - this layout includes the navigation bar and footer, and required js and css. The html for the navigation bar is at `_includes/navigation.html`, and the html for the footer is at `_includes/footer.html`.
 

_news/2023-09-23-processing-community-catalog-reading.md → _announcements/2023-09-23-processing-community-catalog-reading.md

@@ -1,11 +1,9 @@
 ---
-layout: event
+layout: entry
 title: Processing Community Catalog Reading
 subtitle: Hosted by Creative Code Berlin — with special guest Casey Reas
 description: A warm evening with Casey Reas and the Processing community in Berlin.
-start_date: 2023-09-23
-end_date: 2023-09-23
-event_title: Processing Community Catalog Reading
+date: 2023-09-23
 main_image: /assets/img/events/2023-09-23-processing-community-catalog-reading/an-introduction-by-casey-reas.webp
 images: 
   - file: /assets/img/events/2023-09-23-processing-community-catalog-reading/casey-reas-and-olivia-jack.webp
@@ -16,7 +14,6 @@ images:
     caption: Rachel Uwa
   - file: /assets/img/events/2023-09-23-processing-community-catalog-reading/processing-community-catalog.jpeg
     caption: Processing Community Catalog
-publish_date: 2023-09-23
 tags: portfolio
 ---
 It was an exciting in-person event at Prachtsaal Studio. We were thrilled

_news/2024-08-26-open-call.md → _announcements/2024-08-26-open-call.md

@@ -4,11 +4,10 @@ title: Open Call for New Tenant Artists
 subtitle: 
 description: We’re looking for someone to join us at Prachtsaal Studio, our beautiful open space in Neukölln (halfway between U-Leinestraße and U-Hermannstraße)!
 images: 
-  - file: /assets/img/news/unit1.webp
+  - file: /assets/img/announcements/unit1.webp
     caption: Half of Unit 1 available for rent
-  - file: /assets/img/news/unit3.webp
+  - file: /assets/img/announcements/unit3.webp
     caption: Unit 3 available for rent
-tags: call
 ---
 
 <video width="720" height="1280" controls>

_news/2024-12-06-the-art-market.md → _announcements/2024-12-06-the-art-market.md

@@ -1,13 +1,11 @@
 ---
-layout: event
+layout: entry
 title: The Art Market
 subtitle: by Artist Stop Being Poor
 main_image: /assets/img/events/2024-12-06-the-art-market/The-Art-Market-4-poster.webp
 description: Visit us between Friday and Sunday during for a unique opportunity to meet artists and buy unique presents for friends and family.
-publish_date: 2024-12-06
-start_date: 2024-12-06
+date: 2024-12-06
 end_date: 2024-12-08
-event_title: The Art Market
 images: 
   - file: /assets/img/events/2024-12-06-the-art-market/20231202_173014_Original-scaled.webp
   - file: /assets/img/events/2024-12-06-the-art-market/20231202_175128_Original-768x1024.webp

_config.yml

@@ -9,10 +9,10 @@ collections:
     sort_by: full_name
     output: true
   events:
-    sort_by: start_date
+    sort_by: date
     output: true
-  news:
-    sort_by: publish_date
+  announcements:
+    sort_by: date
     output: true
 
 future: true

_events/2021-06-18-prachtayama.md

@@ -1,11 +1,11 @@
 ---
-layout: event
+layout: entry
 title: Prachtayama
 subtitle: 48 Hours Neukölln
 main_image: /assets/img/events/2021-06-18-prachtayama/PRACHTSAAL STUDIO_PRACHTAYAMA.webp
 description: An group exhibition inspired by Pranayama
-start_date: 2021-06-18
-end_date: 2021-06-18
+date: 2021-06-18
+end_date: 2021-06-20
 images: 
   - file: /assets/img/events/2021-06-18-prachtayama/PRACHTSAAL STUDIO_LOATION.webp
     caption: Prachtsaal Studio

_events/2023-09-23-processing-community-catalog-reading.md

@@ -1,11 +1,10 @@
 ---
-layout: event
+layout: entry
 title: Processing Community Catalog Reading
 subtitle: Hosted by Creative Code Berlin - with special guest Casey Reas
 main_image: /assets/img/events/2023-09-23-processing-community-catalog-reading/eventbrite-casey-reas.jpeg
 description: We are thrilled to have Casey Reas as our special guest for a special reading of the 20th Anniversary Processing Community Catalog. 
-start_date: 2023-09-23
-end_date: 2023-09-23
+date: 2023-09-23
 link: https://www.eventbrite.com/e/processing-community-catalog-reading-hosted-by-creative-code-berlin-with-special-guest-casey-reas-tickets-715281284577
 link_text: Register
 tags: 

_events/2023-10-13-bestiario.md

@@ -1,14 +1,10 @@
 ---
-layout: event
+layout: entry
 title: bestiario
 subtitle: A solo exhibition by Seudo
 main_image: /assets/img/events/2023-10-13-bestiario/bestiario.webp
 description: The first solo exhibition of Suedo in Berlin. An exploration of his unique creatures and pictorial elements.
-start_date: 2023-10-13
-end_date: 2023-10-13
-quote: bestiario carries itself the premise that we are the beasts that have come to devour everything, even ourselves
-quote_author: Stephan Van Kuyk
-quote_author_role: Curator
+date: 2023-10-13
 tags: exhibition portfolio 
 ---
 The first solo exhibition of Suedo in Berlin. An exploration of his unique creatures and pictorial elements.

_events/2024-06-28-the-neon-gods-they-made.md

@@ -1,10 +1,10 @@
 ---
-layout: event
+layout: entry
 title: The Neon Gods They Made
 subtitle: 48 Hours Neukölln
 main_image: /assets/img/events/2024-06-28-the-neon-gods-they-made/neon-gods-thumb.jpg
 description: 
-start_date: 2024-06-28
+date: 2024-06-28
 end_date: 2024-06-30
 images: 
   - file: /assets/img/events/2024-06-28-the-neon-gods-they-made/neon-gods-full.jpg

_events/2024-09-20-the-art-market.md

@@ -1,10 +1,10 @@
 ---
-layout: event
+layout: entry
 title: The Art Market
 subtitle: by Artist Stop Being Poor
 main_image: /assets/img/events/2024-09-20-the-art-market/The-Art-Market-3-posters-04-crop.webp
 description: 
-start_date: 2024-09-20
+date: 2024-09-20
 end_date: 2024-09-22
 images: 
   - file: /assets/img/events/2024-09-20-the-art-market/20231202_173014_Original-scaled.webp

_events/2025-02-16-tape-art-sessions-for-kids.md

@@ -1,5 +1,5 @@
 ---
-layout: event
+layout: entry
 title: Tape Art Sessions for Kids
 subtitle: Artist-run workshops
 description: "Let's create with tape! In this 3-hour workshop designed for kids
@@ -8,12 +8,13 @@ description: "Let's create with tape! In this 3-hour workshop designed for kids
   bold,  unique designs using vibrant adhesive tapes. In this workshop, one
   of  our seasoned tape artists will guide young creators through the basics  of
   tape art. "
-start_date: 2025-02-16
+date: 2025-02-16
 end_date: 2025-03-16
 main_image: /assets/img/events/2025-02-16-tape-art-sessions-for-kids/tape_art_sessions_for_kids_1.jpg
 images:
   - image: /assets/img/events/2025-02-16-tape-art-sessions-for-kids/tape_art_sessions_for_kids_2.jpg
     caption: Close up of various coloured tapes
+tags: news
 ---
 Let's create with tape! In this 3-hour workshop designed for kids aged 
 6–13 (accompanied by a guardian), kids will explore the exciting 
@@ -27,6 +28,16 @@ vibrant tapes to bring their own unique designs to life. From clean
 geometric lines to playful curves and bold patterns, we encourage 
 following the imagination and experimenting.
 
+Tape Art Sessions are artist-led, artist-run workshops. We bring
+the joy, novelty, and versatility of tape art to the hands of the people!
+Right here in Neukölln, you can learn how to create your very own tape art
+piece.  Tape art is an accessible art form – you can do it without any
+previous experience. We provide all the materials you’ll need at our monthly
+workshops for kids and adults!  Berlin is home to many of today’s preeminent
+tape artists. These workshops pay homage to that history and encourage folks
+of all backgrounds to give it a try! Let’s keep the artistic spirit of this
+city alive. 
+
 ## Dates
 
 Sunday February 16th at 10:00

_events/2025-02-16-tape-art-sessions.md

@@ -1,21 +1,21 @@
 ---
-layout: event
+layout: entry
 title: Tape Art Sessions
 subtitle: Artist-run workshops
-description: Discover  tape art in this 4-hour, hands-on workshop! One of our
+description: Discover tape art in this 4-hour, hands-on workshop! One of our
   seasoned tape  artists will share with you the secrets of this bold and
   fascinating  medium.
-start_date: 2025-02-16
+date: 2025-02-16
 end_date: 2025-03-16
 main_image: /assets/img/events/2025-02-16-tape-art-sessions/tape_art_sessions_1.jpg
 images:
   - image: /assets/img/events/2025-02-16-tape-art-sessions/tape_art_sessions_2.jpg
     caption: Close up of various coloured tapes
   - image: /assets/img/events/2025-02-16-tape-art-sessions/tape_art_sessions_3.jpg
     caption: Proud participants displaying their tape art creations
+tags: news
 ---
-Discover
- tape art in this 4-hour, hands-on workshop! One of our seasoned tape 
+Discover tape art in this 4-hour, hands-on workshop! One of our seasoned tape 
 artists will share with you the secrets of this bold and fascinating 
 medium.
 
@@ -41,7 +41,17 @@ an A3 board containing your tape artwork. If you’re ready to create more
  tape art at home, additional materials are available for purchase. 
 Whether you’re an experienced artist or just looking for a fresh way to 
 express yourself, this workshop will show you how you can use tape to 
-shape something extraordinary
+shape something extraordinary.
+
+Tape Art Sessions are artist-led, artist-run workshops. We bring
+the joy, novelty, and versatility of tape art to the hands of the people!
+Right here in Neukölln, you can learn how to create your very own tape art
+piece.  Tape art is an accessible art form – you can do it without any
+previous experience. We provide all the materials you’ll need at our monthly
+workshops for kids and adults!  Berlin is home to many of today’s preeminent
+tape artists. These workshops pay homage to that history and encourage folks
+of all backgrounds to give it a try! Let’s keep the artistic spirit of this
+city alive. 
 
 ## Dates
 

_layouts/call.html

@@ -52,12 +52,12 @@ <h2 class="text-sm my-2">{{ page.subtitle }}<br>{{ page.date | date: "%d %B %Y"
 
             <div class="grid grid-row md:grid-cols-2 justify-center gap-2">
                     <figure class="max-w-lg">
-                      <img class="h-auto max-w-full rounded-lg caesar-lightbox cursor-pointer" src={{ "/assets/img/news/foyer.webp" | relative_url }} alt="">
+                      <img class="h-auto max-w-full rounded-lg caesar-lightbox cursor-pointer" src={{ "/assets/img/announcements/foyer.webp" | relative_url }} alt="">
                       <figcaption class="mt-2 text-sm text-center text-gray-500 dark:text-gray-400">The entry of Prachtsaal</figcaption>
                     </figure>
 
                     <figure class="max-w-lg">
-                      <img class="h-auto max-w-full rounded-lg caesar-lightbox cursor-pointer" src={{ "/assets/img/news/garden.webp" | relative_url }} alt="">
+                      <img class="h-auto max-w-full rounded-lg caesar-lightbox cursor-pointer" src={{ "/assets/img/announcements/garden.webp" | relative_url }} alt="">
                       <figcaption class="mt-2 text-sm text-center text-gray-500 dark:text-gray-400">Our garden</figcaption>
                     </figure>
               </div>

_layouts/news.html → _layouts/entry.html

@@ -1,13 +1,19 @@
 ---
 layout: default
 ---
+{% if page.end_date and page.date != page.end_date %}
+{% capture date_string %}{{page.date | date: "%d.%m.%Y"}} - {{page.end_date | date: "%d.%m.%Y"}}{% endcapture %}
+{% else %}
+{% capture date_string %} {{page.date | date: "%d.%m.%Y"}}{% endcapture %}
+{% endif %}
+
 <div class="flex justify-center">
     <div class="flex-col mx-12 lg:max-w-6xl items-center">
 
         <header class="flex flex-col mt-28 mb-16 mx-28 text-center font-prachtsaal">
             <h1>{{ page.title }}</h1>
             {% if page.subtitle %}
-            <h2 class="text-sm my-2">{{ page.subtitle }}<br>{{ page.publish_date | date: "%d %B %Y" }}</h2>
+            <h2 class="text-sm my-2">{{ page.subtitle }}<br>{{ date_string }}</h2>
             {% endif %}
         </header>