Merge pull request #709 from naher94/development

Multiple Date Photoset
naher94 · Mar 23, 2024 · 657174b · 657174b
2 parents a1939b1 + c3241f3
commit 657174b
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 31 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -147,8 +147,10 @@ thumbnail | thumbnail file name | `image` `.png` or `.jpg` when featured project
 thumbnail-alt | The `alt` text for the thumbnail image | `string` eg. `Burj Al Arab Atrium`
 hero-image | The image that loads into the hero section | `path` as a `string` eg. `dubai-expo/dubai-hero.jpg`; File should be an `.jpg` aspect ratio 2x1
 hero-image-alt | The `alt` text for the hero image | `string` eg. `Dubai Expo Center Dome`
-featured | Whether it renders in as featured (bigger tiles)  | `bool`
+featured | Whether it renders on `/`  | `bool`
+big-tile | Whether it renders as a big tile on `/photography` | `bool` eg. `true`
 date | `YYYY-MM-DD` | `date`
+display-date | Use in the case of multiple dates | `string` eg. `Winter 2012 & Spring 2022`
 
 
 #### `_resources` Frontmatter Tags

diff --git a/_config.yml b/_config.yml
@@ -13,7 +13,7 @@ description: > # this means to ignore newlines until "baseurl:"
 
 baseurl: "" # the subpath of your site, e.g. /blog
 url: "https://rehanbutt.com" # the base hostname & protocol for your site
-version: 8.3.0
+version: 8.4.0
 version-naming: [Apricot, Blackcurrent, Coconut, Dragonfruit, Elderberry, Fig, Guava, Honeydew]
 
 # Build settings

diff --git a/_layouts/post-photo.html b/_layouts/post-photo.html
@@ -31,19 +31,23 @@
 
       <header class="post-header post-header-hero">
         <p class="date-stamp">
-          {%- assign photo-month = photoset.date| date: "%m" | plus:0 -%}
-          {%- if photo-month >= 3 and photo-month < 6 -%}
-            Spring
-          {%- elsif photo-month >= 6 and photo-month < 9 -%}
-            Summer
-          {%- elsif photo-month >= 9 and photo-month < 12 -%}
-            Fall
-          {%- elsif photo-month >= 12 -%}
-            Winter
-          {%- elsif photo-month < 3 -%}
-            Winter
-          {%- endif -%}
-          &nbsp;{{ page.date| date: "%Y" }}
+          {% if page.display-date %}
+              {{page.display-date}}
+            {% else %}
+              {% assign photo-month = page.date| date: "%m" | plus:0 %}
+              {% if photo-month >= 3 and photo-month < 6 %}
+                Spring
+              {% elsif photo-month >= 6 and photo-month < 9 %}
+                Summer
+              {% elsif photo-month >= 9 and photo-month < 12 %}
+                Fall
+              {% elsif photo-month >= 12 %}
+                Winter
+              {% elsif photo-month < 3 %}
+                Winter
+              {% endif %}
+              {{ page.date| date: "%Y" }}
+            {% endif %}
         </p>
         <h1 itemprop="name headline">{{ page.title }}</h1>
         <p class="post-meta">{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>

diff --git a/_photography/dubai-expo.markdown b/_photography/dubai-expo.markdown
@@ -6,7 +6,7 @@ thumbnail-alt: Al Wasl Plaza Dome in daylight
 hero-image: "dubai-expo/dubai-hero.jpg"
 hero-image-alt: Al Wasl Plaza Dome in daylight
 featured: true
-big-tile: true
+big-tile:
 date: 15-03-2022
 hero-background-color: "#FFFFFF"
 hero-background-color-dark: "#161d27"

diff --git a/_photography/dubai.markdown b/_photography/dubai.markdown
@@ -6,8 +6,9 @@ thumbnail-alt: Lobby of Burj Al Arab
 hero-image: "dubai/hero.jpg"
 hero-image-alt: Lobby of Burj Al Arab
 featured:
-big-tile:
-date: 15-12-2012
+big-tile: true
+date: 15-03-2022
+display-date: Winter 2012 & Spring 2022
 hero-background-color: "#FFFFFF"
 hero-background-color-dark: "#161d27"
 hero-accent-color: "#1F2937"

diff --git a/img/.DS_Store b/img/.DS_Store
diff --git a/photography.html b/photography.html
@@ -19,19 +19,23 @@ <h1 class="visually-hidden">Photography</h1>
         <div class="text-container">
           <h2 class="thumbnail-text">{{ photoset.title }}</h2>
           <span class="thumbnail-text-date">
-            {%- assign photo-month = photoset.date| date: "%m" | plus:0 -%}
-            {%- if photo-month >= 3 and photo-month < 6 -%}
-              Spring
-            {%- elsif photo-month >= 6 and photo-month < 9 -%}
-              Summer
-            {%- elsif photo-month >= 9 and photo-month < 12 -%}
-              Fall
-            {%- elsif photo-month >= 12 -%}
-              Winter
-            {%- elsif photo-month < 3 -%}
-              Winter
-            {%- endif -%}
-            &nbsp;{{ photoset.date| date: "%Y" }}
+            {% if photoset.display-date %}
+              {{photoset.display-date}}
+            {% else %}
+              {% assign photo-month = photoset.date| date: "%m" | plus:0 %}
+              {% if photo-month >= 3 and photo-month < 6 %}
+                Spring
+              {% elsif photo-month >= 6 and photo-month < 9 %}
+                Summer
+              {% elsif photo-month >= 9 and photo-month < 12 %}
+                Fall
+              {% elsif photo-month >= 12 %}
+                Winter
+              {% elsif photo-month < 3 %}
+                Winter
+              {% endif %}
+              {{ photoset.date| date: "%Y" }}
+            {% endif %}
           </span>
         </div>
         {% if photoset.flag %}