From f9845ba3ba5ca4213a4c50dd8109e13aa07cc440 Mon Sep 17 00:00:00 2001 From: vincent porte Date: Tue, 6 Feb 2024 15:59:53 +0100 Subject: [PATCH 1/3] reorder banners templates --- lacommunaute/templates/forum/category_forum_list.html | 7 +++++++ .../templates/forum_conversation/topic_create.html | 2 +- lacommunaute/templates/pages/home.html | 4 ++-- .../anonymous_users.html} | 0 .../{banner.html => banners/emplois_helpdesk.html} | 0 .../twins_promotion.html} | 0 6 files changed, 10 insertions(+), 3 deletions(-) rename lacommunaute/templates/partials/{anonymous_banner.html => banners/anonymous_users.html} (100%) rename lacommunaute/templates/partials/{banner.html => banners/emplois_helpdesk.html} (100%) rename lacommunaute/templates/partials/{promotion_banner.html => banners/twins_promotion.html} (100%) diff --git a/lacommunaute/templates/forum/category_forum_list.html b/lacommunaute/templates/forum/category_forum_list.html index 874527b26..0863954e1 100644 --- a/lacommunaute/templates/forum/category_forum_list.html +++ b/lacommunaute/templates/forum/category_forum_list.html @@ -8,6 +8,13 @@ {% endblock meta_description %} " {% block content %} +
+
+
+
{% include 'partials/banners/anonymous_users.html' %}
+
+
+
diff --git a/lacommunaute/templates/forum_conversation/topic_create.html b/lacommunaute/templates/forum_conversation/topic_create.html index 449cd1fc2..75a34e464 100644 --- a/lacommunaute/templates/forum_conversation/topic_create.html +++ b/lacommunaute/templates/forum_conversation/topic_create.html @@ -8,7 +8,7 @@
{% if not user.is_authenticated %} - {% include 'partials/anonymous_banner.html' %} + {% include 'partials/banners/anonymous_users.html' %} {% endif %}
diff --git a/lacommunaute/templates/pages/home.html b/lacommunaute/templates/pages/home.html index 2a1622510..47effc055 100644 --- a/lacommunaute/templates/pages/home.html +++ b/lacommunaute/templates/pages/home.html @@ -20,9 +20,9 @@
{% if user.is_authenticated %} - {% include 'partials/promotion_banner.html' %} + {% include 'partials/banners/twins_promotion.html' %} {% else %} - {% include 'partials/anonymous_banner.html' %} + {% include 'partials/banners/anonymous_users.html' %} {% endif %}
diff --git a/lacommunaute/templates/partials/anonymous_banner.html b/lacommunaute/templates/partials/banners/anonymous_users.html similarity index 100% rename from lacommunaute/templates/partials/anonymous_banner.html rename to lacommunaute/templates/partials/banners/anonymous_users.html diff --git a/lacommunaute/templates/partials/banner.html b/lacommunaute/templates/partials/banners/emplois_helpdesk.html similarity index 100% rename from lacommunaute/templates/partials/banner.html rename to lacommunaute/templates/partials/banners/emplois_helpdesk.html diff --git a/lacommunaute/templates/partials/promotion_banner.html b/lacommunaute/templates/partials/banners/twins_promotion.html similarity index 100% rename from lacommunaute/templates/partials/promotion_banner.html rename to lacommunaute/templates/partials/banners/twins_promotion.html From 324359dd5e3c8fe2b259c18d90347ee900e02901 Mon Sep 17 00:00:00 2001 From: vincent porte Date: Tue, 6 Feb 2024 17:12:55 +0100 Subject: [PATCH 2/3] add call_for_contributers banner in documentation page --- .../templates/forum/category_forum_list.html | 2 +- .../forum_conversation/topic_create.html | 4 +++- .../banners/call_for_contributers.html | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 lacommunaute/templates/partials/banners/call_for_contributers.html diff --git a/lacommunaute/templates/forum/category_forum_list.html b/lacommunaute/templates/forum/category_forum_list.html index 0863954e1..d900d8e08 100644 --- a/lacommunaute/templates/forum/category_forum_list.html +++ b/lacommunaute/templates/forum/category_forum_list.html @@ -11,7 +11,7 @@
-
{% include 'partials/banners/anonymous_users.html' %}
+
{% include 'partials/banners/call_for_contributers.html' %}
diff --git a/lacommunaute/templates/forum_conversation/topic_create.html b/lacommunaute/templates/forum_conversation/topic_create.html index 75a34e464..959e9e23f 100644 --- a/lacommunaute/templates/forum_conversation/topic_create.html +++ b/lacommunaute/templates/forum_conversation/topic_create.html @@ -7,7 +7,9 @@ {% block content %}
- {% if not user.is_authenticated %} + {% if user.is_authenticated %} + {% include 'partials/banners/emplois_helpdesk.html' %} + {% else %} {% include 'partials/banners/anonymous_users.html' %} {% endif %}
diff --git a/lacommunaute/templates/partials/banners/call_for_contributers.html b/lacommunaute/templates/partials/banners/call_for_contributers.html new file mode 100644 index 000000000..f48794c14 --- /dev/null +++ b/lacommunaute/templates/partials/banners/call_for_contributers.html @@ -0,0 +1,19 @@ +
+ +
+
+ +
+
+

+ C'est le bon moment pour contribuer ! +

+

+ Vous souhaitez mettre en avant une expertise spécifique, et proposer une fiche technique ? Soumettez votre proposition à l'équipe de la communauté. Nous serons ravi de mettre en avant votre contribution ! +

+
+ +
+
From 9039acf17b6ae6e4c28f3c46bdf05225f6a565ef Mon Sep 17 00:00:00 2001 From: vincent porte Date: Tue, 6 Feb 2024 17:25:01 +0100 Subject: [PATCH 3/3] add call_for_contributers banner in category forum pages --- lacommunaute/templates/forum/forum_detail.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lacommunaute/templates/forum/forum_detail.html b/lacommunaute/templates/forum/forum_detail.html index 39980659c..d8fb42797 100644 --- a/lacommunaute/templates/forum/forum_detail.html +++ b/lacommunaute/templates/forum/forum_detail.html @@ -12,6 +12,15 @@ {% endblock meta_description %} " {% block content %} + {% if forum.is_category %} +
+
+
+
{% include 'partials/banners/call_for_contributers.html' %}
+
+
+
+ {% endif %} {% get_permission 'can_add_topic' forum request.user as user_can_add_topic %}