Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bcac42d
rafactor cabri opensteam
Mar 14, 2022
07f9e68
Refactor cabri opensteam (2)
Mar 16, 2022
6846afe
fix iframe responsivity (take all available place)
Mar 16, 2022
fae09bd
Multiple elements
Mar 16, 2022
1fd8303
Merge remote-tracking branch 'vitta/lms-exercises' into dev
Mar 18, 2022
40112c3
resync ns.json files with vittascience's
Mar 18, 2022
dfeb535
Update and reformat EN/ES/IT lang files (manual update)
Apr 7, 2022
46a7b5d
Auto completion of IT/ES/EN lang files using translator script
Apr 7, 2022
056f107
Patch. to hide non supported app types
Apr 15, 2022
ce80aac
update plugin config on gulpTask
Apr 19, 2022
2b5e60a
Merge tag '1.2.6' into dev
Apr 25, 2022
8e37c91
Update translation files
Apr 26, 2022
bc2e038
Fix related to last merge
Apr 27, 2022
d8d1ed6
Merge tag '1.2.6b' into dev
May 17, 2022
6ff759f
auto translate missing labels due to last merge
May 17, 2022
58b89df
Merge tag '1.2.7' into dev
Jun 3, 2022
2e75462
Auto translation of new words for (it, es, en)
Jun 3, 2022
2f602d3
Merge tag '1.2.7a' into dev
Jun 13, 2022
847e90e
Use the same lti files as vittascience files
Jun 15, 2022
149263c
Stop using $_SERVER['HTTP_HOST'] because it is not secured (controlle…
Jun 16, 2022
63de2d8
Step2: Stop using $_SERVER['HTTP_HOST'] because it is not secured (co…
Jun 16, 2022
a2bf267
Remove non needed html inside translation strings
Jun 17, 2022
8bf1b8e
Merge tag '1.2.7b' into dev
Jun 20, 2022
a3cb721
Merge tag '1.2.7c' into dev
Jun 22, 2022
46bc87d
Merge branch 'dev' into main
Jun 22, 2022
6c3001c
Add query param ?version=1.2.7c (to force browser to reload cache)
Jun 28, 2022
5de9f4b
update package version "vittascience/vtuser" : 1.2.5
Jul 13, 2022
db66bb9
Merge branch 'dev' into main
Jul 13, 2022
d1d5503
Merge tag '1.2.9' into dev
Aug 10, 2022
5ba5017
Merge tag '1.2.9a' into dev
polx Aug 24, 2022
9ee66cd
merging release version 1.2.12a
polx Aug 24, 2022
f4460a1
merging release version 1.2.12a
polx Aug 24, 2022
d3c18c8
Do not add button to add student if a gar-teacher.
polx Aug 27, 2022
c6ca1fd
Do not add button to add student if a gar-teacher.
polx Aug 27, 2022
094096e
redirect to "gone out" by missing gar credentials.
polx Aug 29, 2022
1191104
redirect to "gone out" by missing gar credentials.
polx Aug 29, 2022
c27531a
Removal of CDNs.
polx Aug 30, 2022
35cfc0a
Removal of CDNs.
polx Aug 30, 2022
8d2ad94
get rid of CDNs.
polx Aug 30, 2022
3811c09
js and not css!
polx Aug 31, 2022
dc87897
remove sourcemap reference.
polx Aug 31, 2022
36ffee6
a single popper
polx Aug 31, 2022
6fcdad6
a single popper and a few cleanups.
polx Aug 31, 2022
984b709
no sourcemap
polx Aug 31, 2022
f20f59c
no sourcemap
polx Aug 31, 2022
f6ab76e
bootstrap is done as JS
polx Aug 31, 2022
8167571
isFromCanope: don't remove class.
polx Sep 1, 2022
ebd22bf
isFromGar hides a few FAQ entries.
polx Sep 1, 2022
5a2f98c
Only bootstrap js comes at end.
polx Sep 1, 2022
4a06de2
cleanup from the merge
polx Sep 1, 2022
24f707b
Merge tag '1.2.9b' into dev
Sep 12, 2022
cc34e8f
Supprimer le mot opensteam sur la landing page de beta.cabri.com
Oct 5, 2022
315b09a
Deplacement du titre du siteweb beta.cabri.com
Oct 5, 2022
3e62847
Deplacer titre Plateforme Cabri
Oct 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/vendor
/node_modules
.env
.env
composer.lock
/plugins
classroom/assets/plugins
/EmailTemplates
/EmailTemplates
.idea/
347 changes: 347 additions & 0 deletions classroom/Views/_newExercicesPanel.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions classroom/Views/groupAdminProfilePanel.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="classroom-dashboard-profil-panel-groupadmin" class="dashboard-block profile-panel" style="display:none;">

<div class="d-flex flex-column text-center">
<img src="assets/media/profile_picture.svg" alt="Photo de profil" class="user-picture">
<img src="assets/media/profile_picture.svg?version=1.2.12a" alt="Photo de profil" class="user-picture">
<span id="user-name-groupadmin" class="mt-4" data-i18n="classroom.profil.identity">PLACEHOLDER</span>
</div>

Expand All @@ -15,4 +15,4 @@
<i class="fas fa-power-off"></i>
</button>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions classroom/Views/header.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<link rel="stylesheet" href="assets/css/modal.css">
<link rel="stylesheet" href="assets/css/modal.css?version=1.2.12a">
<!-- PLUGIN CSS-->

<!-- END PLUGIN CSS -->
<script src="assets/js/scripts/classroom-lang.js"></script>
<script src="assets/js/scripts/classroom-lang.js?version=1.2.12a"></script>
</head>

<body>
<body>
94 changes: 44 additions & 50 deletions classroom/Views/home_footer.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
</div>
</div>
</div>
<script src="https://code.jquery.com/jquery-3.5.1.min.js"
integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
<script src="assets/js/lib/wysibb/jquery.wysibb.js"></script>
<script src="https://code.jquery.com/ui/1.12.0/jquery-ui.min.js"
integrity="sha256-eGE6blurk5sHj+rmkfsGYeKyZx3M4bG+ZlFyA7Kns7E=" crossorigin="anonymous"></script>
<link rel="stylesheet" stype="text/css" href="assets/js/lib/wysibb/theme/default/wbbtheme.css">
<script src="assets/js/lib/jquery.js?version=1.2.12a"></script>
<script src="assets/js/lib/wysibb/jquery.wysibb.js?version=1.2.12a"></script>
<script src="assets/js/lib/jquery-ui.js?version=1.2.12a"></script>
<link rel="stylesheet" stype="text/css" href="assets/js/lib/wysibb/theme/default/wbbtheme.css?version=1.2.12a">
<script>
$(document).ready(function () {
let wbbOpt = {
Expand All @@ -15,53 +13,49 @@
$("#activity-form-content").wysibb(wbbOpt);
})
</script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous">
</script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous">
</script>
<script src="assets/js/lib/i18next.js"></script>
<script src="assets/js/lib/jquery-i18next.min.js"></script>
<script src="assets/js/lib/i18nextXHRBackend.min.js"></script>
<script src="assets/js/lib/popper.js?version=1.2.12a"></script>
<script src="assets/js/lib/bootstrap.js?version=1.2.12a"></script>
<script src="assets/js/lib/i18next.js?version=1.2.12a"></script>
<script src="assets/js/lib/jquery-i18next.min.js?version=1.2.12a"></script>
<script src="assets/js/lib/i18nextXHRBackend.min.js?version=1.2.12a"></script>
<script
src="assets/js/lib/i18nextBrowserLanguageDetector.min.js">
src="assets/js/lib/i18nextBrowserLanguageDetector.min.js?version=1.2.12a">
</script>
<!-- build:js-classroom -->
<script src="assets/js/utils/url.js"></script>
<script src="assets/js/utils/parsingJson.js"></script>
<script src="assets/js/utils/text.js"></script>
<script src="assets/js/lib/rotate.js"></script>
<script src="assets/js/utils/bbcodeToHtml.js"></script>
<script src="assets/js/utils/activityContentManager.js"></script>
<script src="assets/js/utils/registrationTemplate.js"></script>
<script src="assets/js/scripts/disconnect.js"></script>
<script src="assets/js/scripts/dashboardActivities.js"></script>
<script src="assets/js/scripts/teacherActivities.js"></script>
<script src="assets/js/scripts/manageClassroom.js"></script>
<script src="assets/js/scripts/displayPanel.js"></script>
<script src="assets/js/main/modal.js"></script>
<script src="assets/js/constants/modals.js"></script>
<script src="assets/js/scripts/buttons.js"></script>
<script src="assets/js/scripts/ActivityTracker.js"></script>
<script src="assets/js/scripts/activityManager.js"></script>
<script src="assets/js/scripts/classroomDisplay.js"></script>
<script src="assets/js/utils/url.js?version=1.2.12a"></script>
<script src="assets/js/utils/parsingJson.js?version=1.2.12a"></script>
<script src="assets/js/utils/text.js?version=1.2.12a"></script>
<script src="assets/js/lib/rotate.js?version=1.2.12a"></script>
<script src="assets/js/utils/bbcodeToHtml.js?version=1.2.12a"></script>
<script src="assets/js/utils/activityContentManager.js?version=1.2.12a"></script>
<script src="assets/js/utils/registrationTemplate.js?version=1.2.12a"></script>
<script src="assets/js/scripts/disconnect.js?version=1.2.12a"></script>
<script src="assets/js/scripts/dashboardActivities.js?version=1.2.12a"></script>
<script src="assets/js/scripts/teacherActivities.js?version=1.2.12a"></script>
<script src="assets/js/scripts/manageClassroom.js?version=1.2.12a"></script>
<script src="assets/js/scripts/displayPanel.js?version=1.2.12a"></script>
<script src="assets/js/main/modal.js?version=1.2.12a"></script>
<script src="assets/js/constants/modals.js?version=1.2.12a"></script>
<script src="assets/js/scripts/buttons.js?version=1.2.12a"></script>
<script src="assets/js/scripts/ActivityTracker.js?version=1.2.12a"></script>
<script src="assets/js/scripts/activityManager.js?version=1.2.12a"></script>
<script src="assets/js/scripts/classroomDisplay.js?version=1.2.12a"></script>
<script src="assets/js/main/FoldersManager.js" defer></script>
<!-- end build -->
<script src="assets/js/main/Loader.js"></script>
<script src="assets/js/main/UIManager.js"></script>
<script src="assets/js/main/User.js"></script>
<script src="assets/js/main/ClassroomManager.js"></script>
<script src="assets/js/main/Loader.js?version=1.2.12a"></script>
<script src="assets/js/main/UIManager.js?version=1.2.12a"></script>
<script src="assets/js/main/User.js?version=1.2.12a"></script>
<script src="assets/js/main/ClassroomManager.js?version=1.2.12a"></script>
<!-- manager & groupadmin -->
<script src="assets/js/main/ManagerManager.js"></script>
<script src="assets/js/main/GroupAdminManager.js"></script>
<script src="assets/js/main/MainManagerAndGroup.js"></script>
<script src="assets/js/main/ManagerManager.js?version=1.2.12a"></script>
<script src="assets/js/main/GroupAdminManager.js?version=1.2.12a"></script>
<script src="assets/js/main/MainManagerAndGroup.js?version=1.2.12a"></script>
<!-- end manager & groupadmin -->
<script src="assets/js/main/Main.js"></script>
<script src="assets/js/main/Loader.js"></script>
<script src="assets/js/main/Main.js?version=1.2.12a"></script>
<script src="assets/js/main/Loader.js?version=1.2.12a"></script>
<!-- drag and drop bundle -->
<link rel="stylesheet" stype="text/css" href="assets/css/dragula.css">
<script src="assets/js/lib/dragula.js" ></script>
<link rel="stylesheet" stype="text/css" href="assets/css/dragula.css?version=1.2.12a">
<script src="assets/js/lib/dragula.js?version=1.2.12a" ></script>

<script>
UIManager.init().then((resolve) => {
Expand Down Expand Up @@ -139,9 +133,9 @@

// Update Rémi, allow to return in the manager or groupadmin mode after a refresh
function goBackToThePreviousView(administration = []) {
if ($_GET('panel') &&
(ClassroomSettings.mixPanels.includes($_GET('panel')) ||
ClassroomSettings.teacherPanels.includes($_GET('panel')) ||
if ($_GET('panel') &&
(ClassroomSettings.mixPanels.includes($_GET('panel')) ||
ClassroomSettings.teacherPanels.includes($_GET('panel')) ||
ClassroomSettings.managerPanels.includes($_GET('panel')) ||
ClassroomSettings.groupAdminPanels.includes($_GET('panel')))) {
if (administration[0] === true && $_GET('panel').includes("manager") && $_GET('nav').includes("manager")) {
Expand Down Expand Up @@ -172,10 +166,10 @@
}
}
</script>
<script src="assets/js/utils/translate.js"></script>
<script src="assets/js/utils/translate.js?version=1.2.12a"></script>
<!-- PLUGIN SCRIPTS-->

<!-- END PLUGIN SCRIPTS -->
</body>

</html>
</html>
8 changes: 4 additions & 4 deletions classroom/Views/login_by_link.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div id="classroom-create-account" class="container-border-left container-border-left-enable">
<div class="c-primary-form">
<p>Première viste ? Veuillez choisir un identifiant.</p>
<img src="./assets/media/green_user.png" class="icon-label">
<img src="./assets/media/green_user.png?version=1.2.12a" class="icon-label">
<label for="username">Pseudonyme</label></br>
<input type="text" placeholder="Vitta" name="username" id="new-user-pseudo-form" required>
</div>
Expand All @@ -19,11 +19,11 @@

<p>De retour dans cette classe ?</p>

<img src="./assets/media/green_user.png" class="icon-label">
<img src="./assets/media/green_user.png?version=1.2.12a" class="icon-label">
<label for="username">Pseudonyme</label></br>
<input type="text" placeholder="Vitta" id="user-pseudo-form" name="secret_code" required></br>

<img src="./assets/media/green_lock.png" class="icon-label">
<img src="./assets/media/green_lock.png?version=1.2.12a" class="icon-label">
<label for="username">Mot de passe</label></br>
<input type="password" placeholder="••••••••••" name="secret_code" id="user-password-form"
required></br>
Expand All @@ -37,4 +37,4 @@
<button onclick="returnToConnectionPanel('#classroom-login-container-bis')" class="btn close-login-classroom"><i
class="fas fa-times"></i></button>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions classroom/Views/login_selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div id="classroom-login-code" class="container-border-left">
<h3 class="font-weight-bold c-text-secondary" data-i18n="classroom.login.student"></h3>
<div class="c-secondary-form">
<img src="./assets/media/orange_lock.png" class="icon-label">
<img src="./assets/media/orange_lock.png?version=1.2.12a" class="icon-label">
<label for="secret_code"> Rentrez ici votre code classe</label><br>
<input type="text" placeholder="123ABC" name="secret_code" id="class-code" required>
</div>
Expand All @@ -19,10 +19,10 @@ <h3 class="font-weight-bold c-text-primary" data-i18n="classroom.login.teacher">
</span>
</div>
<div id="classroom-login-gar" class="container-border-right">
<img src="./assets/media/logoGAR.png" alt="Logo GAR">
<img src="./assets/media/logoGAR.png?version=1.2.12a" alt="Logo GAR">
<span class="gar-presentation-text">Profitez du mode classe en toute simplicité à l'aide du GAR.<br>
<a href="http://google.com">Cliquez ici</a> pour en savoir plus.</span>
</div>

</div>
</div>
</div>
4 changes: 2 additions & 2 deletions classroom/Views/managerProfilePanel.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="classroom-dashboard-profil-panel-manager" class="dashboard-block profile-panel" style="display:none;">

<div class="d-flex flex-column text-center">
<img src="assets/media/profile_picture.svg" alt="Photo de profil" class="user-picture">
<img src="assets/media/profile_picture.svg?version=1.2.12a" alt="Photo de profil" class="user-picture">
<span id="user-name-manager" class="mt-4" data-i18n="classroom.profil.identity">PLACEHOLDER</span>
</div>

Expand All @@ -15,4 +15,4 @@
<i class="fas fa-power-off"></i>
</button>
</div>
</div>
</div>
10 changes: 5 additions & 5 deletions classroom/Views/sidebar_groupadmin.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@

<div class="classroom-navbar-button" id="dashboard-groupadmin-users-side"
onclick="navigatePanel('groupadmin-dashboard-users', 'dashboard-groupadmin-users-side')">
<img src="assets/media/my_classes.svg" alt="Icône classe">
<img src="assets/media/my_classes.svg?version=1.2.12a" alt="Icône classe">
<span data-i18n="manager.users.users">Utilisateurs</span>
</div>

<div class="classroom-navbar-button" id="dashboard-groupadmin-apps"
onclick="navigatePanel('groupadmin-apps-main', 'dashboard-groupadmin-apps')">
<img src="assets/media/my_apps.svg" alt="Icône classe">
<img src="assets/media/my_apps.svg?version=1.2.12a" alt="Icône classe">
<span data-i18n="manager.apps.apps">Applications</span>
</div>

<div class="classroom-navbar-button" id="dashboard-groupadmin-help-side"
onclick="navigatePanel('groupadmin-dashboard-help', 'dashboard-groupadmin-help-side')">
<img src="assets/media/call_for_help.svg" alt="Icône Appel à l'aide">
<img src="assets/media/call_for_help.svg?version=1.2.12a" alt="Icône Appel à l'aide">
<span data-i18n="manager.profil.help">Appel à l'aide</span>
</div>

<div id="dashboard-profil-groupadmin" class="classroom-navbar-button"
onclick="navigatePanel('classroom-dashboard-profil-panel-groupadmin', 'dashboard-profil-groupadmin')">
<img class="user-picture" src="assets/media/profile_picture.svg" alt="Photo de profil">
<img class="user-picture" src="assets/media/profile_picture.svg?version=1.2.12a" alt="Photo de profil">
<span data-i18n="classroom.ids.classroom-dashboard-profil-panel-teacher"></span>
</div>
</div>
</div>
8 changes: 4 additions & 4 deletions classroom/Views/sidebar_manager.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

<div class="classroom-navbar-button" id="dashboard-manager-groups"
onclick="navigatePanel('manager-dashboard-main', 'dashboard-manager-groups')">
<img src="assets/media/my_classes.svg" alt="Icône classe">
<img src="assets/media/my_classes.svg?version=1.2.12a" alt="Icône classe">
<span data-i18n="manager.users.users">Utilisateurs</span>
</div>

<div class="classroom-navbar-button" id="dashboard-manager-apps"
onclick="navigatePanel('manager-apps-main', 'dashboard-manager-apps')">
<img src="assets/media/my_apps.svg" alt="Icône Apps">
<img src="assets/media/my_apps.svg?version=1.2.12a" alt="Icône Apps">
<span data-i18n="manager.apps.apps">Applications</span>
</div>

<div id="dashboard-profil-manager" class="classroom-navbar-button"
onclick="navigatePanel('classroom-dashboard-profil-panel-manager', 'dashboard-profil-manager')">
<img class="user-picture" src="assets/media/profile_picture.svg" alt="Photo de profil">
<img class="user-picture" src="assets/media/profile_picture.svg?version=1.2.12a" alt="Photo de profil">
<span data-i18n="classroom.ids.classroom-dashboard-profil-panel-teacher"></span>
</div>
</div>
</div>
8 changes: 4 additions & 4 deletions classroom/Views/sidebar_student.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<div id="classroom-dashboard-container">
<div id="classroom-dashboard-sidebar" class="sidebar-classroom" style="display:none;">
<div id="classroom-sidebar-logo"></div>
<div class="classroom-navbar-button" id="dashboard-activities"><img src="assets/media/my_activities.svg"
<div class="classroom-navbar-button" id="dashboard-activities"><img src="assets/media/my_activities.svg?version=1.2.12a"
alt="Icône activités">
<span data-i18n="classroom.ids.classroom-dashboard-activities-panel-teacher"></span>
</div>
<div class=" classroom-navbar-button" id="dashboard-help"
onclick="navigatePanel('classroom-dashboard-help-panel', 'dashboard-help')"><img
src="assets/media/call_for_help.svg" alt="Icône Appel à l'aide">
src="assets/media/call_for_help.svg?version=1.2.12a" alt="Icône Appel à l'aide">
<span data-i18n="classroom.ids.classroom-dashboard-help-panel"></span>
</div>
<div id="dashboard-profil" class="classroom-navbar-button"
onclick="navigatePanel('classroom-dashboard-profil-panel', 'dashboard-profil')"><img
class="user-picture" src="assets/media/profile_picture.svg" alt="Photo de profil">
class="user-picture" src="assets/media/profile_picture.svg?version=1.2.12a" alt="Photo de profil">
<span data-i18n="classroom.ids.classroom-dashboard-profil-panel-teacher"></span>
</div>

</div>
</div>
8 changes: 4 additions & 4 deletions classroom/Views/sidebar_teacher.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<div id="classroom-sidebar-logo"></div>
<div class="classroom-navbar-button" id="dashboard-activities-teacher"
onclick="navigatePanel('classroom-dashboard-activities-panel-teacher', 'dashboard-activities-teacher')">
<img src="assets/media/my_activities.svg" alt="Icône activités">
<img src="assets/media/my_activities.svg?version=1.2.12a" alt="Icône activités">
<span data-i18n="classroom.ids.classroom-dashboard-activities-panel-teacher"></span> </div>
<div class=" classroom-navbar-button" id="dashboard-classes-teacher"
onclick="navigatePanel('classroom-dashboard-classes-panel-teacher', 'dashboard-classes-teacher')">
<img src="assets/media/my_classes.svg" alt="Icône classe">
<img src="assets/media/my_classes.svg?version=1.2.12a" alt="Icône classe">
<span data-i18n="classroom.ids.classroom-dashboard-classes-panel-teacher"></span> </div>
<div id="dashboard-profil-teacher" class="active classroom-navbar-button"
onclick="navigatePanel('classroom-dashboard-profil-panel-teacher', 'dashboard-profil-teacher')"><img
class="user-picture" src="assets/media/profile_picture.svg" alt="Photo de profil">
class="user-picture" src="assets/media/profile_picture.svg?version=1.2.12a" alt="Photo de profil">
<span data-i18n="classroom.ids.classroom-dashboard-profil-panel-teacher"></span></div>
</div>
</div>
Loading