From 73931c2ed779c8324c7d4354b2b48d9d23dd64c7 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Tue, 2 Aug 2022 17:20:26 +0200
Subject: [PATCH] fix: Move Meetecho buttons to separate button group (#4295)

Fixes #4288
---
 .../meeting/session_buttons_include.html      | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index 2a8cc846c..1e18f53db 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -13,6 +13,33 @@
                         {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
                         {% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %}
                     {% endif %}
+                    <div class="d-flex">
+                    {% if timeslot.location.video_stream_url or timeslot.location.onsite_tool_url %}
+                    <div id="session-meetecho-buttons-{{ session.pk }}"
+                         role="group"
+                         class="btn-group btn-group-sm d-none d-lg-flex me-1">
+                                {# Video stream (meetecho) #}
+                                {% if timeslot.location.video_stream_url %}
+                                    <a class="btn btn-outline-primary"
+                                       role="button"
+                                       href="{{ timeslot.location.video_stream_url|format:session }}"
+                                       aria-label="Full Client with Video"
+                                       title="Full Client with Video">
+                                        <i class="bi bi-camera-video"></i>
+                                    </a>
+                                {% endif %}
+                                {# Onsite tool (meetecho_onsite) #}
+                                {% if timeslot.location.onsite_tool_url %}
+                                    <a class="btn btn-outline-primary"
+                                       role="button"
+                                       href="{{ timeslot.location.onsite_tool_url|format:session }}"
+                                       aria-label="Onsite tool"
+                                       title="Onsite tool">
+                                       <i class="bi bi-phone"></i>
+                                    </a>
+                                {% endif %}
+                    </div>
+                    {% endif %}
                     <div id="session-buttons-{{ session.pk }}"
                          role="group"
                          class="btn-group btn-group-sm d-none d-lg-flex">
@@ -63,26 +90,6 @@
                                    title="Chat room for {{ session.chat_room_name }}">
                                     <i class="bi bi-chat"></i>
                                 </a>
-                                {# Video stream (meetecho) #}
-                                {% if timeslot.location.video_stream_url %}
-                                    <a class="btn btn-outline-primary"
-                                       role="button"
-                                       href="{{ timeslot.location.video_stream_url|format:session }}"
-                                       aria-label="Full Client with Video"
-                                       title="Full Client with Video">
-                                        <i class="bi bi-camera-video"></i>
-                                    </a>
-                                {% endif %}
-                                {# Onsite tool (meetecho_onsite) #}
-                                {% if timeslot.location.onsite_tool_url %}
-                                    <a class="btn btn-outline-primary"
-                                       role="button"
-                                       href="{{ timeslot.location.onsite_tool_url|format:session }}"
-                                       aria-label="Onsite tool"
-                                       title="Onsite tool">
-                                       <i class="bi bi-phone"></i>
-                                    </a>
-                                {% endif %}
                                 {# Audio stream #}
                                 {% if timeslot.location.audio_stream_url %}
                                     <a class="btn btn-outline-primary"
@@ -364,6 +371,7 @@
                         {% endwith %}
                     </ul>
                 </div>
+            </div>
                 {% endwith %}
             {% endwith %}
         {% endwith %}