From cb5fac0dfc8f1e09d8cc07023a150969260de9c0 Mon Sep 17 00:00:00 2001 From: rafalp Date: Sat, 22 Jun 2024 23:12:03 +0200 Subject: [PATCH] Add page headers to all threads lists --- .../templates/misago/categories/header.html | 46 ++++--------------- misago/templates/misago/categories/index.html | 6 ++- misago/templates/misago/index_header.html | 24 ++++++++++ .../misago/private_threads/header.html | 26 +++++++++++ .../misago/private_threads/index.html | 12 ++++- misago/templates/misago/threads/header.html | 16 ++----- misago/templates/misago/threads/index.html | 7 ++- 7 files changed, 85 insertions(+), 52 deletions(-) create mode 100644 misago/templates/misago/index_header.html create mode 100644 misago/templates/misago/private_threads/header.html diff --git a/misago/templates/misago/categories/header.html b/misago/templates/misago/categories/header.html index 37e649ef91..ab85fc4f5a 100644 --- a/misago/templates/misago/categories/header.html +++ b/misago/templates/misago/categories/header.html @@ -1,43 +1,17 @@ {% load i18n %} -{% if is_index %} -
-
-
-
-
-
-
-
-

{{ settings.index_header|default:settings.forum_name }}

-
-
-
- {% if settings.index_message %} -
-
- {{ settings.index_message|force_escape|urlize|linebreaks|safe }} -
-
- {% endif %} -
-
-
-
-{% else %} -
-
-
-
-
-
-
-
-

{% trans "Categories" context "categories page" %}

-
+
+
+
+
+
+
+
+
+

{% trans "Categories" context "categories page" %}

-{% endif %} \ No newline at end of file +
\ No newline at end of file diff --git a/misago/templates/misago/categories/index.html b/misago/templates/misago/categories/index.html index f64d8dacc6..c98755f326 100644 --- a/misago/templates/misago/categories/index.html +++ b/misago/templates/misago/categories/index.html @@ -74,7 +74,11 @@ {% block content %}
- {% include "misago/categories/header.html" %} + {% if is_index %} + {% include "misago/index_header.html" %} + {% else %} + {% include "misago/categories/header.html" %} + {% endif %}
{% pluginoutlet CATEGORIES_LIST_START %} {% if categories_list %} diff --git a/misago/templates/misago/index_header.html b/misago/templates/misago/index_header.html new file mode 100644 index 0000000000..e4a3e6d72c --- /dev/null +++ b/misago/templates/misago/index_header.html @@ -0,0 +1,24 @@ +{% load i18n %} +
+
+
+
+
+
+
+
+

{{ settings.index_header|default:settings.forum_name }}

+
+
+
+ {% if settings.index_message %} +
+
+ {{ settings.index_message|force_escape|urlize|linebreaks|safe }} +
+
+ {% endif %} +
+
+
+
\ No newline at end of file diff --git a/misago/templates/misago/private_threads/header.html b/misago/templates/misago/private_threads/header.html new file mode 100644 index 0000000000..f8f24fdd98 --- /dev/null +++ b/misago/templates/misago/private_threads/header.html @@ -0,0 +1,26 @@ +{% load i18n %} +
+
+
+
+
+
+
+
+

{% trans "Private threads" context "private threads page" %}

+
+
+
+
+
+

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

+
+
+
+
+
+
\ No newline at end of file diff --git a/misago/templates/misago/private_threads/index.html b/misago/templates/misago/private_threads/index.html index ac94193a16..91da460490 100644 --- a/misago/templates/misago/private_threads/index.html +++ b/misago/templates/misago/private_threads/index.html @@ -1 +1,11 @@ -Private threads \ No newline at end of file +{% extends "misago/base.html" %} +{% load i18n %} + + +{% block content %} +
+ {% include "misago/private_threads/header.html" %} +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/misago/templates/misago/threads/header.html b/misago/templates/misago/threads/header.html index fd9ccf4485..f9fbaebaa9 100644 --- a/misago/templates/misago/threads/header.html +++ b/misago/templates/misago/threads/header.html @@ -1,25 +1,17 @@ {% load i18n %} - - -{% block content %}
-
+
-
+
- {% if is_index %} -

{{ settings.index_header|default:settings.forum_name }}

- {% else %} -

SITE THREADS

- {% endif %} +

{% trans "Threads" context "threads page" %}

-
-{% endblock content %} \ No newline at end of file +
\ No newline at end of file diff --git a/misago/templates/misago/threads/index.html b/misago/templates/misago/threads/index.html index a6c64f96b3..5f1f040aab 100644 --- a/misago/templates/misago/threads/index.html +++ b/misago/templates/misago/threads/index.html @@ -4,8 +4,11 @@ {% block content %}
- {% include "misago/threads/header.html" %} - + {% if is_index %} + {% include "misago/index_header.html" %} + {% else %} + {% include "misago/threads/header.html" %} + {% endif %}
{% if threads %}