✨ update page templates for new header

okfde · Oct 9, 2023 · c3458bd · c3458bd
1 parent 277109d
commit c3458bd
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 180 deletions.
diff --git a/fragdenstaat_de/fds_blog/locale/de/LC_MESSAGES/django.po b/fragdenstaat_de/fds_blog/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fragdenstaat.defds_blog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-13 10:10-0500\n"
+"POT-Creation-Date: 2023-10-09 09:17-0500\n"
 "PO-Revision-Date: 2023-06-28 10:59+0200\n"
 "Last-Translator: Stefan Wehrmeyer <stefan.wehrmeyer@okfn.de>\n"
 "Language-Team: \n"
@@ -457,23 +457,6 @@ msgstr "Keine Artikel gefunden."
 msgid "Back"
 msgstr "Zurück"
 
-#: fragdenstaat_de/fds_blog/templates/fds_blog/base.html
-msgid "Freedom of Information investigations"
-msgstr "Recherchen zur Informationsfreiheit"
-
-#: fragdenstaat_de/fds_blog/templates/fds_blog/base.html
-msgid "RSS feed"
-msgstr "RSS-Feed"
-
-#: fragdenstaat_de/fds_blog/templates/fds_blog/base.html
-msgid "Categories"
-msgstr "Kategorien"
-
-#: fragdenstaat_de/fds_blog/templates/fds_blog/base.html
-#: fragdenstaat_de/fds_blog/templates/fds_blog/search.html
-msgid "Search"
-msgstr "Suche"
-
 #: fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html
 msgid "image credit: "
 msgstr "Foto-Credit: "
@@ -486,6 +469,10 @@ msgstr "von"
 msgid "Search articles"
 msgstr "Artikel suchen"
 
+#: fragdenstaat_de/fds_blog/templates/fds_blog/search.html
+msgid "Search"
+msgstr "Suche"
+
 #: fragdenstaat_de/fds_blog/templates/fds_blog/search.html
 #, python-format
 msgid "Results for “%(q)s”"
@@ -511,6 +498,15 @@ msgstr "^autor/(?P<username>[\\w\\.@+-]+)/$"
 msgid "^category/(?P<category>[\\w\\.@+-]+)/$"
 msgstr "^kategorie/(?P<category>[\\w\\.@+-]+)/$"
 
+#~ msgid "Freedom of Information investigations"
+#~ msgstr "Recherchen zur Informationsfreiheit"
+
+#~ msgid "RSS feed"
+#~ msgstr "RSS-Feed"
+
+#~ msgid "Categories"
+#~ msgstr "Kategorien"
+
 #~ msgid "Podcast"
 #~ msgstr "Podcast"
 

diff --git a/fragdenstaat_de/fds_cms/templates/cms/base.html b/fragdenstaat_de/fds_cms/templates/cms/base.html
@@ -5,7 +5,7 @@
 {% load sekizai_tags %}
 {% load frontendbuild %}
 
-{% block body_extra_attributes %} data-staticurl="{{ STATIC_URL }}"{% if request.user.is_staff %} data-sentry="{{ SENTRY_JS_URL}}"{% endif %}{% endblock %}
+{% block body_extra_attributes %} data-staticurl="{{ STATIC_URL }}"{% if request.user.is_staff %} data-sentry="{{ SENTRY_JS_URL}}"{% endif %}{% endblock body_extra_attributes %}
 
 {% block body_tag %}
   {% if request.user.is_authenticated and request.session.impostor %}
@@ -16,15 +16,14 @@
     <div class="top-banner" style="display: none;">
       {% static_placeholder "top_banner" %}
     </div>
-  {% endblock %}
+  {% endblock top_block %}
 
   {% block navbar %}
     {% include "header.html" %}
-  {% endblock %}
+  {% endblock navbar %}
 
   {% block body_wrapper %}
   <main class="main" id="main">
-
     {% block messages %}
       {% include "snippets/messages.html" %}
     {% endblock messages %}
@@ -35,17 +34,17 @@
           {% placeholder "content" %}
         {% endblock %}
       </div>
-    {% endblock %}
+    {% endblock body %}
   </main>
-  {% endblock %}
+  {% endblock body_wrapper %}
 
   {% block footer_container %}
     <footer class="footer" id="footer">
       <div class="container">
         {% static_placeholder "footer" %}
       </div>
     </footer>
-  {% endblock %}
+  {% endblock footer_container %}
 
 {% endblock body_tag %}
 
@@ -58,9 +57,9 @@
   {% endif %}
 
   {{ block.super }}
-{% endblock %}
+{% endblock scripts %}
 
 {% block below_scripts %}
   {% block tracking_code %}{% include "snippets/tracking.html" %}{% endblock %}
-{% endblock %}
+{% endblock below_scripts %}
 
diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html b/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html
@@ -3,16 +3,12 @@
 {% load cms_tags %}
 {% load menu_tags %}
 
-{% block body %}
-  <nav class="bg-body-tertiary" aria-label="breadcrumb">
-    <div class="container">
-      <ol class="breadcrumb">
-        {% show_breadcrumb 1 "cms/breadcrumbs.html" %}
-      </ol>
-    </div>
-  </nav>
+{% block navbar %}
+  {{ block.super }}
 
-  {% block app_body %}
-    {% placeholder "content" %}
-  {% endblock %}
-{% endblock %}
+  <nav class="container-md" aria-label="breadcrumb">
+    <ol class="breadcrumb">
+      {% show_breadcrumb 1 "cms/breadcrumbs.html" %}
+    </ol>
+  </nav>
+{% endblock navbar %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html b/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html
@@ -3,5 +3,7 @@
 {% load cms_tags %}
 
 {% block navbar %}
-  {% include "header_reduced.html" %}
+  {% with reduced=True %}
+    {% include "header.html" %}
+  {% endwith %}
 {% endblock %}
diff --git a/fragdenstaat_de/locale/de/LC_MESSAGES/django.po b/fragdenstaat_de/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-28 02:32-0500\n"
+"POT-Creation-Date: 2023-10-09 09:17-0500\n"
 "PO-Revision-Date: 2023-06-28 09:34+0200\n"
 "Last-Translator: Karl Engelhardt <karl.engelhardt@okfn.de>\n"
 "Language-Team: German <https://weblate.frag-den-staat.de/projects/froide/"
@@ -38,7 +38,6 @@ msgid "Message from Frontex"
 msgstr "Nachricht von Frontex"
 
 #: fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html
-#: fragdenstaat_de/templates/header.html
 msgid "Close"
 msgstr "Schließen"
 
@@ -671,16 +670,21 @@ msgid "Please fill out the questionnaire!"
 msgstr "Bitte füllen Sie den Fragebogen aus!"
 
 #: fragdenstaat_de/templates/header.html
-msgid "Toggle main menu"
-msgstr "Hauptmenü anzeigen"
+#: fragdenstaat_de/templates/header_minimal.html
+msgid "Skip to main content"
+msgstr ""
 
 #: fragdenstaat_de/templates/header.html
 msgid "Menu"
 msgstr "Menü"
 
 #: fragdenstaat_de/templates/header.html
-msgid "Main Menu"
-msgstr "Hauptmenü"
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: fragdenstaat_de/templates/header.html
+msgid "Donate"
+msgstr "Spenden"
 
 #: fragdenstaat_de/templates/header.html
 msgid "Requests"
@@ -706,34 +710,6 @@ msgstr "Kampagnen"
 msgid "Investigations"
 msgstr "Recherchen"
 
-#: fragdenstaat_de/templates/header.html
-msgid "Donate"
-msgstr "Spenden"
-
-#: fragdenstaat_de/templates/header.html
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: fragdenstaat_de/templates/header.html
-msgid "Search requests, authorities, investigations etc."
-msgstr "Suchen Sie in Anfragen, Behörden, Recherchen etc."
-
-#: fragdenstaat_de/templates/header.html
-msgid "Search"
-msgstr "Suche"
-
-#: fragdenstaat_de/templates/header.html
-msgid "Toggle account menu"
-msgstr "Kontomenü anzeigen"
-
-#: fragdenstaat_de/templates/header.html
-msgid "Account Menu"
-msgstr "Kontomenü"
-
-#: fragdenstaat_de/templates/header.html
-msgid "Log out"
-msgstr "Abmelden"
-
 #: fragdenstaat_de/templates/index.html
 msgid "Successful Requests"
 msgstr "Erfolgreiche Anfragen"
@@ -748,6 +724,10 @@ msgstr "Anfrage besuchen"
 msgid "My requests"
 msgstr "Meine Anfragen"
 
+#: fragdenstaat_de/templates/menu/user_menu.html
+msgid "Log out"
+msgstr "Abmelden"
+
 #: fragdenstaat_de/templates/moderation/warn_user_subject.txt
 msgid "Warning: violation of terms"
 msgstr "Warnung: Verstoß gegen Nutzungsbedingungen"
@@ -777,9 +757,26 @@ msgstr ""
 "Informationsfreiheitsanfragen, Informationsfreiheitsgesetze, "
 "Behördeninformationen"
 
+#~ msgid "Toggle main menu"
+#~ msgstr "Hauptmenü anzeigen"
+
+#~ msgid "Main Menu"
+#~ msgstr "Hauptmenü"
+
+#~ msgid "Search requests, authorities, investigations etc."
+#~ msgstr "Suchen Sie in Anfragen, Behörden, Recherchen etc."
+
+#~ msgid "Search"
+#~ msgstr "Suche"
+
+#~ msgid "Toggle account menu"
+#~ msgstr "Kontomenü anzeigen"
+
+#~ msgid "Account Menu"
+#~ msgstr "Kontomenü"
+
 #~ msgid "You like our work? Support us with a donation!"
-#~ msgstr ""
-#~ "Ihnen gefällt unsere Arbeit? Unterstützen Sie uns mit einer Spende!"
+#~ msgstr "Ihnen gefällt unsere Arbeit? Unterstützen Sie uns mit einer Spende!"
 
 #~ msgid "Donate now"
 #~ msgstr "Jetzt spenden"