From 4972877f8ef0e0e3664d3dd0edd651107ddc026f Mon Sep 17 00:00:00 2001 From: mjfernez Date: Thu, 17 Jun 2021 00:25:03 -0400 Subject: .description is now rendered as html .description was previously read as a text file, but this is cumbersome and limits the user. This allows the user to embed html in their .description files by adding the "cur_path" variable to context. 'index.html' has been updated to render the template located in cur_path if a description file exists --- templates/index.html | 4 +++- templates/site/thoughts/rants/.description | 1 + views.py | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 templates/site/thoughts/rants/.description diff --git a/templates/index.html b/templates/index.html index 4bbad1d..714db1c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,7 +1,9 @@ {% extends 'base.html' %} {% block content %} -

{{ description }}

+{% if description %} +{% include cur_path + '/.description' %} +{% endif %} {% if dirs %}

Topics

diff --git a/templates/site/thoughts/rants/.description b/templates/site/thoughts/rants/.description new file mode 100644 index 0000000..33f8ee8 --- /dev/null +++ b/templates/site/thoughts/rants/.description @@ -0,0 +1 @@ + diff --git a/views.py b/views.py index c4e3fe2..682ff94 100644 --- a/views.py +++ b/views.py @@ -41,13 +41,13 @@ def index_dir(path): Lists are sorted alphabetically. *Special files include '.links' and '.description' the format of these - files is unquoted CSV and free text. Both are displayed on the index.html + files is unquoted CSV and text/html. Both are displayed on the index.html for the given `path` """ dirs = [] files = [] links = [] - description = "" + description = False contents = os.listdir(path) for obj in contents: if os.path.isfile(path + '/' + obj): @@ -55,8 +55,7 @@ def index_dir(path): with open(path + '/' + obj) as f: links = f.readlines() elif obj == siteconfig.DESC_FILE: - with open(path + '/' + obj) as f: - description = f.read() + description = True elif obj.startswith('.'): continue else: @@ -140,6 +139,7 @@ def render_file(path): dirs, files, links, description = index_dir(abs_path) context.update( { + 'cur_path': 'site/' + path, 'cur_dir': path.split('/')[-1] + '/', 'dirs': dirs, 'files': files, -- cgit v1.2.3