Add page headers to all threads lists

rafalp · Jun 22, 2024 · cb5fac0 · cb5fac0
1 parent 89dcef4
commit cb5fac0
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 52 deletions.
diff --git a/misago/templates/misago/categories/header.html b/misago/templates/misago/categories/header.html
@@ -1,43 +1,17 @@
 {% load i18n %}
-{% if is_index %}
-  <div class="container page-header-container">
-    <div class="page-header page-header-forum-index">
-      <div class="page-header-bg-image">
-        <div class="page-header-bg-overlay">
-          <div class="page-header-image"></div>
-          <div class="page-header-banner page-header-banner-forum-index">
-            <div class="page-header-banner-bg-image">
-              <div class="page-header-banner-bg-overlay">
-                <h1>{{ settings.index_header|default:settings.forum_name }}</h1>
-              </div>
-            </div>
-          </div>
-          {% if settings.index_message %}
-            <div class="page-header-details">
-              <div class="page-header-message">
-                {{ settings.index_message|force_escape|urlize|linebreaks|safe }}
-              </div>
-            </div>
-          {% endif %}
-        </div>
-      </div>
-    </div>
-  </div>
-{% else %}
-  <div class="container page-header-container">
-    <div class="page-header page-header-categories">
-      <div class="page-header-bg-image">
-        <div class="page-header-bg-overlay">
-          <div class="page-header-image"></div>
-          <div class="page-header-banner page-header-banner-categories">
-            <div class="page-header-banner-bg-image">
-              <div class="page-header-banner-bg-overlay">
-                <h1>{% trans "Categories" context "categories page" %}</h1>
-              </div>
+<div class="container page-header-container">
+  <div class="page-header page-header-categories">
+    <div class="page-header-bg-image">
+      <div class="page-header-bg-overlay">
+        <div class="page-header-image"></div>
+        <div class="page-header-banner page-header-banner-categories">
+          <div class="page-header-banner-bg-image">
+            <div class="page-header-banner-bg-overlay">
+              <h1>{% trans "Categories" context "categories page" %}</h1>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-{% endif %}
+</div>
diff --git a/misago/templates/misago/categories/index.html b/misago/templates/misago/categories/index.html
@@ -74,7 +74,11 @@
 
 {% block content %}
 <div class="page page-categories{{ categories|iffalse:' page-message' }}">
-  {% include "misago/categories/header.html" %}
+  {% if is_index %}
+    {% include "misago/index_header.html" %}
+  {% else %}
+    {% include "misago/categories/header.html" %}
+  {% endif %}
   <div class="container page-container">
     {% pluginoutlet CATEGORIES_LIST_START %}
     {% if categories_list %}

diff --git a/misago/templates/misago/index_header.html b/misago/templates/misago/index_header.html
@@ -0,0 +1,24 @@
+{% load i18n %}
+<div class="container page-header-container">
+  <div class="page-header page-header-forum-index">
+    <div class="page-header-bg-image">
+      <div class="page-header-bg-overlay">
+        <div class="page-header-image"></div>
+        <div class="page-header-banner page-header-banner-forum-index">
+          <div class="page-header-banner-bg-image">
+            <div class="page-header-banner-bg-overlay">
+              <h1>{{ settings.index_header|default:settings.forum_name }}</h1>
+            </div>
+          </div>
+        </div>
+        {% if settings.index_message %}
+          <div class="page-header-details">
+            <div class="page-header-message">
+              {{ settings.index_message|force_escape|urlize|linebreaks|safe }}
+            </div>
+          </div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/misago/templates/misago/private_threads/header.html b/misago/templates/misago/private_threads/header.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+<div class="container page-header-container">
+  <div class="page-header page-header-private-threads">
+    <div class="page-header-bg-image">
+      <div class="page-header-bg-overlay">
+        <div class="page-header-image"></div>
+        <div class="page-header-banner page-header-banner-private-threads">
+          <div class="page-header-banner-bg-image">
+            <div class="page-header-banner-bg-overlay">
+              <h1>{% trans "Private threads" context "private threads page" %}</h1>
+            </div>
+          </div>
+        </div>
+        <div class="page-header-details">
+          <div class="page-header-message">
+            <p>
+              {% blocktrans trimmed context "private threads page" %}
+                Private threads are threads that can be seen only by their starters and the users they have invited. Moderators can also see these threads if they contain reported posts.
+              {% endblocktrans %}
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/misago/templates/misago/private_threads/index.html b/misago/templates/misago/private_threads/index.html
@@ -1 +1,11 @@
-Private threads
+{% extends "misago/base.html" %}
+{% load i18n %}
+
+
+{% block content %}
+<div class="page page-private-threads">
+  {% include "misago/private_threads/header.html" %}
+  <div class="container page-container">
+  </div>
+</div>
+{% endblock content %}
diff --git a/misago/templates/misago/threads/header.html b/misago/templates/misago/threads/header.html
@@ -1,25 +1,17 @@
 {% load i18n %}
-
-
-{% block content %}
 <div class="container page-header-container">
-  <div class="page-header page-header-category">
+  <div class="page-header page-header-threads">
     <div class="page-header-bg-image">
       <div class="page-header-bg-overlay">
         <div class="page-header-image"></div>
-        <div class="page-header-banner page-header-banner-category">
+        <div class="page-header-banner page-header-banner-threads">
           <div class="page-header-banner-bg-image">
             <div class="page-header-banner-bg-overlay">
-              {% if is_index %}
-                <h1>{{ settings.index_header|default:settings.forum_name }}</h1>
-              {% else %}
-                <h1>SITE THREADS</h1>
-              {% endif %}
+              <h1>{% trans "Threads" context "threads page" %}</h1>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-</div>
-{% endblock content %}
+</div>
diff --git a/misago/templates/misago/threads/index.html b/misago/templates/misago/threads/index.html
@@ -4,8 +4,11 @@
 
 {% block content %}
 <div class="page page-threads">
-  {% include "misago/threads/header.html" %}
-
+  {% if is_index %}
+    {% include "misago/index_header.html" %}
+  {% else %}
+    {% include "misago/threads/header.html" %}
+  {% endif %}
   <div class="container page-container">
 
     {% if threads %}