diff options
Diffstat (limited to 'theme/templates')
| -rw-r--r-- | theme/templates/index.html | 14 | ||||
| -rw-r--r-- | theme/templates/wiki.html | 15 |
2 files changed, 29 insertions, 0 deletions
diff --git a/theme/templates/index.html b/theme/templates/index.html index 924335c..923d920 100644 --- a/theme/templates/index.html +++ b/theme/templates/index.html @@ -7,6 +7,19 @@ </section> <section> <h2>Recent Blog Posts</h2> +<<<<<<< HEAD:templates/index.html + {% set section = get_section(path="blog/_index.md") %} + {% set i = 0 %} + {% for page in section.pages %} + {% if i < 3%} + {% set_global i = i + 1%} + <div class="post"> + <time datetime="{{ page.date | date(format='%Y-%m-%d %H:%M:%S') }}">{{ page.date | date(format='%Y-%m-%d') }}</time> + <a href="/blog/{{ page.slug }}/">{{ page.title }}</a> + </div> + {% endif %} + {% endfor %} +======= <div class="post"> <time datetime="2024-03-15"><2024-03-15></time> <a href="/blog/self-hosting-ddns-updater.html">Self-Hosting DDNS Updater</a> @@ -19,6 +32,7 @@ <time datetime="2024-02-21"><2024-02-21></time> <a href="/blog/self-hosting-an-otter-wiki.html">Self-Hosting An Otter Wiki</a> </div> +>>>>>>> org:theme/templates/index.html <br> <a href="/blog/">All Posts →</a> </section> diff --git a/theme/templates/wiki.html b/theme/templates/wiki.html index 3d8b8fd..ead64c4 100644 --- a/theme/templates/wiki.html +++ b/theme/templates/wiki.html @@ -1,13 +1,27 @@ {% extends "base.html" %} +<<<<<<< HEAD:templates/wiki.html +{% block content %} +<h1>{{ section.title }}</h1> +======= {% block subtitle %}Wiki | {% endblock %} {% block main %} <h1>Wiki</h1> +>>>>>>> org:theme/templates/wiki.html <p>Use <code>Ctrl + F</code> to search wiki pages for keywords.</p> <div class="wiki-post"> <p>Wiki Page</p> <p>Last Updated</p> </div> +<<<<<<< HEAD:templates/wiki.html +{% for page in section.pages %} + <div class="wiki-post"> + <p><a href="/wiki/{{ page.slug }}/">{{ page.title }}</a></p> + <time datetime="{{ page.updated | date(format='%Y-%m-%d %H:%M:%S') }}">{{ page.updated | date(format='%Y-%m-%d')}}</p> + </div> +{% endfor %} +{% endblock content %} +======= {% for post in posts %} <div class="wiki-post"> <a href="{{ url_for("wiki", slug=post.slug) }}">{{ post.title }}</a> @@ -15,3 +29,4 @@ </div> {% endfor %} {% endblock %} +>>>>>>> org:theme/templates/wiki.html |