Skip to content

Commit

Permalink
wip: documentatons
Browse files Browse the repository at this point in the history
  • Loading branch information
@hellodeloo
hellodeloo committed Jul 3, 2023
1 parent d686952 commit 275276f
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 117 deletions.
60 changes: 32 additions & 28 deletions lacommunaute/templates/forum/category_forum_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,40 @@ <h2 class="mt-3">Des ressources exclusives pour les professionnels de l'inclusio
</div>
</section>

<div class="row">
{% for forum in forums %}
<div class="col-12 col-md-4 mb-3">
<div class="card c-card has-links-inside h-100">
{% if forum.image %}
<div class="card-header">
<img src="{{ forum.image.url }}" class="img-fluid img-fitcover" alt="">
</div>
{% endif %}
<div class="card-body pb-0">
<p class="h3 lh-base">{{ forum.name }}</p>
{% if forum.short_description %}
<div>
{{ forum.short_description }}
<section class="s-section">
<div class="s-section__container container">
<div class="s-section__row row">
{% for forum in forums %}
<div class="col-12 col-md-4 mb-3 mb-md-5">
<div class="card c-card has-links-inside h-100">
{% if forum.image %}
<div class="card-header">
<img src="{{ forum.image.url }}" class="img-fluid img-fitcover" alt="">
</div>
{% endif %}
<div class="card-body pb-0">
<p class="h3 lh-base"><i class="ri-newspaper-line font-weight-normal"></i> {{ forum.name }}</p>
{% if forum.short_description %}
<div>
{{ forum.short_description }}
</div>
{% endif %}
</div>
{% endif %}
</div>
<div class="card-footer text-right">
<a href="{% url 'forum_extension:forum' forum.slug forum.id %}"
class="btn btn-ico btn-link stretched-link matomo-event"
data-matomo-category="engagement"
data-matomo-action="show"
data-matomo-option="fichestechniques">
<span>Consulter les fiches du thème</span>
<i class="ri-arrow-right-up-line ri-lg"></i>
</a>
<div class="card-footer text-right">
<a href="{% url 'forum_extension:forum' forum.slug forum.id %}"
class="btn btn-ico btn-link stretched-link matomo-event"
data-matomo-category="engagement"
data-matomo-action="show"
data-matomo-option="fichestechniques">
<span>Consulter les fiches du thème</span>
<i class="ri-arrow-right-up-line ri-lg"></i>
</a>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
</div>
</section>

{% endblock content %}
179 changes: 95 additions & 84 deletions lacommunaute/templates/forum/forum_detail.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'board_base.html' %}
{% extends "layouts/base.html" %}
{% load i18n %}
{% load mptt_tags %}
{% load forum_tags %}
Expand All @@ -11,101 +11,111 @@
{% block meta_description %}{{forum.description}}{% endblock meta_description %}"

{% block content %}
<div class="row">
<div class="col-12">
<h1>
{{ forum.name }}
</h1>
</div>
</div>

{% if forum.short_description %}
<div class="row mt-3">
<div class="col-12">
<h2 class="h2">
{{ forum.short_description }}
</h2>
<section class="s-title-01 mt-lg-5">
<div class="s-title-01__container container">
<div class="s-title-01__row row">
<div class="s-title-01__col col-12">
<h1>{{ forum.name }}</h1>
{% if forum.short_description %}
<h2 class="mt-3">
{{ forum.short_description }}
</h2>
{% endif %}
</div>
</div>
</div>
{% endif %}
</section>

{% if forums %}
<div class="row mt-3">
<div class="col-12 col-sm-3">
<a href="{% url 'forum_extension:forum' parent_forum.slug parent_forum.id %}"
class="matomo-event h3"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="forum">
Fiches {{ parent_forum.name }}
</a>
<ul>
{% for forum in forums %}
<li><a href="{% url 'forum_extension:forum' forum.slug forum.id %}">{{ forum.name }}</a></li>
{% endfor%}
</ul>
</div>
<div class="col-12 col-sm-9">
<small>dernière mise à jour le : {{ forum.updated|date:"d/m/Y" }}</small>
{{forum.description.rendered|urlizetrunc_target_blank:30}}
</div>
<section class="s-section">
<div class="s-section__container container">
{% if forums %}
<div class="s-section__row row">
<div class="col-12 col-lg-9">
<small>dernière mise à jour le : {{ forum.updated|date:"d/m/Y" }}</small>
{{forum.description.rendered|urlizetrunc_target_blank:30}}
</div>
<div class="col-12 col-lg-3">
<a href="{% url 'forum_extension:forum' parent_forum.slug parent_forum.id %}"
class="matomo-event h3 text-decoration-none"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="forum">
Fiches {{ parent_forum.name }}
</a>
<ul>
{% for forum in forums %}
<li><a href="{% url 'forum_extension:forum' forum.slug forum.id %}">{{ forum.name }}</a></li>
{% endfor%}
</ul>
</div>
</div>
{% else %}
{% if forum.description %}
<div class="s-section__row row">
<div class="col-12">
<div class="lead">{{forum.description.rendered|urlizetrunc_target_blank:30}}</div>
</div>
</div>
{% endif %}
{% endif %}
</div>
{% else %}
{% if forum.description %}
<div class="row mt-3">
<div class="col-12">
<div class="lead">{{forum.description.rendered|urlizetrunc_target_blank:30}}</div>
</section>

{% if sub_forums %}
<section class="s-section">
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12">
{% forum_list sub_forums %}
</div>
</div>
</div>
{% endif %}
</section>
{% endif %}









{% if sub_forums %}
{% forum_list sub_forums %}
{% endif %}
{% if forum.is_forum %}
<div class="row justify-content-between mt-4">
{% get_permission 'can_add_topic' forum request.user as user_can_add_topic %}
{% get_permission 'can_approve_posts' forum request.user as user_can_access_stats %}
{% if user_can_add_topic or user_can_access_stats %}
<div class="col-12 col-sm-auto forum-actions-block">
{% if user_can_add_topic %}
<a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
class="btn btn-primary btn-ico matomo-event"
data-matomo-category="engagement"
data-matomo-action="contribute"
data-matomo-option="new_topic">
<i class="ri-chat-new-line ri-lg"></i>
<span>{% if forum.kind == 'NEWS' %}{% trans "New news" %}{% else %}{% trans "New topic" %}{% endif %}</span>
</a>
{% endif %}
{% if user_can_access_stats and forum.members_group%}
<button id="id_dropdown_moderators_stats_button" class="btn btn-ico-only btn-outline-primary" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-bar-chart-line ri-lg" aria-label="Statistiques animateurs"></i>
</button>
<div class="dropdown-menu" aria-labelledby="id_dropdown_moderators_stats_button">
<a href="{% url 'members:forum_profiles' forum.slug forum.pk %}"
class="dropdown-item matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="directory">
{% trans "Members" %}
</a>
<section class="s-section">
<div class="s-section__container container">
<div class="s-section__row row justify-content-between">
{% get_permission 'can_add_topic' forum request.user as user_can_add_topic %}
{% get_permission 'can_approve_posts' forum request.user as user_can_access_stats %}
{% if user_can_add_topic or user_can_access_stats %}
<div class="col-12 col-sm-auto forum-actions-block">
{% if user_can_add_topic %}
<a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
class="btn btn-primary btn-ico matomo-event"
data-matomo-category="engagement"
data-matomo-action="contribute"
data-matomo-option="new_topic">
<i class="ri-chat-new-line ri-lg"></i>
<span>{% if forum.kind == 'NEWS' %}{% trans "New news" %}{% else %}{% trans "New topic" %}{% endif %}</span>
</a>
{% endif %}
{% if user_can_access_stats and forum.members_group%}
<button id="id_dropdown_moderators_stats_button" class="btn btn-ico-only btn-outline-primary" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-bar-chart-line ri-lg" aria-label="Statistiques animateurs"></i>
</button>
<div class="dropdown-menu" aria-labelledby="id_dropdown_moderators_stats_button">
<a href="{% url 'members:forum_profiles' forum.slug forum.pk %}"
class="dropdown-item matomo-event"
data-matomo-category="engagement"
data-matomo-action="view"
data-matomo-option="directory">
{% trans "Members" %}
</a>
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endif %}
</div>
<div class="s-tabs-01">
<div class="s-tabs-01__container ">
</div>
</section>
{% endif %}

{% if forum.is_forum %}
<section class="s-tabs-01">
<div class="s-tabs-01__container">
<div class="s-tabs-01__row row">
<div class="s-tabs-01__col col-12">
<ul class="s-tabs-01__nav nav nav-tabs" role="tablist">
Expand Down Expand Up @@ -158,6 +168,7 @@ <h2 class="h2">
</div>
</div>
</div>
</div>
</section>
{% endif %}

{% endblock content %}
4 changes: 2 additions & 2 deletions lacommunaute/templates/forum/forum_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ <h3 class="h3 mb-0">
{% elif forum_contents.top_nodes.0.obj.parent.is_category %}
<div class="row mt-4">
{% for node in forum_contents.top_nodes %}
<div class="col-12 col-md-4 mb-3">
<div class="col-12 col-md-4 mb-3 mb-md-5">
<div class="card c-card has-links-inside h-100">
<div class="card-body pb-0">
<p class="h3 lh-base">{{ node.obj.name }}</p>
<p class="h3 lh-base"><i class="ri-newspaper-line font-weight-normal"></i> {{ node.obj.name }}</p>
{% if node.obj.short_description %}
<div>
{{ node.obj.short_description }}
Expand Down
3 changes: 0 additions & 3 deletions lacommunaute/templates/forum_conversation/topics_public.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,10 @@ <h2 class="mt-3">Posez vos questions et répondez aux autres professionnels (tex
<div class="s-section__container container">
<div class="s-section__row row">
<div class="s-section__col col-12">

<div class="c-box">

{% with topics=topics %}
{% include "forum_conversation/topic_list.html" %}
{% endwith %}

</div>
</div>
</div>
Expand Down

0 comments on commit 275276f

Please sign in to comment.