From e8c5a0a77a38b0ea1d58b1c24aea985585aa5fbe Mon Sep 17 00:00:00 2001 From: Christian Moser Date: Wed, 14 Jan 2026 17:47:47 +0100 Subject: [PATCH] 2026.01.14 17:47:47 (cachyos.cmoser.eu) --- templates/base.html | 2 + tinywiki/settings.py | 18 ++-- tinywiki/templates/tinywiki/bs-base.html | 100 +++++++++++++++++++++++ 3 files changed, 112 insertions(+), 8 deletions(-) create mode 100644 tinywiki/templates/tinywiki/bs-base.html diff --git a/templates/base.html b/templates/base.html index c4fa2fc..ecb2513 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,6 +21,7 @@
+ {% block title %} {% if brand_logo %} {% else %} @@ -32,6 +33,7 @@ {% if subtitle %} {{ subtitle }} {% endif %} + {% endblock title %}
diff --git a/tinywiki/settings.py b/tinywiki/settings.py index 6bb3a6f..e747a6a 100644 --- a/tinywiki/settings.py +++ b/tinywiki/settings.py @@ -26,13 +26,6 @@ TINYWIKI_BOOSTRAP_TAGS = { } } -TINYWIKI_BASE_TEMPLATE = getattr( - settings, - "TINYWIKI_BASE_TEMPLATE", - getattr(settings, - "BASE_TEMPLATE", - "tinywiki/base.html") -) TINYWIKI_HOME = getattr(settings, "TINYWIKI_HOME", "tw-home") TINYWIKI_BBCODE_EXTRA_FORMATTERS = getattr(settings, 'TINYWIKI_BBCODE_EXTRA_FORMATTERS', None) @@ -40,4 +33,13 @@ TINYWIKI_BBCODE_EXTRA_SIMPLE_FORMATTERS = getattr(settings, 'TINYWIKI_BBCODE_EXTRA_SIMPLE_FORMATTERS', None) -USE_BOOTSTRAP = getattr(settings, "USE_BOOTSTRAP", False) +USE_BOOTSTRAP = getattr(settings, "USE_BOOTSTRAP", True) + +TINYWIKI_BASE_TEMPLATE = getattr( + settings, + "TINYWIKI_BASE_TEMPLATE", + getattr(settings, + "BASE_TEMPLATE", + ("tinywiki/bs-base.html" if USE_BOOTSTRAP + else "tinywiki/base.html") +) diff --git a/tinywiki/templates/tinywiki/bs-base.html b/tinywiki/templates/tinywiki/bs-base.html new file mode 100644 index 0000000..ecb2513 --- /dev/null +++ b/tinywiki/templates/tinywiki/bs-base.html @@ -0,0 +1,100 @@ + +{% load i18n static %} + + + + + TinyWiki + + {% block extra_css %}{% endblock %} + + + + {% block scripts %}{% endblock %} + + + +
+
+
+ {% block title %} + {% if brand_logo %} + + {% else %} + + + + {% endif %} + {{ brand_name }} + {% if subtitle %} + {{ subtitle }} + {% endif %} + {% endblock title %} +
+
+
+
+ +
    + {% if user.is_authenticated %} +
  • +
    + {% csrf_token %} + +
    +
    • + {% else %} +
  • + {% translate "Log in" %} +
    • + {% endif %} +
+
+
+
+
+ {% block left_sidebar %} + {{ tinywiki_sidebar }} + {% endblock left_sidebar %} +
+
+
+ {% block content %} +

It Works!

+ {% endblock %} +
+
+
+
+
+
+
+ + Powered by TinyWiki + + + © 2025 + +
+ {% block extra_body %}{% endblock extra_body %} + + + {% block extra_scripts %}{% endblock extra_scripts %} + + \ No newline at end of file