Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 1-navigation
  • 15-choses-a-faire-css
  • 2-gitlab-deploy
  • 3-qcu-features
  • 42-mementos-non-pris-en-compte-dans-commentaires-survey
  • add-tat-sample
  • gitlab-ci-debug
  • macao3-export
  • main
  • test
10 results

Target

Select target project
  • macao/macao-hugo
  • dbeniamine/macao-hugo
2 results
Select Git revision
  • 1-navigation
  • 15-choses-a-faire-css
  • 2-gitlab-deploy
  • 3-qcu-features
  • add-tat-sample
  • gitlab-ci-debug
  • macao3-export
  • main
  • test
9 results
Show changes
Commits on Source (63)
Show whitespace changes
Inline Side-by-side
Showing
with 436 additions and 82 deletions
.idea/dbnavigator.xml
View file @ 9e8b6f80
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DBNavigator.Project.DDLFileAttachmentManager">
<mappings />
<preferences />
</component>
<component name="DBNavigator.Project.DatabaseAssistantManager">
<assistants />
</component>
<component name="DBNavigator.Project.DatabaseBrowserManager">
<autoscroll-to-editor value="false" />
<autoscroll-from-editor value="true" />
......@@ -22,6 +29,7 @@
<display-mode value="TABBED" />
<navigation-history-size value="100" />
<show-object-details value="false" />
<enable-sticky-paths value="true" />
</general>
<filters>
<object-type-filter>
......@@ -47,9 +55,15 @@
<object-type name="TYPE" enabled="true" />
<object-type name="TYPE_ATTRIBUTE" enabled="true" />
<object-type name="ARGUMENT" enabled="true" />
<object-type name="JAVA_CLASS" enabled="true" />
<object-type name="JAVA_INNER_CLASS" enabled="true" />
<object-type name="JAVA_FIELD" enabled="true" />
<object-type name="JAVA_METHOD" enabled="true" />
<object-type name="DIMENSION" enabled="true" />
<object-type name="CLUSTER" enabled="true" />
<object-type name="DBLINK" enabled="true" />
<object-type name="CREDENTIAL" enabled="true" />
<object-type name="AI_PROFILE" enabled="true" />
</object-type-filter>
</filters>
<sorting>
......@@ -86,9 +100,15 @@
<object-type name="FUNCTION" enabled="true" />
<object-type name="PACKAGE" enabled="true" />
<object-type name="TYPE" enabled="true" />
<object-type name="JAVA CLASS" enabled="true" />
<object-type name="INNER CLASS" enabled="true" />
<object-type name="JAVA FIELD" enabled="true" />
<object-type name="JAVA METHOD" enabled="true" />
<object-type name="JAVA PARAMETER" enabled="true" />
<object-type name="DIMENSION" enabled="false" />
<object-type name="CLUSTER" enabled="false" />
<object-type name="DBLINK" enabled="true" />
<object-type name="CREDENTIAL" enabled="false" />
</lookup-objects>
<force-database-load value="false" />
<prompt-connection-selection value="true" />
......@@ -363,9 +383,6 @@
<compile-dependencies value="ASK" />
<always-show-controls value="false" />
</compiler>
<debugger>
<debugger-type value="JDBC" />
</debugger>
</operation-settings>
<ddl-file-settings>
<extensions>
......@@ -379,6 +396,7 @@
<mapping file-type-id="TYPE" extensions="tpe" />
<mapping file-type-id="TYPE_SPEC" extensions="tps" />
<mapping file-type-id="TYPE_BODY" extensions="tpb" />
<mapping file-type-id="JAVA_SOURCE" extensions="sql" />
</extensions>
<general>
<lookup-ddl-files value="true" />
......@@ -388,6 +406,11 @@
<make-scripts-rerunnable value="true" />
</general>
</ddl-file-settings>
<assistant-settings>
<credential-settings>
<credentials />
</credential-settings>
</assistant-settings>
<general-settings>
<regional-settings>
<date-format value="MEDIUM" />
......
README.md
View file @ 9e8b6f80
......@@ -6,7 +6,7 @@
# Démo. avec Gitlab Pages
https://macao.pages.tetras-libre.fr
https://macao.pages.tetras-libre.fr/macao-hugo/
# Installation pour le développent
......
macao/assets/_custom.scss
View file @ 9e8b6f80
body {
--accent-quiz: #2aa198;
// Defined but not used for now
// Global theme colors are defined in macao/themes/macao-hugo-theme/assets/_defaults.scss and go to @mixin theme-tetras
--quizz-backgourd-color: #00000;
--feedback-sucess-color: lightgreen;
--feedback-error-color: #ef5d5d;
--feedback-sucess-color: #FFF2CC;
--feedback-error-color: #FFF2CC;
}
// ***********************************
// Gloabl
// Global
// ***********************************
* {
line-height: 1.2 !important
}
#sv-nav-complete {
display: none;
img.inlineImage {
vertical-align: middle;
height: 1em;
}
img.inlineImage12 {
vertical-align: middle;
height: 1.2em;
}
img.inlineImage14 {
vertical-align: middle;
height: 1.4em;
}
img.inlineImage16 {
vertical-align: middle;
height: 1.6em;
}
img.inlineImage18 {
vertical-align: middle;
height: 1.8em;
}
img.inlineImage2 {
vertical-align: middle;
height: 2em;
}
img.inlineImage22 {
vertical-align: middle;
height: 2.2em;
}
img.inlineImage24 {
vertical-align: middle;
height: 2.4em;
}
img.inlineImage26 {
vertical-align: middle;
height: 2.6em;
}
img.inlineImage28 {
vertical-align: middle;
height: 2.8em;
}
img.inlineImage3 {
vertical-align: middle;
height: 3em;
}
.btn-play {
cursor: pointer;
background-color: var(--macao-primary-color);
border-radius: 5px;
border: none;
padding: 5px 10px;
color: white;
}
.notextplay {
font-size: 0; /* hides text */
color: white;
}
.notextplay i {
font-size: medium; /* keep icon visible */
}
p#gapfill-container {
......@@ -39,7 +111,6 @@ select.sd-dropdown.inline-dropdown, input.sd-input.inline-input {
}
#correct-indic {
//border: 2px solid var(--accent-quiz);
border-radius: 8px;
padding: 16px;
......@@ -69,5 +140,103 @@ select.sd-dropdown.inline-dropdown, input.sd-input.inline-input {
.sd-question__header {
margin-top: 0;
max-width: 150px;
}
}
// ***********************************
// General look and feel
// ***********************************
.book-page > article {
background-color: var(--secondary-background-color);
border-radius: 15px;
}
.book-page > article {
padding: 16px;
margin-top: 16px;
}
.book-search {
border-radius: 10px;
padding: 0px 5px;
background-color: var(--secondary-background-color);
}
a {
color: var(--macao-primary-color);
}
a:visited {
color: var(--macao-primary-color) !important;
}
a.active {
color: var(--macao-secondary-font-color) !important;
background-color: var(--macao-primary-color);
border-radius: 5px;
padding: 5px;
margin-right: 5px;
}
// Hide element when width is less than 900px
@media (min-width: 900px) {
.book-icon {
display: none;
}
}
.sd-btn {
padding: 5px 10px !important;
}
// ***********************************
// Comment on page
// ***********************************
.comment-trigger {
cursor: pointer;
color: var(--macao-primary-color);
text-decoration: underline;
}
em:not(:has(strong)) {
background-color: lightgray;
padding: 3px;
padding-right: 4px;
border-radius: 5px;
}
// ***********************************
// Dropdowns
// ***********************************
// Min width for dropdowns
.sv-dropdown_select-wrapper {
min-width: 150px !important;
}
// ***********************************
// .sv-title-actions__title
// ***********************************
.sv-title-actions__title {
white-space: break-spaces !important;
}
.one-line {
.sd-question__header {
max-width: 60%;
}
.sv-string-viewer {
display: inline-flex;
align-items: center;
gap: 5px;
max-width: 100%;
flex-wrap: wrap;
}
}
@import "plugins/_scrollbars.scss";
macao/assets/custom.js
View file @ 9e8b6f80
......@@ -2,8 +2,47 @@ console.log('Custom JS loaded');
$(document).ready(function() {
console.log('Custom JS executed');
// Add specific classes to play buttons
$('button:contains("Play")').html('<i class="fa-solid fa-play"></i>');
$('button:contains("Play")').html('<i class="fa-solid fa-play"></i> Écouter').addClass('btn-play').prop('title','Écouter');
// Add Title on top of the page
$('.book-header').show();
$('.commentaireInfo').hide();
// $('.commentaireInfo').prop('popover', 'auto');
$('.commentaireInfoGroup').show();
// Comment popover
$('[spanid]').addClass('comment-trigger').each(function (){
const spanid = $(this).attr('spanid');
if($("[commentaireid=" + spanid + "]").length !== 0) {
$(this).popover({
trigger: 'click',
html: true,
placement: 'auto',
content: $("[commentaireid=" + spanid + "]")
});
$("[commentaireid=" + spanid + "]").toggle()
}
});
// $(document).on('click', function() {
// $('[spanid]').popover('hide');
// });
// Simplify th in td
$('th').each(function () {
// Store the current content of the <th>
const content = $(this).html();
// Replace <th> with a <td> containing the same content
$(this).replaceWith(`<td>${content}</td>`);
});
// Tricky way to add gap between play button and the next element
// like http://localhost:1313/macao-hugo/activities/mosorgmacao_fusion_ss_barre/mosmod10/mosmod11/mosetp129/pg334/
$(".btn-play").parent().siblings().css("margin-top", "10px")
if ($(window).width() > 900) {
$('.book-icon').hide();
}
});
macao/assets/quiz.js
View file @ 9e8b6f80
......@@ -3,18 +3,18 @@
*/
function checkAllQuestions(questions, surveyConfig, converter) {
let allCorrect = true;
questions.forEach((question) => {
if (!question.isAnswerCorrect()) {
allCorrect = false;
}
});
if (allCorrect) {
correctIndic.node.className = "correct";
surveyConfig.correctComment = surveyConfig.correctComment.replace(/\n\n/g, "<br>");
correctIndic.commentNode.innerHTML = converter.renderInline(surveyConfig.correctComment) || "All answers are correct!";
} else {
correctIndic.node.className = "incorrect";
surveyConfig.incorrectComment = surveyConfig.incorrectComment.replace(/\n\n/g, "<br>");
correctIndic.commentNode.innerHTML = converter.renderInline(surveyConfig.incorrectComment) || "Some answers are incorrect!";
}
}
......@@ -26,13 +26,31 @@ function clearAllQuestions(questions) {
questions.forEach((question) => {
question.value = undefined;
});
correctIndic.node.className = "hidden";
correctIndic.commentNode.innerHTML = "";
}
/**
* Toggles the visibility of the help comment for a question.
*/
function toggleHelpComment(question, htmlElement) {
const helpCommentElement = htmlElement.querySelector('.help-comment');
if (helpCommentElement) {
// If help comment is already shown, remove it
helpCommentElement.remove();
} else {
// Otherwise, create and show the help comment
const newHelpCommentElement = document.createElement('div');
newHelpCommentElement.className = 'help-comment';
newHelpCommentElement.innerHTML = question.helpComment;
htmlElement.appendChild(newHelpCommentElement);
}
}
let correctIndic;
// The following allows to define complementary attributes in survey JSONS
$(function () {
correctIndic = {
node: document.getElementById("correct-indic"),
......@@ -40,12 +58,59 @@ $(function () {
};
Survey.JsonObject.metaData.addProperty("question", {
name: "customFormat", type: "text", category: "general", default: "", visibleIndex: 0,
name: "customFormat",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
Survey.JsonObject.metaData.addProperty("survey", {
name: "isSurveySummaryVisible",
type: "boolean",
category: "general",
default: "false",
visibleIndex: 0,
});
Survey.JsonObject.metaData.addProperty("question", {
name: "helpComment",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
Survey.JsonObject.metaData.addProperty("question", {
name: "compComment",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
Survey.JsonObject.metaData.addProperty("question", {
name: "transcript",
type: "text",
category: "general",
default: "",
visibleIndex: 0,
});
// Load survey model from JSON
const survey = new Survey.Model(jsonStatic);
const questions = survey.getAllQuestions();
if (questions.length === 1) {
console.log("Survey has only one question");
console.log(questions[0]);
const regex = /pg\d\d\d/g;
if (questions[0].title.match(regex)) {
questions[0].titleLocation = "hidden";
}
}
// Instantiate `markdown-it`
const converter = markdownit({
......@@ -53,12 +118,7 @@ $(function () {
});
survey.onTextMarkdown.add((_, options) => {
// Convert Markdown to HTML
let str = converter.renderInline(options.text);
// ...
// Sanitize the HTML markup using a third-party library here
// ...
// Set HTML markup to render
options.html = str;
});
......@@ -71,8 +131,36 @@ $(function () {
$(options.htmlElement).addClass("hide-disabled-checkboxes");
}
}
});
// Display compComment if present
if (options.question.compComment) {
const compCommentElement = document.createElement('div');
compCommentElement.className = 'comp-comment';
compCommentElement.innerHTML = options.question.compComment;
options.htmlElement.appendChild(compCommentElement);
}
// Add "Corrigé" button if helpComment is present
if (options.question.helpComment) {
const helpButton = document.createElement('button');
helpButton.innerHTML = 'Corrigé';
helpButton.className = 'sd-btn sd-btn--action nav-input';
helpButton.onclick = () => toggleHelpComment(options.question, options.htmlElement);
options.htmlElement.appendChild(helpButton);
}
if( options.question.getType() === "dropdown" ) {
// Very ugly fix to avoid sliding dropdown on focus
$('.book-article').css({
'will-change' : 'unset',
'transition': 'none',
});
$('.book-page').css({
'will-change' : 'unset',
'transition': 'none',
});
}
});
// Add "Check answers" button
survey.addNavigationItem({
......@@ -96,9 +184,59 @@ $(function () {
innerCss: "sd-btn nav-input"
});
survey.onComplete.add(function (sender) {
if (sender.isSurveySummaryVisible) {
console.log("Survey summary is visible");
const userData = sender.data;
const summaryDiv = document.createElement("div");
summaryDiv.id = "surveySummary";
let html = "<h3>Your Results:</h3><ul>";
sender.getAllQuestions().forEach(q => {
const userAnswer = userData[q.name];
const correctAnswer = q.correctAnswer;
const isCorrect = userAnswer === correctAnswer;
html += `<li><b>${q.title}</b><br>
Your answer: ${userAnswer} <br>
Correct answer: ${correctAnswer} <br>
<span style="color:${isCorrect ? 'green' : 'red'};">
${isCorrect ? "Correct" : "Incorrect"}
</span>`;
// Check if the transcript property exists and add an image if it does
if (q.transcript) {
html += `<br><img src="${q.transcript}" alt="Transcript Image" class="inlineImage">`;
}
html += `</li><br>`;
});
html += "</ul>";
summaryDiv.innerHTML = html;
// Append the summary after the survey container
document.getElementById("surveyContainer").appendChild(summaryDiv);
}
});
// Ugly tricks to avoid creating a new theme
const customTheme = SurveyTheme.DefaultLightPanelless;
const primColor = getComputedStyle(document.documentElement, null).getPropertyValue('--macao-primary-color');
customTheme.cssVariables["--sjs-primary-backcolor"] = primColor;
customTheme.cssVariables["--sjs-primary-backcolor-dark"] = primColor;
// Apply theme
survey.applyTheme(SurveyTheme.DefaultLightPanelless);
console.log("Survey theme applied", SurveyTheme.DefaultLightPanelless);
survey.showCompleteButton = false;
// Inflate the survey in the page
$("#surveyContainer").Survey({ model: survey });
});
$(document).ready(function() {
$('button:contains("Play")').html('<i class="fa-solid fa-play"></i> Écouter').addClass('btn-play').prop('title', 'Écouter');
});
macao/content/activities/MosOrg1/seq100407/act153876/pg1888/index.md
View file @ 9e8b6f80
......@@ -8,9 +8,7 @@ Ecoutez et complétez les deux énoncés suivants en vous servant de
vos connaissances grammaticales.
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg191/index.md
View file @ 9e8b6f80
......@@ -7,14 +7,12 @@ weight = 60
Ecoutez l'énoncé :
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
Cet énoncé renvoie-t-il à une situation réelle ?
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg191/quiz.json
View file @ 9e8b6f80
......@@ -2,6 +2,7 @@
"elements": [
{
"name": "pg191",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
{
......
macao/content/activities/MosOrg1/seq100407/act153876/pg2429/index.md
View file @ 9e8b6f80
......@@ -5,15 +5,13 @@ weight = 100
Ecoutez :
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran26_01.mp3" ><source src="/macao-hugo/media/ecran26/ecran26_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran26_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran26_01.mp3" ><source src="/macao-hugo/media/ecran26/ecran26_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran26_01.mp3').play()">Play</button></div>
---
Sélectionnez ce que vous avez entendu.
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg3602/index.md
View file @ 9e8b6f80
......@@ -8,14 +8,12 @@ Ecoutez l'énoncé et remettez les éléments ci-dessous dans
l'ordre de
l'énoncé entendu :
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | |
| --- | --- |
| <div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div> | |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/>
---
<div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div>
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg3746/index.md
View file @ 9e8b6f80
......@@ -7,16 +7,14 @@ weight = 40
Ecoutez les deux énoncés suivants.
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | |
| --- | --- |
| <div><audio id="ecran201_04.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_04.mp3').play()">Play</button></div><div><audio id="ecran201_01.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_01.mp3').play()">Play</button></div> | Whenever I phone her <div><audio id="mots20itape1_01.mp3" ><source src="/macao-hugo/media/mots20itape1/mots20itape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20itape1_01.mp3').play()">Play</button></div> the conversation. |
| <div><audio id="ecran202_04.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_04.mp3').play()">Play</button></div><div><audio id="ecran202_01.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_01.mp3').play()">Play</button></div> | If I had a tape recorder <div><audio id="mots20id_tape1_01.mp3" ><source src="/macao-hugo/media/mots20id_tape1/mots20id_tape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20id_tape1_01.mp3').play()">Play</button></div> the conversation. |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/>
---
<div><audio id="ecran201_04.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_04.mp3').play()">Play</button></div><div><audio id="ecran201_01.mp3" ><source src="/macao-hugo/media/ecran201/ecran201_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran201_01.mp3').play()">Play</button></div> Whenever I phone her <div><audio id="mots20itape1_01.mp3" ><source src="/macao-hugo/media/mots20itape1/mots20itape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20itape1_01.mp3').play()">Play</button></div> the conversation.
<div><audio id="ecran202_04.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_04.mp3').play()">Play</button></div><div><audio id="ecran202_01.mp3" ><source src="/macao-hugo/media/ecran202/ecran202_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran202_01.mp3').play()">Play</button></div> If I had a tape recorder <div><audio id="mots20id_tape1_01.mp3" ><source src="/macao-hugo/media/mots20id_tape1/mots20id_tape1_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots20id_tape1_01.mp3').play()">Play</button></div> the conversation.
Que diriez-vous des blocs mis en valeur ?
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg3746/quiz.json
View file @ 9e8b6f80
......@@ -2,6 +2,7 @@
"elements": [
{
"name": "pg3746",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
{
......
macao/content/activities/MosOrg1/seq100407/act153876/pg6329/index.md
View file @ 9e8b6f80
......@@ -7,16 +7,14 @@ weight = 20
Réécoutez l'énoncé :
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran17_04.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_04.mp3').play()">Play</button></div><div><audio id="ecran17_01.mp3" ><source src="/macao-hugo/media/ecran17/ecran17_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran17_01.mp3').play()">Play</button></div>
---
| Est-ce qu'on entend distinctement | | **'s** | | --- | | ? |
| --- | --- | --- | --- |
Est-ce qu'on entend distinctement **'s** ?
--- ---
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg6329/quiz.json
View file @ 9e8b6f80
......@@ -2,6 +2,7 @@
"elements": [
{
"name": "pg6329",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
{
......
macao/content/activities/MosOrg1/seq100407/act153876/pg6866/index.md
View file @ 9e8b6f80
......@@ -6,13 +6,11 @@ weight = 80
Ecoutez à nouveau l'énoncé et complétez.
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg7434/index.md
View file @ 9e8b6f80
......@@ -7,14 +7,12 @@ weight = 50
Ecoutez l'énoncé :
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
Cet énoncé comporte-t-il une hypothèse ?
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg7434/quiz.json
View file @ 9e8b6f80
......@@ -2,6 +2,7 @@
"elements": [
{
"name": "pg7434",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
{
......
macao/content/activities/MosOrg1/seq100407/act153876/pg7664/index.md
View file @ 9e8b6f80
......@@ -7,16 +7,14 @@ weight = 90
Ecoutez les deux énoncés suivants.
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | |
| --- | --- |
| <div><audio id="ecran251_04.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_04.mp3').play()">Play</button></div><div><audio id="ecran251_01.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_01.mp3').play()">Play</button></div> | I wish I could go to Africa. <div><audio id="mots25there_01.mp3" ><source src="/macao-hugo/media/mots25there/mots25there_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25there_01.mp3').play()">Play</button></div> so many different languages there. |
| <div><audio id="ecran252_04.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_04.mp3').play()">Play</button></div><div><audio id="ecran252_01.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_01.mp3').play()">Play</button></div> | They've moved back to London. <div><audio id="mots25they_01.mp3" ><source src="/macao-hugo/media/mots25they/mots25they_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25they_01.mp3').play()">Play</button></div> so happy to live in the capital again. |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/>
---
<div><audio id="ecran251_04.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_04.mp3').play()">Play</button></div><div><audio id="ecran251_01.mp3" ><source src="/macao-hugo/media/ecran251/ecran251_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran251_01.mp3').play()">Play</button></div> I wish I could go to Africa. <div><audio id="mots25there_01.mp3" ><source src="/macao-hugo/media/mots25there/mots25there_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25there_01.mp3').play()">Play</button></div> so many different languages there.
<div><audio id="ecran252_04.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_04.mp3').play()">Play</button></div><div><audio id="ecran252_01.mp3" ><source src="/macao-hugo/media/ecran252/ecran252_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran252_01.mp3').play()">Play</button></div> They've moved back to London. <div><audio id="mots25they_01.mp3" ><source src="/macao-hugo/media/mots25they/mots25they_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('mots25they_01.mp3').play()">Play</button></div> so happy to live in the capital again.
Que diriez-vous des blocs mis en valeur ?
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}
macao/content/activities/MosOrg1/seq100407/act153876/pg7664/quiz.json
View file @ 9e8b6f80
......@@ -2,6 +2,7 @@
"elements": [
{
"name": "pg7664",
"titleLocation": "hidden",
"type": "radiogroup",
"choices": [
{
......@@ -17,4 +18,4 @@
}
]
,
"correctComment": "\n\nEffectivement, on entend pratiquement la même chose. Les voyelles\ntendues /***eɪ***/ (de ***they***) et ***/eə/*** (de ***there***) sont\nmodifiées par la présence de ***are***. Le plus souvent, on entend ***/ðeə/*** aussi bien\npour ***there are*** que pour ***they are***.\n\nPourtant, sur le plan grammatical, ils\nne sont pas interchangeables. En effet, ***there are*** signifie ***il y a*** et ***they\nare*** signifie ***ils / elles sont***.\n\nRéécoutez les énoncés.\n\n"}
"correctComment": "\n\nEffectivement, on entend pratiquement la même chose. Les <span spanId=\"commentfile_doc266709.htm\">voyelles</span>\ntendues /***eɪ***/ (de ***they***) et ***/eə/*** (de ***there***) sont\nmodifiées par la présence de ***are***. Le plus souvent, on entend ***/ðeə/*** aussi bien\npour ***there are*** que pour ***they are***.\n\nPourtant, sur le plan grammatical, ils\nne sont pas interchangeables. En effet, ***there are*** signifie ***il y a*** et ***they\nare*** signifie ***ils / elles sont***.\n\nRéécoutez les énoncés.\n\n"}
macao/content/activities/MosOrg1/seq100407/act153876/pg8601/index.md
View file @ 9e8b6f80
......@@ -5,15 +5,13 @@ weight = 70
Ecoutez l'énoncé :
| <img src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> | <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div> |
| --- | --- |
<img class="inlineImage" src="/macao-hugo/media/ecouteur_macao.png" id="ecouteur_macao.png"/> <div><audio id="ecran211_04.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_04.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_04.mp3').play()">Play</button></div><div><audio id="ecran211_01.mp3" ><source src="/macao-hugo/media/ecran211/ecran211_01.mp3" type="audio/mpeg"></audio><button onclick="document.getElementById('ecran211_01.mp3').play()">Play</button></div>
---
Quels sont les indices grammaticaux qui renvoient à une situation hypothétique ?
<div class="commentaireInfoGroup">
<div class="commentaireInfo">
</div>
<div class="commentaireInfoGroup" hidden="True">
</div>
{{< quiz >}}