From c22d531de6b66a4e3d122abcdca3a92ed239ba12 Mon Sep 17 00:00:00 2001
From: cubicroot <cccv@cubicroot.xyz>
Date: Sat, 14 Dec 2024 02:02:01 +0000
Subject: [PATCH] Seiten-Titel von statischen Seiten benutzen & prefixen
---
.../jinja2/plainui/static_page.html.j2 | 3 +-
.../jinja2/plainui/static_page_diff.html.j2 | 30 +++++++++----------
.../jinja2/plainui/static_page_edit.html.j2 | 2 +-
.../plainui/static_page_history.html.j2 | 2 +-
src/plainui/locale/de/LC_MESSAGES/django.po | 9 ++----
src/plainui/locale/en/LC_MESSAGES/django.po | 9 ++----
6 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/src/plainui/jinja2/plainui/static_page.html.j2 b/src/plainui/jinja2/plainui/static_page.html.j2
index d2f9f43e0..e8b256976 100644
--- a/src/plainui/jinja2/plainui/static_page.html.j2
+++ b/src/plainui/jinja2/plainui/static_page.html.j2
@@ -37,7 +37,7 @@
{% endcall %}
{%- endif %}
- {{ navMacro.top_nav(_("Wiki page") ) }}
+ {{ navMacro.top_nav("Wiki: " + page.title) }}
{% if not archive_mode %}
<div class="row">
@@ -56,7 +56,6 @@
{% endif %}
<div class="hub-card">
- <h2 class="hub-section-title">{{ page.title }}</h2>
<article class="hub-text">{{ markdownMacro.markdown(markdown=page_body | safe, border=False) }}</article>
</div>
{% endif %}
diff --git a/src/plainui/jinja2/plainui/static_page_diff.html.j2 b/src/plainui/jinja2/plainui/static_page_diff.html.j2
index 194e1d0c3..4d8d95b98 100644
--- a/src/plainui/jinja2/plainui/static_page_diff.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_diff.html.j2
@@ -6,7 +6,7 @@
{% endblock title %}
{% block content %}
- {{ navMacro.top_nav(_("Compare") ) }}
+ {{ navMacro.top_nav("Wiki: " + page.title) }}
<nav aria-label="breadcrumb">
<ol class="breadcrumb hub-breadcrumbs">
@@ -14,24 +14,24 @@
<li class="breadcrumb-item">
<a href="{{ url('plainui:static_page', page_slug=page_slug) }}">{{ page.title }}</a>
</li>
- <li class="breadcrumb-item">
- <a href="{{ url('plainui:static_page_global_history') }}">{{ _("Global History") }}</a>
- </li>
</ol>
</nav>
- <div class="row diff_rev">
- <div class="col">
- <h2>
- <a href="{{ url('plainui:static_page', page_slug=page_slug) }}?rev={{ rev_id.rev1 }}">{{ rev_id.rev1 }}</a>
- </h2>
- </div>
- <div class="col">
- <h2>
- <a href="">{{ rev_id.rev2 }}</a>
- </h2>
+ <div class="hub-card">
+ <h2 class="hub-section-title">{{ _("Compare") }}</h2>
+ <div class="row diff_rev">
+ <div class="col">
+ <h2>
+ <a href="{{ url('plainui:static_page', page_slug=page_slug) }}?rev={{ rev_id.rev1 }}">{{ rev_id.rev1 }}</a>
+ </h2>
+ </div>
+ <div class="col">
+ <h2>
+ <a href="">{{ rev_id.rev2 }}</a>
+ </h2>
+ </div>
</div>
+ <article class="pb-11">{{ diff |safe }}</article>
</div>
- <article class="pb-11">{{ diff |safe }}</article>
{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_edit.html.j2 b/src/plainui/jinja2/plainui/static_page_edit.html.j2
index 2c278773d..10cb8228b 100644
--- a/src/plainui/jinja2/plainui/static_page_edit.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_edit.html.j2
@@ -7,7 +7,7 @@
{% endblock title %}
{% block content %}
- {{ navMacro.top_nav(_("Edit") ) }}
+ {{ navMacro.top_nav("Wiki: " + page.title) }}
<nav aria-label="breadcrumb">
<ol class="breadcrumb hub-breadcrumbs">
diff --git a/src/plainui/jinja2/plainui/static_page_history.html.j2 b/src/plainui/jinja2/plainui/static_page_history.html.j2
index dd8fdde0c..68b9af311 100644
--- a/src/plainui/jinja2/plainui/static_page_history.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_history.html.j2
@@ -6,7 +6,7 @@
{% endblock title %}
{% block content %}
- {{ navMacro.top_nav(_("History") ) }}
+ {{ navMacro.top_nav("Wiki: " + page.title) }}
<nav aria-label="breadcrumb">
<ol class="breadcrumb hub-breadcrumbs">
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index 643960cae..67c0f4532 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -744,6 +744,9 @@ msgstr "Historie"
msgid "Wiki"
msgstr ""
+msgid "Compare"
+msgstr "Vergleichen"
+
msgid "This page is currently being edited by another user, please try again in a moment."
msgstr "Diese Seite wird aktuell von jemand anderem editiert. Bitte versuche es später erneut."
@@ -786,9 +789,6 @@ msgstr "{Unbekannter Nutzer}"
msgid "Wiki__history__rev_help"
msgstr "Wähle 2 Versionen um sie zu vergleichen."
-msgid "Compare"
-msgstr "Vergleichen"
-
msgid "Password Reset"
msgstr "Passwort Zurücksetzen"
@@ -1048,9 +1048,6 @@ msgstr "%(conf)s - Registrierung"
msgid "Create"
msgstr "erstellen"
-msgid "Wiki page"
-msgstr "Wikiseite"
-
#, python-format
msgid "Tag %(name)s"
msgstr "Tag %(name)s"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index 5aaecd472..1f6fe0719 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -744,6 +744,9 @@ msgstr ""
msgid "Wiki"
msgstr ""
+msgid "Compare"
+msgstr ""
+
msgid "This page is currently being edited by another user, please try again in a moment."
msgstr ""
@@ -786,9 +789,6 @@ msgstr ""
msgid "Wiki__history__rev_help"
msgstr "Chose 2 versions to compare them."
-msgid "Compare"
-msgstr ""
-
msgid "Password Reset"
msgstr ""
@@ -1048,9 +1048,6 @@ msgstr ""
msgid "Create"
msgstr ""
-msgid "Wiki page"
-msgstr ""
-
#, python-format
msgid "Tag %(name)s"
msgstr "Day %(name)s"
--
GitLab