diff --git a/.gitignore b/.gitignore index 2c3accc6..c0019dca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ /vendor /node_modules -.env +.env composer.lock /plugins classroom/assets/plugins -/EmailTemplates \ No newline at end of file +/EmailTemplates +.idea/ + +classroom/cookie.php + +classroom/legalnotice.css diff --git a/README.md b/README.md index 61e04d85..956c80ce 100644 --- a/README.md +++ b/README.md @@ -230,8 +230,8 @@ This $body variable will be injected inside your html emails before sending each The current repository only contains front elements of the LMS. The back end is mainly located in the dependencies (in the vendor folder) : -- [vuser](https://github.com/vittascience/vuser) : current version (1.2.7) -- [vclassroom](https://github.com/vittascience/vclassroom) : current version (1.3.2) +- [vuser](https://github.com/vittascience/vuser) : current version (1.2.8) +- [vclassroom](https://github.com/vittascience/vclassroom) : current version (1.3.5) - [vutils](https://github.com/vittascience/vutils) : current version (1.2.8b) -- vinterfaces (not public yet) : current version (1.2.9) -- vlearn (not public yet) : current version (1.2.13) \ No newline at end of file +- vinterfaces (not public yet) : current version (1.3.3) +- vlearn (not public yet) : current version (1.3.2) diff --git a/classroom/Views/_newExercicesPanel.html b/classroom/Views/_newExercicesPanel.html new file mode 100644 index 00000000..5b0339e0 --- /dev/null +++ b/classroom/Views/_newExercicesPanel.html @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/classroom/Views/groupAdminProfilePanel.html b/classroom/Views/groupAdminProfilePanel.html index 3c8fd102..3bf7cbde 100644 --- a/classroom/Views/groupAdminProfilePanel.html +++ b/classroom/Views/groupAdminProfilePanel.html @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/classroom/Views/header.html b/classroom/Views/header.html index 50870f61..fc215ad9 100644 --- a/classroom/Views/header.html +++ b/classroom/Views/header.html @@ -1,8 +1,8 @@ - + - + - \ No newline at end of file + diff --git a/classroom/Views/home_footer.html b/classroom/Views/home_footer.html index d269e4ff..53d2ec50 100644 --- a/classroom/Views/home_footer.html +++ b/classroom/Views/home_footer.html @@ -4,7 +4,7 @@ - + - - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + + + + + - + - \ No newline at end of file + diff --git a/classroom/Views/home_topbar.html b/classroom/Views/home_topbar.html index 7c510036..d2c21930 100644 --- a/classroom/Views/home_topbar.html +++ b/classroom/Views/home_topbar.html @@ -1,4 +1,7 @@
+
+
+
diff --git a/classroom/Views/login_by_link.html b/classroom/Views/login_by_link.html index ab0e0240..b799994b 100644 --- a/classroom/Views/login_by_link.html +++ b/classroom/Views/login_by_link.html @@ -5,7 +5,7 @@

Première viste ? Veuillez choisir un identifiant.

- +
@@ -19,11 +19,11 @@

De retour dans cette classe ?

- +

- +

@@ -37,4 +37,4 @@
-
\ No newline at end of file +
diff --git a/classroom/Views/login_selection.html b/classroom/Views/login_selection.html index 955a66e5..2ccf759e 100644 --- a/classroom/Views/login_selection.html +++ b/classroom/Views/login_selection.html @@ -4,7 +4,7 @@

- +
@@ -19,10 +19,10 @@

- Logo GAR + Logo GAR Profitez du mode classe en toute simplicité à l'aide du GAR.
Cliquez ici pour en savoir plus.
- \ No newline at end of file + diff --git a/classroom/Views/managerProfilePanel.html b/classroom/Views/managerProfilePanel.html index ddc4cbff..583e74d0 100644 --- a/classroom/Views/managerProfilePanel.html +++ b/classroom/Views/managerProfilePanel.html @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/classroom/Views/newExercicesPanel.html b/classroom/Views/newExercicesPanel.html index 880e7931..adaae652 100644 --- a/classroom/Views/newExercicesPanel.html +++ b/classroom/Views/newExercicesPanel.html @@ -1,5 +1,5 @@ - diff --git a/classroom/Views/sidebar_student.html b/classroom/Views/sidebar_student.html index d4476f65..15bc2586 100644 --- a/classroom/Views/sidebar_student.html +++ b/classroom/Views/sidebar_student.html @@ -2,19 +2,19 @@
\ No newline at end of file +
diff --git a/classroom/Views/sidebar_teacher.html b/classroom/Views/sidebar_teacher.html index 3a2465f3..f0b62145 100644 --- a/classroom/Views/sidebar_teacher.html +++ b/classroom/Views/sidebar_teacher.html @@ -2,14 +2,14 @@
- Icône activités + Icône activités
- Icône classe + Icône classe
Photo de profil + class="user-picture" src="assets/media/profile_picture.svg?version=VERSIONNUM" alt="Photo de profil">
- \ No newline at end of file + diff --git a/classroom/Views/studentActivitiesPanel.html b/classroom/Views/studentActivitiesPanel.html index 89e9b61f..c24148b3 100644 --- a/classroom/Views/studentActivitiesPanel.html +++ b/classroom/Views/studentActivitiesPanel.html @@ -7,16 +7,16 @@

- +
-

Brouillons

+

Brouillons

- +
@@ -25,7 +25,7 @@

- +
@@ -41,9 +41,9 @@