From c3a732da211afb2b3c60d836173f8343d1146a55 Mon Sep 17 00:00:00 2001
From: bmagnin <vi>
Date: Tue, 20 Nov 2012 11:00:07 +0100
Subject: [PATCH] Wording for interactivities

---
 .../Choisir.wgt/scripts/selQuestionApp.js     |  2 +-
 .../Morpion.wgt/i18n/Messages.properties      |  4 ++--
 .../Morpion.wgt/js/help-template.js           |  2 +-
 .../Tables.wgt/js/help-template.js            |  2 +-
 .../Train.wgt/js/help-template.js             | 20 +++++++++----------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
index b7c9a5a3..d0d77154 100644
--- a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
+++ b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
@@ -43,7 +43,7 @@ var sankoreLang = {
     help: "Help",
     help_content: 
 "<p><h2> Choose the right answer</h2></p>" +
-"<p><h3> Multiple-Choice Question (MCQ).</h3></p>" +
+"<p><h3> Multiple-Choice Question (MCQ)</h3></p>" +
 "<p>Multiple-choice question. The goal is to choose the correct answer.</p>" +
 "<p>“Reload” button resets the exercises.</p>" +
 
diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties b/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties
index fcd6fc11..a64c04fe 100644
--- a/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties
+++ b/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties
@@ -1,7 +1,7 @@
 fr.njin.i18n.document.title = Tic tac toe
 
-fr.njin.i18n.toolbar.edit = Display
-fr.njin.i18n.toolbar.view = Close
+fr.njin.i18n.toolbar.edit = Edit
+fr.njin.i18n.toolbar.view = Display
 fr.njin.i18n.toolbar.reload = Reload
 fr.njin.i18n.toolbar.help = Help
 
diff --git a/resources/library/interactivities/Morpion.wgt/js/help-template.js b/resources/library/interactivities/Morpion.wgt/js/help-template.js
index b7efa617..d762431a 100644
--- a/resources/library/interactivities/Morpion.wgt/js/help-template.js
+++ b/resources/library/interactivities/Morpion.wgt/js/help-template.js
@@ -8,7 +8,7 @@
 <p> The first player to get 3 of his marks ( X or O) in a row (up, down, across, or diagonally) is the winner.</p>
 <p> The "Reload" button restarts the game. </p>
 <p> Enter the "Edit" mode to : </p>
-<ul>
+
 <ul> <li> choose the theme of interactivity : tablet, slate or none (by default : tablet),</li>
 <li> modify the calculations that you want to use for your activity. </li> </ul>
 
diff --git a/resources/library/interactivities/Tables.wgt/js/help-template.js b/resources/library/interactivities/Tables.wgt/js/help-template.js
index be901b5c..1217f7c5 100644
--- a/resources/library/interactivities/Tables.wgt/js/help-template.js
+++ b/resources/library/interactivities/Tables.wgt/js/help-template.js
@@ -9,7 +9,7 @@
 
 
 <p> Enter the "Edit" mode to choose the : </p>
-<ul>
+
 <ul> <li>  theme of interactivity : tablet, slate or none (by default : tablet),</li>
 <li> desired operation: addition, subtraction, multiplication or division,</ li>
 <li> number of rows and columns (1 to 12). </li> </ul>
diff --git a/resources/library/interactivities/Train.wgt/js/help-template.js b/resources/library/interactivities/Train.wgt/js/help-template.js
index 6a3c0589..9baea123 100644
--- a/resources/library/interactivities/Train.wgt/js/help-template.js
+++ b/resources/library/interactivities/Train.wgt/js/help-template.js
@@ -1,16 +1,16 @@
  <h3> Train </h3>
 <h4>Ascending or descending numbers</h4>
  
-<p> The goal is to put the numbers in the correct order by dragging and dropping labels to the right place. </p>
+<p>The goal is to put the numbers in the correct order by dragging and dropping labels to the right place.</p>
 
-<p> Interactivity does not correct the exercise. </p>
+<p>Interactivity does not correct the exercise.</p>
  
-<p> "Reload" button generates new labels numbers. </p>
-<p> Enter the "Edit" mode to choose : </p>
-<ul>
-<ul> <li> choose the theme of interactivity : tablet, slate or none (by default : tablet),</li>
-<li> the number of labels (2-6),</li>
-<li> magnitude of proposed numbers,</li>
-<li> the order to class numbers (ascending or descending). </li> </ul>
+<p>"Reload" button generates new labels numbers.</p>
+<p>Enter the "Edit" mode to choose :</p>
 
-<p> "Display" button comes back to the activity.</p>
\ No newline at end of file
+<ul><li> choose the theme of interactivity : tablet, slate or none (by default : tablet),</li>
+<li>the number of labels (2-6),</li>
+<li>magnitude of proposed numbers,</li>
+<li>the order to class numbers (ascending or descending).</li></ul>
+
+<p>"Display" button comes back to the activity.</p>
\ No newline at end of file