diff --git a/web/flaskr/routes.py b/web/flaskr/routes.py
index e6147fcd..0989d95c 100755
--- a/web/flaskr/routes.py
+++ b/web/flaskr/routes.py
@@ -57,7 +57,6 @@
from flaskr.models import MeetingFiles
from flaskr.models import MeetingFilesExternal
from flaskr.models import User
-from flaskr.utils import retry_join_meeting
from netaddr import IPAddress
from netaddr import IPNetwork
from sqlalchemy import exc
@@ -1382,7 +1381,7 @@ def waiting_meeting(meeting_fake_id, user_id, h, fullname="", fullname_suffix=""
if not role:
return redirect(url_for("routes.index"))
return render_template(
- "meeting/join.html",
+ "meeting/wait.html",
meeting=meeting,
meeting_fake_id=meeting_fake_id,
user_id=user_id,
@@ -1390,9 +1389,6 @@ def waiting_meeting(meeting_fake_id, user_id, h, fullname="", fullname_suffix=""
role=role,
fullname=fullname,
fullname_suffix=fullname_suffix,
- retry_join_meeting=retry_join_meeting(
- request.referrer, role, fullname, fullname_suffix
- ),
)
diff --git a/web/flaskr/templates/meeting/join.html b/web/flaskr/templates/meeting/join.html
index 232a506b..37e07118 100644
--- a/web/flaskr/templates/meeting/join.html
+++ b/web/flaskr/templates/meeting/join.html
@@ -5,16 +5,69 @@
{% endblock %}
{% block main %}
- {% include 'meeting/signin.html' %}
-{% endblock %}
+
{% trans %}Rejoindre {{ the_meeting }}{% endtrans %}
+
+
+
+ {% if role == "authenticated" %}
{% endif %}
{% endblock %}
diff --git a/web/flaskr/templates/meeting/signin.html b/web/flaskr/templates/meeting/signin.html
deleted file mode 100644
index e0a26d46..00000000
--- a/web/flaskr/templates/meeting/signin.html
+++ /dev/null
@@ -1,77 +0,0 @@
- {% trans %}Rejoindre {{ the_meeting }}{% endtrans %}
-
-
-
- {% if role == "authenticated" %}
-
- {% endif %}
diff --git a/web/flaskr/templates/meeting/wait.html b/web/flaskr/templates/meeting/wait.html
new file mode 100644
index 00000000..27211477
--- /dev/null
+++ b/web/flaskr/templates/meeting/wait.html
@@ -0,0 +1,44 @@
+{% extends 'layout.html' %}
+
+{% block jumbotron %}
+{% include 'rie.html' %}
+{% endblock %}
+
+{% block main %}
+
+
+
+ {% trans %}Bonjour {{ fullname }}, vous pourrez bientôt entrer{% endtrans %}
+
+
+
+
+
+ {% trans %}Votre hôte n’est pas encore arrivé. Vous entrerez automatiquement dans la salle de visio-conférence dès qu’il sera présent.{% endtrans %}
+
+
+
+
+
+{% endblock %}
+
+{% block js %}
+
+{% endblock %}
diff --git a/web/flaskr/utils.py b/web/flaskr/utils.py
index 07e41fb0..5aede516 100644
--- a/web/flaskr/utils.py
+++ b/web/flaskr/utils.py
@@ -3,11 +3,3 @@
def secret_key():
return current_app.config["SECRET_KEY"]
-
-
-def retry_join_meeting(referrer, role, fullname, fullname_suffix):
- return bool(
- (referrer and "/meeting/wait/" in referrer)
- or (role in ("attendee", "moderator") and fullname)
- or (role == "authenticated" and fullname and fullname_suffix)
- )
diff --git a/web/instance/config.py b/web/instance/config.py
index b650ecec..87b08061 100755
--- a/web/instance/config.py
+++ b/web/instance/config.py
@@ -173,17 +173,6 @@
"reunion": lazy_gettext("une réunion à laquelle"),
"seminaire": "un séminaire auquel",
},
- "A_MEETING_ATTENTE": {
- "cours": lazy_gettext(
- "Votre cours n'a pas encore été activé par un modérateur "
- ),
- "reunion": lazy_gettext(
- "Votre réunion n'a pas encore été activée par un modérateur "
- ),
- "seminaire": lazy_gettext(
- "Votre séminaire n'a pas encore été activé par un modérateur "
- ),
- },
"WELCOME_PAGE_SUBTITLE": {
"cours": lazy_gettext(
"Créez un cours immédiatement avec des réglages standards. Ce cours ne sera pas enregistré dans votre liste de salons."
@@ -232,7 +221,6 @@
WORDING_A_MEETING_TO_WHICH = AVAILABLE_WORDINGS["A_MEETING_TO_WHICH"][
MEETING_KEY_WORDING
]
-WORDING_A_MEETING_ATTENTE = AVAILABLE_WORDINGS["A_MEETING_ATTENTE"][MEETING_KEY_WORDING]
WELCOME_PAGE_SUBTITLE = AVAILABLE_WORDINGS["WELCOME_PAGE_SUBTITLE"][MEETING_KEY_WORDING]
MEETING_MAIL_SUBJECT = AVAILABLE_WORDINGS["MEETING_MAIL_SUBJECT"][MEETING_KEY_WORDING]
@@ -263,7 +251,6 @@
"to_the_meeting": WORDING_TO_THE_MEETING,
"meeting_undefined_article": WORDING_MEETING_UNDEFINED_ARTICLE,
"a_meeting_to_which": WORDING_A_MEETING_TO_WHICH,
- "meeting_attente": WORDING_A_MEETING_ATTENTE,
"welcome_page_subtitle": WELCOME_PAGE_SUBTITLE,
"documentation_page_subtitle": DOCUMENTATION_PAGE_SUBTITLE,
"meeting_mail_subject": MEETING_MAIL_SUBJECT,
diff --git a/web/tests/test_utils.py b/web/tests/test_utils.py
deleted file mode 100644
index 5126e197..00000000
--- a/web/tests/test_utils.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import flaskr.utils
-
-
-def test_retry_join_meeting():
- SIGNIN_URL = "http://demo.test/meeting/signin/1/creator/1/hash/1432758aec5073701e4f0d65280a7dc7980a393e"
- WAIT_ROOM_URL = "http://demo.test/meeting/wait/1/creator/1/hash/1432758aec5073701e4f0d65280a7dc7980a393e/fullname/BBB%20User/fullname_suffix/XX"
-
- assert (
- flaskr.utils.retry_join_meeting(WAIT_ROOM_URL, "authenticated", "Alice", "")
- is True
- )
- assert flaskr.utils.retry_join_meeting(SIGNIN_URL, "attendee", "", "") is False
- assert flaskr.utils.retry_join_meeting(SIGNIN_URL, "attendee", "Alice", "") is True
- assert flaskr.utils.retry_join_meeting(SIGNIN_URL, "moderator", "", "") is False
- assert flaskr.utils.retry_join_meeting(SIGNIN_URL, "moderator", "Alice", "") is True
- assert flaskr.utils.retry_join_meeting(SIGNIN_URL, "authenticated", "", "") is False
- assert (
- flaskr.utils.retry_join_meeting(SIGNIN_URL, "authenticated", "Alice", "")
- is False
- )
- assert (
- flaskr.utils.retry_join_meeting(
- SIGNIN_URL, "authenticated", "Alice", "Service A"
- )
- is True
- )