Merge pull request #58 from pawroman/2023-12-fixes

Fix `show_only_description` breaking page rendering
pawroman · Dec 27, 2023 · 03ce85e · 03ce85e
2 parents 39d13a9 + d22b1e5
commit 03ce85e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ Example:
 
 Same as `image`, but with a few extra optional arguments:
 
-- **`caption`**
+- **`caption`** (supports markdown)
 - **`caption_position`** (center \[default\] | left | right)
 - **`caption_style`**
 
@@ -97,8 +97,8 @@ Example:
           style="width: 25%;",
           position="right",
           caption_position="left",
-          caption="Ferris, the (unofficial) Rust mascot",
-          caption_style="font-weight: bold; font-style: italic;") }}
+          caption="**Ferris**, the (unofficial) Rust mascot",
+          caption_style="font-style: italic;") }}
 ```
 
 ## OpenGraph

diff --git a/content/welcome-terminimal-theme.md b/content/welcome-terminimal-theme.md
@@ -77,16 +77,16 @@ figure(src="http://rustacean.net/assets/rustacean-flat-gesture.png",
        style="width: 25%;",
        position="center",
        caption_position="left",
-       caption="Ferris, the (unofficial) Rust mascot",
+       caption="**Ferris**, the (unofficial) Rust mascot",
        caption_style="font-weight: bold; font-style: italic;")
 ```
 
 {{ figure(src="http://rustacean.net/assets/rustacean-flat-gesture.png",
           style="width: 25%;",
           position="center",
           caption_position="left",
-          caption="Ferris, the (unofficial) Rust mascot",
-          caption_style="font-weight: bold; font-style: italic;") }}
+          caption="**Ferris**, the (unofficial) Rust mascot",
+          caption_style="font-style: italic;") }}
 
 ---
 

diff --git a/templates/macros/post.html b/templates/macros/post.html
@@ -15,6 +15,7 @@
             </a>
         </div>
     {% else %}
+        {#- full content -#}
         <div class="post-content">
             {{ page.content | safe }}
         </div>

diff --git a/templates/page.html b/templates/page.html
@@ -7,7 +7,7 @@
 {% block content %}
     <div class="post">
         {{ post_macros::header(page=page) }}
-        {{ post_macros::content(page=page, summary=true, show_only_description=false) }}
+        {{ post_macros::content(page=page, summary=false, show_only_description=false) }}
         {{ post_macros::earlier_later(page=page) }}
     </div>
 {% endblock content %}