[DONE] Fix event info display (#1234)

* Fixup. Format code with Black * Correction de l'affichage des infos d'un évènement + affichage du nombre de vue * Delete 'get_username' call
EsupPortail · Jan 13, 2025 · 2e9bcf0 · 2e9bcf0
1 parent c8b4a80
commit 2e9bcf0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 42 deletions.
diff --git a/pod/live/templates/live/event-all-info.html b/pod/live/templates/live/event-all-info.html
@@ -1,24 +1,17 @@
 {% load i18n %}
 {% load tagging_tags %}
 
-<div class="ps-0 pe-0">
-  <div class="navbar d-flex flex-row-reverse p-0">
-    <ul class="nav nav-tabs" id="pod-infos-tabs" role="tablist">
-      {% if event.description %}
-        <li class="nav-item dropdown">
-          <a class="nav-link active show" id="summary-tab" data-toggle="tab" href="#summary" role="tab" aria-selected="true" title="{% trans 'Summary' %}">
-            <i class="bi bi-justify" aria-hidden="true"></i>
-          </a>
-        </li>
-      {% endif %}
-
-      {% if event.is_draft == False or event.owner == request.user or request.user in event.additional_owners.all or request.user.is_superuser %}
+<div class="video-info_duration-view-share">
+  <div class="pod-info-video__view">
+    <i class="bi bi-eye" aria-hidden="true"></i> {% trans 'Number of views' %}
+   {{ event.max_viewers }}
+  </div>
+    <div class="pod-info-video__buttons">
+     {% if event.is_draft == False or event.owner == request.user or request.user in event.additional_owners.all or request.user.is_superuser %}
         <button type="button" class="btn btn-link btn-lg pod-btn-share" data-bs-toggle="modal" data-bs-target="#share">
           <i class="bi bi-share" aria-hidden="true"></i><span class="visually-hidden">{% trans 'Embed/Share' %}</span>
         </button>
       {% endif %}
-    </ul>
-
   </div>
 </div>
 

diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html
@@ -4,27 +4,20 @@
 {% load thumbnail %}
 {% load event_tags %}
 
-<div class="tab-content w-100" id="event-meta">
-  {% if event.description %}
-    <div class="tab-pane fade active show" id="summary" role="tabpanel" aria-labelledby="summary-tab">
-      <h2 class="tab-title"><i class="bi bi-justify" aria-hidden="true"></i>&nbsp;{% trans 'Summary' %}</h2>
-      <hr>
-      <p>{{ event.description|safe }}</p>
-    </div>
-  {% endif %}
-
-  <div id="info"
-    {% if not event.description %}
-      class="tab-pane fade active show pod-live-info"
-    {% else %}
-      class="tab-pane fade"
-    {% endif %}
-  >
+{% if event.description%}
+  <div class="pod-info-video__summary my-3" id="summary">
+      <div class="pod-video-description">
+        {{ event.description|safe }}
+      </div>
+  </div>
+{% endif %}
 
-    <!-- <hr> -->
+<div id="video-meta">
+  <div id="info" class="pod-info-video__info">
+    <h2 class="tab-title visually-hidden"><i class=" bi bi-info-circle"></i>&nbsp;{% trans 'Infos' %}</h2>
     <ul class="list-inline d-flex flex-wrap">
       <li class="col-6 col-md-4">
-        <h3 class="meta-title">{% trans 'Broadcasted on:' %}</h3>
+        <span class="pod-meta-title">{% trans 'Broadcasted on:' %}</span>
         <div>
           {% if event.start_date__date == event.end_date__date %}
             {% blocktrans with start_date=event.start_date|date:"d/m/Y" start_time=event.start_date|time:"H:i" end_time=event.end_date|time:"H:i" %}{{start_date}} from {{start_time}} to {{end_time}}{% endblocktrans %}
@@ -34,29 +27,27 @@ <h3 class="meta-title">{% trans 'Broadcasted on:' %}</h3>
         </div>
       </li>
       <li class="col-6 col-md-4">
-        <h3 class="meta-title">{% trans 'Location:' %}</h3>
-        <div>{{ event.broadcaster.building.name }} - {{ event.broadcaster.name }}
-        </div>
+        <span class="pod-meta-title">{% trans 'Location:' %}</span>
+          <div>{{ event.broadcaster.building.name }} - {{ event.broadcaster.name }}</div>
       </li>
       <li class="col-6 col-md-4">
-        <h3 class="meta-title">{% trans 'Added by:' %}</h3>
-        <div>
-          <a class="btn btn-link btn-sm" href="{% url 'videos:videos' %}?owner={{ event.owner.get_username }}" {% if request.GET.is_iframe %}target="_blank"{% endif %}>
+        <span class="pod-meta-title">{% trans 'Added by:' %}</span>
+          <a class="btn btn-link btn-sm px-0" href="{% url 'videos:videos' %}?owner={{ event.owner.get_username}}" {% if request.GET.is_iframe %}target="_blank" {% endif %} title="{% blocktrans with video_user_name=video.owner %}Show video list of user “{{ video_user_name }}”{% endblocktrans %}" data-bs-toggle="tooltip" data-bs-placement="bottom">
           {% if event.owner.owner.userpicture.file %}
             {% thumbnail event.owner.owner.userpicture.file "x34" as im %}
               <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class='userpicture rounded' alt="" loading="lazy">
             {% endthumbnail %}
           {% endif %}
           {{ event.owner }}
           </a>
-        </div>
       </li>
       <li class="col-6 col-md-4">
-        <h3 class="meta-title">{% trans 'Type:' %}</h3>
-        <div><a href="{% url 'videos:videos' %}?type={{ event.type.slug }}" {% if request.GET.is_iframe %}target="_blank"{% endif %}>{{ event.type.title }}</a></div>
+        <span class="pod-meta-title">{% trans 'Type:' %}</span>
+        <a class="btn btn-link btn-sm px-0" href="{% url 'videos:videos' %}?type={{ event.type.slug }}" {% if request.GET.is_iframe %}target="_blank"{% endif %}>{{ event.type.title }}</a>
       </li>
     </ul>
   </div>
+</div>
 
   {% if event.is_draft == False or event.owner == request.user or request.user in event.additional_owners.all or request.user.is_superuser %}
     <!-- Start modal -->
@@ -133,4 +124,3 @@ <h2 class="modal-title h5" id="shareLabel">
       </div> <!-- End modal dialog-->
     </div> <!-- End modal -->
   {% endif %}
-</div>