Skip to content

Commit

Permalink
wip: hp & search results
Browse files Browse the repository at this point in the history
  • Loading branch information
hellodeloo committed Jul 3, 2023
1 parent 7ab3efc commit d686952
Show file tree
Hide file tree
Showing 28 changed files with 136 additions and 115 deletions.
2 changes: 1 addition & 1 deletion lacommunaute/templates/400.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block body_class %}p-error{{ block.super }}{% endblock %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/403.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% block content %}
{% block htmx %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

{% block content %}
{% block htmx %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block body_class %}p-error{{ block.super }}{% endblock %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/event/event_calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% block sub_title %}{% trans "calendar" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/event/event_confirm_delete.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% block sub_title %}{% trans "Delete event" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/event/event_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% block sub_title %}{% trans "Post a new Public Event" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/event/event_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block sub_title %}{% trans "My Events" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<section class="s-title-01 mt-lg-5">
<div class="s-title-01__container container">
<div class="s-title-01__row row mb-3">
<div class="s-title-01__col col-12">
Expand Down
14 changes: 7 additions & 7 deletions lacommunaute/templates/forum/category_forum_list.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% extends 'board_base.html' %}

{% extends "layouts/base.html" %}

{% block title %}Documentations{{ block.super }}{% endblock %}
{% block meta_description %}Des ressources exclusives pour les professionnels de l'inclusion{% endblock meta_description %}"

{% block content %}

<section class="s-page-menu-01 s-page-menu-01--communaute">
<div class="s-page-menu-01__container container">
<div class="s-page-menu-01__row row align-items-center">
<div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
<h1 class="h1-hero lh-sm font-weight-bold m-0">Documentations</h1>
<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>Documentations</h1>
<h2 class="mt-3">Des ressources exclusives pour les professionnels de l'inclusion (texte pour le SEO)</h2>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<button class="btn btn-sm btn-ico-only btn-secondary" type="button" id="dropdownMenuSocialShare" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-share-fill ri-lg" aria-label="{% trans "Share this topics on " %}"></i>
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuSocialShare">
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuSocialShare">
{% post_to_facebook topic '<i class="ri-facebook-fill ri-lg"></i> Partager sur Facebook' %}
{% post_to_whatsapp topic '<i class="ri-whatsapp-line ri-lg"></i> Partager sur Whatsapp' %}
{% post_to_twitter "{{topic_subject}}" topic '<i class="ri-twitter-line ri-lg"></i> Partager sur Twitter' %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<div class="row">
<div class="col-12">
<div id="{{ topic.pk }}" class="card post mb-3">
<div class="card-header mb-1 d-flex flex-column flex-md-row align-items-md-center">
<div class="card-header mb-1 d-flex align-items-center">
<div class="topic-thumbnail bg-light d-none d-md-block">
<i class="ri-article-line ri-xl mr-1" aria-hidden="true"></i>
<i class="ri-newspaper-line ri-xl mr-1" aria-hidden="true"></i>
</div>
<p class="h4 mb-0 flex-grow-1">
<a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
Expand All @@ -30,6 +30,9 @@
{{ topic.subject }} {% if topic.is_locked %}&nbsp;<i class="fas fa-times-circle locked-indicator" aria-label="{% trans 'This topic is locked' %}"></i>{% endif %}
</a>
</p>
<div>
{% include "forum_conversation/partials/social_share_buttons.html" with topic=topic %}
</div>
</div>
<div class="card-body pt-0">
<div class="row">
Expand Down Expand Up @@ -59,18 +62,12 @@
{% get_permission 'can_download_files' topic.forum request.user as user_can_download_files %}
{% endif %}
{% include "forum_conversation/forum_attachments/attachments_detail.html" with post=topic.first_post user_can_download_files=user_can_download_files %}

</div>
</div>
</div>
</div>
</div>
</div>
<div class="row align-items-sm-center mb-3 justify-content-end">
<div class="col-12 col-sm-auto">
{% include "forum_conversation/partials/social_share_buttons.html" with topic=topic %}
</div>
</div>
{% empty %}
<div class="row m-0 p-3">
<div class="col-12 pl-0">
Expand Down
16 changes: 8 additions & 8 deletions lacommunaute/templates/forum_conversation/topics_newsfeed.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
{% block title %}Actualités de l'inclusion{{ block.super }}{% endblock %}
{% block meta_description %}{% endblock meta_description %}"

{% block body_class %}p-homepage{{ block.super }}{% endblock %}
{% block body_class %}{{ block.super }}{% endblock %}

{% block content %}

<section class="s-page-menu-01 s-page-menu-01--communaute">
<div class="s-page-menu-01__container container">
<div class="s-page-menu-01__row row align-items-center">
<div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
<h1 class="h1-hero lh-sm font-weight-bold m-0">Actualités de l'inclusion</h1>
<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>Actualités de l'inclusion</h1>
<h2 class="mt-3">Retrouvez les dernières actus et infos de l'inclusion (texte pour le SEO)</h2>
</div>
</div>
Expand All @@ -40,9 +40,9 @@ <h2 class="mt-3">Retrouvez les dernières actus et infos de l'inclusion (texte p
{% if not user.is_authenticated %}
<section class="s-section">
<div class="s-section__container container">
<div class="s-section__row row mb-1 mb-md-3">
<div class="s-section__row row mb-1 mb-md-3 justify-content-center">
<div class="s-section__col col-12 col-lg-auto">
<a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-outline-primary justify-content-center">
<a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-primary">
<i class="ri-login-box-line ri-lg" aria-hidden="true"></i>
<span>
Je me connecte pour accéder à toutes mes thématiques
Expand Down
22 changes: 10 additions & 12 deletions lacommunaute/templates/forum_conversation/topics_public.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,26 @@
{% block title %}Accueil{{ block.super }}{% endblock %}
{% block meta_description %}Entraide, information et apprentissage pour les professionnels de l'Insertion par l'Activité Economique{% endblock meta_description %}"

{% block body_class %}p-homepage{{ block.super }}{% endblock %}
{% block body_class %}{{ block.super }}{% endblock %}

{% block content %}

<section class="s-page-menu-01 s-page-menu-01--communaute">
<div class="s-page-menu-01__container container">
<div class="s-page-menu-01__row row align-items-center">
<div class="s-page-menu-01__col s-page-menu-01__col--title col-12">
<h1 class="h1-hero lh-sm font-weight-bold m-0">Espace d'échanges</h1>
<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>Espace d'échanges</h1>
<h2 class="mt-3">Posez vos questions et répondez aux autres professionnels (texte pour le SEO)</h2>
</div>
</div>
<div class="s-page-menu-01__row row align-items-center">
<div class="s-page-menu-01__col s-page-menu-01__col--title col-12 col-lg-8 mt-3 mt-lg-5">
<div class="s-title-01__row row">
<div class="s-title-01__col col-12 mt-3 mt-lg-5">
{% include "partials/ask_a_question.html" %}
</div>
</div>

</div>
</section>


<div id="community"></div>

<section class="s-section mt-0">
Expand All @@ -52,9 +50,9 @@ <h2 class="mt-3">Posez vos questions et répondez aux autres professionnels (tex
{% if not user.is_authenticated %}
<section class="s-section">
<div class="s-section__container container">
<div class="s-section__row row mb-1 mb-md-3">
<div class="s-section__row row mb-1 mb-md-3 justify-content-center">
<div class="s-section__col col-12 col-lg-auto">
<a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-outline-primary justify-content-center">
<a href="{% url 'inclusion_connect:authorize' %}" class="btn btn-block btn-ico btn-primary">
<i class="ri-login-box-line ri-lg" aria-hidden="true"></i>
<span>
Je me connecte pour accéder à toutes mes thématiques
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/forum_member/join_forum_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% block sub_title %}{% trans "Join forum" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% block sub_title %}{% trans "Join forum" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% load str_filters %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/forum_member/profiles.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% load static %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/forum_search/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{% block title %}{% trans "Search" %}{{ block.super }}{% endblock %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% block sub_title %}{% trans "Mark forums read" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% block sub_title %}{% trans "Mark topics read" %}{% endblock sub_title %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/pages/accessibilite.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block body_class %}p-acces{{ block.super }}{% endblock %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
2 changes: 1 addition & 1 deletion lacommunaute/templates/pages/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% block body_class %}p-contact{{ block.super }}{% endblock %}

{% block content %}
<section class="s-title-01">
<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">
Expand Down
Loading

0 comments on commit d686952

Please sign in to comment.