From d6fe8c61c831ec2671215b6d553a28e5901b6f4e Mon Sep 17 00:00:00 2001
From: evilchili <evilchili@gmail.com>
Date: Sun, 7 Aug 2022 16:45:46 -0700
Subject: [PATCH] adding maps, gallery

---
 deadsands/content/pages/maps.md               |  3 ++-
 deadsands/content/regions/blooming-wastes.md  |  8 ++-----
 .../static/deadsands/css/style.css            | 23 +++++++++++++++++++
 .../deadsands-theme/templates/macros.html     | 13 +++++++++++
 deadsands/deadsands-theme/templates/page.html | 16 +------------
 5 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/deadsands/content/pages/maps.md b/deadsands/content/pages/maps.md
index 1c1652b..7cf8d49 100644
--- a/deadsands/content/pages/maps.md
+++ b/deadsands/content/pages/maps.md
@@ -8,6 +8,7 @@ date: 2022-08-03 23:20:02.243922
 key_image:
     src: '/images/dewa_qasos.png'
     alt: "Hand-drawn map of the Dewa Q'Asos"
+gallery:
+    overland_map.png: "Overland map of the Sahwat Desert (so far)"
 ---
 
-Map men map men map map map men men men  ...men.
diff --git a/deadsands/content/regions/blooming-wastes.md b/deadsands/content/regions/blooming-wastes.md
index 5a38a30..7166bd8 100644
--- a/deadsands/content/regions/blooming-wastes.md
+++ b/deadsands/content/regions/blooming-wastes.md
@@ -7,6 +7,7 @@ tags: region, homebrew
 date: 2022-07-20 17:54:47.286869
 template: region
 show_dm_content: True
+description: <a href='/images/overland_blooming_wastes.png'><img class='region_map' alt="Detail of an overland map of the Sahwat Desert" src='/images/overland_blooming_wastes.png'></a> Leads to <a href='/regions/calamity-ridge/'>Calamity Ridge</a>, <a href='/regions/dust-river-canyon/'>Dust River Canyon</a>, and Tano's Edge.
 region:
     name: The Blooming Wastes
     size: 20
@@ -60,9 +61,4 @@ region:
           Effect: Bubbles rain upwards, obscuring vision; disadvantage on perception checks
 ---
 
-The Blooming Wastes stretch out before you: a mostly flat
-expanse of hard,  cracked earth blanketed by some kind of
-sandy brown scrub. Small mesas dot the horizon, suggesting the
-possibility of shelter. As you approach you see that the scrub
-is covered in thick black thorns sharp enough to pierce boot
-leather; you will need to tread carefully. 
+The Blooming Wastes stretch out before you: a mostly flat expanse of hard,  cracked earth blanketed by some kind of sandy brown scrub. Small mesas dot the horizon, suggesting the possibility of shelter. As you approach you see that the scrub is covered in thick black thorns sharp enough to pierce boot leather; you will need to tread carefully. 
diff --git a/deadsands/deadsands-theme/static/deadsands/css/style.css b/deadsands/deadsands-theme/static/deadsands/css/style.css
index 476efb4..4fd2c97 100644
--- a/deadsands/deadsands-theme/static/deadsands/css/style.css
+++ b/deadsands/deadsands-theme/static/deadsands/css/style.css
@@ -163,6 +163,29 @@ img {
     z-index: -1;
 }
 
+.gallery_image {
+    max-width: 300px;
+    height: auto;
+    margin: 0px auto;
+}
+
+.gallery_image a {
+    position: relative;
+    display: block;
+    border: 5px solid black;
+}
+.gallery_image a:active, .gallery_image a:hover {
+    border-color:#cca138;
+}
+.gallery_iamge a img {
+    position: relative;
+}
+.gallery_image span {
+    display: block;
+    padding: 10px;
+    text-justify: left;
+}
+
 article.recent {
     font-style: italic;
     margin-bottom: 1em;
diff --git a/deadsands/deadsands-theme/templates/macros.html b/deadsands/deadsands-theme/templates/macros.html
index 467b70d..c68cd9e 100644
--- a/deadsands/deadsands-theme/templates/macros.html
+++ b/deadsands/deadsands-theme/templates/macros.html
@@ -6,6 +6,19 @@
     {% endif %}
 {% endmacro %}
 
+{% macro image(filename, alt) %}
+    <div class='gallery_image'>
+        <a href="/images/{{ filename }}"><img src="/images/{{ filename|replace('.','_thumb.') }}"></a>
+        <span>{{ alt }}</span>
+    </div>
+{% endmacro %}
+
+{% macro gallery(ref) %}
+    <div class='gallery'>
+        {% for img in ref.gallery %}{{ image(img, ref.gallery[img]) }}{% endfor %}
+    </div>
+{% endmacro %}
+
 {% macro table(t, headers=[]) %}
     <table>
         <tr>{% for h in headers %}{% if h %}<th>{{ h }}</th>{% endif %}{% endfor %}</tr>
diff --git a/deadsands/deadsands-theme/templates/page.html b/deadsands/deadsands-theme/templates/page.html
index 386778f..0724df6 100644
--- a/deadsands/deadsands-theme/templates/page.html
+++ b/deadsands/deadsands-theme/templates/page.html
@@ -9,22 +9,8 @@
         <h2>{{ page.title }}</h2>
         <hr>
         {{ page.content }}
+        {% if page.gallery %}{{ macros.gallery(page) }}{% endif %}
         <hr>
     </div>
-
-    {% if page.show_recent %}
-    <div class='column'>
-        <div class='signs'>
-        <h3>Recent Sessions</h3>
-            {% with count=10, key='category', values=['sessions', 'test'] %}{% include "signs.html" %}{% endwith %}
-        </div>
-    </div>
-    <div class='column'>
-        <h3>Recent Lore</h3>
-        <div class='signs'>
-            {% with count=10, key='category', values=['lore', 'dm'] %}{% include "signs.html" %}{% endwith %}
-        </div>
-    </div>
-    {% endif %}
 </section>
 {% endblock content %}