From dc1fa01c7cf1b64a4b2723e50347d6e84701c363 Mon Sep 17 00:00:00 2001 From: Rehan Butt Date: Fri, 22 Mar 2024 19:08:20 -0700 Subject: [PATCH 1/2] Multiple Date Photoset Closes #703 --- .DS_Store | Bin 12292 -> 12292 bytes README.md | 4 +++- _layouts/post-photo.html | 30 +++++++++++++++++------------- _photography/dubai-expo.markdown | 2 +- _photography/dubai.markdown | 5 +++-- img/.DS_Store | Bin 16388 -> 16388 bytes photography.html | 30 +++++++++++++++++------------- 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/.DS_Store b/.DS_Store index b794bfcf2866efddbd19efa6629fb4f3e1c316fb..9896a92cd7cc08698eae4da68f1557a258230ed1 100644 GIT binary patch delta 58 zcmV-A0LA}=V1!_>&lm_aF*7V6GcqufuOS(-f QCOQGElME+Gv-uhe6<2W-f&c&j delta 191 zcmZokXi3;`UV_8S#85}U*wA?LdPV8UvqV)Ui%D8B3rR^&Uau-H6feMEoRMGdnVg>& zP?TDhnOZ*iylTMY!;)E?5t%^2;LNJj$@WsBlAOv88Vq0{z@Q9aFfb@POh}k~QBBrM z*&zTTrtIJimE>U1W^iN(W{6=ZWN2WR&ajwaE5kvCa}19ezA`d1@-m7sDluv^>M)uz bnlm~udNO)3Ml;4RCQdd`SKa(midz%_y8kSQ diff --git a/README.md b/README.md index 554c5c91..074660b0 100644 --- 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/_layouts/post-photo.html b/_layouts/post-photo.html index ea1ec5db..9e3fa438 100644 --- a/_layouts/post-photo.html +++ b/_layouts/post-photo.html @@ -31,19 +31,23 @@

- {%- 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 -%} -  {{ 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 %}

{{ page.title }}

{% if page.author %} • {% endif %}

diff --git a/_photography/dubai-expo.markdown b/_photography/dubai-expo.markdown index d2b4c599..8a9f25b3 100644 --- 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 index 3eac44ed..df25094c 100644 --- 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 index 8af361fad317222ff65fa1f64af9e09c2fee83a7..7ceb74e7dca7ff0f789c1f3ccdb68f5947b011d8 100644 GIT binary patch delta 52 tcmZo^U~Fk%-0;tg!^F^7N5R<0VDd&O>B;hfDw|!+cd}!MPIfil4*;aT4{iVe delta 52 tcmZo^U~Fk%-0;tg!_?eRN5Rm{eDX#q>B;hfDw|!+cd}!MPIfil4*;j24~hT) diff --git a/photography.html b/photography.html index 5695de30..acab33f5 100644 --- a/photography.html +++ b/photography.html @@ -19,19 +19,23 @@

Photography

{{ photoset.title }}

- {%- 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" }} + {% 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 %}
{% if photoset.flag %} From c3241f3e97e00e6fe6ed375ef38c555fb0ef8b27 Mon Sep 17 00:00:00 2001 From: Rehan Butt Date: Fri, 22 Mar 2024 19:14:06 -0700 Subject: [PATCH 2/2] Version Increment --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index d20afbc3..6243eaf5 100644 --- 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