summaryrefslogtreecommitdiff
path: root/Template
diff options
context:
space:
mode:
authorDebulois <quentin@debulois.fr>2022-04-10 21:25:00 +0200
committerDebulois <quentin@debulois.fr>2022-04-10 21:25:00 +0200
commit2923e6fca634231533cca11e43a9091344ff4ba5 (patch)
tree7181e1b0e26ddb072530adec7d55f77e9e389783 /Template
parent9939f74c0b274ee916f742a45a32d3c843e0960b (diff)
Ajout d'un système de notification pour alerter les pro et finition
Diffstat (limited to 'Template')
-rw-r--r--Template/Include/en/message.php94
-rw-r--r--Template/Include/en/table.php2
-rw-r--r--Template/Include/en/text.php31
-rw-r--r--Template/Include/en/title.php4
-rw-r--r--Template/Include/fr/message.php88
-rw-r--r--Template/Include/fr/table.php4
-rw-r--r--Template/Include/fr/text.php45
-rw-r--r--Template/Include/fr/title.php2
-rw-r--r--Template/Include/incl_form_mission.php13
-rw-r--r--Template/Include/incl_form_register.php5
-rw-r--r--Template/Include/incl_global_message.php3
-rw-r--r--Template/Include/incl_global_notification.php23
-rw-r--r--Template/Include/incl_table_myMission.php4
-rw-r--r--Template/message.php1
14 files changed, 177 insertions, 142 deletions
diff --git a/Template/Include/en/message.php b/Template/Include/en/message.php
index 503fd98..8419b88 100644
--- a/Template/Include/en/message.php
+++ b/Template/Include/en/message.php
@@ -14,8 +14,8 @@ $messageText = [
"infosUpdate" => [
"success" => [
"success" => true,
- "title" => "Update user information.",
- "info" => "User informations updated !",
+ "title" => "Update user informations",
+ "info" => "Your informations have been updated!",
"timer" => true,
"toSrc" => true
]
@@ -24,15 +24,15 @@ $messageText = [
"login" => [
"success" => [
"success" => true,
- "title" => "Login.",
- "info" => "Successfully logged in!",
+ "title" => "Sign-in",
+ "info" => "You are now successfully logged in!",
"timer" => true,
"toSrc" => false
],
"fail" => [
"success" => false,
- "title" => "Login.",
- "info" => "Error bad credentials.",
+ "title" => "Sign-in",
+ "info" => "You have entered bad credentials.",
"timer" => true,
"toSrc" => true
]
@@ -48,8 +48,8 @@ $messageText = [
],
"fail" => [
"success" => false,
- "title" => "Login cookie.",
- "info" => "Error with the cookie auto-login.",
+ "title" => "Auto-login",
+ "info" => "Something wrong happened.",
"timer" => true,
"toSrc" => false
]
@@ -58,8 +58,8 @@ $messageText = [
"logout" => [
"success" => [
"success" => true,
- "title" => "Log out.",
- "info" => "Successefuly logged out!",
+ "title" => "Sign-out",
+ "info" => "You are now logged out.",
"timer" => true,
"toSrc" => false
]
@@ -68,22 +68,22 @@ $messageText = [
"missionRegister" => [
"success" => [
"success" => true,
- "title" => "Register a mission.",
- "info" => "Mission registered !",
+ "title" => "Mandate a mission",
+ "info" => "Mission successfully mandated.",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Mandate a mission.",
- "info" => "Error, please sign-in before.",
+ "title" => "Mandate a mission",
+ "info" => "The mission has not been mandated.",
"timer" => true,
"toSrc" => true
],
"notConnected" => [
"success" => false,
- "title" => "Mandate infos.",
- "info" => "Error, you must be connected, and connected as client.",
+ "title" => "Mandate a mission",
+ "info" => "You must sign-in as client first.",
"timer" => true,
"toSrc" => false
]
@@ -92,15 +92,15 @@ $messageText = [
"missionAccepted" => [
"success" => [
"success" => true,
- "title" => "Mission info.",
- "info" => "Mission accepted !",
+ "title" => "Pending mission",
+ "info" => "You have accepted the mission!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Mandate infos.",
- "info" => "Error, mission not accepted.",
+ "title" => "Pending mission",
+ "info" => "The mission has not been accepted.",
"timer" => true,
"toSrc" => true
]
@@ -109,15 +109,15 @@ $messageText = [
"missionValidated" => [
"success" => [
"success" => true,
- "title" => "Mission info.",
- "info" => "Mission completed!",
+ "title" => "Mission update",
+ "info" => "The mission is now marked as completed!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Mandate info.",
- "info" => "Error, mission not marked as completed.",
+ "title" => "Mandate update",
+ "info" => "The mission has not been marked as completed.",
"timer" => true,
"toSrc" => true
]
@@ -126,14 +126,14 @@ $messageText = [
"missionReview" => [
"success" => [
"success" => true,
- "title" => "Mission review.",
- "info" => "Your review has been registered!",
+ "title" => "Mission review",
+ "info" => "Your review has been sucessfully registered!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Mission review.",
+ "title" => "Mission review",
"info" => "Error, your review has not been resgistered.",
"timer" => true,
"toSrc" => true
@@ -143,15 +143,15 @@ $messageText = [
"userAdd" => [
"success" => [
"success" => true,
- "title" => "Register an user.",
- "info" => "User successfully registered !",
+ "title" => "Sign-up",
+ "info" => "Your account has been successfully created, you can now sign-in with.",
"timer" => true,
"toSrc" => false
],
"fail" => [
"success" => false,
- "title" => "Register an user.",
- "info" => "Error, user not registered.",
+ "title" => "Sign-up",
+ "info" => "We can't create an account with the given informations.",
"timer" => true,
"toSrc" => true
]
@@ -160,15 +160,15 @@ $messageText = [
"adminDelUser" => [
"success" => [
"success" => true,
- "title" => "Delete an user.",
- "info" => "User deleted !",
+ "title" => "Deletion of an account",
+ "info" => "The account is successfully delated.",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Delete an user.",
- "info" => "No user was deleted.",
+ "title" => "Deletion of an account",
+ "info" => "The account is not delated.",
"timer" => true,
"toSrc" => true
]
@@ -177,15 +177,15 @@ $messageText = [
"adminAddJob" => [
"success" => [
"success" => true,
- "title" => "Add a job category.",
- "info" => "Category added !",
+ "title" => "Add a job category",
+ "info" => "The job category is successfully added!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Add a job category.",
- "info" => "Category not added.",
+ "title" => "Add a job category",
+ "info" => "The job category is not added.",
"timer" => true,
"toSrc" => true
]
@@ -194,15 +194,15 @@ $messageText = [
"adminDelJob" => [
"success" => [
"success" => true,
- "title" => "Deletion of a job category.",
- "info" => "Category deleted !",
+ "title" => "Deletion of a job category",
+ "info" => "The job category is successfully deleted!",
"timer" => true,
"toSrc" => true
],
"delete" => [
"success" => false,
- "title" => "Deletion of a job category.",
- "info" => "Category not deleted !",
+ "title" => "Deletion of a job category",
+ "info" => "The job category is not deleted.",
"timer" => true,
"toSrc" => true
]
@@ -211,15 +211,15 @@ $messageText = [
"adminDelMission" => [
"success" => [
"success" => true,
- "title" => "Deletion of a mission.",
- "info" => "Mission deleted !",
+ "title" => "Deletion of a mission",
+ "info" => "The mission is successfully deleted!",
"timer" => true,
"toSrc" => true
],
"delete" => [
"success" => false,
- "title" => "Deletion of a mission.",
- "info" => "Mission not deleted !",
+ "title" => "Deletion of a mission",
+ "info" => "The mission is not deleted.",
"timer" => true,
"toSrc" => true
]
diff --git a/Template/Include/en/table.php b/Template/Include/en/table.php
index 8aef67f..2feb5dc 100644
--- a/Template/Include/en/table.php
+++ b/Template/Include/en/table.php
@@ -62,7 +62,7 @@ $header = [
],
// En-tête des colonnes du tableau mes missions.
"ongoingMissions" => [
- "Accpeted by pro date",
+ "Accepted by pro date",
"Pro name",
"Job",
"Subject",
diff --git a/Template/Include/en/text.php b/Template/Include/en/text.php
index b6f81e0..417a1d9 100644
--- a/Template/Include/en/text.php
+++ b/Template/Include/en/text.php
@@ -7,6 +7,10 @@
// ############################################################################
$text = [
+ "incl_global_notification" => [
+ "header" => "Notification",
+ "info" => "You have a new mission!",
+ ],
"incl_form_admin" => [
"btManageJob" => "Manage job categories",
"btManageUser" => "Manage users",
@@ -39,9 +43,9 @@ $text = [
"submit" => "Modify"
],
"incl_form_login" => [
- "h2" => "Login",
- "email" => "Email",
- "password" => "Password",
+ "h2" => "Sign-in",
+ "email" => "Your email",
+ "password" => "Your password",
"rememberMe" => "Remember me",
"submit" => "Sign-in"
],
@@ -49,7 +53,6 @@ $text = [
"h2" => "Form to register a mission",
"subject" => "Subject",
"review" => "Review",
- "proId" => "Pro ID",
"submit" => "Register",
"jobsSel" => "Jobs"
],
@@ -66,20 +69,20 @@ $text = [
"incl_global_navbar" => [
"h2" => "AlphaJob",
"btnSearch" => "Search",
- "btnInfos" => "Modif. infos",
- "btnMission" => "Register mission",
+ "btnInfos" => "My infos",
"btnMyMission" => "My missions",
"btnAdmin" => "Administration",
"btnLogin" => "Sign-in",
- "btnLogout" => "Loggout",
+ "btnLogout" => "Sign-out",
"btnRegister" => "Sign-up",
"lang" => "Language",
- "btnLang" => "Select"
+ "btnLang" => "Choose"
],
"incl_form_register" => [
- "h2" => "Form to sign-up",
- "email" => "Email",
- "password" => "Password",
+ "h2" => "Sign-up",
+ "email" => "Your email",
+ "mailNotice" => "The email is valid.",
+ "password" => "Your password",
"passNotice" => "The password must have at least:",
"passLength" => "8 characters,",
"passUpper" => "one uppercase,",
@@ -102,9 +105,9 @@ $text = [
"mandate" => "Mandate"
],
"incl_index_slideshow" => [
- "slide1" => "Find the right proffessional for you.<br><br>For all your needs.<br><br><span>AlphaJob</span>",
- "slide2" => "Only the bests proffessionals can register!<br><br>Quality of work guarantee!<br><br><span>AlphaJob</span>",
- "slide3" => "Find the bests offers for your website today.<br><br>Discover our ready to use solutions.<br><br><span>AlphaJob</span>"
+ "slide1" => "Find the right professional for you.<br><br>For all your needs.<br><br><span>AlphaJob</span>",
+ "slide2" => "Only the bests professionals register here!<br><br>Quality of work guarantee!<br><br><span>AlphaJob</span>",
+ "slide3" => "Find the best offers for your new website today.<br><br>Check our ready to use solutions.<br><br><span>AlphaJob</span>"
]
];
diff --git a/Template/Include/en/title.php b/Template/Include/en/title.php
index c4fbeca..da773d6 100644
--- a/Template/Include/en/title.php
+++ b/Template/Include/en/title.php
@@ -8,11 +8,11 @@
$title = [
"index" => "AlphaJob - Index",
- "login" => "AlphaJob - Login",
+ "login" => "AlphaJob - Sign-in",
"message" => "AlphaJob - Message",
"mission" => "AlphaJob - Manage a mission",
"myMission" => "AlphaJob - My missions",
- "register" => "AlphaJob - Register",
+ "register" => "AlphaJob - Sign-up",
"userInfo" => "AlphaJob - My user informations",
"admin" => "AlphaJob - Administration"
];
diff --git a/Template/Include/fr/message.php b/Template/Include/fr/message.php
index ef86420..9046d07 100644
--- a/Template/Include/fr/message.php
+++ b/Template/Include/fr/message.php
@@ -14,8 +14,8 @@ $messageText = [
"infosUpdate" => [
"success" => [
"success" => true,
- "title" => "Mise à jour des informations.",
- "info" => "Informations mise à jour!",
+ "title" => "Mise à jour de vos informations",
+ "info" => "Vos Informations ont bien été mise à jour!",
"timer" => true,
"toSrc" => true
]
@@ -24,15 +24,15 @@ $messageText = [
"login" => [
"success" => [
"success" => true,
- "title" => "Connection.",
- "info" => "Connection réussie!",
+ "title" => "Connexion",
+ "info" => "Vous êtes maintenant connecté!",
"timer" => true,
"toSrc" => false
],
"fail" => [
"success" => false,
- "title" => "Connection.",
- "info" => "Erreur, connection échouée.",
+ "title" => "Connection",
+ "info" => "La connexion a échoué.",
"timer" => true,
"toSrc" => true
]
@@ -48,8 +48,8 @@ $messageText = [
],
"fail" => [
"success" => false,
- "title" => "Connection avec auto-connection.",
- "info" => "Erreur, connection échouée.",
+ "title" => "Connexion auto.",
+ "info" => "La connexion a échoué.",
"timer" => true,
"toSrc" => false
]
@@ -58,8 +58,8 @@ $messageText = [
"logout" => [
"success" => [
"success" => true,
- "title" => "Déconnection.",
- "info" => "Vous êtes déconnecté!",
+ "title" => "Déconnexion",
+ "info" => "Vous êtes maintenant déconnecté!",
"timer" => true,
"toSrc" => false
]
@@ -68,22 +68,22 @@ $messageText = [
"missionRegister" => [
"success" => [
"success" => true,
- "title" => "Requête de mission.",
- "info" => "La requete a été émise!",
+ "title" => "Requête de mission",
+ "info" => "La requete a bien été émise!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Requête de mission.",
- "info" => "Erreur lors de la requête.",
+ "title" => "Requête de mission",
+ "info" => "Erreur lors l'émission de la requête.",
"timer" => true,
"toSrc" => true
],
"notConnected" => [
"success" => false,
- "title" => "Requête de mission.",
- "info" => "Erreur, vous devez être connecté, et connecté en tant que client.",
+ "title" => "Requête de mission",
+ "info" => "Vous devez d'abord être connecté en tant que client!",
"timer" => true,
"toSrc" => false
]
@@ -92,15 +92,15 @@ $messageText = [
"missionAccepted" => [
"success" => [
"success" => true,
- "title" => "Mission info.",
- "info" => "Mission acceptée!",
+ "title" => "Mission info",
+ "info" => "La mission a été acceptée!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Mission info.",
- "info" => "Erreur, mission non acceptée.",
+ "title" => "Mission info",
+ "info" => "La mission n'est pas acceptée.",
"timer" => true,
"toSrc" => true
]
@@ -109,15 +109,15 @@ $messageText = [
"missionValidated" => [
"success" => [
"success" => true,
- "title" => "Mission info.",
- "info" => "Mission completée!",
+ "title" => "Mission info",
+ "info" => "La mission est signalée comme terminée!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Mandate info.",
- "info" => "Erreur, mission non enregistrée comme completée.",
+ "title" => "Mandate info",
+ "info" => "La mission n'a pas pu être validée.",
"timer" => true,
"toSrc" => true
]
@@ -126,15 +126,15 @@ $messageText = [
"missionReview" => [
"success" => [
"success" => true,
- "title" => "Avis sur la mission.",
+ "title" => "Votre avis sur la mission",
"info" => "Votre avis a bien été enregistré!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Avis sur la mission.",
- "info" => "Erreur, votre avis n'a pas été enregistré.",
+ "title" => "Votre avis sur la mission.",
+ "info" => "Votre avis n'a pas pu être enregistré.",
"timer" => true,
"toSrc" => true
]
@@ -143,15 +143,15 @@ $messageText = [
"userAdd" => [
"success" => [
"success" => true,
- "title" => "Enregistrement d'un utilisateur.",
- "info" => "Utilisateur enregistré!",
+ "title" => "Inscription",
+ "info" => "Votre inscription a bien été validé, vous pouvez maintenant vous connecter.",
"timer" => true,
"toSrc" => false
],
"fail" => [
"success" => false,
- "title" => "Enregistrement d'un utilisateur.",
- "info" => "Erreur, l'utilisateur n'a pas été enregistré.",
+ "title" => "Inscription",
+ "info" => "Inscription impossible.",
"timer" => true,
"toSrc" => true
]
@@ -160,15 +160,15 @@ $messageText = [
"adminDelUser" => [
"success" => [
"success" => true,
- "title" => "Suppression d'un utilisateur.",
- "info" => "Utilisateur supprimé!",
+ "title" => "Suppression d'un utilisateur",
+ "info" => "L'utilisateur a été supprimé!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Suppression d'un utilisateur.",
- "info" => "Erreur, l'utilisateur n'a pas été supprimé.",
+ "title" => "Suppression d'un utilisateur",
+ "info" => "L'utilisateur n'a pas été supprimé.",
"timer" => true,
"toSrc" => true
]
@@ -177,15 +177,15 @@ $messageText = [
"adminAddJob" => [
"success" => [
"success" => true,
- "title" => "Ajout d'une catégorie d'emploi.",
+ "title" => "Ajout d'une catégorie d'emploi",
"info" => "La catégorie a bien été ajoutée!",
"timer" => true,
"toSrc" => true
],
"fail" => [
"success" => false,
- "title" => "Ajout d'une catégorie d'emploi.",
- "info" => "Erreur, la catégorie n'a pas été ajoutée.",
+ "title" => "Ajout d'une catégorie d'emploi",
+ "info" => "La catégorie n'a pas été ajoutée.",
"timer" => true,
"toSrc" => true
]
@@ -194,15 +194,15 @@ $messageText = [
"adminDelJob" => [
"success" => [
"success" => true,
- "title" => "Suppression d'une catégorie.",
+ "title" => "Suppression d'une catégorie",
"info" => "Categorie supprimée!",
"timer" => true,
"toSrc" => true
],
"delete" => [
"success" => false,
- "title" => "Suppression d'une catégorie.",
- "info" => "Erreur, la catégorie n'a pas été supprimée.",
+ "title" => "Suppression d'une catégorie",
+ "info" => "La catégorie n'a pas été supprimée.",
"timer" => true,
"toSrc" => true
]
@@ -211,15 +211,15 @@ $messageText = [
"adminDelMission" => [
"success" => [
"success" => true,
- "title" => "Suppression d'une mission.",
+ "title" => "Suppression d'une mission",
"info" => "Mission supprimée!",
"timer" => true,
"toSrc" => true
],
"delete" => [
"success" => false,
- "title" => "Suppression d'une mission.",
- "info" => "Erreur, la mission n'a pas été supprimée.",
+ "title" => "Suppression d'une mission",
+ "info" => "La mission n'a pas été supprimée.",
"timer" => true,
"toSrc" => true
]
diff --git a/Template/Include/fr/table.php b/Template/Include/fr/table.php
index 342b5e5..619bb32 100644
--- a/Template/Include/fr/table.php
+++ b/Template/Include/fr/table.php
@@ -12,9 +12,9 @@ $header = [
"ID utilisateur",
"Email",
"Mot de passe chiffré",
- "Jeton d'auto-connection",
+ "Jeton d'auto-connexion",
"Date d'inscription",
- "Status de l'utilisateur"
+ "Statut de l'utilisateur"
],
// En-tête des colonnes du tableau des missions de l'admin.
"adminMissions" => [
diff --git a/Template/Include/fr/text.php b/Template/Include/fr/text.php
index bff6489..3622669 100644
--- a/Template/Include/fr/text.php
+++ b/Template/Include/fr/text.php
@@ -7,6 +7,10 @@
// ############################################################################
$text = [
+ "incl_global_notification" => [
+ "header" => "Notification!",
+ "info" => "Vous avez une nouvelle mission!",
+ ],
"incl_form_admin" => [
"btManageJob" => "Gestion des emplois",
"btManageUser" => "Gestion des utilisateurs",
@@ -30,28 +34,27 @@ $text = [
"adress" => "Adresse",
"zipCode" => "Code postal",
"city" => "Ville",
- "myJobs" => "Mes emplois:",
"jobsSel" => "Emplois",
"jobsAdd" => "Ajouter",
+ "myJobs" => "Mes emplois:",
"degree" => "Diplômes",
"capability" => "Capacités",
"description" => "Description",
"submit" => "Modifier"
],
"incl_form_login" => [
- "h2" => "Identification",
- "email" => "Email",
- "password" => "Mot de passe",
+ "h2" => "Connexion",
+ "email" => "Votre email",
+ "password" => "Votre mot de passe",
"rememberMe" => "Se souvenir de moi",
- "submit" => "Connection"
+ "submit" => "Connexion"
],
"incl_form_mission" => [
- "h2" => "Formulaire pour enregistrer une mission",
- "subject" => "Sujet",
+ "h2" => "Votre mission",
+ "subject" => "Sujet de la mission",
+ "jobsSel" => "Emploi",
"review" => "Commentaire",
- "proId" => "ID du pro",
- "submit" => "Enregistrer",
- "jobsSel" => "Emplois"
+ "submit" => "Enregistrer"
],
"incl_table_myMission" => [
"pendingMission" => "Missions en attente",
@@ -66,20 +69,20 @@ $text = [
"incl_global_navbar" => [
"h2" => "AlphaJob",
"btnSearch" => "Rechercher",
- "btnInfos" => "Modif. infos",
- "btnMission" => "Enreg. mission",
+ "btnInfos" => "Mes infos",
"btnMyMission" => "Mes missions",
"btnAdmin" => "Administration",
- "btnLogin" => "Connection",
- "btnLogout" => "Déconnection",
+ "btnLogin" => "Connexion",
+ "btnLogout" => "Déconnexion",
"btnRegister" => "Inscription",
"lang" => "Langue",
- "btnLang" => "Sélectionner"
+ "btnLang" => "Choisir"
],
"incl_form_register" => [
- "h2" => "Formulaire d'inscription",
- "email" => "Email",
- "password" => "Mot de passe",
+ "h2" => "Vous inscrire",
+ "email" => "Votre email",
+ "mailNotice" => "L'email est valide.",
+ "password" => "Votre mot de passe",
"passNotice" => "Le mot de passe doit au moins avoir:",
"passLength" => "8 caractères,",
"passUpper" => "une majuscule,",
@@ -102,9 +105,9 @@ $text = [
"mandate" => "Mandater"
],
"incl_index_slideshow" => [
- "slide1" => "Trouvez le proffessionel idéal proche de chez vous.<br><br>Pour tous vos besoins.<br><br><span>AlphaJob</span>",
- "slide2" => "Seuls les meilleurs professionnels sont acceptés.<br><br>Qualité guarantie.<br><br><span>AlphaJob</span>",
- "slide3" => "Les meilleurs offres pour créer votre site Web.<br><br>Découvrez nos solutions clefs en main.<br><br><span>AlphaJob</span>"
+ "slide1" => "Trouvez le professionel idéal proche de chez vous.<br><br>Pour tous vos besoins.<br><br><span>AlphaJob</span>",
+ "slide2" => "Seul les meilleurs professionnels sont acceptés.<br><br>Qualité guarantie.<br><br><span>AlphaJob</span>",
+ "slide3" => "Les meilleures offres pour créer votre site Web.<br><br>Découvrez nos solutions clefs en main.<br><br><span>AlphaJob</span>"
]
];
diff --git a/Template/Include/fr/title.php b/Template/Include/fr/title.php
index 49285a2..c2681d2 100644
--- a/Template/Include/fr/title.php
+++ b/Template/Include/fr/title.php
@@ -8,7 +8,7 @@
$title = [
"index" => "AlphaJob - Index",
- "login" => "AlphaJob - Connection",
+ "login" => "AlphaJob - Connexion",
"message" => "AlphaJob - Message",
"mission" => "AlphaJob - Gestion d'une mission",
"myMission" => "AlphaJob - Mes missions",
diff --git a/Template/Include/incl_form_mission.php b/Template/Include/incl_form_mission.php
index b95c396..03d4254 100644
--- a/Template/Include/incl_form_mission.php
+++ b/Template/Include/incl_form_mission.php
@@ -27,15 +27,18 @@ if (isset($_SESSION["missionInitiate"])
<i class="fas fa-edit"></i>
<input type="text" name="missionSubject" placeholder="'.$text[basename(__FILE__, ".php")]["subject"].'" maxlength="128" required>
</label>
- <select name="missionJob" required>
- <option value="" selected>'.$text[basename(__FILE__, ".php")]["jobsSel"].'</option>'.PHP_EOL);
+ <label>
+ <i class="fas fa-wrench"></i>
+ <select id="missionJob" name="missionJob" required>
+ <option value="" selected>'.$text[basename(__FILE__, ".php")]["jobsSel"].'</option>'.PHP_EOL);
// On loop à traves les emplois du pro et on récupère l'id et le nom pour peupler le select
for ($i = 0; $i < count($_SESSION["missionInitiate"]["proJobs"]); $i++) {
$categoryName = $_SESSION["missionInitiate"]["proJobs"][$i]["jobCategoryName".ucwords($_SESSION["lang"])];
$value = $_SESSION["missionInitiate"]["proJobs"][$i]["jobCategoryId"];
echo(' <option value="'.$value.'">'.$categoryName.'</option>'.PHP_EOL);
}
- echo(' </select>
+ echo(' </select>
+ </label>
<input type="hidden" name="missionProId" value="'.$_SESSION["missionInitiate"]["proId"].'">
<input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
</form>
@@ -59,9 +62,9 @@ if (isset($_SESSION["missionInitiate"])
<main id="mainMission">
<h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2>
<form id="missionForm" action="/../Core/wrapper.php" method="post">
- <label class="flex-start">
+ <label>
<i class="far fa-star"></i>
- <select name="note" required>
+ <select id="missionNote" name="note" required>
<option value="" selected disabled hidden>Note</option>
<option value="5">5</option>
<option value="4">4</option>
diff --git a/Template/Include/incl_form_register.php b/Template/Include/incl_form_register.php
index 849d129..402e2cc 100644
--- a/Template/Include/incl_form_register.php
+++ b/Template/Include/incl_form_register.php
@@ -20,8 +20,11 @@ echo('<!-- Division principale -->
<div>
<label>
<i class="fas fa-envelope-square"></i>
- <input type="email" name="email" id="email" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["email"].'" maxlength="128" required>
+ <input type="email" name="email" id="email" maxlength="128" onkeyup="check_email()" placeholder="'.$text[basename(__FILE__, ".php")]["email"].'" maxlength="128" required>
</label>
+ <p>
+ <span id="mailNotice" class="invalid">'.$text[basename(__FILE__, ".php")]["mailNotice"].'</span>
+ </p>
<label>
<i class="fas fa-lock"></i>
<input type="password" name="password" id="password" maxlength="128" onkeyup="check_pass()" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required>
diff --git a/Template/Include/incl_global_message.php b/Template/Include/incl_global_message.php
index a0a9e5f..5e920e2 100644
--- a/Template/Include/incl_global_message.php
+++ b/Template/Include/incl_global_message.php
@@ -36,7 +36,8 @@ echo('<!-- Texte principal -->
<p>'.$messageText[$name][$status]["info"].'</p>
<p id="redirect" class="info">'.$redirect.'</p></main>
<!-- Chargement du javascript dédié à cette page -->
-<script src="/Static/Js/message.js"></script>');
+<script src="/Static/Js/message.js"></script>
+<script src="/Static/Js/main.js"></script>');
// ****************************************************************************
// RECUPERATION DE LA PAGE VERS LAQUELLE REDIRIGER SI CE N'EST PAS L'INDEX
diff --git a/Template/Include/incl_global_notification.php b/Template/Include/incl_global_notification.php
new file mode 100644
index 0000000..2c0f25b
--- /dev/null
+++ b/Template/Include/incl_global_notification.php
@@ -0,0 +1,23 @@
+<?php
+
+// ############################################################################
+// # #
+// # Description: Système de notification #
+// # #
+// ############################################################################
+
+// Import du texte en fonction de la langue sélecitonnée
+require_once(dirname( __FILE__ )."./".$_SESSION["lang"]."/text.php");
+
+// Partie html de la notification
+echo('<!-- Notification -->
+<aside id="notif">
+ <button type="button" onclick="toggle_notif()">&#10006;</button>
+ <a onclick="redirect(\'Template/myMission\')">
+ <span>&#128276;</span>
+ <h3>'.$text[basename(__FILE__, ".php")]["header"].'</h3>
+ <p>'.$text[basename(__FILE__, ".php")]["info"].'</p>
+ </a>
+</aside>');
+
+?> \ No newline at end of file
diff --git a/Template/Include/incl_table_myMission.php b/Template/Include/incl_table_myMission.php
index d97e32d..e55346d 100644
--- a/Template/Include/incl_table_myMission.php
+++ b/Template/Include/incl_table_myMission.php
@@ -74,7 +74,7 @@ echo('<div id="myMissionButtons">
// ****************************************************************************
// TABLEAU DES MISSIONS EN ATTENTE
// ****************************************************************************
-echo('<section id="secCompleted">');
+echo('<section id="secPending">');
if ($missionStatus["pending"]) {
echo(' <table>
<!-- En-tête -->
@@ -109,7 +109,7 @@ echo('</section>');
// ****************************************************************************
// TABLEAU DES MISSIONS EN COURS
// ****************************************************************************
-echo('<section id="secCompleted">');
+echo('<section id="secOngoing">');
if ($missionStatus["ongoing"]) {
echo(' <table>
<!-- En-tête -->
diff --git a/Template/message.php b/Template/message.php
index b28e067..b6336cf 100644
--- a/Template/message.php
+++ b/Template/message.php
@@ -36,7 +36,6 @@ if (!isset($_SESSION["message"])) {
<?php require_once(dirname( __FILE__ )."./Include/incl_global_navbar.php"); ?>
<?php require_once(dirname( __FILE__ )."./Include/incl_global_message.php"); ?>
<?php require_once(dirname( __FILE__ )."./Include/incl_global_footer.php"); ?>
- <script src="/Static/Js/main.js"></script>
</body>
</html>
<?php unset($_SESSION["messageNumber"]); ?>