From 63336c322b9f19ae261e4f82792036fdcfc06704 Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Tue, 28 May 2024 22:12:03 +0100
Subject: [PATCH] bring vars into line

---
 content/objects/atom/proc/cross.md |  5 +-
 templates/macros.html              | 74 ++++++++++++++++++++----------
 templates/var.html                 | 30 +-----------
 templates/var_list.html            | 19 +++-----
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/content/objects/atom/proc/cross.md b/content/objects/atom/proc/cross.md
index 9c04876ce..79e707b8b 100644
--- a/content/objects/atom/proc/cross.md
+++ b/content/objects/atom/proc/cross.md
@@ -2,7 +2,10 @@
 title = "Cross"
 
 [extra]
-return_val = ["1 to allow movement", "0 to prevent movement"]
+return_val = """
+1 to allow movement
+0 to prevent movement
+"""
 args = [
     { name = "thing", type = "/atom/movable", description = "The object attempting to overlap." },
     ]
diff --git a/templates/macros.html b/templates/macros.html
index d2c81cbe6..80d65c5ad 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -229,20 +229,17 @@ <h3 class="text-xl">Inherited Procs:</h3>
         {% set possibleVarPage = get_section(path=possibleVarPageUrl) %}
         {% if possibleVarPage.title == "var" %}
             {% if possibleVarPage.pages | length > 0 %}
-            {{ self::render_page_parent_type(page=possibleVarPage, skip_level=0, recursive=false) }}
-            <div class="pl-3 flex flex-row gap-5">
-            <div>
-            <i class="fa-solid fa-arrow-turn-up fa-rotate-90"></i>
-            </div>
-            <div class="flex flex-col">
+                {{ self::render_page_parent_type(page=possibleVarPage, skip_level=0, recursive=false) }}
+                <div class="pl-3 flex flex-row gap-5">
+                    <div class="flex flex-col">
             {% endif %}
-            {% for newVar in possibleVarPage.pages | sort(attribute="title") %}
-                <div class="code-title"><a href="{{newVar.permalink | safe}}">/var/{{ newVar.title }}</a></div>
-            {% endfor %}
+                {% for newVar in possibleVarPage.pages | sort(attribute="title") %}
+                        <div class="code-title"><a href="{{newVar.permalink | safe}}">/var/{{ newVar.title }}</a></div>
+                {% endfor %}
             {% if possibleVarPage.pages | length > 0 %}
-            </div>
-            </div>
-            <br>
+                    </div>
+                </div>
+                <br>
             {% endif %}
             {% break %}
         {% endif %}
@@ -314,17 +311,7 @@ <h1 class="title text-3xl">
     <div class="border-l-2 border-gray-500 pl-3">
     <div class="text-xl">Returns:</div> 
     <div class="pl-5">
-        {%- if page.extra.return_val and page.extra.return_val is iterable -%}
-            <div class="flex flex-col">
-            {%- for option in page.extra.return_val -%}
-                <div>{{- option -}}</div>
-            {%- endfor -%}
-            </div>
-        {%- elif page.extra.return_val is defined -%}
-            {{ page.extra.return_val }}
-        {%- else -%}
-            null
-        {%- endif -%}
+        {{ page.extra.return_val | default(value="null") | linebreaksbr | markdown | safe }}
     </div> 
     </div>
 
@@ -333,6 +320,47 @@ <h1 class="title text-3xl">
     </div>
 {% endmacro %}
 
+{% macro render_var_title(page, list=false) %}
+    <h1 class="title text-3xl code-title">
+        {% if page.extra.override %}
+        {% set overrideText = "" %}
+        {% else %}
+        {% set overrideText = "/var" %}
+        {% endif %}
+        {{ macros::render_page_parent_type(page=page, skip_level=1) }}
+        {% if list -%}
+        <a href="{{ page.permalink | safe}}">
+        {%- endif -%}
+        {{overrideText}}/{{ page.title }}
+        {%- if list -%}
+        </a>
+        {%- endif -%}
+    </h1>
+{% endmacro %}
+
+{% macro render_var(page, list=false) %}
+    <div>
+    {% if page.extra.default_value %}
+    <div>Default Value:</div>
+    <div class="pl-5">{{ page.extra.default_value }}</div>
+    {% endif %}
+    </div>
+    
+    <div>
+    {% if page.extra.permitted_values %}
+    <div>Permitted Values:</div>
+    <div class="pl-5">{{ page.extra.permitted_values }}</div>
+    {% endif %}
+    </div>
+    
+    <div>
+    {% if page.extra.type %}
+    <div>Type:</div> 
+    <div class="pl-5">{{ macros::render_single_type(type=page.extra.type) }}</div>
+    {% endif %}
+    </div>
+{% endmacro render_var %}
+
 {% macro get_github_link(page) %}
 {{ config.extra.repo }}/blob/{{ config.extra.branch }}/content/{{ page.relative_path }}?plain=1
 {% endmacro get_github_link %}
\ No newline at end of file
diff --git a/templates/var.html b/templates/var.html
index d0db81ccc..eb41b483e 100644
--- a/templates/var.html
+++ b/templates/var.html
@@ -3,12 +3,7 @@
 
 {% block header %}
 <h1 class="title text-3xl">
-    {% if page.extra.override %}
-        {% set overrideText = "" %}
-    {% else %}
-        {% set overrideText = "/var" %}
-    {% endif %}
-    {{ macros::render_page_parent_type(page=page, skip_level=1) }}{{overrideText}}/{{ page.title }}
+{{ macros::render_var_title(page=page) }}
 </h1>
 {% endblock header %}
 
@@ -16,28 +11,7 @@ <h1 class="title text-3xl">
 
 <div class="flex flex-col gap-5">
 
-<div>
-{% if page.extra.default_value %}
-<div>Default Value:</div>
-<div class="pl-5">{{ page.extra.default_value }}</div>
-{% endif %}
-</div>
-
-<div>
-{% if page.extra.permitted_values %}
-<div>Permitted Values:</div>
-<div class="pl-5">{{ page.extra.permitted_values }}</div>
-{% endif %}
-</div>
-
-<div>
-{% if page.extra.type %}
-<div>Type:</div> 
-<div class="pl-5">{{ macros::render_single_type(type=page.extra.type) }}</div>
-{% endif %}
-</div>
-
-{{ page.content | safe }}
+{{ macros::render_var(page=page) }}
 
 {{ macros::render_backlinks(page=page) }}
 
diff --git a/templates/var_list.html b/templates/var_list.html
index 7664521ee..76612ec88 100644
--- a/templates/var_list.html
+++ b/templates/var_list.html
@@ -9,19 +9,14 @@ <h1 class="title text-3xl">{{ macros::render_page_parent_type(page=section, skip
 
 <div class="flex flex-col gap-5">
 
-<div>
-{% for page in section.pages %}
-    {% if not page.extra.override %}
-        <h3 class="text-xl">Vars:</h3>
-        {% break %}
-    {% endif %}
-{% endfor %}
-{% for page in section.pages %}
-    {% if not page.extra.override %}
-        <div><a href="{{page.permalink | safe}}">/var/{{ page.title }}</a></div>
-    {% endif %}
+{% for page in section.pages | sort(attribute="title") %}
+    <div class="border border-white border-dashed p-5">
+        <div class="flex flex-col gap-3">
+            {{ macros::render_var_title(page=page, list=true) }}
+            {{ macros::render_var(page=page, list=true) }}
+        </div>
+    </div>
 {% endfor %}
-</div>
 
 <div>
 {{ macros::render_inherited_vars_page(page=section) }}