Merge branch 'wiki-titles' into 'develop'

Seiten-Titel von statischen Seiten benutzen & prefixen

See merge request hub/hub!1087

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 %}

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,12 +14,11 @@
       <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="hub-card">
+    <h2 class="hub-section-title">{{ _("Compare") }}</h2>
     <div class="row diff_rev">
       <div class="col">
         <h2>
@@ -33,5 +32,6 @@
       </div>
     </div>
     <article class="pb-11">{{ diff |safe }}</article>
+  </div>
 
 {% endblock content %}

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">

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">

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"

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"