Merge pull request #34 from yaal-coop/issue-13-waiting-message

Mise à jour de la formulation du message d'attente

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 sqlalchemy import exc
 from webdav3.client import Client as webdavClient
 from webdav3.exceptions import WebDavException
@@ -1360,17 +1359,14 @@ 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,
         h=h,
         role=role,
         fullname=fullname,
         fullname_suffix=fullname_suffix,
-        retry_join_meeting=retry_join_meeting(
-            request.referrer, role, fullname, fullname_suffix
-        ),
     )
 
 

web/flaskr/static/css/global.css

@@ -100,7 +100,7 @@ form.delete {
 }
 
 .rf-highlight.info {
-  border-color: var(--bf500) ;
+  border-color: var(--border-plain-blue-france) ;
   background-color: var(--bf300-plain);
   text-align: center;
   font-size: 0.9em;
@@ -370,7 +370,7 @@ Secondary buttons are broken in version 0.3.1.
 This is a fix until we deal with the update.
 */
 .rf-btn--secondary {
-  border: 1px var(--bf500) solid;
+  border: 1px var(--border-plain-blue-france) solid;
 }
 
 @media (max-width: 749px) {

web/flaskr/static/css/spinner.css

@@ -17,7 +17,7 @@
     width: 18px;
     height: 18px;
     margin: 0 5px;
-    background-color: var(--bf500);
+    background-color: var(--background-action-high-blue-france-active);
     display: inline-block;
     border-radius: 100%;
     animation: sk-bouncedelay 1.4s infinite ease-in-out both;