wip: hp & search results

gip-inclusion · Jul 3, 2023 · 77aaa1c · 77aaa1c
1 parent 6463064
commit 77aaa1c
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 41 deletions.
diff --git a/lacommunaute/templates/forum_conversation/partials/poster.html b/lacommunaute/templates/forum_conversation/partials/poster.html
@@ -9,7 +9,6 @@
 
 <small class="text-muted">
     {% spaceless %}
-        <i class="fas fa-clock"></i>&nbsp;
         {% if post.poster %}
             {% url 'members:profile' post.poster.username as poster_url %}
             {% blocktrans trimmed with poster_url=poster_url poster=post.poster_display_name creation_date=post.created %}

diff --git a/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
@@ -19,6 +19,7 @@
                     <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="topic-thumbnail bg-light d-none d-md-block">
+                                <i class="ri-article-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 %}"

diff --git a/lacommunaute/templates/forum_search/search.html b/lacommunaute/templates/forum_search/search.html
@@ -43,15 +43,16 @@ <h3 class="h4 mb-0">{{ page.paginator.count }} {% trans "result" %}{{ page.pagin
                                                     <tr>
                                                         <td class="position-relative">
                                                             <a href="{% url 'forum_conversation:topic' result.forum_slug result.forum result.topic_slug result.topic %}"
-                                                               class="btn-link stretched-link matomo-event"
+                                                               class="btn-link stretched-link btn-ico matomo-event"
                                                                data-matomo-category="engagement"
                                                                data-matomo-action="view"
                                                                data-matomo-option="topic"
                                                             >
-                                                                {{ result.topic_subject }}</a><br>
+                                                                <i class="ri-user-line ri-lg" aria-hidden="true"></i>
+                                                                <span>{{ result.topic_subject }}</span>
+                                                            </a><br>
                                                             <small class="text-muted">
                                                                 {% spaceless %}
-                                                                    <i class="fas fa-clock"></i>&nbsp;
                                                                     {% blocktrans trimmed with poster_username=result.poster_name creation_date=result.created %}
                                                                         By: {{ poster_username }},
                                                                     {% endblocktrans %}
@@ -67,15 +68,16 @@ <h3 class="h4 mb-0">{{ page.paginator.count }} {% trans "result" %}{{ page.pagin
                                                     <tr>
                                                         <td class="position-relative">
                                                             <a href="{% url 'forum_extension:forum' result.forum_slug result.forum %}"
-                                                               class="btn-link stretched-link matomo-event"
+                                                               class="btn-link btn-ico stretched-link matomo-event"
                                                                data-matomo-category="engagement"
                                                                data-matomo-action="view"
                                                                data-matomo-option="forum"
                                                             >
-                                                                {{ result.forum_name }}</a><br>
+                                                                <i class="ri-article-line" aria-hidden="true"></i>
+                                                                <span>{{ result.forum_name }}</span>
+                                                            </a><br>
                                                             <small class="text-muted">
                                                                 {% spaceless %}
-                                                                    <i class="fas fa-clock"></i>&nbsp;
                                                                     Fiche mise à jour
                                                                 {% endspaceless %}
                                                                 {{result.forum_updated|relativetimesince_fr}}

diff --git a/lacommunaute/templates/pages/home.html b/lacommunaute/templates/pages/home.html
@@ -107,13 +107,8 @@ <h3>Les dernières actus</h3>
                 </div>
             </div>
         </div>
-    </div>
-    </div>
     </section>
 
-
-
-
 {% endblock %}
 
 {% block extra_js %}

diff --git a/lacommunaute/templates/partials/ask_a_question.html b/lacommunaute/templates/partials/ask_a_question.html
@@ -1,31 +1,29 @@
 {% load i18n %}
 
-
 {% if forum %}
-    <div class="row">
-        <div class="col-12 col-lg-auto">
+    <div class="row align-items-center">
+        <div class="col-12 col-md-auto">
             <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">
+                class="btn btn-primary btn-ico btn-block 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>{% trans "New topic" %}</span>
             </a>
         </div>
-        <div class="col-12 col-lg-auto">
+        <div class="col-12 col-md-auto py-1 py-md-0 px-md-0 text-center">
             ou
         </div>
-        <div class="col-12 col-lg-auto">
+        <div class="col-12 col-md-auto">
             <a href="{% url 'forum_search_extension:search' %}"
-               class="btn btn-outline-primary btn-ico matomo-event"
-               data-matomo-category="engagement"
-               data-matomo-action="search"
-               data-matomo-option="query">
+                class="btn btn-outline-primary btn-ico btn-block matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="search"
+                data-matomo-option="query">
                 <i class="ri-chat-new-line ri-lg"></i>
                 <span>{% trans "Search forums" %}</span>
             </a>
         </div>
     </div>
 {% endif %}
-
diff --git a/lacommunaute/templates/partials/footer.html b/lacommunaute/templates/partials/footer.html
@@ -31,11 +31,7 @@
                                 Évènements publics
                             </a>
                         </li>
-                        <li>
-                            <a href="{% url 'forum_search_extension:search' %}">
-                                {% trans "Search forums" %}
-                            </a>
-                        </li>
+                        <li><a href="{% url 'forum_search_extension:search' %}">{% trans "Search forums" %}</a></li>
                     </ul>
                 </div>
                 <div class="s-footer-quick__col col-12 col-md-6 col-lg-auto">

diff --git a/lacommunaute/templates/partials/header_nav_secondary_items.html b/lacommunaute/templates/partials/header_nav_secondary_items.html
@@ -2,32 +2,27 @@
 {% load i18n %}
 {% load theme_inclusion %}
 <ul>
-    <li class="col-12 col-lg-auto">
-        <a href="{% url 'pages:home' %}">
-            Accueil
-        </a>
-    </li>
-    <li class="col-12 col-lg-auto">
+    <li>
         <a href="{% url 'forum_conversation_extension:publicforum' %}">
             Espace d'échanges
         </a>
     </li>
-    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+    <li>
         <a href="{% url 'forum_conversation_extension:newsfeed' %}">
             Actualités
         </a>
     </li>
-    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+    <li>
         <a href="{% url 'forum_extension:documentation' %}">
             Documentations
         </a>
     </li>
-    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+    <li>
         <a href="{% url 'event:calendar' %}">
             Évènements publics
         </a>
     </li>
-    <li class="col-12 col-lg-auto mt-3 mt-lg-0">
+    <li>
         <a href="{% url 'forum_search_extension:search' %}">
             {% trans "Search forums" %}
         </a>