Skip to content

Commit

Permalink
(moderation) activate moderation queue for anonymous
Browse files Browse the repository at this point in the history
  • Loading branch information
@vincentporte
vincentporte committed Feb 5, 2024
1 parent 5d73c7e commit 01ba38b
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 2 deletions.
6 changes: 5 additions & 1 deletion lacommunaute/templates/forum_conversation/topic_create.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
{% endblock sub_title %}
{% block content %}
<div class="row">
<div class="col-12 mb-3 mb-lg-5">{% include "partials/banner.html" %}</div>
<div class="col-12 mb-3 mb-lg-5">
{% if not user.is_authenticated %}
{% include 'partials/anonymous_banner.html' %}
{% endif %}
</div>
<div class="col-12">
<h1>{{ forum.name }}</h1>
</div>
Expand Down
92 changes: 92 additions & 0 deletions lacommunaute/templates/forum_moderation/moderation_queue/list.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{% extends 'board_base.html' %}
{% load i18n %}
{% load forum_member_tags %}
{% block sub_title %}
{% trans "Moderation queue" %}
{% endblock sub_title %}
{% block content %}
<div class="row">
<div class="col-12">
<h1>{% trans "Moderation queue" %}</h1>
</div>
</div>
<div class="mb-3 row">
<div class="col-6 col-md-4 forum-actions-block">
{% if paginator.count > 0 %}
<p class="mt-1 mb-0 text-muted">
{% blocktrans with paginator.count as topic_length %}{{ topic_length }} posts found{% endblocktrans %}
</p>
{% endif %}
</div>
<div class="col-12 col-md-8 pagination-block">
{% with "pagination-sm justify-content-end" as pagination_size %}
{% include "partials/pagination.html" %}
{% endwith %}
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card postmoderationlist">
<div class="card-header">
<div class="row panel-row">
<div class="col-12 col-md-8 post-name-col">
<h3 class="m-0 card-title h5">{% trans "Moderation queue" %}</h3>
</div>
<div class="col-md-2 d-none d-md-block moderation-col">{% trans "Topic" %}</div>
<div class="col-md-2 d-none d-md-block moderation-col">{% trans "Forum" %}</div>
</div>
</div>
<div class="p-0 card-body">
{% for post in posts %}
<div class="m-0 row">
<div class="col-12 col-md-8 post-name">
<table class="post-data-table">
<tr>
<td class="post-name">
<a href="{% url 'forum_moderation:queued_post' post.pk %}" class="post-name-link">{{ post.subject }}</a>
<div>
<div class="post-created">
{% if post.poster %}
{% url 'member:profile' post.poster_id as poster_url %}
{% blocktrans trimmed with poster_url=poster_url username=post.poster|forum_member_display_name creation_date=post.created %}
By: <a href="{{ poster_url }}">{{ username }}</a> on {{ creation_date }}
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with poster_username=post.username creation_date=post.created %}
By: {{ poster_username }} on {{ creation_date }}
{% endblocktrans %}
{% endif %}
</div>
</div>
</td>
</tr>
</table>
</div>
<div class="col-md-2 d-none d-md-block topic-name">
{% if post.is_topic_head %}
<span class="badge badge-secondary">{% trans "New topic" %}</span>
{% else %}
<a href="{% url 'forum_conversation:topic' forum_slug=post.topic.forum.slug forum_pk=post.topic.forum.pk slug=post.topic.slug pk=post.topic.pk %}" class="post-name-link">{{ post.topic.subject }}</a>
{% endif %}
</div>
<div class="col-md-2 d-none d-md-block forum-name">
<a href="{% url 'forum_extension:forum' slug=post.topic.forum.slug pk=post.topic.forum.pk %}" class="post-name-link">{{ post.topic.forum.name }}</a>
</div>
</div>
{% empty %}
<div class="row m-0 px-3 py-2">
<div class="p-0 col-12">{% trans "No posts awaiting approval." %}</div>
</div>
{% endfor %}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12 pagination-block">
{% with "pagination-sm justify-content-end" as pagination_size %}
{% include "partials/pagination.html" %}
{% endwith %}
</div>
</div>
{% endblock content %}
8 changes: 7 additions & 1 deletion lacommunaute/templates/pages/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
<section>
<div class="s-section__container container">
<div class="s-section__row row mt-3 mt-md-5">
<div class="s-section__col col-12">{% include 'partials/promotion_banner.html' %}</div>
<div class="s-section__col col-12">
{% if user.is_authenticated %}
{% include 'partials/promotion_banner.html' %}
{% else %}
{% include 'partials/anonymous_banner.html' %}
{% endif %}
</div>
</div>
</div>
</section>
Expand Down
14 changes: 14 additions & 0 deletions lacommunaute/templates/partials/anonymous_banner.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="alert alert-warning alert-dismissible fade show" role="status">
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Fermer"></button>
<div class="row">
<div class="col-auto pe-0">
<i class="ri-alarm-warning-line ri-xl text-warning"></i>
</div>
<div class="col">
<p class="mb-2">
Pour que vos questions et réponses apparaissent plus rapidement dans l'espace d'échanges, nous vous recommandons de vous connecter avec votre compte Inclusion Connect.
<strong><a href="{% url 'inclusion_connect:authorize' %}" rel="nofollow">Je me connecte !</a></strong>
</p>
</div>
</div>
</div>
6 changes: 6 additions & 0 deletions lacommunaute/templates/partials/header_nav_primary_items.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
<a href="{% url 'forum_extension:index' %}" class="dropdown-item text-primary matomo-event" data-matomo-category="engagement" data-matomo-action="view" data-matomo-option="forums">Accéder à mes thématiques</a>
</li>
{% if user.is_superuser %}
<li>
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item text-primary" href="{% url 'forum_moderation:queue' %}"><i class="ri-alarm-warning-line ri-xl text-warning"></i>Moderation Queue</a>
</li>
<li>
<div class="dropdown-divider"></div>
</li>
Expand Down

0 comments on commit 01ba38b

Please sign in to comment.