From 872009894da1e11459c9439f7a1805981719184b Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Fri, 7 Jun 2024 13:51:24 +0200 Subject: [PATCH] New index page for ETEAM Signed-off-by: Emmy D'Anello --- locale/fr/LC_MESSAGES/django.po | 206 ++++++++++++------ tfjm/context_processors.py | 7 + tfjm/settings.py | 13 +- tfjm/static/tfjm/img/eteam.png | Bin 0 -> 15121 bytes tfjm/templates/base.html | 6 +- tfjm/templates/index_eteam.html | 67 ++++++ .../templates/{index.html => index_tfjm.html} | 0 tfjm/templates/navbar.html | 6 +- tfjm/urls.py | 3 +- 9 files changed, 231 insertions(+), 77 deletions(-) create mode 100644 tfjm/context_processors.py create mode 100644 tfjm/static/tfjm/img/eteam.png create mode 100644 tfjm/templates/index_eteam.html rename tfjm/templates/{index.html => index_tfjm.html} (100%) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 41664fe..7f9121e 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-07 13:20+0200\n" +"POT-Creation-Date: 2024-06-07 13:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -217,7 +217,7 @@ msgstr "" msgid "Toggle fullscreen mode" msgstr "Inverse le mode plein écran" -#: chat/templates/chat/content.html:76 tfjm/templates/navbar.html:117 +#: chat/templates/chat/content.html:76 tfjm/templates/navbar.html:119 msgid "Log out" msgstr "Déconnexion" @@ -241,15 +241,15 @@ msgstr "Chat du TFJM²" #: chat/templates/chat/login.html:10 chat/templates/chat/login.html:29 #: registration/templates/registration/password_reset_complete.html:10 -#: tfjm/templates/base.html:79 tfjm/templates/base.html:80 -#: tfjm/templates/navbar.html:98 +#: tfjm/templates/base.html:81 tfjm/templates/base.html:82 +#: tfjm/templates/navbar.html:100 #: tfjm/templates/registration/includes/login.html:22 #: tfjm/templates/registration/login.html:7 #: tfjm/templates/registration/login.html:8 msgid "Log in" msgstr "Connexion" -#: chat/urls.py:13 tfjm/templates/navbar.html:66 +#: chat/urls.py:13 tfjm/templates/navbar.html:68 msgid "Chat" msgstr "Chat" @@ -264,7 +264,7 @@ msgstr "équipes" msgid "round" msgstr "tour" -#: draw/apps.py:10 tfjm/templates/navbar.html:60 +#: draw/apps.py:10 tfjm/templates/navbar.html:62 msgid "Draw" msgstr "Tirage au sort" @@ -1424,12 +1424,12 @@ msgstr "Modifier" #: participation/templates/participation/create_team.html:11 #: participation/templates/participation/tournament_form.html:14 -#: tfjm/templates/base.html:75 +#: tfjm/templates/base.html:77 msgid "Create" msgstr "Créer" #: participation/templates/participation/join_team.html:11 -#: tfjm/templates/base.html:70 +#: tfjm/templates/base.html:72 msgid "Join" msgstr "Rejoindre" @@ -1979,7 +1979,7 @@ msgid "Edit tournament" msgstr "Modifier le tournoi" #: participation/templates/participation/tournament_detail.html:74 -#: tfjm/templates/navbar.html:29 +#: tfjm/templates/navbar.html:31 msgid "Teams" msgstr "Équipes" @@ -2052,7 +2052,7 @@ msgid "Back to tournament page" msgstr "Retour à la page du tournoi" #: participation/templates/participation/tournament_list.html:6 -#: tfjm/templates/base.html:62 +#: tfjm/templates/base.html:64 msgid "All tournaments" msgstr "Tous les tournois" @@ -2083,8 +2083,8 @@ msgstr "Modèles :" msgid "Warning: non-free format" msgstr "Attention : format non libre" -#: participation/views.py:62 tfjm/templates/base.html:74 -#: tfjm/templates/navbar.html:35 +#: participation/views.py:62 tfjm/templates/base.html:76 +#: tfjm/templates/navbar.html:37 msgid "Create team" msgstr "Créer une équipe" @@ -2096,8 +2096,8 @@ msgstr "Vous ne participez pas, vous ne pouvez pas créer d'équipe." msgid "You are already in a team." msgstr "Vous êtes déjà dans une équipe." -#: participation/views.py:103 tfjm/templates/base.html:69 -#: tfjm/templates/navbar.html:40 +#: participation/views.py:103 tfjm/templates/base.html:71 +#: tfjm/templates/navbar.html:42 msgid "Join team" msgstr "Rejoindre une équipe" @@ -3713,11 +3713,11 @@ msgstr "Privé, réservé aux utilisateur⋅rices explicitement autorisé⋅es" msgid "Admin users" msgstr "Administrateur⋅rices" -#: tfjm/settings.py:172 +#: tfjm/settings.py:173 msgid "English" msgstr "Anglais" -#: tfjm/settings.py:173 +#: tfjm/settings.py:174 msgid "French" msgstr "Français" @@ -3774,7 +3774,15 @@ msgstr "" "administrateur⋅rices avec les détails de l'erreur. Vous pouvez désormais " "retourner chercher d'autres solutions.." -#: tfjm/templates/base.html:66 +#: tfjm/templates/base.html:13 +msgid "ETEAM Platform" +msgstr "Plateforme de l'ETEAM" + +#: tfjm/templates/base.html:16 +msgid "Registration platform to the ETEAM." +msgstr "Plateforme d'inscription à l'ETEAM." + +#: tfjm/templates/base.html:68 msgid "Search results" msgstr "Résultats de la recherche" @@ -3786,42 +3794,105 @@ msgstr "Nous contacter" msgid "About" msgstr "À propos" -#: tfjm/templates/index.html:9 +#: tfjm/templates/index_eteam.html:9 tfjm/templates/index_tfjm.html:9 msgid "Welcome onto the registration site of the" msgstr " Bienvenue sur le site d'inscription au" -#: tfjm/templates/index.html:18 -msgid "You want to participate to the 𝕋𝔽𝕁𝕄² ?" -msgstr " Tu souhaites participer au 𝕋𝔽𝕁𝕄² ?" +#: tfjm/templates/index_eteam.html:18 +msgid "You want to participate to the ETEAM ?" +msgstr " Tu souhaites participer à l'ETEAM ?" -#: tfjm/templates/index.html:20 -msgid "Your team is already complete?" -msgstr "Ton équipe est déjà formée ?" +#: tfjm/templates/index_eteam.html:20 +msgid "Your team is selected and already complete?" +msgstr "Ton équipe est sélectionnée et déjà formée ?" -#: tfjm/templates/index.html:25 +#: tfjm/templates/index_eteam.html:25 tfjm/templates/index_tfjm.html:25 msgid "Register now!" msgstr "Inscris-toi maintenant !" -#: tfjm/templates/index.html:26 +#: tfjm/templates/index_eteam.html:26 tfjm/templates/index_tfjm.html:26 msgid "I already have an account" msgstr "J'ai déjà un compte" -#: tfjm/templates/index.html:32 +#: tfjm/templates/index_eteam.html:32 tfjm/templates/index_tfjm.html:32 msgid "How does it work?" msgstr "Comment ça marche ?" -#: tfjm/templates/index.html:35 +#: tfjm/templates/index_eteam.html:35 +#, python-format +msgid "" +"To participate to the ETEAM, you must be selected by your national " +"organization. If so, you just need to create an account on the Registration page. You will then have " +"to confirm your email address." +msgstr "" +"Pour participer à l'ETEAM, vous devez préalablement avoir été sélectionné⋅es " +"par votre organisation nationale. Si c'est bien le cas, il vous suffit de " +"créer un compte sur la page " +"d'inscription. Vous devrez ensuite confirmer votre adresse mail." + +#: tfjm/templates/index_eteam.html:44 +#, python-format +msgid "" +"You can access your account via the Login page. Once logged in, you will be able to create a team or join " +"one already created by one of your comrades via an access code that will " +"have been transmitted to you. You will then be invited to submit a right to " +"image authorization, essential for the smooth running of the ETEAM. Once " +"your team has at least 4 participants (maximum 6) and a supervisor, you can " +"request to validate your team to be able to work on the problems of your " +"choice." +msgstr "" +"Vous pourrez accéder à votre compte via la page de connexion. Une fois connecté⋅e, " +"vous pourrez créer une équipe ou en rejoindre une déjà créée par un⋅e de vos " +"camarades via un code d'accès qui vous aura été transmis. Vous serez ensuite " +"invité⋅e à soumettre une autorisation de droit à l'image, essentielle pour " +"le bon déroulement de l'ETEAM. Une fois votre équipe constituée d'au moins 4 " +"participant⋅es (maximum 6) et d'un⋅e encadrant⋅e, vous pourrez demander à " +"valider votre équipe pour pouvoir travailler sur les problèmes de votre " +"choix." + +#: tfjm/templates/index_eteam.html:53 tfjm/templates/index_tfjm.html:62 +msgid "I have a question" +msgstr "J'ai une question" + +#: tfjm/templates/index_eteam.html:56 +msgid "" +"Do not hesitate to consult the documentation of the site, to check if the answer is " +"not already there. Also refer of course to the 𝕋𝔽𝕁𝕄² rules. For any other question, do " +"not hesitate to contact us by email at the address eteam_moc@proton.me ." +msgstr "" +"N'hésitez pas à consulter la documentation du site, pour vérifier si la réponse n'y " +"est pas déjà. Référez-vous également bien sûr au règlement de l'ETEAM. Pour toute autre " +"question, n'hésitez pas à nous contacter par mail à l'adresse eteam_moc@proton.me ." + +#: tfjm/templates/index_tfjm.html:18 +msgid "You want to participate to the 𝕋𝔽𝕁𝕄² ?" +msgstr " Tu souhaites participer au 𝕋𝔽𝕁𝕄² ?" + +#: tfjm/templates/index_tfjm.html:20 +msgid "Your team is already complete?" +msgstr "Ton équipe est déjà formée ?" + +#: tfjm/templates/index_tfjm.html:35 #, python-format msgid "" "To participate to the 𝕋𝔽𝕁𝕄², you just need to create an account on the " "Registration page. You will " "then have to confirm your email address." msgstr "" -"Pour participer au 𝕋𝔽𝕁𝕄², il vous suffit de créer un compte sur la " -"page d'inscription. Vous devrez " -"ensuite confirmer votre adresse mail." +"Pour participer au 𝕋𝔽𝕁𝕄², il vous suffit de créer un compte sur la " +"page d'inscription. Vous " +"devrez ensuite confirmer votre adresse mail." -#: tfjm/templates/index.html:43 +#: tfjm/templates/index_tfjm.html:43 #, python-format msgid "" "You can access your account via the Login" -"page de connexion. Une fois connecté⋅e, vous pourrez créer une " -"équipe ou en rejoindre une déjà créée par un⋅e de vos camarades via un code " -"d'accès qui vous aura été transmis. Vous serez ensuite invité⋅e à soumettre " -"une autorisation de droit à l'image, essentielle pour le bon déroulement du " -"𝕋𝔽𝕁𝕄². Une fois votre équipe constituée d'au moins 4 participant⋅es " -"(maximum 6) et d'un⋅e encadrant⋅e, vous pourrez demander à valider votre " -"équipe pour pouvoir travailler sur les problèmes de votre choix." +"Vous pourrez accéder à votre compte via la page de connexion. Une fois connecté⋅e, " +"vous pourrez créer une équipe ou en rejoindre une déjà créée par un⋅e de vos " +"camarades via un code d'accès qui vous aura été transmis. Vous serez ensuite " +"invité⋅e à soumettre une autorisation de droit à l'image, essentielle pour " +"le bon déroulement du 𝕋𝔽𝕁𝕄². Une fois votre équipe constituée d'au moins 4 " +"participant⋅es (maximum 6) et d'un⋅e encadrant⋅e, vous pourrez demander à " +"valider votre équipe pour pouvoir travailler sur les problèmes de votre " +"choix." -#: tfjm/templates/index.html:52 +#: tfjm/templates/index_tfjm.html:52 msgid "I can't find a team, help me!" msgstr "Je ne trouve pas d'équipe, aidez-moi !" -#: tfjm/templates/index.html:56 +#: tfjm/templates/index_tfjm.html:56 msgid "" "You can contact us at the address contact@tfjm.org so that we can help you get in touch with other " @@ -3856,11 +3928,7 @@ msgstr "" "org\">contact@tfjm.org pour que nous puissions vous mettre en relation " "avec d'autres participant⋅es qui cherchent également une équipe." -#: tfjm/templates/index.html:62 -msgid "I have a question" -msgstr "J'ai une question" - -#: tfjm/templates/index.html:65 +#: tfjm/templates/index_tfjm.html:65 msgid "" "Do not hesitate to consult the documentation of the site, to check if the answer is " @@ -3871,20 +3939,20 @@ msgid "" "rg\"> contact@tf" "jm.org ." msgstr "" -"N'hésitez pas à consulter la " -"documentation du site, pour vérifier si la réponse n'y est pas déjà. " -"Référez-vous également bien sûr au règlement du 𝕋𝔽𝕁𝕄². Pour toute autre question, " -"n'hésitez pas à nous contacter par mail à l'adresse contact@tf" -"jm.org ." +"N'hésitez pas à consulter la documentation du site, pour vérifier si la réponse n'y " +"est pas déjà. Référez-vous également bien sûr au règlement du 𝕋𝔽𝕁𝕄². Pour toute autre " +"question, n'hésitez pas à nous contacter par mail à l'adresse contact@" +"tfjm.org ." -#: tfjm/templates/index.html:77 +#: tfjm/templates/index_tfjm.html:77 msgid "Save the dates!" msgstr "Attention aux dates !" -#: tfjm/templates/index.html:78 +#: tfjm/templates/index_tfjm.html:78 msgid "" "If you don't end your registration by the indicated deadline, you will " "unfortunately not be able to participate in the 𝕋𝔽𝕁𝕄²." @@ -3892,43 +3960,43 @@ msgstr "" "Si vous ne finalisez pas votre inscription avant la date limite indiquée, " "vous ne pourrez malheureusement pas participer au 𝕋𝔽𝕁𝕄²." -#: tfjm/templates/navbar.html:17 +#: tfjm/templates/navbar.html:19 msgid "Home" msgstr "Accueil" -#: tfjm/templates/navbar.html:21 +#: tfjm/templates/navbar.html:23 msgid "Tournaments" msgstr "Tournois" -#: tfjm/templates/navbar.html:26 +#: tfjm/templates/navbar.html:28 msgid "Users" msgstr "Utilisateur⋅rices" -#: tfjm/templates/navbar.html:46 +#: tfjm/templates/navbar.html:48 msgid "My team" msgstr "Mon équipe" -#: tfjm/templates/navbar.html:51 +#: tfjm/templates/navbar.html:53 msgid "My participation" msgstr "Ma participation" -#: tfjm/templates/navbar.html:72 +#: tfjm/templates/navbar.html:74 msgid "Administration" msgstr "Administration" -#: tfjm/templates/navbar.html:80 +#: tfjm/templates/navbar.html:82 msgid "Search…" msgstr "Chercher…" -#: tfjm/templates/navbar.html:89 +#: tfjm/templates/navbar.html:91 msgid "Return to admin view" msgstr "Retourner à l'interface administrateur⋅rice" -#: tfjm/templates/navbar.html:94 +#: tfjm/templates/navbar.html:96 msgid "Register" msgstr "S'inscrire" -#: tfjm/templates/navbar.html:110 +#: tfjm/templates/navbar.html:112 msgid "My account" msgstr "Mon compte" @@ -3972,3 +4040,7 @@ msgstr "Aucun résultat." #: tfjm/templates/sidebar.html:10 tfjm/templates/sidebar.html:21 msgid "Informations" msgstr "Informations" + +#~ msgctxt "TFJM" +#~ msgid "TFJM² Platform" +#~ msgstr "Plateforme du TFJM²" diff --git a/tfjm/context_processors.py b/tfjm/context_processors.py new file mode 100644 index 0000000..f5d4c80 --- /dev/null +++ b/tfjm/context_processors.py @@ -0,0 +1,7 @@ +from django.conf import settings + + +def tfjm_context(request): + return { + 'TFJM_APP': settings.TFJM_APP, + } diff --git a/tfjm/settings.py b/tfjm/settings.py index 0e094fb..08fb323 100644 --- a/tfjm/settings.py +++ b/tfjm/settings.py @@ -118,6 +118,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'tfjm.context_processors.tfjm_context', ], }, }, @@ -306,6 +307,12 @@ else: } } +CHANNEL_LAYERS = { + "default": { + "BACKEND": "channels.layers.InMemoryChannelLayer" + } +} + # Custom phone number format PHONENUMBER_DB_FORMAT = 'NATIONAL' PHONENUMBER_DEFAULT_REGION = 'FR' @@ -361,11 +368,7 @@ FORBIDDEN_TRIGRAMS = [ "SEX", ] -CHANNEL_LAYERS = { - "default": { - "BACKEND": "channels.layers.InMemoryChannelLayer" - } -} +TFJM_APP = os.getenv("TFJM_APP", "TFJM") # Change to ETEAM for the ETEAM tournament if TFJM_STAGE == "prod": # pragma: no cover from .settings_prod import * # noqa: F401,F403 diff --git a/tfjm/static/tfjm/img/eteam.png b/tfjm/static/tfjm/img/eteam.png new file mode 100644 index 0000000000000000000000000000000000000000..72e24be141c2c8085afbc131c5e72949c984df5b GIT binary patch literal 15121 zcmeIZRZtz_w>^lvyAy&#aQEO6+}%C6ySo#DJ14jWch}(V?k>Uo-}&A9Fjes-amWB`s6Dbs8`kSUcyq=G`6|Mu?xdHKIr`meSBA6@=m ze&_%7?*HZT{|6o;cv}SmIDvm z@d2a-7j+rdj^K#X_XJONQdc!6j|Nxa+bhN9Ctj5S=H7q1R|doRqsh!<750xJd&z~I zTniDBCojUT{slNn_(@4azNMnkODz_~haV(?>uzyBrUQ$EI@Dmt3?#oGgMPhRy|&@x z2|JNqE`02PzWXV~j>(8l$JBQj$ubHI`WwgdIbt8a2ekT(qVn%Mgx7eid_U;QI9x>t z7#7BbVk&k+<=!`(jk(SJ*aPUwlAUi~=$BeP7apUejrKSjAWNpc+m;sGe(e*4`RT;r z=ldaBCjt%jBB&r~X2hVTPQSCZKsb(o4fg9|On9(|zpO-Ec0QZ;?1f+NFyL_UVe%`j zhKgCDX8J^;YpRlKv3zyjxo)~l^1O^?iJI|dD(+p%>a`<+>KuB5wp*3#G`*Ob`-y|8 zFO?cjWU`f%j45|*U?rK}ia#OOB(6$f1H`+gGy2S5ua12>#P5!0;qmON4RPv%_JnJx^YuiSqeFJ~6c0x5 z7W!5k^<6w`(+~409UF!?sq+xWt}s=3KT#8(ja4R)rSXTiMlq;LTR!SW=0{OsHfc~6ot7tx*{kGoIMl{g(c&USS81UiLU6b< zB~xRJoEPFnONLoZt&NQdF&4ym<%W5WDHTSk7-#lGjj_Z>y7oQ(u!PzfY_Ooq^rXn; z{R|t(af<`y0n=*OQ&fZ2f{-?1|H6!KT^L4}-hVLn3-@a}#tuU_gU|4@}$vHp-=0>-we6TYehvG+#wM-Efo5I_Ny) zv!h7CS>E-xk9-C39=_q^O7iEwpHIqYRw6rktrG^eotQlxd)Eczasr~^tM3e3!^lQs zDAZA8x94RjK61uY8%-|1x)72$ZEn7T~Go_H(a`A+&K(3}1uce}E$Em_Zv1_w_G&vl8nVfS8xTvn}xfd+JR#v4PQok0eH$8Gq>P5=TW9PxZ5r#+|h7 zFmk96#-Nux{h5-}#We3yhkbWATtX|+g@?#xU{Q2>{!W4HlpfXTLU^FAP0Nb%yU;Cy zcpZfp1A_F?d#uFmXsro(mS^JKD|`7z%x`3N|3MTp;iJ#pOQ|~2(}Z0>I~ zUP^Ag>ABUQBbZe%lYZxEhllT8%!E@tkiJFk#w!o4$@)>z{(A*4Y0Mbq3n9u?gNzae zxHaKuCI{||T1AWX^4xDXu2}k&bKaexkG7zVSzeB|YDfAGtj#VLtOhmYIr_B3T_N-Q z#h-C$?|udjEpmKf*)QiXvwTni`E{NTx zZ8O$#dyu>yhHKvhNS3~Hh6*j{n#zN-Z{Lx4Z5|o~Z*K~57eDv_X@R@;f>nZJ+K)I} zy~RQe@C@?PW#xHTx4&YW_}S?rVMDNaFP4q8&xMdpiP^fZ-J1$;F0mmay+rE?%fGJs z-#Kv8E$T4!&wKV1_ID`zk34ONzX6#t&L`KZ@o??NiU6g$ZLQ3=MaE9%>WyA9&AdtW za5Qo27Kc;i4h24NjBUS@jhFm)67}j=Z(pjiXdQ!tV|7~fHuWM_9WOaQwr#<0OmF0+ zIb$lfzo=sPXjDq}mFCJxm@R4kB;xHcVR8v(J$b#6Tm%K6kjR>$`n%)*z)1fysR@9T zA^%^@2478vE3!vb6m_hgYoFudmx)?hbWt!iV=M%jQipo>xGuQ%#oTe= zNo)UwtAf@9`v~# znb#j!08N1ZXXzQ>fR&6lF69{Xl@hCImC4gH-*BI{N3EvD$9GBPH3u=rB3oPDVW z4_a^UOs^;Oz& zLJJA*Uf=T7t$+LSe5a=9Zcg2e>0I~~dM%6Ns?Csan|MvE1Z2fft>jy$58?NHCs3-U zf_+Qaj1ERoExAENSb3A9dW1jfVNpDgl&L0hq$_L^!n7&xS+%`do_N`Y+`q>)*BHUY zqZ+=WY5H=)-8j7t(bIH|<8*uUXW^M2UKU*;&)X0BG?|Q7F!P2l6uz;STic--j-AO+ zCDsk0AUpPf4MuQ|v%I!g9$<-itJj4`)wyfO9=8f7CK_D+A?h{2jf}?leUiBDB{@vc zfWwzkY&g+Go<2~I4BA)xE=s0C_V9TXBcr|m9Jb47bmeq)f;gDu)cWsRtcM`MVbi9m zb+os7@xSmEy!x2|oKs;ipC2jBEG_Nq4XKZeep(M zT7%7}JAOIEEWOxx>Pthy~)P(@5)Km@}3kU_QaeEI3e!caZb(~z2$ z`ZG}C<^e$6b7&c4)P+z$0Cc!B)+wTIq3uaGSRUKpyGJqINS%`e7U#Y>b)_PYO3JJ% zn7o}Bd%BaVuu1z>_{SzOk*Ar7wU!6(!HJ0R-H{Nv;ko#PPf$KEDMCRY3Y(_6w{vWv z&|gOk1%-39VV62|cP{1oa94$p*%$!2j&2mG4_q)(QTABy(PDEJi9rX0Ynh1)hA|T&!FJBFN^nchRoBq~* zM`Q1sw0K2-zCBwS5*`u@pT$K)Gm)(Rj{qi;)$%TKWlrsUfwuu>i5g?1ZoU&g3pHvB z!7Upf!X{`jMu;MCDFDM$)r|1}h(EQ6N~>CT=WSDAqR*f1jL4k}JWhWUC`%?dGj(Zqb#w1M@?2;5E4yo8vMFSt zC;YjlR#@I<#8_TUXvfnHkw|p=x+U$ey1g6%DbPP{@ka~530w$#wppERw##67UP@4(ji%r6-5 zXNKw216ylt(G-k}miz$r{^*TJ!M_d&a74Ap#xG8gQ26nd{A3Gy#qUf!T-G~{TuFy-~ zwb-`WeJAKN?~@o({e-o2lM&g`Oc#U7vU8UOn^wjT&1Ep@Q9PCT8>HwM8x)E0SPohQ z2qVwdcob3C!6Wj6PhMg)t+ytp5fkrjAZekp=os~YX>w8G_c!r)W^jyE&Bm4~r7E<+3Uy=G%a>;8BLqV5p16vozR!4DOM*VTW2XGe zGA_Um(3G45uvl@Ot60;_x69}c_v3EcqUEn=X>OG}#DB9rBJlG3J*$A^kToaas7%iR zb4N^mP%pd5Vy^FQKH3LBn7k4Vo-uD%ni}3$J(#kK-)2)pFUs!C9tb*ng0X)h#WYFc z!C1lsvFD8!NnezSoHN(19Y@xo3M%5dS;$u#GTi^PV|kP~(q0`sq|;2AIFFFl%kXc13*Hzn_3Oy6u`eE(qC(nPLpJwr>TK@uqFul@CfO&#qq9YiyfX(4D6l6H=8 zKS482PErnvesNAuh2_0RsgHcQx84oPSC9;})OwGaw?NGH1clP+NdB@^WI5Ebmirdq z|FNJoJZi{x6Gwm%1NiAuf1T?Y@$jn;?!zG~VRoXX7TSM`dzCbm`Bm+W)RdJe>WgWB z6Uo&6dbj9$wHzSbj&;I6t*rqwg&SWSk80<~A=Oxnc2Vxw2B)1MCNJyf9ay)5bI_==F2QTi z8}Ztp5aJ;TL((_vrMhYETo=qA%IO=m-a>5wODskXZq7i|}`vccg( z0H+{LSWyEE1q&HI$+gy~q+(7RMPB7~SK{F%C)UcTYJ~#BlHRv|Sr2mEmAT)vr!s1GJ)_k(j7drM+z|4x>zt(!< z^ON{NPIO2FlVj=JJp&;pv7UYTmnDjcK~(VYojz=}+K5u86N>f6BPm$k#V`}xqdi9d z8&$^J`#iS0qPsESW2Z3M01C|FxgY)4{IvM%>bvfP0qVP)^2Rdom#)^3e(~$yl4t4_ zGWODdNrewQli9ULmY#4B&|I2|Ci;R$ogpgXn2Wkn!;TaXS^iQRCso%$-dyYgACh)= z7|(;Vzs*=dx9~SfE6e;{1X3Hxw{2d0vf5|0Om?!grkt9S&a0veY%RmGmiFBB|M$Z5 zRvs@$ezav$+#TK*yszocmZ?&SUzdxb|MoG69{UYgC^OIR-xBK1O>#7LW+G}oA@{S1 zO1|CXsd3q6YrF4RK)rIo18<*qk^$?6??|T_Y-h#V$^1Q<%jhhwHGeI!* zvA$8e&E9~2KR;*6#g{B^n1oZ_>~x5rB_j?W?HSD+`ur<15I=x}V7P8}I>8I=t`wH6 z%LymLYxfoV@ty3->!8bl_%7rkQNau{B~C%4L)E?i5FjdydQS%jD9d%*;C?WWuFkdX zMXgWYmph|{WC)Iy(v|i3OWMurFdBbF%XwM3DkKCf8E^rmTrV`_W68WP?ckuWb0QSo zZ~=tsLqRB^JkM_el{k+!3nY7btW|Zsj(s#PQkLMS8nG|~9~o0;0b!>*fdQ!QB3Nuw zJ55fHZKGq;wC{h`?m$yDiyhBN7moz{xfAo#DeGHzW3Udnt=)SsRSG--JE5o(-M;!y z7#ERD8xKvdqx+fy&P)K0WwPoQ{eXE-qpCHu%vucb_4StnRsIa!zGbru(GP}ErN0-d zYdJgde9k*cPvgdO#U$+7C179GGU96s>+;o(@An<{?wk z3A$IVVrjXI;?p@sM>%xzcU)mDhrT`gf}NYxjMqxzdH$aa-Uw4`-v;q##&NHcmek{` za=rlY6{79*;oJ^iv2xDv2PB8|_o)O&4DFUNWg5<3peG64n4K>ev&y#e>m^94b$`77Zn{)tqo#?_S zX(WIBdxJ16Z_Cv(JMG;y@jUxGeDJa0updQg*>U#wgquf++Dz7KQbuLDQpd4q$37O< zOr?{MpV0*zz=Z9bS>MM^M}|k*uXTATwH&xwTHoc0mRo+^$F2Tkcx(rPWi=xe1UK85 zKhQ9`_eDK?OmrX?yt&u}o&yr70)+L8H+wvRhjY1D#o-Tp8`C(mGj}z{^lm*)bS}u0 z8_K6^4duIe$=^HwQ=+hJuapk~wx|@(cFuAAsLS7G&g~@+*JWQFNWEn|d`2_&s9>;b z(71%mpWDd!q%W@YHs)64$Hr?id^Swwf678e1cbWpouD^c?7tRn0egqoDY$frh`KQH zW^{aj_Xi_~RAhJRtLVf=sWBDoL~Ep(XGN{aeg!p7oQ-tPM+hspgeqKh{7Sn!4p;Ja zz`VJxb@u+mS2yaAtxT&3xP3zQN|pb8>%Ck_l+(rdFW+nyClsB7Z9ZrtYNUmJyB>WuSI$;nw zD{|LZ27eHwz;+T9qEQ8ymP!eXWpg`9hZsh-Pa{-KooMGWDV*# z$5l}SOISq(+|@N*cnJ2xgE+`=)WVc;tgN4UcDcWAd=dYfn?l%>_*HQLjnboyJB_^o z%TY!_iJ#>Sbem%gVDvNYMFoOy%r`6-koU4(WxSVN88?>8x*L;0Z3ggCI>x%{AB6vIZ6`Un#=(^a`qM6{OPkW zjxXQ%i^{QZcRDe*-gac*f_MpBj<%@D9qqnz(jnZsi>-%+YU`H#bhj(mNy3#~n;fr; z(u8)s3j?5^isGUp)6hCL9T*TQMhx?xPnXk1Q?T<)ueoWQSdm)8K0my_?C^0&9BXxL zMQoT5S|=~H@glRm&!XN3tVgKzBqLBz*HkXMA1|uAmw7Rw$`cz;J3RgLq@NYSl0R<~ z#+%12Sn5HOxQ7Y1*Fo{ToG1tTCF&A^*_RHM#@6SQ6Rj66tTT%Nk1v7dt&Qy z3Yl=Q#)U7IcSIXN3MzR)yLuCi`EKCvCPt{gu!%mP?FFw05?=PVNT*N*%d4u*A@{kB zP$YWEwVQ^IyA>8O4)>1NQVA@(+~hj(lHa!Bsm9`BDlq*6RWgDQQ__V|Qa;*!)7}(M z%)t(&_uMehFzbFxlAGm%`9^YVjEnwsE>cmi&2BDf#yo0Me>+18r;3JSmZ9m`41j_l z=La%0iMwFt&)~Wm3Ypd4;uK@@?3I;n2Zs;1nt6z>-hz4@-5@ua@S+H<6u*tQ=FFb{ zc{tm7a&3&fFM`EB@Pz)l<_;0E{w$2Oj2o0NVSd+k%*hXx{aoJ@TPHrAa&3KTd~G=H zTKwbFB(KHu*_V%u`3?Kr<7`J`lN+TI9wNiPJ0UOkQRQ4rp%U6wx?Rw3Z)(0Hem^@O z5~jlx1QFFYsa5?GAI%}u-WS>3zFaPMJNK8N6!0}=d-A7HwH`iQ1~Zy2%`LEM>if*-lX|rT3P>U zRCR$`Sk}nb9{16G!Gzj#@T7@(^0&iPMRvi8dPw|gqK1C2y%ek>@^kpM|I=gZ-}fl-*dkC zuC!~?0z6|2YjSBtbSfI?u!geQIga!XyEg`^RLIM(7Bsg=|4(y~dVSmM2#qAuDHnRE zw!s%?qZcX%JhBbkL-BLp?*>qjf=^3^wgnwgnlA)l2q)5_6e0)@KDc4J+Pw){a4+!L zAEDZePINlZSeSlvS*q7-5XciDUhP&d(r-Dni8>x#|6jjk8qDJlPPDlj>b zTpB?@FjMeH@?5_HAdHcu;WM?K(x4s3aGZmt;J96*W_M5XLpL)CyIpI#rYH^y+$O!U zyAa#%!N*#QdY&9>mB$O(U{%wg+yDr zTs{A!t!c^Px+;ekS%bY{UUAQ?hjz@%a~+_0L>7gGV;#90EN9TfRSXdST;^uF5I6j) za75jmyyK`W0RIP1I*!RLv5~2SU^j)ZdgaGo5_#MBjK+evvjxN5Ek=MkRo{J?iVbZk zR8tLiaeL_j=2uy+d74_{X78oq?cc2fNd;{Nf*BOir3PGX5te!C@S_?;Z&U*t=_9gMp)SPHRT;E{qeJ20m+A00_JKudPkEBA zN2#M$ae+{ZVpP4}2A+|DkTg-V@_-rD@e~-oC|Z8rBzC@7!ydZ9MOA3bf7*j3Zjx@9<=rWu(;$AIy6UN;v$P>}1$#06`#$?w1S*jOEcGkb|? z3}k$Dm?u%6v&{h5(D3XRt7eY6D#$hJNw?S@mhp>;*rG@;qnZtBN+9;2_wsz)!Fm&! zs1r;?pvQWDQQ4;Ioc?mH{^{ZR;S9dja{mD?_1odHub?(|+4H-8sW84D_j81)0 z@+s=@Q&)z~gDd%RZPp*Bao-W2h!^>0E|qgZ)h10n0ego%#Av}orrf20m#qlhv{5R? zsPLo+Te9;9)E}7~m((@SuonIu6ZL}#V4}I4jB38VC&KKeS?s62IQxL_LU4Gc!JIer&qc%RL{?zLqvTU`;-f(&iaJ%xl4}MvV z>SX^!z+qbK&i-CpkD*=IK9Hm0NKTBL8rNj0he-a?ZM#GC=4u<@++vZ32*ZWRbd!r^ zp|N|mK*+fWV=G?)G|!eE2B3>-f&MO%?@F`k-N9c>E3aXb-3?c-5`kvv%d@HP7ej6z zS*T-WtO}s*9Tvm}_$s|cxpDjQyyV4G+lS8TYUstM_a2bSVUCvtc(MVL$orVXTF%~V z!P5dom;Zv(Wl~?@%g-mvn?Lyy7ES^Y#>lHW1pivvE5FAF@2lh`^%~ZSR`SMuh5aj9 zhWBv6z%VzDtbQ5<>`3sQ%%Y@su>!XGaBtp>lwrPU+~6KOu?gLiJw`yeZqB=xtD(Ku z4mjo1!EB$K4ikYDw)KyNBZfmxbIvSG385v}8)!7~`)TJ`nUW|wjtRTPuHc{{UKVi@ zuG6!cRwUQ(CT95Lk2al)(S`4HJ|AdMe(j`!Oui^UvTf}XI{h+vgB(O-S0cQK2Iq-a zOm8-`nIOFf#MvKm4WgN~Fkk-sYoY-p)%p;@p(De3+s4_$1?w65V|(+=1p`E~r^cO~ zhc|!w)OLuBo*u$-dbYU$^<*(}`{9@H)8V1BRyztE4N>yh?38eNx8T#XWy@v{q>~H; z%d*itx-Lkw9#@*1YGKdS-!51qy*5AF*|4iXB;lI{cj}G=DHqRSe?I=WK7t(ZS&2th zHDvWU53U{^GH)T;bKbk!lnjB$nqaU<4A)aC8l#k`49E_K(haJ}sMY*`rX*!n7d*_# z!=3F(8{a9oeNmVu94&J+?CaU1gqNrkp}nc9jm^O$%y90Cyz)3wEB|%aI8t#kWe&u9 z&~vYCud@S9y|$|TtD-%X#X&q>9`PELAnF6{O%Hb4s_VR^DMyKsCc*6RFB-4qF{(*z zWT4b9hf7v36dS*<#uM~H;WuZrBdQZd+MfJRC z`w{!=hgeW=d-)U{LHErS^x`^f1}}WxbO0$HjM6RGmCp*dYO$WXVv}Zzg2%?Txtc3= z6U)>5;}=b2VJTdin<^2{Ln;q_@U5%t?z^kNqE;lL8p5nz6M|H!7TxfY%nVxtPD1~Q z88{L0Edh&kwJJ)!PHgKin|T0yx(|f*xd(mtCn?^JpcR>1PDJtE1pxS)Bh#ZUkW9aT zw$wGK)r*|01`=p1pE7vw+Mu(><9xD~VvfX~N-N9Zc+Z^@4`4yuiD`|i-D=&4K-zNH zdRfsxlc4yDml&`R!hf12|AB!LkLvg#jq7v;~}gBZm7`RMe9=ED@lv^dj1;s7pto7I7CZBPK@UM=0T zLr}6r9V?UN(ya60pgoGJVYpzl#m+_Z${ZZd(rj zcsO1sbs&DigUUyzs)ujTa@N*@j?JJ=DA(DEE?NHwURL&Pmdk?7eJZbbE^(FgGgnnc z@z@xb9C18BLo7zAp<0h_ZH=*7R$FRl`ZFnTR8z&>bO$plw%xsgbepx*a}*iGV|lIb zI$6eER7wLTtM$Y1R#mlJ{TTV-5(pi^PO4U>9F|f-5PwqkX*}uCJyl*EE$o;;n57Nu zQCSCaYU0z78FHS6lSgu9liR(!=zSHW$xn;_O|Za+PCkfTXlh8^HA60CMdWUja$%*9 zPK9r?n(}6?h-XwI6IfLkA|RLA*nJVa(a`Z}ET-!$Y(n}6%HtfV45ER;ALyPo2HIp} z0Gc!V4z_ZjdCc9F%>biu*l9cEnqZYp89ua#|EdIR`bf~}R?ABOxm&P=GPtW8^qd*A zV)9y8Sv#6`A%wQ40C1d;y?PT+THe}XaufugC~`N4|lR%#@#>Pui5J8Id?Ya0w7ffXeIt30Pwk>2&OE*wN3(tWHIEd>$` z^^PBA&&^fn!y0ypf)J9Lqg|5m<(wcw@30_R{W+N06LI!J=rab6w%8|`o7>69K>^5z zQp7KQOeaonrAK;UvRtbta(i2bVn|56^O(=bViWdVk^giM>?=*;E2hzr$?Av{407f& zYLokpY0C4br$0S9g%y+8Nr{?#LOo?`0TQ@i>w4nK`#ZVV`tz#XQ03@Q2(4BjaWCqe zKvIfSmI{KBB|=t1a;8Bec>UC|Lzjba;Ggzjm&Cxu#T0@aUbm1NmO@S4wZol+MH6c zX1Y6XZuE-4>6uK0i|<&_mb`=5qcCwL7oH-mB0$5m=XjC6a&Ef`lsjc!z52pX7aW13 ziK9+=>%Kh+-NqZw({)D~58NP3tukpcfS2dglLjR)nk%@SY;Hilk)8+b3Z1yGO>}66 z-LCT-vGhEjH;La@U?J0;>5VtOAD>Y6mb9>#w^V)NUn!f^^4`M*cK)nr*A1V&Asuyo zy(~MN!_j(kyj9&#n}MRs&wAE%#zD#blSZe(Z{h7m;5D4gqJnIeRZ1R39*{!&a5dNQ zLJ#+=Z`>!-qbnN?M(=KC1*8n&9KIug4qd}DnKG~Ys}yEFrIuD~FzSd^p!g;QmKE?8 z)tVTbpjdF-xcvOM#cE>LS786a{1oF;m@ z{%!Rj$;&CkxH&f6Ht{qH5O%$N&ZGqWQVkB?E5=P%R;u!ZC zRRC&a(2f;;@adK0_Vw`Rwv%RY$G!{>gv8f+q)?{YneR$g@o;xgS{%4UiHHz_Yeuu3 z)&TP!dpzTs%t8^t5)S#%#Klrrc?cJB<@3sLiaPV2;(Z!uan7?=#%2%Xx+}=Oj0+VB zLATBK+?HcNM*t=H%$zLn*O!V8v2qnxQ?H_tiElEiOwiF0qFMKb1FQH7&tqK6Zku4g z$9Vzck@2bLB1_7Xq|<@;LAI`o-tJdAWnFFMcGDGK^ke{l(WdWjlFT>le@h*%3n@*? z{wg=h4aww!5E4M@^e>rk+F<&!s5AH(V!e{I`9jWpWyGuUCR3 ztY25{&pe0!6hzpD|z5CjgqD7a}@jbldZ>*LIB!Zo>gzf6~vg z0Y9t75uaJBxVWPO*4)-^aJS8J9nv#x?CK6E__%xwUI>H?tZJVv10K16JMv7Il)B|%E!}^Vs!;B6Q}U9Kiv2*LZ(+h7j9MGG*P3Y6&ZB2?fMx5i}flBQcR(*6vE;H zz7OHQt7R|uc)F5fL7O^++a)xJc6oq_0tD&APdW%)lIG7W?5woS6IEy-6727@j2QC7 zCS);3&^h7N*$V@%KidVM0gOn%hd_-U)G5v8p?>Fn689E1!co0>xY&PVg_!%4D~RSi zxl%$Ot;EcSKwxFIdxH>S`7+OwM6Qe%t*(#ybf*f(_h1vlZ!caJefry`*R2TqHxN}k zd{4z3JW~wBYcn*nSDcW$J|2ivmX(+WS?%xBUzIi{f_4tXX`-F-5`RMaP&;Jn5q>z{ zL3P=3Ly_rq-ym3?b=PZ`bLFIn0JY0}rVxbW-aj-L3sQhZH_bL?C=cB6BEV{51iDiQ zw!RG9@)KLF&B3Q9@W6gOl4bvklyP6-&gIiL|}u*F=mGKp8yTv(g(KA-vO)3TZyjlHtsOZ z`9+$m=|@{x`~U%ne$DppwMzH_@W4a^8`93c^_R@FkTSmK%Ekc_kuMtp_>4Iz4LkKC zIrE)NOn3=pf;l0;AVdK)I#4zMs-dD<)<_~)JPRXE26ajvjI5`0TLYSkHqzF3cu@Y3wpGJjyzi(#>}fM7>L^W~ElTr849f*n1qUa3QW)4T6Iw(kcv6r8y2&rIKN!pm z^OZ}kulI;)CX;3exq|V+Ty6#c*+>Ktkt}xa*PdjVe{e$HRKSz%Cb|Cl*ZiEkNP9ioC2usFNj;@lo`<{E%RWb!=*hl$cGwW13H;1y!n#j$_@|cM z&<(2aNF`X-6bu6K$cQLxFJD(ad*bgunm#lBI%}3@nosEzMYIeM?;n|$6tf=;nV%jFALFP};C;f6o$#dJV711~p=riqdaSh5bZgb!jSj+Kah`_8yi zUi=`cY}|IRk&1d~0xUHws3FTVE`k4M{DmK4>~hhf=6Lezuz|h!qvy}q?W7WEY%loN8b zz^y#rHdV+Q;H;Bj5Ylb6X*uU;^Oe3k8W}JGlKj$rowOkhq@X3yqp3+vK!PVwK7+)$ zTV0-F(ihZ+$6QWN)xOa886_u7(FKG+h@11((XByg$Qvqx#oW&wZUDmi5htJz`d@b* zW8Y-D(YV1!9f~j$H&^VWil~D;4UlRmnsErb*2MflJ@4p4ZHPh>6Xz8v zoY|7H=Wp~ud+n{rCDSg4mVa}>=F=z=G5fWt3lRQe9$nRasIuCjG=LN-R};NxR=Xbo zOx20Q&G$zbW@c>+uRhHIV5h!Q&c@C27cIafPVOd;*{u@=AU6M}OWZQiE3M&!Gp&_G zLqP$~0X247hjoOK_pnnsLS|}K{{ba6S*n&Gjm>?FaRsx{=9k|fYW-!_xR8+v+i2`kOGH3}`wuhf&AVk5=|r)QyprmDc{oF%Yal zeOc6HmnqTh5c7DBHcETfC&i${pzkGs%d)Edj-1tB*_6}5j{<0+qb(MZg3Ft>6Jg#F z=5OCdB^5PnTk$>rHriCA)%G2M)$2Vs4G^wUDL)ed_h*E--Q>&sX6`&+BXgqs=!yUr z{+BXbPE4}Qj`#bX9{2L~hNT%eP9D8VA%r>|iG;eGS4ujVJ26p{a0Yik(uE!F<|Ho@tUd8|;U3j$3%8{1`Bq8+$fpmRiNC1(ZluDr} z&Mtfr%4(zQLZs#%LrCK)1=n9;2Dz2rNBI>ry|cA~MD+MvpwtTo)=}&VsOsPy3Mid1 z=nM8s%Tso5Cl?*)8|J>eKvd#)V&eLpuc7BIffIW}D~BEd;U+M5Qy?}b*i(Y|5>RS` zNN*(?5|_F3oa?N}j@OymzYPXy z?luszco}Lv!krdwu)znJ-rpRk(WWUhrp*Z^*kgC=^q(2H3niDgNkuuH!7%H;J$)aG zsMK6$+iRE064}9{yM}v+VdvrK|GvMT6_~Md%S0>tgVny$Y{Ev%ov|;}lxkCbdHi#nKpp(V>iZ7bmfd0I_aD%3|gQ{F{{k_jPQ}7CcP} zimG#k(>8v#`GmmCS$c<*C=++AI2UrkjY+AY(FB^Uu|Ta94Pb)?Pz(23{h!4g;2qmr6ZlH%Vx{f%r*Pxwy| zP=@fG>>lg0wI$qZ-!Mh?e+>r`;W=6V|D%xq+ra1loXPyJGygqj`9ClJ&xy{6h2am# ZPdLee(G%r)z^E&jw79%jm55=`{{i8+OS=F7 literal 0 HcmV?d00001 diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html index d375480..a35dd6c 100644 --- a/tfjm/templates/base.html +++ b/tfjm/templates/base.html @@ -9,9 +9,11 @@ - {% block title %}{{ title }}{% endblock title %} - Plateforme du TFJM² + {# TODO ETEAM Plus d'uniformité #} + {% block title %}{{ title }}{% endblock title %} - {% trans "ETEAM Platform" %} - + {# TODO ETEAM Plus d'uniformité #} + {# Favicon #} diff --git a/tfjm/templates/index_eteam.html b/tfjm/templates/index_eteam.html new file mode 100644 index 0000000..a0ec20d --- /dev/null +++ b/tfjm/templates/index_eteam.html @@ -0,0 +1,67 @@ +{% extends "base.html" %} + +{% load i18n %} + +{% block content %} +
+
+

+ {% trans "Welcome onto the registration site of the" %} + ETEAM ! +

+
+
+ +
+
+

+ {% trans "You want to participate to the ETEAM ?" %} +
+ {% trans "Your team is selected and already complete?" %} +

+
+
+
+ {% trans "Register now!" %} + {% trans "I already have an account" %} +
+
+
+ +
+
{% trans "How does it work?" %}
+

+ {% url "registration:signup" as signup_url %} + {% blocktrans trimmed %} + To participate to the ETEAM, you must be selected by your national organization. + If so, you just need to create an account on the Registration page. + You will then have to confirm your email address. + {% endblocktrans %} +

+ +

+ {% url "login" as login_url %} + {% blocktrans trimmed %} + You can access your account via the Login page. + Once logged in, you will be able to create a team or join one already created by one of your comrades + via an access code that will have been transmitted to you. You will then be invited to submit a right to image authorization, + essential for the smooth running of the ETEAM. Once your team has at least 4 participants (maximum 6) + and a supervisor, you can request to validate your team to be able to work on the problems of your choice. + {% endblocktrans %} +

+ +

{% trans "I have a question" %}

+ +

+ {% blocktrans trimmed %} + Do not hesitate to consult the documentation of the site, to check if + the answer is not already there. Also refer of course to the + 𝕋𝔽𝕁𝕄² rules. + For any other question, do not hesitate to contact us by email at the address + + eteam_moc@proton.me + . + {% endblocktrans %} +

+
+{% endblock %} diff --git a/tfjm/templates/index.html b/tfjm/templates/index_tfjm.html similarity index 100% rename from tfjm/templates/index.html rename to tfjm/templates/index_tfjm.html diff --git a/tfjm/templates/navbar.html b/tfjm/templates/navbar.html index 31ff632..2227c5d 100644 --- a/tfjm/templates/navbar.html +++ b/tfjm/templates/navbar.html @@ -2,8 +2,10 @@