From 283654d9a0d644ec3cd6e9c06898f11ac8effa78 Mon Sep 17 00:00:00 2001
From: mjfernez <mjf@mjfer.net>
Date: Wed, 22 Dec 2021 16:59:15 -0500
Subject: Remove site as the parent directory, manual merge

merges needed changes (and CSS) from mjfer.net branch
---
 templates/base.html      | 6 +++---
 templates/index.html     | 2 +-
 templates/site/home.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/base.html b/templates/base.html
index 5ca253a..c280184 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,19 +14,19 @@
         <div class="navbar">
         <b>|</b> <!-- This makes the bar symmetrical -->
         {% for dir in navbar %}
-        <b> <a href="/site/{{ dir }}">{{ dir }}/</a> |</b>
+        <b> <a href="/{{ dir }}">{{ dir }}/</a> |</b>
         {% endfor %}
         <!-- Add icons here -->
         <a href="/feed.xml"target="_blank" rel="noopener noreferrer">
             <img src="https://icons.getbootstrap.com/assets/icons/rss-fill.svg">
         </a>
         </div>
-        <h2>{{ title }}</h2>
+        <h2 class="center">{{ title }}</h2>
         <div class="content">
             {% block content %}
             {% endblock %}
             <h3 class="center">{{ errors }}</h3>
-            {% if parent_dir != '/site/' %}
+            {% if parent_dir %}
             <h3 class="center"><a href="{{ parent_dir }}">Go up to parent folder ({{ parent_dir }})</a></h3>
             {% endif %}
         </div>
diff --git a/templates/index.html b/templates/index.html
index c8356fe..b612c63 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,7 +2,7 @@
 {% block content %}
 <center>
 {% if description %}
-{% include cur_path + '/.description' %}
+{% include '/site/' + cur_path + '/.description' %}
 {% endif %}
 
 {% if dirs %}
diff --git a/templates/site/home.html b/templates/site/home.html
index 01d676e..46c1663 100644
--- a/templates/site/home.html
+++ b/templates/site/home.html
@@ -1,4 +1,4 @@
 {% extends 'base.html' %}
 {% block content %}
-<p>Home</p>
+<center><p>Home</p></center>
 {% endblock %}
-- 
cgit v1.2.3