Merge from Cabri fork - dev branch#174
Open
maxencelav wants to merge 381 commits intovittascience:cabri-syncfrom
Open
Merge from Cabri fork - dev branch#174maxencelav wants to merge 381 commits intovittascience:cabri-syncfrom
dev branch#174maxencelav wants to merge 381 commits intovittascience:cabri-syncfrom
Conversation
maxencelav
requested review from
ThomasDumazet and
ultimecreation
and removed request for
ultimecreation
Closed
Member
ThomasDumazet
left a comment
ThomasDumazet
left a comment
There was a problem hiding this comment.
- What is the purpose of
classroom/Views/_newExercicesPanel.html? It should be deleted if it's not to be used in OpenSTEAM-LMS core. - The
favicon.icofile with Cabri logo should be removed. - About translation files, the spelling and grammatical corrections are welcome but all elements specific for Cabri use should be removed.
|
|
||
| <div class="col-md"> | ||
| <label for="app_create_sort_index" data-i18n="manager.activitiesRestrictions.indexPos">Nombre</label> | ||
| <label for="app_create_sort_index" data-i18n="manager.activitiesRestrictions.max">Nombre</label> |
Member
There was a problem hiding this comment.
manager.activitiesRestrictions.max does'nt exist in the translation files. Would'nt it be better to change this in the translation plugin ?
| genialyiframe: { | ||
| title: CURLANG.genialy, | ||
| buttonHTML: '<img class="fonticon ve-tlb-link1" src="/classroom/assets/media/activity/SigleGenially.png" width="26" height="26" style="margin-top: 2px;" />', | ||
| buttonHTML: '<img class="fonticon ve-tlb-link1" src="/learn/assets/media/SigleGenially.png?version=VERSIONNUM" width="26" height="26" style="margin-top: 2px;" />', |
Member
There was a problem hiding this comment.
What is the purpose of changing /classroom to /learn ? This folder does'nt seem to exist.
| <html lang="en"> | ||
|
|
||
| <head> | ||
| <> |
Member
There was a problem hiding this comment.
Was this change intentional?
If so, what is the purpose?
| <link rel="stylesheet" href="assets/css/modal.css"> | ||
| <link rel="stylesheet" href="assets/css/elements.css"> | ||
| <link href="assets/css/jquery-ui.css?version=VERSIONNUM"> | ||
| <link rel="stylesheet" href="assets/css/bootstrap.css?version=VERSIONNUM"> |
Member
There was a problem hiding this comment.
We need to keep the id="bs4-css-import" attribute for the bootstrap css link.
classroom/home.html
Outdated
| <!-- 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.7c"></script> |
Member
There was a problem hiding this comment.
Here the file version isn't VERSIONNUM but 1.2.7c.
Is that intentional ?
| $contentItemsLabel = "https://purl.imsglobal.org/spec/lti-dl/claim/content_items"; | ||
| // here save activity url in db | ||
|
|
||
| //dd($validatedToken); |
classroom/lti/score.php
Outdated
| // TODO: IT SHOULD BE BETTER TO GENERATE THE PUBLIC KEY HERE INSTEAD OF GETTING IT FROM THE JWKS ENDPOINT | ||
| $jwks = json_decode(file_get_contents("https://{$_SERVER['HTTP_HOST']}"."/classroom/lti/certs.php"), true); | ||
| //$platform_url = isset($_SERVER['HTTPS']) ? 'https://' : 'http://' . $_SERVER['HTTP_HOST']; | ||
| //$platform_url = getenv('VS_HOST'); |
Member
There was a problem hiding this comment.
The lines 35 and 36 can be removed.
|
|
||
| // todo HTTP_HOST is insecure (controlled by the client) | ||
| $platform_url = "https://{$_SERVER['HTTP_HOST']}"; | ||
| //$platform_url = isset($_SERVER['HTTPS']) ? 'https://' : 'http://' . $_SERVER['HTTP_HOST']; |
Member
There was a problem hiding this comment.
The lines 28 and 29 can be removed.
+ Seif-Eddine Benomar copyright additions
…d by client side)
Other adjustments in the translation to avoid wild clicking that take students out of the "cadre de confiance". All is a consequence of the GAR conformité.
fix fix sepcial add html fix delete activity and notif test log try fix delete notif fix forgot fix test fix fix back fix remove html back to +/- fix title try fix change delete modal name of activity restore notif test fix modal text title test fix notif fix
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.