Skip to content

Commit

Permalink
bring vars into line
Browse files Browse the repository at this point in the history
  • Loading branch information
@hry-gh
hry-gh committed May 28, 2024
1 parent 6f3c7ce commit 63336c3
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 64 deletions.
5 changes: 4 additions & 1 deletion content/objects/atom/proc/cross.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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." },
]
Expand Down
74 changes: 51 additions & 23 deletions templates/macros.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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>

Expand All @@ -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 %}
30 changes: 2 additions & 28 deletions templates/var.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,15 @@

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

{% block content %}

<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) }}

Expand Down
19 changes: 7 additions & 12 deletions templates/var_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down

0 comments on commit 63336c3

Please sign in to comment.