From 013d1a1b4658335843b29eca42392f987508af4b Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Sun, 5 Jul 2026 09:56:36 +0200 Subject: [PATCH 01/10] Generate a script to make a photo gallery --- assets/css/customsty.css | 141 +++++++++++++++++++++++++++++++++++++++ conference/2026.md | 108 ++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+) diff --git a/assets/css/customsty.css b/assets/css/customsty.css index 5975a377..3fef5704 100644 --- a/assets/css/customsty.css +++ b/assets/css/customsty.css @@ -346,3 +346,144 @@ a.iconlink:hover { color:#0F79D0 !important; transition: 0.3s; } + +/* Image Gallery & Lightbox Styles */ +.image-gallery { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); + gap: 20px; + margin: 30px 0; +} + +.gallery-item { + position: relative; + aspect-ratio: 1 / 1; + overflow: hidden; + border-radius: 8px; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05); + cursor: pointer; + background-color: #f0f0f0; + transition: transform 0.3s cubic-bezier(0.165, 0.84, 0.44, 1), box-shadow 0.3s ease; +} + +.gallery-item:hover { + transform: translateY(-4px) scale(1.02); + box-shadow: 0 12px 20px rgba(0, 0, 0, 0.15); +} + +.gallery-item img { + width: 100%; + height: 100%; + object-fit: cover; + display: block; + margin: 0; + transition: filter 0.3s ease; +} + +/* Lightbox Modal */ +.lightbox-modal { + display: none; + position: fixed; + z-index: 10000; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: rgba(15, 15, 15, 0.9); + backdrop-filter: blur(8px); + -webkit-backdrop-filter: blur(8px); + align-items: center; + justify-content: center; + opacity: 0; + transition: opacity 0.3s ease-in-out; +} + +.lightbox-modal.show { + display: flex; + opacity: 1; +} + +.lightbox-content { + position: relative; + max-width: 85%; + max-height: 85%; + display: flex; + justify-content: center; + align-items: center; +} + +#lightbox-img { + max-width: 100%; + max-height: 85vh; + object-fit: contain; + border-radius: 4px; + box-shadow: 0 10px 30px rgba(0, 0, 0, 0.5); + transition: opacity 0.15s ease-in-out; + opacity: 1; +} + +/* Close & Navigation Buttons */ +.lightbox-close { + position: absolute; + top: 25px; + right: 35px; + color: rgba(255, 255, 255, 0.7); + font-size: 40px; + font-weight: 300; + cursor: pointer; + transition: color 0.2s ease, transform 0.2s ease; + user-select: none; + z-index: 10010; +} + +.lightbox-close:hover { + color: #ffffff; + transform: scale(1.1); +} + +.lightbox-prev, +.lightbox-next { + position: absolute; + top: 50%; + transform: translateY(-50%); + color: rgba(255, 255, 255, 0.6); + font-size: 36px; + font-weight: bold; + padding: 16px 24px; + cursor: pointer; + user-select: none; + transition: color 0.2s ease, background-color 0.2s ease, transform 0.2s ease; + z-index: 10010; + text-decoration: none !important; +} + +.lightbox-prev { + left: 20px; + border-radius: 0 8px 8px 0; +} + +.lightbox-next { + right: 20px; + border-radius: 8px 0 0 8px; +} + +.lightbox-prev:hover, +.lightbox-next:hover { + color: #ffffff; + background-color: rgba(255, 255, 255, 0.1); + transform: translateY(-50%) scale(1.05); +} + +@media (max-width: 768px) { + .lightbox-prev, + .lightbox-next { + padding: 12px 18px; + font-size: 28px; + } + .lightbox-close { + top: 15px; + right: 20px; + font-size: 35px; + } +} + diff --git a/conference/2026.md b/conference/2026.md index 46c52ba9..ec544e0f 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -250,8 +250,116 @@ Best Presentation and Poster Awards. - [Claire Lestringant](http://www.dalembert.upmc.fr/home/lestringant/), Sorbonne Université. - [Corrado Maurini](http://www.lmm.jussieu.fr/~corrado/), Sorbonne Université. - [Ridgway Scott](https://people.cs.uchicago.edu/~ridg/), University of Chicago. +## Photo Gallery + +
+
+ University of Chicago Paris Center +
+
+ FEniCS 2016 Welcome Board +
+
+ Oslo Geometric Sculpture +
+
+ Lecture Hall Audience +
+
+ Presenter at FEniCS 2011 +
+
+ Anders Logg Presenting +
+
+ Shape optimization using phi-FEM Poster +
+
+ Numerical Simulation of Asphalt Solar Collector Systems Poster +
+
+ + + + + + ## Contact If you have any questions about the conference organization, please contact: [fenics-2026@dalembert.upmc.fr](mailto:fenics-2026@dalembert.upmc.fr?cc=corrado.maurini%40sorbonne-universite.fr%2Cridg%40uchicago.edu&subject=FEniCS26%3A%20). + From 0cc43a826c26b0a410afb55bbcdf61a094915801 Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Sun, 5 Jul 2026 10:00:51 +0200 Subject: [PATCH 02/10] Add slider --- assets/css/customsty.css | 66 ++++++++++++++++++++++++++++++++++++++-- conference/2026.md | 63 +++++++++++++++++++++++--------------- 2 files changed, 102 insertions(+), 27 deletions(-) diff --git a/assets/css/customsty.css b/assets/css/customsty.css index 3fef5704..564818b4 100644 --- a/assets/css/customsty.css +++ b/assets/css/customsty.css @@ -347,12 +347,37 @@ a.iconlink:hover { transition: 0.3s; } -/* Image Gallery & Lightbox Styles */ +/* Image Gallery Slider Styles */ +.gallery-slider-container { + position: relative; + display: flex; + align-items: center; + width: 100%; + margin: 30px 0; +} + +.gallery-scroll-wrapper { + overflow-x: auto; + overflow-y: hidden; + scrollbar-width: none; /* Firefox */ + -ms-overflow-style: none; /* IE 10+ */ + width: 100%; + scroll-behavior: smooth; + padding: 10px 0; /* Add padding for translateY hover translations */ +} + +.gallery-scroll-wrapper::-webkit-scrollbar { + display: none; /* Safari and Chrome */ +} + .image-gallery { display: grid; - grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); + grid-template-rows: repeat(2, 180px); + grid-auto-flow: column; + grid-auto-columns: 180px; gap: 20px; - margin: 30px 0; + width: max-content; + margin: 0; } .gallery-item { @@ -380,6 +405,41 @@ a.iconlink:hover { transition: filter 0.3s ease; } +/* Slider buttons for the thumbnail grid */ +.slider-btn { + background-color: rgba(255, 255, 255, 0.9); + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 50%; + width: 44px; + height: 44px; + font-size: 18px; + color: #333333; + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1); + transition: background-color 0.2s, color 0.2s, transform 0.2s; + z-index: 10; + user-select: none; +} + +.slider-btn:hover { + background-color: #0F79D0; + color: #ffffff; + border-color: #0F79D0; + transform: scale(1.05); +} + +.prev-btn { + margin-right: 15px; +} + +.next-btn { + margin-left: 15px; +} + + /* Lightbox Modal */ .lightbox-modal { display: none; diff --git a/conference/2026.md b/conference/2026.md index ec544e0f..c599cb3a 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -252,31 +252,37 @@ Best Presentation and Poster Awards. - [Ridgway Scott](https://people.cs.uchicago.edu/~ridg/), University of Chicago. ## Photo Gallery -
-
- University of Chicago Paris Center -
-
- FEniCS 2016 Welcome Board -
-
- Oslo Geometric Sculpture -
-
- Lecture Hall Audience -
-
- Presenter at FEniCS 2011 -
-
- Anders Logg Presenting -
-
- Shape optimization using phi-FEM Poster -
-
- Numerical Simulation of Asphalt Solar Collector Systems Poster +
+ + +
@@ -335,6 +341,15 @@ Best Presentation and Poster Awards. }, 150); } + function scrollGallery(direction) { + const container = document.getElementById("gallery-scroll-wrapper"); + const scrollAmount = container.clientWidth * 0.8; + container.scrollBy({ + left: direction * scrollAmount, + behavior: 'smooth' + }); + } + // Close lightbox when clicking outside the image document.getElementById("gallery-lightbox").addEventListener("click", function(e) { if (e.target === this) { From 6bb7ab06178b8aec5e2c64d439ef94cb7ac181d6 Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Sun, 5 Jul 2026 10:22:27 +0200 Subject: [PATCH 03/10] feat: implement automated dynamic gallery image fetching and insertion via JSON-based workflows --- .github/workflows/build.yml | 3 + .gitignore | 1 + _tools/update_galleries.py | 127 ++++++++++++++++++++++++++++++++++++ conference/2026.md | 69 ++++++++++---------- 4 files changed, 164 insertions(+), 36 deletions(-) create mode 100644 _tools/update_galleries.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 679d678e..bf2c4aa0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,5 +19,8 @@ jobs: - uses: actions/checkout@v4 - run: sudo bundle install name: Install bundle + - run: python3 _tools/update_galleries.py + name: Update photo galleries - run: bundle exec jekyll build name: Build website + diff --git a/.gitignore b/.gitignore index c560e6ec..4c57478d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ # Ignore local build Gemfile.lock _site/ +*.json \ No newline at end of file diff --git a/_tools/update_galleries.py b/_tools/update_galleries.py new file mode 100644 index 00000000..0a6824a4 --- /dev/null +++ b/_tools/update_galleries.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python3 +import os +import urllib.request +import re +import json +from html.parser import HTMLParser + + +class SwiftLinkParser(HTMLParser): + def __init__(self): + super().__init__() + self.links = [] + + def handle_starttag(self, tag, attrs): + if tag == 'a': + for name, value in attrs: + if name == 'href': + # Filter for image links and exclude thumbnails + is_img = value.lower().endswith( + ('.jpg', '.jpeg', '.png', '.gif') + ) + is_thumb = 'thumbnails' in value.lower() + if is_img and not is_thumb: + self.links.append(value) + + +def fetch_images_from_url(url): + try: + headers = {'User-Agent': 'Mozilla/5.0'} + req = urllib.request.Request(url, headers=headers) + with urllib.request.urlopen(req) as response: + html = response.read().decode('utf-8') + parser = SwiftLinkParser() + parser.feed(html) + # Construct absolute URLs + image_urls = [] + for link in parser.links: + if not link.startswith('http'): + image_urls.append(url + link) + else: + image_urls.append(link) + return sorted(list(set(image_urls))) + except Exception as e: + print(f"Error fetching {url}: {e}") + return [] + + +def update_markdown_file(filepath): + with open(filepath, 'r', encoding='utf-8') as f: + content = f.read() + + # Match frontmatter between --- + match = re.match(r'^---\s*\n(.*?)\n---\s*\n(.*)$', content, re.DOTALL) + if not match: + return + + frontmatter_content = match.group(1) + body_content = match.group(2) + + # Parse frontmatter simple key-value pairs + lines = frontmatter_content.split('\n') + gallery_url = None + gallery_data = None + for line in lines: + if line.startswith('gallery_url:'): + gallery_url = line.split(':', 1)[1].strip().strip('"\'') + elif line.startswith('gallery_data:'): + gallery_data = line.split(':', 1)[1].strip().strip('"\'') + + if not gallery_url or not gallery_data: + return + + print(f"Updating gallery for {filepath}") + images = fetch_images_from_url(gallery_url) + if not images: + print(f"No images found for {gallery_url}") + return + + # Write images to the JSON file specified in gallery_data + relative_dir = os.path.dirname(filepath) + output_file = os.path.join(relative_dir, gallery_data) + os.makedirs(os.path.dirname(output_file), exist_ok=True) + + with open(output_file, 'w', encoding='utf-8') as f: + json.dump(images, f, indent=2) + + # Reconstruct frontmatter without existing gallery_images + new_lines = [] + in_gallery_images = False + for line in lines: + if line.startswith('gallery_images:'): + in_gallery_images = True + continue + if in_gallery_images: + if ( + line.startswith(' ') + or line.startswith('-') + or line.strip() == '' + ): + continue + else: + in_gallery_images = False + new_lines.append(line) + + new_frontmatter = '\n'.join(new_lines) + new_content = f"---\n{new_frontmatter}\n---\n{body_content}" + + with open(filepath, 'w', encoding='utf-8') as f: + f.write(new_content) + + msg = f"Wrote {len(images)} image URLs to {output_file}" + print(msg) + + +def main(): + # Walk all files in the repo looking for .md files + for root, dirs, files in os.walk('.'): + # Skip git and other hidden directories + if '.git' in root or '_site' in root: + continue + for file in files: + if file.endswith('.md'): + update_markdown_file(os.path.join(root, file)) + + +if __name__ == "__main__": + main() diff --git a/conference/2026.md b/conference/2026.md index c599cb3a..a643c43d 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -4,8 +4,9 @@ subtitle: University of Chicago in Paris
John W. Boyer Center, Paris, France image: assets/img/fenics2026/universityofchicagoparis.jpg image-zoom: fill permalink: /fenics-2026/ +gallery_url: http://pub.fenicsproject.org/photos/fenics16-oslo/ +gallery_data: pages_2026/fenics16-oslo.json --- - # Description The FEniCS 2026 conference is an opportunity for all those interested in @@ -255,31 +256,8 @@ Best Presentation and Poster Awards.
diff --git a/_tools/update_galleries.py b/_tools/update_galleries.py index 0a6824a4..981051da 100644 --- a/_tools/update_galleries.py +++ b/_tools/update_galleries.py @@ -76,9 +76,9 @@ def update_markdown_file(filepath): print(f"No images found for {gallery_url}") return - # Write images to the JSON file specified in gallery_data - relative_dir = os.path.dirname(filepath) - output_file = os.path.join(relative_dir, gallery_data) + # Write images to the JSON file specified in gallery_data relative to repo root + clean_data_path = gallery_data.lstrip('/') + output_file = os.path.join('.', clean_data_path) os.makedirs(os.path.dirname(output_file), exist_ok=True) with open(output_file, 'w', encoding='utf-8') as f: diff --git a/conference/2026.md b/conference/2026.md index a643c43d..989e2ed5 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -5,7 +5,7 @@ image: assets/img/fenics2026/universityofchicagoparis.jpg image-zoom: fill permalink: /fenics-2026/ gallery_url: http://pub.fenicsproject.org/photos/fenics16-oslo/ -gallery_data: pages_2026/fenics16-oslo.json +gallery_data: /conference/pages_2026/fenics16-oslo.json --- # Description @@ -251,123 +251,11 @@ Best Presentation and Poster Awards. - [Claire Lestringant](http://www.dalembert.upmc.fr/home/lestringant/), Sorbonne Université. - [Corrado Maurini](http://www.lmm.jussieu.fr/~corrado/), Sorbonne Université. - [Ridgway Scott](https://people.cs.uchicago.edu/~ridg/), University of Chicago. -## Photo Gallery -
- - - -
+## Photo Gallery - - +{% include gallery.html data_url=page.gallery_data %} - ## Contact From f26930ff9232ae34cb26174f09995a7b0359e417 Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Sun, 5 Jul 2026 10:32:58 +0200 Subject: [PATCH 05/10] Move photo gallery section up --- conference/2026.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/conference/2026.md b/conference/2026.md index 989e2ed5..53be0cd1 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -26,6 +26,10 @@ and dedicated time for discussions and coding. Links to previous FEniCS conferences can be found [here](index.md). +## Photo Gallery + +{% include gallery.html data_url=page.gallery_data %} + ## FEniCS 2026 Awardees In this edition of the FEniCS Conference, alongside the main awards, the Award @@ -252,12 +256,6 @@ Best Presentation and Poster Awards. - [Corrado Maurini](http://www.lmm.jussieu.fr/~corrado/), Sorbonne Université. - [Ridgway Scott](https://people.cs.uchicago.edu/~ridg/), University of Chicago. -## Photo Gallery - -{% include gallery.html data_url=page.gallery_data %} - - - ## Contact If you have any questions about the conference organization, please contact: From f28a77fdf1e78b9e9c6ae1400dea7603a4fb6feb Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Mon, 6 Jul 2026 14:18:42 +0200 Subject: [PATCH 06/10] Enable HEIC-to-JPG conversion in gallery tools and replace lightbox modal with direct image linking --- .github/workflows/build.yml | 2 + .gitignore | 3 +- _includes/gallery.html | 91 ++++--------------------------- _tools/update_galleries.py | 73 ++++++++++++++++++++++--- assets/css/customsty.css | 103 ------------------------------------ conference/2026.md | 4 +- 6 files changed, 82 insertions(+), 194 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf2c4aa0..57c5a6f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ jobs: - uses: actions/checkout@v4 - run: sudo bundle install name: Install bundle + - run: pip3 install pillow pillow-heif + name: Install Python dependencies for HEIC conversion - run: python3 _tools/update_galleries.py name: Update photo galleries - run: bundle exec jekyll build diff --git a/.gitignore b/.gitignore index 4c57478d..9425bff3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ # Ignore local build Gemfile.lock _site/ -*.json \ No newline at end of file +*.json +*.jpg \ No newline at end of file diff --git a/_includes/gallery.html b/_includes/gallery.html index 184e8ffa..e6b52d20 100644 --- a/_includes/gallery.html +++ b/_includes/gallery.html @@ -8,20 +8,7 @@
- - - diff --git a/_tools/update_galleries.py b/_tools/update_galleries.py index 981051da..6c807c7d 100644 --- a/_tools/update_galleries.py +++ b/_tools/update_galleries.py @@ -3,8 +3,17 @@ import urllib.request import re import json +import io from html.parser import HTMLParser +try: + from PIL import Image + from pillow_heif import register_heif_opener + register_heif_opener() + HAS_HEIF = True +except ImportError: + HAS_HEIF = False + class SwiftLinkParser(HTMLParser): def __init__(self): @@ -17,7 +26,7 @@ def handle_starttag(self, tag, attrs): if name == 'href': # Filter for image links and exclude thumbnails is_img = value.lower().endswith( - ('.jpg', '.jpeg', '.png', '.gif') + ('.jpg', '.jpeg', '.png', '.gif', '.heic') ) is_thumb = 'thumbnails' in value.lower() if is_img and not is_thumb: @@ -45,6 +54,25 @@ def fetch_images_from_url(url): return [] +def convert_heic_to_jpg(url, output_path): + if not HAS_HEIF: + print(f"Warning: pillow-heif not installed. Skip HEIC: {url}") + return False + try: + headers = {'User-Agent': 'Mozilla/5.0'} + req = urllib.request.Request(url, headers=headers) + with urllib.request.urlopen(req) as response: + data = response.read() + + # Open image from bytes in memory + image = Image.open(io.BytesIO(data)) + image.save(output_path, "JPEG", quality=85) + return True + except Exception as e: + print(f"Error converting HEIC image {url}: {e}") + return False + + def update_markdown_file(filepath): with open(filepath, 'r', encoding='utf-8') as f: content = f.read() @@ -76,13 +104,46 @@ def update_markdown_file(filepath): print(f"No images found for {gallery_url}") return - # Write images to the JSON file specified in gallery_data relative to repo root + # Write images to the JSON file specified in gallery_data + # relative to repo root clean_data_path = gallery_data.lstrip('/') - output_file = os.path.join('.', clean_data_path) - os.makedirs(os.path.dirname(output_file), exist_ok=True) + output_dir = os.path.dirname(clean_data_path) + os.makedirs(output_dir, exist_ok=True) + + processed_images = [] + for img_url in images: + if img_url.lower().endswith('.heic'): + # Convert to local JPEG + filename = os.path.basename(img_url) + jpg_filename = os.path.splitext(filename)[0] + ".jpg" + local_jpg_path = os.path.join(output_dir, jpg_filename) + + # Convert if not already present + success = True + if not os.path.exists(local_jpg_path): + print(f"Converting HEIC: {img_url} -> {local_jpg_path}") + success = convert_heic_to_jpg(img_url, local_jpg_path) + + if success: + display_url = "/" + os.path.join(output_dir, jpg_filename) + processed_images.append({ + "src": display_url, + "link": img_url + }) + else: + processed_images.append({ + "src": img_url, + "link": img_url + }) + else: + processed_images.append({ + "src": img_url, + "link": img_url + }) + output_file = os.path.join('.', clean_data_path) with open(output_file, 'w', encoding='utf-8') as f: - json.dump(images, f, indent=2) + json.dump(processed_images, f, indent=2) # Reconstruct frontmatter without existing gallery_images new_lines = [] @@ -108,7 +169,7 @@ def update_markdown_file(filepath): with open(filepath, 'w', encoding='utf-8') as f: f.write(new_content) - msg = f"Wrote {len(images)} image URLs to {output_file}" + msg = f"Wrote {len(processed_images)} image URLs to {output_file}" print(msg) diff --git a/assets/css/customsty.css b/assets/css/customsty.css index 564818b4..bdb53b46 100644 --- a/assets/css/customsty.css +++ b/assets/css/customsty.css @@ -440,110 +440,7 @@ a.iconlink:hover { } -/* Lightbox Modal */ -.lightbox-modal { - display: none; - position: fixed; - z-index: 10000; - left: 0; - top: 0; - width: 100%; - height: 100%; - background-color: rgba(15, 15, 15, 0.9); - backdrop-filter: blur(8px); - -webkit-backdrop-filter: blur(8px); - align-items: center; - justify-content: center; - opacity: 0; - transition: opacity 0.3s ease-in-out; -} - -.lightbox-modal.show { - display: flex; - opacity: 1; -} - -.lightbox-content { - position: relative; - max-width: 85%; - max-height: 85%; - display: flex; - justify-content: center; - align-items: center; -} -#lightbox-img { - max-width: 100%; - max-height: 85vh; - object-fit: contain; - border-radius: 4px; - box-shadow: 0 10px 30px rgba(0, 0, 0, 0.5); - transition: opacity 0.15s ease-in-out; - opacity: 1; -} - -/* Close & Navigation Buttons */ -.lightbox-close { - position: absolute; - top: 25px; - right: 35px; - color: rgba(255, 255, 255, 0.7); - font-size: 40px; - font-weight: 300; - cursor: pointer; - transition: color 0.2s ease, transform 0.2s ease; - user-select: none; - z-index: 10010; -} - -.lightbox-close:hover { - color: #ffffff; - transform: scale(1.1); -} - -.lightbox-prev, -.lightbox-next { - position: absolute; - top: 50%; - transform: translateY(-50%); - color: rgba(255, 255, 255, 0.6); - font-size: 36px; - font-weight: bold; - padding: 16px 24px; - cursor: pointer; - user-select: none; - transition: color 0.2s ease, background-color 0.2s ease, transform 0.2s ease; - z-index: 10010; - text-decoration: none !important; -} -.lightbox-prev { - left: 20px; - border-radius: 0 8px 8px 0; -} -.lightbox-next { - right: 20px; - border-radius: 8px 0 0 8px; -} - -.lightbox-prev:hover, -.lightbox-next:hover { - color: #ffffff; - background-color: rgba(255, 255, 255, 0.1); - transform: translateY(-50%) scale(1.05); -} - -@media (max-width: 768px) { - .lightbox-prev, - .lightbox-next { - padding: 12px 18px; - font-size: 28px; - } - .lightbox-close { - top: 15px; - right: 20px; - font-size: 35px; - } -} diff --git a/conference/2026.md b/conference/2026.md index a2b9bbc8..2dae2f40 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -4,8 +4,8 @@ subtitle: University of Chicago in Paris
John W. Boyer Center, Paris, France image: assets/img/fenics2026/universityofchicagoparis.jpg image-zoom: fill permalink: /fenics-2026/ -gallery_url: http://pub.fenicsproject.org/photos/fenics16-oslo/ -gallery_data: /conference/pages_2026/fenics16-oslo.json +gallery_url: http://pub.fenicsproject.org/photos/fenics26-paris/ +gallery_data: /conference/pages_2026/fenics26-paris.json --- # Description From b35218bd5a115825231839df0bae23762a45ebf0 Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Mon, 6 Jul 2026 14:47:04 +0200 Subject: [PATCH 07/10] Drop dependence on JS --- .github/workflows/build.yml | 2 - _includes/gallery.html | 58 ---------------- _tools/update_galleries.py | 133 +++++++++++------------------------- assets/css/customsty.css | 10 +-- conference/2026.md | 23 ++++++- 5 files changed, 66 insertions(+), 160 deletions(-) delete mode 100644 _includes/gallery.html diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57c5a6f4..bf2c4aa0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,8 +19,6 @@ jobs: - uses: actions/checkout@v4 - run: sudo bundle install name: Install bundle - - run: pip3 install pillow pillow-heif - name: Install Python dependencies for HEIC conversion - run: python3 _tools/update_galleries.py name: Update photo galleries - run: bundle exec jekyll build diff --git a/_includes/gallery.html b/_includes/gallery.html deleted file mode 100644 index e6b52d20..00000000 --- a/_includes/gallery.html +++ /dev/null @@ -1,58 +0,0 @@ -
- - - -
- - diff --git a/_tools/update_galleries.py b/_tools/update_galleries.py index 6c807c7d..6a0cbc32 100644 --- a/_tools/update_galleries.py +++ b/_tools/update_galleries.py @@ -2,18 +2,8 @@ import os import urllib.request import re -import json -import io from html.parser import HTMLParser -try: - from PIL import Image - from pillow_heif import register_heif_opener - register_heif_opener() - HAS_HEIF = True -except ImportError: - HAS_HEIF = False - class SwiftLinkParser(HTMLParser): def __init__(self): @@ -26,7 +16,7 @@ def handle_starttag(self, tag, attrs): if name == 'href': # Filter for image links and exclude thumbnails is_img = value.lower().endswith( - ('.jpg', '.jpeg', '.png', '.gif', '.heic') + ('.jpg', '.jpeg', '.png', '.gif') ) is_thumb = 'thumbnails' in value.lower() if is_img and not is_thumb: @@ -54,25 +44,6 @@ def fetch_images_from_url(url): return [] -def convert_heic_to_jpg(url, output_path): - if not HAS_HEIF: - print(f"Warning: pillow-heif not installed. Skip HEIC: {url}") - return False - try: - headers = {'User-Agent': 'Mozilla/5.0'} - req = urllib.request.Request(url, headers=headers) - with urllib.request.urlopen(req) as response: - data = response.read() - - # Open image from bytes in memory - image = Image.open(io.BytesIO(data)) - image.save(output_path, "JPEG", quality=85) - return True - except Exception as e: - print(f"Error converting HEIC image {url}: {e}") - return False - - def update_markdown_file(filepath): with open(filepath, 'r', encoding='utf-8') as f: content = f.read() @@ -88,88 +59,62 @@ def update_markdown_file(filepath): # Parse frontmatter simple key-value pairs lines = frontmatter_content.split('\n') gallery_url = None - gallery_data = None for line in lines: if line.startswith('gallery_url:'): gallery_url = line.split(':', 1)[1].strip().strip('"\'') - elif line.startswith('gallery_data:'): - gallery_data = line.split(':', 1)[1].strip().strip('"\'') - if not gallery_url or not gallery_data: + if not gallery_url: + return + + # Check if markers exist in body + start_marker = "" + end_marker = "" + if start_marker not in body_content or end_marker not in body_content: return - print(f"Updating gallery for {filepath}") + print(f"Updating gallery in-place for {filepath}") images = fetch_images_from_url(gallery_url) if not images: print(f"No images found for {gallery_url}") return - # Write images to the JSON file specified in gallery_data - # relative to repo root - clean_data_path = gallery_data.lstrip('/') - output_dir = os.path.dirname(clean_data_path) - os.makedirs(output_dir, exist_ok=True) - - processed_images = [] - for img_url in images: - if img_url.lower().endswith('.heic'): - # Convert to local JPEG - filename = os.path.basename(img_url) - jpg_filename = os.path.splitext(filename)[0] + ".jpg" - local_jpg_path = os.path.join(output_dir, jpg_filename) - - # Convert if not already present - success = True - if not os.path.exists(local_jpg_path): - print(f"Converting HEIC: {img_url} -> {local_jpg_path}") - success = convert_heic_to_jpg(img_url, local_jpg_path) - - if success: - display_url = "/" + os.path.join(output_dir, jpg_filename) - processed_images.append({ - "src": display_url, - "link": img_url - }) - else: - processed_images.append({ - "src": img_url, - "link": img_url - }) - else: - processed_images.append({ - "src": img_url, - "link": img_url - }) - - output_file = os.path.join('.', clean_data_path) - with open(output_file, 'w', encoding='utf-8') as f: - json.dump(processed_images, f, indent=2) - - # Reconstruct frontmatter without existing gallery_images - new_lines = [] - in_gallery_images = False + # Generate image list HTML + image_lines = [] + for idx, img_url in enumerate(images): + line = ( + f' ' + f'' + ) + image_lines.append(line) + + gallery_html = "\n".join(image_lines) + + # Replace content between markers + pattern = re.escape(start_marker) + r"(.*?)" + re.escape(end_marker) + replacement = f"{start_marker}\n{gallery_html}\n {end_marker}" + new_body_content = re.sub( + pattern, replacement, body_content, flags=re.DOTALL + ) + + # Remove gallery_data and gallery_images from frontmatter if present + new_fm_lines = [] for line in lines: - if line.startswith('gallery_images:'): - in_gallery_images = True + if ( + line.startswith('gallery_data:') + or line.startswith('gallery_images:') + ): continue - if in_gallery_images: - if ( - line.startswith(' ') - or line.startswith('-') - or line.strip() == '' - ): - continue - else: - in_gallery_images = False - new_lines.append(line) + new_fm_lines.append(line) - new_frontmatter = '\n'.join(new_lines) - new_content = f"---\n{new_frontmatter}\n---\n{body_content}" + new_frontmatter = '\n'.join(new_fm_lines) + new_content = f"---\n{new_frontmatter}\n---\n{new_body_content}" with open(filepath, 'w', encoding='utf-8') as f: f.write(new_content) - msg = f"Wrote {len(processed_images)} image URLs to {output_file}" + msg = f"Successfully updated {filepath} with {len(images)} static links." print(msg) diff --git a/assets/css/customsty.css b/assets/css/customsty.css index bdb53b46..972885d9 100644 --- a/assets/css/customsty.css +++ b/assets/css/customsty.css @@ -380,9 +380,11 @@ a.iconlink:hover { margin: 0; } -.gallery-item { +.image-gallery a { position: relative; - aspect-ratio: 1 / 1; + display: block; + width: 180px; + height: 180px; overflow: hidden; border-radius: 8px; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05); @@ -391,12 +393,12 @@ a.iconlink:hover { transition: transform 0.3s cubic-bezier(0.165, 0.84, 0.44, 1), box-shadow 0.3s ease; } -.gallery-item:hover { +.image-gallery a:hover { transform: translateY(-4px) scale(1.02); box-shadow: 0 12px 20px rgba(0, 0, 0, 0.15); } -.gallery-item img { +.image-gallery a img { width: 100%; height: 100%; object-fit: cover; diff --git a/conference/2026.md b/conference/2026.md index 2dae2f40..ed01351a 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -5,7 +5,6 @@ image: assets/img/fenics2026/universityofchicagoparis.jpg image-zoom: fill permalink: /fenics-2026/ gallery_url: http://pub.fenicsproject.org/photos/fenics26-paris/ -gallery_data: /conference/pages_2026/fenics26-paris.json --- # Description @@ -28,7 +27,27 @@ Links to previous FEniCS conferences can be found [here](index.md). ## Photo Gallery -{% include gallery.html data_url=page.gallery_data %} +
+ + + +
## FEniCS 2026 Awardees From c9bc9acd559a47fe0ee694f888b75e938bcf97f1 Mon Sep 17 00:00:00 2001 From: Andrey Latyshev Date: Mon, 6 Jul 2026 15:04:46 +0200 Subject: [PATCH 08/10] Look for photos in subfolders --- _tools/update_galleries.py | 144 +++++++++++++++++++++++++------------ assets/css/customsty.css | 32 +++++---- conference/2026.md | 70 ++++++++++++++---- 3 files changed, 173 insertions(+), 73 deletions(-) diff --git a/_tools/update_galleries.py b/_tools/update_galleries.py index 6a0cbc32..e34b60b9 100644 --- a/_tools/update_galleries.py +++ b/_tools/update_galleries.py @@ -8,40 +8,69 @@ class SwiftLinkParser(HTMLParser): def __init__(self): super().__init__() - self.links = [] + self.images = [] + self.subdirs = [] def handle_starttag(self, tag, attrs): if tag == 'a': for name, value in attrs: if name == 'href': - # Filter for image links and exclude thumbnails - is_img = value.lower().endswith( + # Exclude parent or absolute links + if ( + value == '../' + or value.startswith('/') + or value.startswith('http') + ): + continue + if value.endswith('/'): + self.subdirs.append(value) + elif value.lower().endswith( ('.jpg', '.jpeg', '.png', '.gif') - ) - is_thumb = 'thumbnails' in value.lower() - if is_img and not is_thumb: - self.links.append(value) + ): + if 'thumbnails' not in value.lower(): + self.images.append(value) def fetch_images_from_url(url): + all_images = [] + + def crawl(current_url): + try: + headers = {'User-Agent': 'Mozilla/5.0'} + req = urllib.request.Request(current_url, headers=headers) + with urllib.request.urlopen(req) as response: + html = response.read().decode('utf-8') + parser = SwiftLinkParser() + parser.feed(html) + + # Add images found in current dir + for img in parser.images: + all_images.append(current_url + img) + + # Recurse into subdirs + for subdir in parser.subdirs: + if current_url.endswith('/'): + subdir_url = current_url + subdir + else: + subdir_url = current_url + '/' + subdir + crawl(subdir_url) + except Exception as e: + print(f"Error crawling {current_url}: {e}") + + crawl(url) + + # Explicitly check for 'jpeg/' subfolder if virtual directories are hidden + jpeg_url = url + 'jpeg/' if url.endswith('/') else url + '/jpeg/' try: headers = {'User-Agent': 'Mozilla/5.0'} - req = urllib.request.Request(url, headers=headers) - with urllib.request.urlopen(req) as response: - html = response.read().decode('utf-8') - parser = SwiftLinkParser() - parser.feed(html) - # Construct absolute URLs - image_urls = [] - for link in parser.links: - if not link.startswith('http'): - image_urls.append(url + link) - else: - image_urls.append(link) - return sorted(list(set(image_urls))) - except Exception as e: - print(f"Error fetching {url}: {e}") - return [] + req = urllib.request.Request(jpeg_url, headers=headers) + with urllib.request.urlopen(req): + print(f"Crawling explicit subfolder: {jpeg_url}") + crawl(jpeg_url) + except Exception: + pass + + return sorted(list(set(all_images))) def update_markdown_file(filepath): @@ -67,35 +96,57 @@ def update_markdown_file(filepath): return # Check if markers exist in body - start_marker = "" - end_marker = "" - if start_marker not in body_content or end_marker not in body_content: + row1_start = "" + row1_end = "" + row2_start = "" + row2_end = "" + + if ( + row1_start not in body_content + or row1_end not in body_content + or row2_start not in body_content + or row2_end not in body_content + ): return - print(f"Updating gallery in-place for {filepath}") + print(f"Updating gallery rows in-place for {filepath}") images = fetch_images_from_url(gallery_url) if not images: print(f"No images found for {gallery_url}") return - # Generate image list HTML - image_lines = [] - for idx, img_url in enumerate(images): - line = ( - f' ' - f'' - ) - image_lines.append(line) - - gallery_html = "\n".join(image_lines) - - # Replace content between markers - pattern = re.escape(start_marker) + r"(.*?)" + re.escape(end_marker) - replacement = f"{start_marker}\n{gallery_html}\n {end_marker}" + # Divide images into two rows + mid = (len(images) + 1) // 2 + row1_images = images[:mid] + row2_images = images[mid:] + + def build_row_html(images_list, start_idx): + lines_list = [] + for idx, img_url in enumerate(images_list): + line = ( + f' ' + f'' + ) + lines_list.append(line) + return "\n".join(lines_list) + + row1_html = build_row_html(row1_images, 0) + row2_html = build_row_html(row2_images, mid) + + # Replace row 1 + pattern1 = re.escape(row1_start) + r"(.*?)" + re.escape(row1_end) + replacement1 = f"{row1_start}\n{row1_html}\n {row1_end}" new_body_content = re.sub( - pattern, replacement, body_content, flags=re.DOTALL + pattern1, replacement1, body_content, flags=re.DOTALL + ) + + # Replace row 2 + pattern2 = re.escape(row2_start) + r"(.*?)" + re.escape(row2_end) + replacement2 = f"{row2_start}\n{row2_html}\n {row2_end}" + new_body_content = re.sub( + pattern2, replacement2, new_body_content, flags=re.DOTALL ) # Remove gallery_data and gallery_images from frontmatter if present @@ -114,7 +165,10 @@ def update_markdown_file(filepath): with open(filepath, 'w', encoding='utf-8') as f: f.write(new_content) - msg = f"Successfully updated {filepath} with {len(images)} static links." + msg = ( + f"Successfully updated {filepath} with {len(images)} static links " + f"across 2 rows." + ) print(msg) diff --git a/assets/css/customsty.css b/assets/css/customsty.css index 972885d9..47d7b9f5 100644 --- a/assets/css/customsty.css +++ b/assets/css/customsty.css @@ -370,38 +370,42 @@ a.iconlink:hover { display: none; /* Safari and Chrome */ } -.image-gallery { - display: grid; - grid-template-rows: repeat(2, 180px); - grid-auto-flow: column; - grid-auto-columns: 180px; +.image-gallery-container { + display: flex; + flex-direction: column; gap: 20px; width: max-content; margin: 0; } -.image-gallery a { +.image-gallery-row { + display: flex; + flex-direction: row; + gap: 20px; + width: max-content; +} + +.image-gallery-row a { position: relative; display: block; - width: 180px; height: 180px; + width: auto; overflow: hidden; border-radius: 8px; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05); cursor: pointer; background-color: #f0f0f0; - transition: transform 0.3s cubic-bezier(0.165, 0.84, 0.44, 1), box-shadow 0.3s ease; + transition: transform 0.2s ease, box-shadow 0.2s ease; } -.image-gallery a:hover { - transform: translateY(-4px) scale(1.02); - box-shadow: 0 12px 20px rgba(0, 0, 0, 0.15); +.image-gallery-row a:hover { + transform: translateY(-2px); + box-shadow: 0 8px 15px rgba(0, 0, 0, 0.1); } -.image-gallery a img { - width: 100%; +.image-gallery-row a img { height: 100%; - object-fit: cover; + width: auto; display: block; margin: 0; transition: filter 0.3s ease; diff --git a/conference/2026.md b/conference/2026.md index ed01351a..a97e544c 100644 --- a/conference/2026.md +++ b/conference/2026.md @@ -30,20 +30,62 @@ Links to previous FEniCS conferences can be found [here](index.md).