diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts
index 6b2894cf..88f25d5a 100644
--- a/resources/i18n/sankore_fr.ts
+++ b/resources/i18n/sankore_fr.ts
@@ -377,7 +377,7 @@
</message>
<message>
<source>Show Desktop</source>
- <translation>Afficher le bureau</translation>
+ <translation>Bureau</translation>
</message>
<message>
<source>Ctrl+Shift+H</source>
@@ -1961,7 +1961,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ?</translation>
</message>
<message>
<source>Add a link</source>
- <translation>Ajouter un lien.web</translation>
+ <translation>Ajouter un lien web</translation>
</message>
<message>
<source>Page: %0</source>
diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts
index 6b2894cf..88f25d5a 100644
--- a/resources/i18n/sankore_fr_CH.ts
+++ b/resources/i18n/sankore_fr_CH.ts
@@ -377,7 +377,7 @@
</message>
<message>
<source>Show Desktop</source>
- <translation>Afficher le bureau</translation>
+ <translation>Bureau</translation>
</message>
<message>
<source>Ctrl+Shift+H</source>
@@ -1961,7 +1961,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ?</translation>
</message>
<message>
<source>Add a link</source>
- <translation>Ajouter un lien.web</translation>
+ <translation>Ajouter un lien web</translation>
</message>
<message>
<source>Page: %0</source>
diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
index 967256d0..3895c032 100644
--- a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Fermer",
+ display: "Afficher",
edit: "Modifier",
short_desc: "Sélectionner le numéro «trois».",
add: "Nouveau bloc",
diff --git a/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
index 184c4822..441069a9 100644
--- a/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
@@ -21,6 +21,16 @@ var sankoreLang = {
"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
"<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité.</li></ul>"+
+<<<<<<< HEAD
+"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+
+"<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+
+"<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+
+"<li>ajoutez des zones image(s) en cliquant sur le gros signe + en dessous,</li>"+
+"<li>insérez des images par glisser-déposer des images à partir de votre bibliothèque,</li>"+
+"<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
+"<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+
+"<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+
+=======
"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+
"<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+
"<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+
@@ -29,6 +39,7 @@ var sankoreLang = {
"<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
"<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+
"<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+
+>>>>>>> 986e8e8f3435c5208d294c97db33e0cf54790514
"<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
diff --git a/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js b/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
index 90cbd71c..3e1395ec 100644
--- a/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Fermer",
+ display: "Afficher",
edit: "Modifier",
first_desc: "Fruits",
second_desc: "Légumes",
@@ -28,13 +28,14 @@ var sankoreLang = {
"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
"<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité.</li></ul>"+
- "<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, une zone bleue apparaît, c’est une catégorie, puis.</p>"+
- "<ul><li>insérez le nom de la catégorie (par exemple “fruits”, “légumes”, “mammifères”...) en cliquant dans le champ de texte “Saisir le nom de la catégorie ici …”,</li>"+
- "<li>cliquez sur le gros “+” situé à gauche de la catégorie ce qui vous permet de rajouter des étiquettes de mots,</li>"+
- "<li>entrez des mots dans ces étiquettes,</li>"+
- "<li>ajoutez ensuite une catégorie (ou plusieurs) en cliquant sur le signe “+” situé à droite de la catégorie, complétez par son nom et ajoutez des étiquettes de mots.</li></ul>"+
- "<p>Pour supprimer une étiquette de mots, cliquez sur la croix située dans le coin supérieur droit de celle-ci.</p>"+
- "<p>Pour supprimer une catégorie, cliquez sur le signe “-” situé à droite de celle-ci.</p>"+
+"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, une zone bleue apparaît, c’est une catégorie, puis :</p>"+
+"<ul><li>insérez le nom de la catégorie (par exemple “fruits”, “légumes”, “mammifères”...) en cliquant dans le champ de texte “Saisir le nom de la catégorie ici …”,</li>"+
+"<li>cliquez sur le gros “+” situé à gauche de la catégorie ce qui vous permet de rajouter des étiquettes de mots,</li>"+
+"<li>entrez des mots dans ces étiquettes,</li>"+
+"<li>ajoutez ensuite une catégorie (ou plusieurs) en cliquant sur le signe “+” situé à droite de la catégorie, complétez par son nom et ajoutez des étiquettes de mots.</li></ul>"+
+"<p>Pour supprimer une étiquette de mots, cliquez sur la croix située dans le coin supérieur droit de celle-ci.</p>"+
+"<p>Pour supprimer une catégorie, cliquez sur le signe “-” situé à droite de celle-ci.</p>"+
+
"<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
diff --git a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
index 6c976c50..36b0c319 100644
--- a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
+++ b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
@@ -52,7 +52,7 @@ var sankoreLang = {
"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
"<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité.</li></ul>"+
-"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Ajouter une nouvelle question …”, puis.</p>"+
+"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Ajouter une nouvelle question …”, puis :</p>"+
"<ul><li>insérez la question en cliquant sur le champ de texte “Saisir la question ici ...”,</li>"+
"<li>cliquez sur ”Options” pour choisir l’affichage des propositions (une seule bonne réponse, plusieurs bonnes réponses, liste déroulante). Cliquez sur “Fermer”,</li>"+
"<li>cliquez sur ”Ajouter une proposition” et saisissez la proposition dans le champ de texte,</li>"+
diff --git a/resources/library/interactivities/Enveloppe.wgt/js/help_fr-template.js b/resources/library/interactivities/Enveloppe.wgt/js/help_fr-template.js
index 17301536..44e0fc11 100644
--- a/resources/library/interactivities/Enveloppe.wgt/js/help_fr-template.js
+++ b/resources/library/interactivities/Enveloppe.wgt/js/help_fr-template.js
@@ -8,7 +8,7 @@
<p>Le bouton “Modifier” vous permet : </p>
<ul>
<li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut tablette), </li>
-<li>de déterminer le nombre de trombone(s) souhaités.</li>
+<li>de déterminer le nombre de trombone(s) souhaité(s).</li>
</ul>
<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>
\ No newline at end of file
diff --git a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
index 7d6c73a6..3d9d5b47 100644
--- a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Fermer",
+ display: "Afficher",
edit: "Modifier",
text_content: "Ceci est un exemple. Au lieu de ce texte, vous pouvez mettre votre propre texte ou glisser-déposer une image, un son ou une vidéo.",
new_txt: "Nouveau bloc de texte",
@@ -18,12 +18,14 @@ var sankoreLang = {
"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
"<li>de modifier les pages du livret.</li></ul>"+
- "<p>Sur chaque page, vous pouvez :</p>"+
- "<ul><li>insérer des zones de texte avec le bouton “+T” situé en haut à gauche de l’interactivité. (pour modifier ces zones de texte, cliquez à l’intérieur et écrivez du texte),</li>"+
- "<li>insérer des images, sons et vidéos par glisser-déposer de fichiers depuis la bibliothèque jusqu’à l’intérieur de la page du livret,</li>"+
- "<li>déplacer les textes, images, sons et vidéos à l’intérieur de la page en cliquant et en déplaçant la flèche multidirectionnelle qui se situe dans le coin supérieur gauche de chaque élément,</li>"+
- "<li>agrandir la taille d’un élément avec la double flèche en bas à droite de celui-ci,</li>"+
- "<li>supprimer un élément avec la case en haut à droite de celui-ci.</li></ul>"+
+
+"<p>Sur chaque page, vous pouvez :</p>"+
+"<ul><li>insérer des zones de texte avec le bouton “+T” situé en haut à gauche de l’interactivité (pour modifier ces zones de texte, cliquez à l’intérieur et écrivez du texte),</li>"+
+"<li>insérer des images, sons et vidéos par glisser-déposer de fichiers depuis la bibliothèque jusqu’à l’intérieur de la page du livret,</li>"+
+"<li>déplacer les textes, images, sons et vidéos à l’intérieur de la page en cliquant et en déplaçant la flèche multidirectionnelle qui se situe dans le coin supérieur gauche de chaque élément,</li>"+
+"<li>agrandir la taille d’un élément avec la double flèche en bas à droite de celui-ci,</li>"+
+"<li>supprimer un élément avec la case en haut à droite de celui-ci.</li></ul>"+
+
"<p>Pour ajouter une page, cliquez sur la flèche verte accompagnée d’un “+” se trouvant en bas à gauche et à droite.</p>"+
"<p>Pour supprimer une page, cliquez sur la croix rouge située en haut à droite de la page.</p>"+
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/ar_down.png b/resources/library/interactivities/Ordre phrase.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/ar_down_white.png b/resources/library/interactivities/Ordre phrase.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/parameters-bg.png b/resources/library/interactivities/Ordre phrase.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Ordre phrase.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-display.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-edit.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-help-white.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-help.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ordre phrase.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-help.png b/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Ordre phrase.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Ordre phrase.wgt/index.html b/resources/library/interactivities/Ordre phrase.wgt/index.html
index 48305e39..90fcc335 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/index.html
+++ b/resources/library/interactivities/Ordre phrase.wgt/index.html
@@ -60,11 +60,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -74,7 +69,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html
index 763aa128..ef868edb 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html
@@ -36,11 +36,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -50,7 +45,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
index 65cbc135..184102b8 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
+++ b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
@@ -26,7 +26,7 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Afficher",
+ view: "Fermer",
edit: "Modifier",
example: "Cette phrase\nest un\nexemple",
wgt_name: "Ordonner des phrases",
@@ -36,23 +36,23 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "<p><h2>Ordonner des phrases</h2></p>"+
-"<p><h3>Ordonner des segments de phrases pour reconstituer le texte.</h3></p>"+
+ "<p><h3>Ordonner des segments de phrases pour reconstituer le texte.</h3></p>"+
-"<p>Des étiquettes avec des phrases sont dans le désordre. Le but est de les remettre en ordre pour avoir un texte compréhensible et correct. Lorsque le texte est en ordre, l’interactivité se colore en vert. L’activité s’effectue par un glisser-déposer des étiquettes pour remettre le texte en ordre.</p>"+
+ "<p>Des étiquettes avec des phrases sont dans le désordre. Le but est de les remettre en ordre pour avoir un texte compréhensible et correct. Lorsque le texte est en ordre, l’interactivité se colore en vert. L’activité s’effectue par un glisser-déposer des étiquettes pour remettre le texte en ordre.</p>"+
-"<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
+ "<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
-"<p>Le bouton “Modifier” vous permet : </p>"+
-"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
-"<li>de déterminer le texte à reconstituer et le nombre de séparations dans l’énoncé.</li></ul>"+
+ "<p>Le bouton “Modifier” vous permet : </p>"+
+ "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
+ "<li>de déterminer le texte à reconstituer et le nombre de séparations dans l’énoncé.</li></ul>"+
-"<p>Pour insérer du texte dans la zone, cliquez sur la zone et saisissez le texte souhaité.</p>"+
-"<p>Pour ajouter des séparations dans l’énoncé, retournez à la ligne. Votre texte sera séparé lors d'un retour à la ligne.</p>"+
+ "<p>Pour insérer du texte dans la zone, cliquez sur la zone et saisissez le texte souhaité.</p>"+
+ "<p>Pour ajouter des séparations dans l’énoncé, retournez à la ligne. Votre texte sera séparé lors d'un retour à la ligne.</p>"+
-"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>"
+ "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
+ theme:"Thème"
};
-
var sentence = "";
var curSentence = "";
@@ -82,23 +82,34 @@ var input_width = 606;
var widget_padding = 0;
$(document).ready(function(){
- if(sankore.preference("ord_phrases_style","")){
- changeStyle(sankore.preference("ord_phrases_style",""));
- $(".style_select").val(sankore.preference("ord_phrases_style",""));
- } else
- changeStyle("3")
-
+ if(window.sankore)
+ if(sankore.preference("ord_phrases_style","")){
+ changeStyle(sankore.preference("ord_phrases_style",""));
+ $("#style_select").val(sankore.preference("ord_phrases_style",""));
+ } else
+ changeStyle("3")
+
$("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
modeView();
@@ -107,7 +118,7 @@ $(document).ready(function(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
modeEdit();
@@ -120,11 +131,13 @@ $(document).ready(function(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -158,13 +171,7 @@ $(document).ready(function(){
}
});
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
})
function str_replace( w, b, s ){
@@ -230,10 +237,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -247,10 +254,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -264,10 +271,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -355,7 +362,7 @@ function modeEdit()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("ord_phrases_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_phrases_style", $("#style_select").find("option:selected").val());
if($( "#mp_word textarea" ).val())
{
modeView();
@@ -377,4 +384,4 @@ if (window.widget) {
}
sankore.setPreference("rightOrdPhrases", sentence);
}
-}
+}
\ No newline at end of file
diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html
index 763aa128..ef868edb 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html
@@ -36,11 +36,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -50,7 +45,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js
index 8163d8af..398d9fa7 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js
+++ b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js
@@ -27,7 +27,7 @@ function checkResponse()
var sankoreLang = {
edit: "Изменить",
- view: "Просмотр",
+ view: "Закрыть",
example: "это\nпример\nпредложения",
wgt_name: "Порядок фраз",
reload: "Обновить",
@@ -35,10 +35,10 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
}
-
var sentence = "";
var curSentence = "";
@@ -68,23 +68,34 @@ var input_width = 606;
var widget_padding = 0;
$(document).ready(function(){
- if(sankore.preference("ord_phrases_style","")){
- changeStyle(sankore.preference("ord_phrases_style",""));
- $(".style_select").val(sankore.preference("ord_phrases_style",""));
- } else
- changeStyle("3")
-
+ if(window.sankore)
+ if(sankore.preference("ord_phrases_style","")){
+ changeStyle(sankore.preference("ord_phrases_style",""));
+ $("#style_select").val(sankore.preference("ord_phrases_style",""));
+ } else
+ changeStyle("3")
+
$("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
modeView();
@@ -93,7 +104,7 @@ $(document).ready(function(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
modeEdit();
@@ -106,11 +117,13 @@ $(document).ready(function(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -144,13 +157,7 @@ $(document).ready(function(){
}
});
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
})
function str_replace( w, b, s ){
@@ -216,10 +223,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -233,10 +240,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -250,10 +257,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -341,7 +348,7 @@ function modeEdit()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("ord_phrases_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_phrases_style", $("#style_select").find("option:selected").val());
if($( "#mp_word textarea" ).val())
{
modeView();
@@ -363,4 +370,4 @@ if (window.widget) {
}
sankore.setPreference("rightOrdPhrases", sentence);
}
-}
+}
\ No newline at end of file
diff --git a/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js b/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
index 99241058..d63220b3 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
+++ b/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
@@ -28,7 +28,7 @@ function checkResponse()
var sankoreLang = {
edit: "Edit",
- view: "Display",
+ view: "Close",
example: "this is\nan example\nsentence",
wgt_name: "Order phrases",
reload: "Reload",
@@ -36,7 +36,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
}
@@ -72,7 +73,7 @@ $(document).ready(function(){
if(window.sankore)
if(sankore.preference("ord_phrases_style","")){
changeStyle(sankore.preference("ord_phrases_style",""));
- $(".style_select").val(sankore.preference("ord_phrases_style",""));
+ $("#style_select").val(sankore.preference("ord_phrases_style",""));
} else
changeStyle("3")
@@ -80,13 +81,23 @@ $(document).ready(function(){
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
modeView();
@@ -95,7 +106,7 @@ $(document).ready(function(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
modeEdit();
@@ -108,11 +119,13 @@ $(document).ready(function(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -146,13 +159,7 @@ $(document).ready(function(){
}
});
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
})
function str_replace( w, b, s ){
@@ -218,10 +225,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -235,10 +242,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -252,10 +259,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -343,7 +350,7 @@ function modeEdit()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("ord_phrases_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_phrases_style", $("#style_select").find("option:selected").val());
if($( "#mp_word textarea" ).val())
{
modeView();
diff --git a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
index 401a2bea..741bf47f 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
+++ b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -149,57 +149,40 @@ textarea{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -234,51 +217,50 @@ textarea{
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -287,5 +269,36 @@ textarea{
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Selectionner.wgt/css/basic.css b/resources/library/interactivities/Selectionner.wgt/css/basic.css
index 8a5c3d9d..7f682d90 100644
--- a/resources/library/interactivities/Selectionner.wgt/css/basic.css
+++ b/resources/library/interactivities/Selectionner.wgt/css/basic.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -28,14 +28,6 @@ body{
margin: 5px 10px;
}
-.green_point{
- background-image: url(../img/green_point.png);
-}
-
-.red_point{
- background-image: url(../img/red_point.png);
-}
-
#display_text, #edit_text{
height: 19px;
padding: 3px 0 0 0;
@@ -322,57 +314,40 @@ body{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -407,51 +382,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -460,5 +434,36 @@ body{
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Selectionner.wgt/img/ar_down.png b/resources/library/interactivities/Selectionner.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/ar_down_white.png b/resources/library/interactivities/Selectionner.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/green_point.png b/resources/library/interactivities/Selectionner.wgt/img/green_point.png
deleted file mode 100644
index a2a44680..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/green_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/parameters-bg.png b/resources/library/interactivities/Selectionner.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Selectionner.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/red_point.png b/resources/library/interactivities/Selectionner.wgt/img/red_point.png
deleted file mode 100644
index f6daa19a..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/red_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-display.png b/resources/library/interactivities/Selectionner.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-edit.png b/resources/library/interactivities/Selectionner.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-help-white.png b/resources/library/interactivities/Selectionner.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-help.png b/resources/library/interactivities/Selectionner.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Selectionner.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/toolbar-edit.png b/resources/library/interactivities/Selectionner.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Selectionner.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/toolbar-help.png b/resources/library/interactivities/Selectionner.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Selectionner.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Selectionner.wgt/img/toolbar-reload.png b/resources/library/interactivities/Selectionner.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Selectionner.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Selectionner.wgt/index.html b/resources/library/interactivities/Selectionner.wgt/index.html
index 688bb52f..47062b93 100644
--- a/resources/library/interactivities/Selectionner.wgt/index.html
+++ b/resources/library/interactivities/Selectionner.wgt/index.html
@@ -52,11 +52,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -66,7 +61,17 @@
<td>
<div id="help"></div>
<div id="data">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Selectionner.wgt/js/script.js b/resources/library/interactivities/Selectionner.wgt/js/script.js
index f8a5f9a2..0e96f2eb 100644
--- a/resources/library/interactivities/Selectionner.wgt/js/script.js
+++ b/resources/library/interactivities/Selectionner.wgt/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Display",
+ display: "Close",
edit: "Edit",
short_desc: "Select animals from the following list:",
add: "Add new block",
@@ -15,7 +15,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
//main function
@@ -27,9 +28,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("selectionner","")){
@@ -39,7 +42,7 @@ function start(){
showExample();
if(sankore.preference("sel_style","")){
changeStyle(sankore.preference("sel_style",""));
- $(".style_select").val(sankore.preference("sel_style",""));
+ $("#style_select").val(sankore.preference("sel_style",""));
} else
changeStyle("3")
}
@@ -50,18 +53,20 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
- sankore.setPreference("sel_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("sel_style", $("#style_select").find("option:selected").val());
}
}
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -83,7 +88,7 @@ function start(){
$("#wgt_display").trigger("click");
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -94,7 +99,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -122,7 +127,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
@@ -446,10 +451,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -463,10 +468,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -480,10 +485,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html b/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html
index 218567a2..33fa36f6 100644
--- a/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html
@@ -26,11 +26,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -40,7 +35,17 @@
<td>
<div id="help"></div>
<div id="data">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js b/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js
index 7650dcaf..7cdd8d02 100644
--- a/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Afficher",
+ display: "Fermer",
edit: "Modifier",
short_desc: "Sélectionner les animaux dans la liste suivante :",
add: "Nouveau bloc",
@@ -16,24 +16,25 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "<p><h2>Sélectionner</h2></p>"+
-"<p><h3>Trouver les éléments correspondants à la consigne.</h3></p>"+
+ "<p><h3>Trouver les éléments correspondants à la consigne.</h3></p>"+
-"<p>Une consigne est écrite précisant le ou les éléments à chercher parmi tous les éléments proposés. Le but est de trouver les éléments correspondants à la consigne. L’activité s’effectue en cochant les cases sous les éléments correspondants. Une fois que tous les éléments corrects sont cochés, la zone se colore en vert.</p>"+
+ "<p>Une consigne est écrite précisant le ou les éléments à chercher parmi tous les éléments proposés. Le but est de trouver les éléments correspondants à la consigne. L’activité s’effectue en cochant les cases sous les éléments correspondants. Une fois que tous les éléments corrects sont cochés, la zone se colore en vert.</p>"+
-"<p>Le bouton “Recharger” réinitialise les exercices.</p>"+
+ "<p>Le bouton “Recharger” réinitialise les exercices.</p>"+
-"<p>Le bouton “Modifier” vous permet :</p>"+
-"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
-"<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité. </li></ul>"+
+ "<p>Le bouton “Modifier” vous permet :</p>"+
+ "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
+ "<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité. </li></ul>"+
-"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis</p>"+
-"<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre consigne ici ...”, </li>"+
-"<li>ajoutez des zones de texte en cliquant sur le gros “+T” vert en dessous puis entrez le texte voulu.</li></ul>"+
-"<p>Pour supprimer une zone de texte, cliquez sur la croix située dans le coin supérieur de celle-ci.</p>"+
+ "<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis</p>"+
+ "<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre consigne ici ...”, </li>"+
+ "<li>ajoutez des zones de texte en cliquant sur le gros “+T” vert en dessous puis entrez le texte voulu.</li></ul>"+
+ "<p>Pour supprimer une zone de texte, cliquez sur la croix située dans le coin supérieur de celle-ci.</p>"+
-"<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
+ "<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
-"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>"
+ "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
+ theme:"Thème"
};
//main function
@@ -45,9 +46,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("selectionner","")){
@@ -57,7 +60,7 @@ function start(){
showExample();
if(sankore.preference("sel_style","")){
changeStyle(sankore.preference("sel_style",""));
- $(".style_select").val(sankore.preference("sel_style",""));
+ $("#style_select").val(sankore.preference("sel_style",""));
} else
changeStyle("3")
}
@@ -68,18 +71,20 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
- sankore.setPreference("sel_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("sel_style", $("#style_select").find("option:selected").val());
}
}
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -101,7 +106,7 @@ function start(){
$("#wgt_display").trigger("click");
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -112,7 +117,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -140,7 +145,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
@@ -196,31 +201,31 @@ function start(){
if($(this).is(":checked"))
$(this).parent().find("input:hidden").val(1);
else
- $(this).parent().find("input:hidden").val(0);
- }
- });
+ $(this).parent().find("input:hidden").val(0);
+ }
+ });
- //play/pause event
- $(".play, .stop").live("click", function(){
- var tmp_audio = $(this);
- var audio = tmp_audio.parent().find("audio").get(0);
- if($(this).hasClass("play")){
+ //play/pause event
+ $(".play, .stop").live("click", function(){
+ var tmp_audio = $(this);
+ var audio = tmp_audio.parent().find("audio").get(0);
+ if($(this).hasClass("play")){
if(tmp_audio.parent().find("source").attr("src")){
- tmp_audio.removeClass("play").addClass("stop");
- var id = setInterval(function(){
- if(audio.currentTime == audio.duration){
- clearInterval(id);
- tmp_audio.removeClass("stop").addClass("play");
- }
+ tmp_audio.removeClass("play").addClass("stop");
+ var id = setInterval(function(){
+ if(audio.currentTime == audio.duration){
+ clearInterval(id);
+ tmp_audio.removeClass("stop").addClass("play");
+ }
}, 10);
- tmp_audio.parent().find("input").val(id);
- audio.play();
+ tmp_audio.parent().find("input").val(id);
+ audio.play();
}
- } else {
- $(this).removeClass("stop").addClass("play");
- clearInterval( tmp_audio.parent().find("input").val())
- audio.pause();
- }
+ } else {
+ $(this).removeClass("stop").addClass("play");
+ clearInterval( tmp_audio.parent().find("input").val())
+ audio.pause();
+ }
});
$(".replay").live("click", function(){
@@ -463,10 +468,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -480,10 +485,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -497,10 +502,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html b/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html
index 1e415855..61714a1f 100644
--- a/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html
@@ -26,11 +26,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -40,7 +35,17 @@
<td>
<div id="help"></div>
<div id="data">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js b/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js
index 872e57bf..8f4f3589 100644
--- a/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js
+++ b/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Показать",
+ display: "Закрыть",
edit: "Изменить",
short_desc: "Выберите животных из следующего списка:",
add: "Новый блок",
@@ -15,7 +15,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
//main function
@@ -27,9 +28,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("selectionner","")){
@@ -39,7 +42,7 @@ function start(){
showExample();
if(sankore.preference("sel_style","")){
changeStyle(sankore.preference("sel_style",""));
- $(".style_select").val(sankore.preference("sel_style",""));
+ $("#style_select").val(sankore.preference("sel_style",""));
} else
changeStyle("3")
}
@@ -50,18 +53,20 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
- sankore.setPreference("sel_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("sel_style", $("#style_select").find("option:selected").val());
}
}
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -83,7 +88,7 @@ function start(){
$("#wgt_display").trigger("click");
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -94,7 +99,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -122,7 +127,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
@@ -178,31 +183,31 @@ function start(){
if($(this).is(":checked"))
$(this).parent().find("input:hidden").val(1);
else
- $(this).parent().find("input:hidden").val(0);
- }
- });
+ $(this).parent().find("input:hidden").val(0);
+ }
+ });
- //play/pause event
- $(".play, .stop").live("click", function(){
- var tmp_audio = $(this);
- var audio = tmp_audio.parent().find("audio").get(0);
- if($(this).hasClass("play")){
+ //play/pause event
+ $(".play, .stop").live("click", function(){
+ var tmp_audio = $(this);
+ var audio = tmp_audio.parent().find("audio").get(0);
+ if($(this).hasClass("play")){
if(tmp_audio.parent().find("source").attr("src")){
- tmp_audio.removeClass("play").addClass("stop");
- var id = setInterval(function(){
- if(audio.currentTime == audio.duration){
- clearInterval(id);
- tmp_audio.removeClass("stop").addClass("play");
- }
+ tmp_audio.removeClass("play").addClass("stop");
+ var id = setInterval(function(){
+ if(audio.currentTime == audio.duration){
+ clearInterval(id);
+ tmp_audio.removeClass("stop").addClass("play");
+ }
}, 10);
- tmp_audio.parent().find("input").val(id);
- audio.play();
+ tmp_audio.parent().find("input").val(id);
+ audio.play();
}
- } else {
- $(this).removeClass("stop").addClass("play");
- clearInterval( tmp_audio.parent().find("input").val())
- audio.pause();
- }
+ } else {
+ $(this).removeClass("stop").addClass("play");
+ clearInterval( tmp_audio.parent().find("input").val())
+ audio.pause();
+ }
});
$(".replay").live("click", function(){
@@ -445,10 +450,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -462,10 +467,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -479,10 +484,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/ar_down.png b/resources/library/interactivities/Separe phrase.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/ar_down_white.png b/resources/library/interactivities/Separe phrase.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/parameters-bg.png b/resources/library/interactivities/Separe phrase.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Separe phrase.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-display.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-edit.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-help-white.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-help.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Separe phrase.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/toolbar-edit.png b/resources/library/interactivities/Separe phrase.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Separe phrase.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/toolbar-help.png b/resources/library/interactivities/Separe phrase.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Separe phrase.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/img/toolbar-reload.png b/resources/library/interactivities/Separe phrase.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Separe phrase.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Separe phrase.wgt/index.html b/resources/library/interactivities/Separe phrase.wgt/index.html
index e108a1c9..10583ebf 100644
--- a/resources/library/interactivities/Separe phrase.wgt/index.html
+++ b/resources/library/interactivities/Separe phrase.wgt/index.html
@@ -58,11 +58,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -72,7 +67,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html b/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html
index 593e885a..db3451e8 100644
--- a/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html
@@ -36,11 +36,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -50,7 +45,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js
index 73f641e9..e74b586e 100644
--- a/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Afficher",
+ view: "Fermer",
edit: "Modifier",
example: "Ceci est une série de mots à séparer correctement",
wgt_name: "Séparer une phrase",
@@ -9,25 +9,26 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "<p><h2>Séparer une phrase</h2></p>"+
-"<p><h3>Séparer les mots d’une phrase.</h3></p>"+
+ "<p><h3>Séparer les mots d’une phrase.</h3></p>"+
-"<p>Une phrase est écrite sans que les mots ne soient séparés. Le but de cette activité est d’insérer les espaces aux bons endroits. Une fois que les séparations sont placées correctement, la phrase se colore en vert.</p>"+
+ "<p>Une phrase est écrite sans que les mots ne soient séparés. Le but de cette activité est d’insérer les espaces aux bons endroits. Une fois que les séparations sont placées correctement, la phrase se colore en vert.</p>"+
-"<p>Pour ajouter des séparations entre les mots, déplacez le curseur et cliquez entre deux lettres, une séparation s’ajoute alors.</p>"+
+ "<p>Pour ajouter des séparations entre les mots, déplacez le curseur et cliquez entre deux lettres, une séparation s’ajoute alors.</p>"+
-"<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
+ "<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
-"<p>Le bouton “Modifier” vous permet :</p>"+
+ "<p>Le bouton “Modifier” vous permet :</p>"+
-"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), </li>"+
-"<li>de déterminer la phrase sur laquelle travailler.</li></ul>"+
+ "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), </li>"+
+ "<li>de déterminer la phrase sur laquelle travailler.</li></ul>"+
-"<p>Ecrivez simplement une phrase dans la zone de texte.</p>"+
+ "<p>Ecrivez simplement une phrase dans la zone de texte.</p>"+
-"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>"
+ "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
+ theme: "Thème"
};
@@ -38,180 +39,180 @@ var isBrowser = ( typeof( widget ) == "undefined" );
function wcontainer( containerID )
{
- // some protecred variables
- var thisInstance = this;
- this.editMode = false;
- var data = {}; // see setData and getData
+ // some protecred variables
+ var thisInstance = this;
+ this.editMode = false;
+ var data = {}; // see setData and getData
- // widget size parameters
- this.minHeight = 100;
- this.minWidth = 400;
+ // widget size parameters
+ this.minHeight = 100;
+ this.minWidth = 400;
- // set to 0 for no max width restriction
- this.maxWidth = 0;
+ // set to 0 for no max width restriction
+ this.maxWidth = 0;
- // links to the elements of the widget
- this.elements = {};
+ // links to the elements of the widget
+ this.elements = {};
- /*
+ /*
============
create
============
- creates html base, inits this.elements, assings events
*/
- this.create = function( containerID )
- {
- var html =
- '<div id="mp_content">' +
- '<div class="viewmode" id="mp_view">' +
- '</div>' +
- '<div class="editmode" id="mp_edit">' +
- '</div>' +
- '</div>';
+ this.create = function( containerID )
+ {
+ var html =
+ '<div id="mp_content">' +
+ '<div class="viewmode" id="mp_view">' +
+ '</div>' +
+ '<div class="editmode" id="mp_edit">' +
+ '</div>' +
+ '</div>';
- var container = $( containerID );
+ var container = $( containerID );
- container.append( html );
- this.elements.edit = container.find( ".editmode" );
- this.elements.view = container.find( ".viewmode" );
- this.elements.container = container;
- this.elements.subcontainer = container.find( "#mp_content" );
- this.elements.containerView = this.elements.subcontainer.find( ".viewmode" );
- this.elements.containerEdit = this.elements.subcontainer.find( ".editmode" );
+ container.append( html );
+ this.elements.edit = container.find( ".editmode" );
+ this.elements.view = container.find( ".viewmode" );
+ this.elements.container = container;
+ this.elements.subcontainer = container.find( "#mp_content" );
+ this.elements.containerView = this.elements.subcontainer.find( ".viewmode" );
+ this.elements.containerEdit = this.elements.subcontainer.find( ".editmode" );
- $("#wgt_edit").live("click", function(){
- thisInstance.modeEdit();
- } );
+ $("#wgt_edit").live("click", function(){
+ thisInstance.modeEdit();
+ } );
- $("#wgt_display").live("click", function(){
- thisInstance.modeView();
- } );
- };
+ $("#wgt_display").live("click", function(){
+ thisInstance.modeView();
+ } );
+ };
- /*
+ /*
===============
setViewContent
===============
- assigns custom html to the viewmode container
*/
- this.setViewContent = function( html )
- {
- this.elements.container.find( "#mp_content .viewmode" ).html( html );
- };
+ this.setViewContent = function( html )
+ {
+ this.elements.container.find( "#mp_content .viewmode" ).html( html );
+ };
- /*
+ /*
===============
setEditContent
===============
- assigns custom html to the editmode container
*/
- this.setEditContent = function( html )
- {
- this.elements.container.find( "#mp_content .editmode" ).html( html );
- };
+ this.setEditContent = function( html )
+ {
+ this.elements.container.find( "#mp_content .editmode" ).html( html );
+ };
- /*
+ /*
=========================
modeEdit and modeView
=========================
- switch the widget betweed modes
* for customization extend onEditMode and onViewMode
*/
- this.modeEdit = function()
- {
- this.onEditMode();
- this.editMode = true;
- this.elements.edit.removeClass( "hide" );
- this.elements.view.addClass( "hide" );
+ this.modeEdit = function()
+ {
+ this.onEditMode();
+ this.editMode = true;
+ this.elements.edit.removeClass( "hide" );
+ this.elements.view.addClass( "hide" );
- //this.adjustSize();
- };
- this.modeView = function()
- {
- this.onViewMode();
- this.editMode = false;
- this.elements.edit.addClass( "hide" );
- this.elements.view.removeClass( "hide" );
+ //this.adjustSize();
+ };
+ this.modeView = function()
+ {
+ this.onViewMode();
+ this.editMode = false;
+ this.elements.edit.addClass( "hide" );
+ this.elements.view.removeClass( "hide" );
- //this.adjustSize();
- };
+ //this.adjustSize();
+ };
- /*
+ /*
======================
setData and getData
======================
- store some data inside
*/
- this.setData = function( name, value ){
- data[name] = value;
- };
- this.getData = function( name ){
- if( typeof( data[name] ) == "undefined" ){
- return null;
- } else return data[name];
- };
+ this.setData = function( name, value ){
+ data[name] = value;
+ };
+ this.getData = function( name ){
+ if( typeof( data[name] ) == "undefined" ){
+ return null;
+ } else return data[name];
+ };
- // redefinable methods
+ // redefinable methods
- /*
+ /*
==========================
onEditMode and onViewMode
==========================
- these are called when the mode is being changed
*/
- this.onEditMode = function(){
- //
- };
- this.onViewMode = function(){
- //
- };
-
- /*
+ this.onEditMode = function(){
+ //
+ };
+ this.onViewMode = function(){
+ //
+ };
+
+ /*
======================
viewSize and editSize
======================
- calculate container size for the adjustSize method
* they are likely to be redefined for each particular widget
*/
- this.viewSize = function(){
- return {
- w: this.elements.containerView.outerWidth(),
- h: this.elements.containerView.outerHeight()
- };
- };
- this.editSize = function(){
- return {
- w: this.elements.containerEdit.outerWidth(),
- h: this.elements.containerEdit.outerHeight()
- };
- };
-
- /*
+ this.viewSize = function(){
+ return {
+ w: this.elements.containerView.outerWidth(),
+ h: this.elements.containerView.outerHeight()
+ };
+ };
+ this.editSize = function(){
+ return {
+ w: this.elements.containerEdit.outerWidth(),
+ h: this.elements.containerEdit.outerHeight()
+ };
+ };
+
+ /*
=====================
checkAnswer
=====================
- check if the exercise in the view mode was done right
* redefine it for each particular widget
*/
- this.checkAnswer = function()
- {
- //
- };
-
-
- // constructor end
-
- // if the constructor was called with a parameter,
- // call create() automatically
- if( arguments.length > 0 ){
- this.create( containerID );
- }
- this.setData( "dw", this.elements.container.outerWidth( true ) - this.elements.container.width() );
- this.setData( "dh", this.elements.container.outerHeight( true ) - this.elements.container.height() );
- window.winstance = thisInstance;
+ this.checkAnswer = function()
+ {
+ //
+ };
+
+
+ // constructor end
+
+ // if the constructor was called with a parameter,
+ // call create() automatically
+ if( arguments.length > 0 ){
+ this.create( containerID );
+ }
+ this.setData( "dw", this.elements.container.outerWidth( true ) - this.elements.container.width() );
+ this.setData( "dh", this.elements.container.outerHeight( true ) - this.elements.container.height() );
+ window.winstance = thisInstance;
}
diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html b/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html
index 61039d1a..e13bfddc 100644
--- a/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html
@@ -20,7 +20,6 @@
<script type="text/javascript" src="../../scripts/app.js"></script>
<script type="text/javascript">
$(document).ready(function(){
- alert(2)
if(window.sankore)
sankore.enableDropOnWidget(false);
});
@@ -37,11 +36,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -51,7 +45,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js
index d73ca911..9eb8a67e 100644
--- a/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Показать",
+ view: "Закрыть",
edit: "Изменить",
example: "это группа слов которую нужно разделить",
wgt_name: "Разделить фразу",
@@ -8,7 +8,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
// if use the "view/edit" button or rely on the api instead
diff --git a/resources/library/interactivities/Separe phrase.wgt/scripts/app.js b/resources/library/interactivities/Separe phrase.wgt/scripts/app.js
index 693e63c4..7150da1a 100644
--- a/resources/library/interactivities/Separe phrase.wgt/scripts/app.js
+++ b/resources/library/interactivities/Separe phrase.wgt/scripts/app.js
@@ -31,7 +31,7 @@ $(document).ready(function()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("spl_phrase_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("spl_phrase_style", $("#style_select").find("option:selected").val());
if(w.editMode){
sankore.setPreference("ordSplPhrases", w.elements.container.find( "textarea" ).val());
sankore.setPreference("ordSplPhrasesState", "0");
@@ -47,7 +47,6 @@ $(document).ready(function()
if(window.sankore && sankore.preference("spl_phrase_style","")){
changeStyle(sankore.preference("spl_phrase_style",""));
- $(".style_select").val(sankore.preference("spl_phrase_style",""));
} else
changeStyle("3")
@@ -55,13 +54,23 @@ $(document).ready(function()
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
w.modeView();
@@ -70,7 +79,7 @@ $(document).ready(function()
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
w.modeEdit();
@@ -83,11 +92,13 @@ $(document).ready(function()
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -104,14 +115,6 @@ $(document).ready(function()
}
});
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
-
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
-
w.maxWidth = 600;
w.setEditContent( '<div class="inputwrap"><textarea class="percent">' + sentence + '</textarea></div>' );
@@ -263,7 +266,7 @@ $(document).ready(function()
//changing the style
function changeStyle(val){
- switch(val){
+ switch(val){
case "1":
$(".b_top_left").removeClass("btl_pad").removeClass("without_back");
$(".b_top_center").removeClass("btc_pad").removeClass("without_back");
@@ -276,10 +279,10 @@ $(document).ready(function()
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -293,10 +296,10 @@ $(document).ready(function()
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -310,12 +313,12 @@ $(document).ready(function()
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
-}
+ }
});
\ No newline at end of file
diff --git a/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js
index be809815..4ed155a6 100644
--- a/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Display",
+ view: "Close",
edit: "Edit",
example: "this is a bunch of words which should be split apart",
wgt_name: "Split a phrase",
@@ -8,7 +8,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
// if use the "view/edit" button or rely on the api instead
diff --git a/resources/library/interactivities/Separe phrase.wgt/styles/app.css b/resources/library/interactivities/Separe phrase.wgt/styles/app.css
index 6db70b17..ba022a7e 100644
--- a/resources/library/interactivities/Separe phrase.wgt/styles/app.css
+++ b/resources/library/interactivities/Separe phrase.wgt/styles/app.css
@@ -109,57 +109,40 @@
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -194,51 +177,50 @@
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -247,5 +229,36 @@
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Separe phrase.wgt/styles/master.css b/resources/library/interactivities/Separe phrase.wgt/styles/master.css
index 62ff205f..f08ff509 100644
--- a/resources/library/interactivities/Separe phrase.wgt/styles/master.css
+++ b/resources/library/interactivities/Separe phrase.wgt/styles/master.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
diff --git a/resources/library/interactivities/Separe texte.wgt/img/ar_down.png b/resources/library/interactivities/Separe texte.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/ar_down_white.png b/resources/library/interactivities/Separe texte.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/parameters-bg.png b/resources/library/interactivities/Separe texte.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Separe texte.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-display.png b/resources/library/interactivities/Separe texte.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-edit.png b/resources/library/interactivities/Separe texte.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-help-white.png b/resources/library/interactivities/Separe texte.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-help.png b/resources/library/interactivities/Separe texte.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Separe texte.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/toolbar-edit.png b/resources/library/interactivities/Separe texte.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Separe texte.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/toolbar-help.png b/resources/library/interactivities/Separe texte.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Separe texte.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Separe texte.wgt/img/toolbar-reload.png b/resources/library/interactivities/Separe texte.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Separe texte.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Separe texte.wgt/index.html b/resources/library/interactivities/Separe texte.wgt/index.html
index f615b9fe..bdb587f7 100644
--- a/resources/library/interactivities/Separe texte.wgt/index.html
+++ b/resources/library/interactivities/Separe texte.wgt/index.html
@@ -27,7 +27,6 @@
lang = sankore.locale().substr(0,2);
} else
lang = "en";
-
if(lang != "en"){
returnStatus(lang);
}
@@ -60,12 +59,7 @@
<div id="wgt_help"></div>
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
- <div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
+ <div id="wgt_edit"></div>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -75,7 +69,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html b/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html
index 4a728cf8..20d6f93b 100644
--- a/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html
@@ -36,11 +36,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -50,7 +45,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js
index f7c3e597..6fa223ee 100644
--- a/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Afficher",
+ view: "Fermer",
edit: "Modifier",
example: "bonjour, ceci est la première phrase. salut, c'est la deuxième phrase. bonjour à nouveau, c'est la troisième phrase. bonjour, c'est la quatrième phrase. salut, désolé, je suis en retard, je suis la cinquième phrase.",
wgt_name: "Séparer un texte",
@@ -10,23 +10,24 @@ var sankoreLang = {
help: "Aide",
help_content: "<p><h3>Séparer les phrases d’un texte.</h3></p>"+
-"<p>Un texte est écrit sans que les points entre les phrases n’apparaissent. Le but de cette activité est d’insérer les points aux bons endroits. Une fois que les points sont placés correctement, la phrase se colore en vert.</p>"+
+ "<p>Un texte est écrit sans que les points entre les phrases n’apparaissent. Le but de cette activité est d’insérer les points aux bons endroits. Une fois que les points sont placés correctement, la phrase se colore en vert.</p>"+
-"<p>Pour ajouter les points entre les phrases, déplacez le curseur et cliquez entre deux mots, un point s’ajoute alors.</p>"+
+ "<p>Pour ajouter les points entre les phrases, déplacez le curseur et cliquez entre deux mots, un point s’ajoute alors.</p>"+
-"<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
+ "<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
-"<p>Le bouton “Modifier” vous permet :</p>"+
+ "<p>Le bouton “Modifier” vous permet :</p>"+
-"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), </li>"+
-"<li>de déterminer le texte sur lequel travailler.</li></ul>"+
+ "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), </li>"+
+ "<li>de déterminer le texte sur lequel travailler.</li></ul>"+
-"<p>Ecrivez simplement dans la zone de texte les différentes phrases séparées par des points.<b> NB : Les points d’interrogation, les deux points “:”, les points-virgules “;” et les points d’exclamation ne sont pas pris en compte.</b></p>"+
+ "<p>Ecrivez simplement dans la zone de texte les différentes phrases séparées par des points.<b> NB : Les points d’interrogation, les deux points “:”, les points-virgules “;” et les points d’exclamation ne sont pas pris en compte.</b></p>"+
-"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>"
+ "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
+ theme: "Thème"
};
@@ -57,7 +58,7 @@ function wcontainer( containerID )
create
============
- creates html base, inits this.elements, assings events
- */
+ */
this.create = function( containerID )
{
var html =
@@ -93,7 +94,7 @@ function wcontainer( containerID )
setViewContent
===============
- assigns custom html to the viewmode container
- */
+ */
this.setViewContent = function( html )
{
this.elements.container.find( "#mp_content .viewmode" ).html( html );
@@ -104,7 +105,7 @@ function wcontainer( containerID )
setEditContent
===============
- assigns custom html to the editmode container
- */
+ */
this.setEditContent = function( html )
{
this.elements.container.find( "#mp_content .editmode" ).html( html );
@@ -117,8 +118,8 @@ function wcontainer( containerID )
modeEdit and modeView
=========================
- switch the widget betweed modes
- * for customization extend onEditMode and onViewMode
- */
+ * for customization extend onEditMode and onViewMode
+ */
this.modeEdit = function()
{
this.onEditMode();
@@ -126,7 +127,7 @@ function wcontainer( containerID )
this.elements.edit.removeClass( "hide" );
this.elements.view.addClass( "hide" );
- //this.adjustSize();
+ //this.adjustSize();
};
this.modeView = function()
{
@@ -135,7 +136,7 @@ function wcontainer( containerID )
this.elements.edit.addClass( "hide" );
this.elements.view.removeClass( "hide" );
- //this.adjustSize();
+ //this.adjustSize();
};
@@ -145,7 +146,7 @@ function wcontainer( containerID )
setData and getData
======================
- store some data inside
- */
+ */
this.setData = function( name, value ){
data[name] = value;
};
@@ -163,7 +164,7 @@ function wcontainer( containerID )
onEditMode and onViewMode
==========================
- these are called when the mode is being changed
- */
+ */
this.onEditMode = function(){
//
};
@@ -176,8 +177,8 @@ function wcontainer( containerID )
viewSize and editSize
======================
- calculate container size for the adjustSize method
- * they are likely to be redefined for each particular widget
- */
+ * they are likely to be redefined for each particular widget
+ */
this.viewSize = function(){
return {
w: this.elements.containerView.outerWidth(),
@@ -196,8 +197,8 @@ function wcontainer( containerID )
checkAnswer
=====================
- check if the exercise in the view mode was done right
- * redefine it for each particular widget
- */
+ * redefine it for each particular widget
+ */
this.checkAnswer = function()
{
//
diff --git a/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html b/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html
index 4a728cf8..20d6f93b 100644
--- a/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html
@@ -36,11 +36,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -50,7 +45,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js
index 8fb023d9..b0bc3111 100644
--- a/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Показать",
+ view: "Закрыть",
edit: "Изменить",
example: "привет, это первое предложение. а это второе предложение. и снова привет, это третье предложение. добрый день, это четвертое предложение. привет, извини, но я последнее предложение.",
wgt_name: "Разделить текст",
@@ -8,7 +8,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
// if use the "view/edit" button or rely on the api instead
diff --git a/resources/library/interactivities/Separe texte.wgt/scripts/app2.js b/resources/library/interactivities/Separe texte.wgt/scripts/app2.js
index a53fa9b5..db3ed1ac 100644
--- a/resources/library/interactivities/Separe texte.wgt/scripts/app2.js
+++ b/resources/library/interactivities/Separe texte.wgt/scripts/app2.js
@@ -32,7 +32,7 @@ $(document).ready(function()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("spl_text_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("spl_text_style", $("#style_select").find("option:selected").val());
if(w.editMode){
sankore.setPreference("ordSplText", w.elements.container.find( "textarea" ).val());
sankore.setPreference("ordSplTextState", "0");
@@ -48,7 +48,7 @@ $(document).ready(function()
if(sankore.preference("spl_text_style","")){
changeStyle(sankore.preference("spl_text_style",""));
- $(".style_select").val(sankore.preference("spl_text_style",""));
+ $("#style_select").val(sankore.preference("spl_text_style",""));
} else
changeStyle("3")
@@ -56,13 +56,23 @@ $(document).ready(function()
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
w.modeView();
@@ -71,7 +81,7 @@ $(document).ready(function()
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
w.modeEdit();
@@ -84,11 +94,13 @@ $(document).ready(function()
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -105,14 +117,6 @@ $(document).ready(function()
}
});
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
-
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
-
w.maxWidth = 600;
w.setEditContent( '<div class="inputwrap"><textarea class="percent">' + sentences + '</textarea></div>' );
@@ -279,10 +283,10 @@ $(document).ready(function()
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -296,10 +300,10 @@ $(document).ready(function()
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -313,10 +317,10 @@ $(document).ready(function()
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js
index f64ef65c..7cc12b34 100644
--- a/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js
+++ b/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Display",
+ view: "Close",
edit: "Edit",
example: "hello, this is the first sentence. hi, this is the second sentence. hello again, this is the third sentence. good morning, this is the fourth sentence. hi, sorry, i\'m late, i\'m the fifth sentence.",
wgt_name: "Split a text",
@@ -8,7 +8,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
// if use the "view/edit" button or rely on the api instead
diff --git a/resources/library/interactivities/Separe texte.wgt/styles/app.css b/resources/library/interactivities/Separe texte.wgt/styles/app.css
index fb0061ea..e96bbf70 100644
--- a/resources/library/interactivities/Separe texte.wgt/styles/app.css
+++ b/resources/library/interactivities/Separe texte.wgt/styles/app.css
@@ -110,57 +110,40 @@
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -195,51 +178,50 @@
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -248,5 +230,36 @@
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Separe texte.wgt/styles/master.css b/resources/library/interactivities/Separe texte.wgt/styles/master.css
index 42dde744..c1b4e81c 100644
--- a/resources/library/interactivities/Separe texte.wgt/styles/master.css
+++ b/resources/library/interactivities/Separe texte.wgt/styles/master.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
diff --git a/resources/library/interactivities/Syllabes.wgt/config.xml b/resources/library/interactivities/Syllabes.wgt/config.xml
index 221ba65e..aa5f8820 100644
--- a/resources/library/interactivities/Syllabes.wgt/config.xml
+++ b/resources/library/interactivities/Syllabes.wgt/config.xml
@@ -4,7 +4,7 @@
xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://www.example.net/widgets/helloworld"
version="1.0"
- width="750"
+ width="770"
height="320"
ub:resizable="true">
diff --git a/resources/library/interactivities/Syllabes.wgt/img/ar_down.png b/resources/library/interactivities/Syllabes.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/ar_down_white.png b/resources/library/interactivities/Syllabes.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/parameters-bg.png b/resources/library/interactivities/Syllabes.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Syllabes.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-display.png b/resources/library/interactivities/Syllabes.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-edit.png b/resources/library/interactivities/Syllabes.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-help-white.png b/resources/library/interactivities/Syllabes.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-help.png b/resources/library/interactivities/Syllabes.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Syllabes.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/toolbar-edit.png b/resources/library/interactivities/Syllabes.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Syllabes.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/toolbar-help.png b/resources/library/interactivities/Syllabes.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Syllabes.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Syllabes.wgt/img/toolbar-reload.png b/resources/library/interactivities/Syllabes.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Syllabes.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Syllabes.wgt/index.html b/resources/library/interactivities/Syllabes.wgt/index.html
index f0e87e3b..89edc875 100644
--- a/resources/library/interactivities/Syllabes.wgt/index.html
+++ b/resources/library/interactivities/Syllabes.wgt/index.html
@@ -60,11 +60,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -74,7 +69,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Syllabes.wgt/locales/fr/index.html b/resources/library/interactivities/Syllabes.wgt/locales/fr/index.html
index 99f21db7..5a32491c 100644
--- a/resources/library/interactivities/Syllabes.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Syllabes.wgt/locales/fr/index.html
@@ -37,11 +37,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -51,7 +46,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js
index de1c180a..1b8db4ef 100644
--- a/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js
+++ b/resources/library/interactivities/Syllabes.wgt/locales/fr/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Afficher",
+ view: "Fermer",
edit: "Modifier",
example: "so*phis*ti*qué",
wgt_name: "Syllabe",
@@ -9,20 +9,21 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "<p><h2>Syllabe</h2></p>"+
-"<p><h3>Séparer les syllabes d’un mot.</h3></p>"+
+ "<p><h3>Séparer les syllabes d’un mot.</h3></p>"+
-"<p>Un mot est écrit et le but est de découper le mot en syllabes. Une fois que le découpage est correct, le mot se colore en vert.</p>"+
-"<p>Pour ajouter une séparation entre deux syllabes, déplacez le curseur et cliquez entre deux lettres, une séparation s’ajoute. </p>"+
+ "<p>Un mot est écrit et le but est de découper le mot en syllabes. Une fois que le découpage est correct, le mot se colore en vert.</p>"+
+ "<p>Pour ajouter une séparation entre deux syllabes, déplacez le curseur et cliquez entre deux lettres, une séparation s’ajoute. </p>"+
-"<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
+ "<p>Le bouton “Recharger” réinitialise l’exercice.</p>"+
-"<p>Le bouton “Modifier” vous permet :</p>"+
-"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut tablette), </li>"+
-"<li>de déterminer le mot sur lequel travailler.</li></ul>"+
+ "<p>Le bouton “Modifier” vous permet :</p>"+
+ "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut tablette), </li>"+
+ "<li>de déterminer le mot sur lequel travailler.</li></ul>"+
-"<p>Ecrivez simplement dans la zone de texte le mot en insérant entre les syllabes une étoile *.</p>"+
+ "<p>Ecrivez simplement dans la zone de texte le mot en insérant entre les syllabes une étoile *.</p>"+
-"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>"
+ "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
+ theme: "Thème"
};
@@ -118,7 +119,7 @@ function wcontainer( containerID )
this.elements.edit.removeClass( "hide" );
this.elements.view.addClass( "hide" );
- //this.adjustSize();
+ //this.adjustSize();
};
this.modeView = function()
{
@@ -127,7 +128,7 @@ function wcontainer( containerID )
this.elements.edit.addClass( "hide" );
this.elements.view.removeClass( "hide" );
- //this.adjustSize();
+ //this.adjustSize();
};
diff --git a/resources/library/interactivities/Syllabes.wgt/locales/ru/index.html b/resources/library/interactivities/Syllabes.wgt/locales/ru/index.html
index 99f21db7..5a32491c 100644
--- a/resources/library/interactivities/Syllabes.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Syllabes.wgt/locales/ru/index.html
@@ -37,11 +37,6 @@
<div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div>
- <select class="style_select">
- <option value="1"></option>
- <option value="2"></option>
- <option value="3"></option>
- </select>
</td>
<td class="b_top_right"> </td>
</tr>
@@ -51,7 +46,17 @@
<td>
<div id="help"></div>
<div id="ub-widget">
-
+ <div id="parameters">
+ <div class="inline">
+ <label>
+ <select id="style_select">
+ <option value="1"></option>
+ <option value="2"></option>
+ <option value="3"></option>
+ </select>
+ </label>
+ </div>
+ </div>
</div>
</td>
<td class="b_center_right"> </td>
diff --git a/resources/library/interactivities/Syllabes.wgt/locales/ru/scripts/wcontainer.js b/resources/library/interactivities/Syllabes.wgt/locales/ru/scripts/wcontainer.js
index cf158ff3..cde55e7a 100644
--- a/resources/library/interactivities/Syllabes.wgt/locales/ru/scripts/wcontainer.js
+++ b/resources/library/interactivities/Syllabes.wgt/locales/ru/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Показать",
+ view: "Закрыть",
edit: "Изменить",
example: "слож*ный",
wgt_name: "Разделить слово",
@@ -8,7 +8,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
// if use the "view/edit" button or rely on the api instead
diff --git a/resources/library/interactivities/Syllabes.wgt/scripts/spl-word.js b/resources/library/interactivities/Syllabes.wgt/scripts/spl-word.js
index e46e7f0d..9c2309d9 100644
--- a/resources/library/interactivities/Syllabes.wgt/scripts/spl-word.js
+++ b/resources/library/interactivities/Syllabes.wgt/scripts/spl-word.js
@@ -36,7 +36,7 @@ $(document).ready(function()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("spl_word_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("spl_word_style", $("#style_select").find("option:selected").val());
if(w.editMode){
sankore.setPreference("ordSplWords", w.elements.container.find( "input" ).val().trim( ['*'] ));
sankore.setPreference("ordSplWordsState", "0");
@@ -52,21 +52,31 @@ $(document).ready(function()
if(sankore.preference("spl_word_style","")){
changeStyle(sankore.preference("spl_word_style",""));
- $(".style_select").val(sankore.preference("spl_word_style",""));
+ $("#style_select").val(sankore.preference("spl_word_style",""));
} else
changeStyle("3")
$("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
- $("#help").html(sankoreLang.help_content);
+ $("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
w.modeView();
@@ -75,7 +85,7 @@ $(document).ready(function()
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
w.modeEdit();
@@ -88,11 +98,13 @@ $(document).ready(function()
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -108,14 +120,6 @@ $(document).ready(function()
$("#wgt_display").trigger("click");
}
});
-
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
-
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
// onViewMode
w.onViewMode = function()
@@ -214,10 +218,10 @@ $(document).ready(function()
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -231,10 +235,10 @@ $(document).ready(function()
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -248,10 +252,10 @@ $(document).ready(function()
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js b/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js
index daaf20b3..62742d3a 100644
--- a/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js
+++ b/resources/library/interactivities/Syllabes.wgt/scripts/wcontainer.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- view: "Display",
+ view: "Close",
edit: "Edit",
example: "so*phis*ti*ca*ted",
wgt_name: "Split a word",
@@ -8,7 +8,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
// if use the "view/edit" button or rely on the api instead
diff --git a/resources/library/interactivities/Syllabes.wgt/styles/master.css b/resources/library/interactivities/Syllabes.wgt/styles/master.css
index 9775eba8..c9d9a0c1 100644
--- a/resources/library/interactivities/Syllabes.wgt/styles/master.css
+++ b/resources/library/interactivities/Syllabes.wgt/styles/master.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
diff --git a/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css b/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css
index 3bcf504f..417d0ef3 100644
--- a/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css
+++ b/resources/library/interactivities/Syllabes.wgt/styles/spl-word.css
@@ -111,57 +111,40 @@
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -196,52 +179,50 @@
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -250,5 +231,36 @@
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index 17e25564..91e67e88 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -1229,10 +1229,10 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex)
//disabling g section parsing as a group of elements. Use groups refs instead
// mXmlWriter.writeStartElement("g");
// mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "uuid", UBStringUtils::toCanonicalUuid(strokesGroupItem->uuid()));
- QMatrix matrix = item->sceneMatrix();
- if (!matrix.isIdentity()){
- mXmlWriter.writeAttribute("transform", toSvgTransform(matrix));
- }
+// QMatrix matrix = item->sceneMatrix();
+// if (!matrix.isIdentity()){
+// mXmlWriter.writeAttribute("transform", toSvgTransform(matrix));
+// }
// Add the polygons
foreach(QGraphicsItem* item, strokesGroupItem->childItems()){
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index b269b8fa..94d317d4 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -537,7 +537,7 @@ void UBBoardController::duplicateScene()
duplicateScene(mActiveSceneIndex);
}
-UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
+UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item, bool bAsync)
{
if (!item)
return NULL;
@@ -568,7 +568,10 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
if (srcFile.isEmpty())
srcFile = item->sourceUrl().toString();
- QString contentTypeHeader = UBFileSystemUtils::mimeTypeFromFileName(srcFile);
+ QString contentTypeHeader;
+ if (!srcFile.isEmpty())
+ contentTypeHeader = UBFileSystemUtils::mimeTypeFromFileName(srcFile);
+
if(NULL != qgraphicsitem_cast<UBGraphicsGroupContainerItem*>(commonItem))
itemMimeType = UBMimeType::Group;
else
@@ -593,9 +596,13 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
if (mitem)
{
sourceUrl = mitem->mediaFileUrl();
- downloadURL(sourceUrl, srcFile, itemPos, QSize(itemSize.width(), itemSize.height()), false, false);
+ if (bAsync)
+ {
+ downloadURL(sourceUrl, srcFile, itemPos, QSize(itemSize.width(), itemSize.height()), false, false);
+ return NULL; // async operation
+ }
}
- }return NULL; // async operation
+ }break;
case UBMimeType::VectorImage:
{
@@ -621,35 +628,32 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
case UBMimeType::Group:
{
- UBGraphicsGroupContainerItem* groupItem = dynamic_cast<UBGraphicsGroupContainerItem*>(item);
+ UBGraphicsGroupContainerItem* groupItem = dynamic_cast<UBGraphicsGroupContainerItem*>(item);
UBGraphicsGroupContainerItem* duplicatedGroup = NULL;
- if(groupItem){
- QTransform groupTransform = groupItem->transform();
- groupItem->resetTransform();
-
- QList<QGraphicsItem*> children = groupItem->childItems();
- foreach(QGraphicsItem* pIt, children){
- UBItem* pItem = dynamic_cast<UBItem*>(pIt);
- if(NULL != pItem){
- duplicateItem(pItem);
- }
- }
- groupItem->setTransform(groupTransform);
- groupItem->setSelected(false);
- UBApplication::mainWindow->actionGroupItems->trigger();
- QList<QGraphicsItem*> selItems = mActiveScene->selectedItems();
- if(!selItems.empty()){
- // I don't like this solution but for now this is the only way I found.
- // Normally, at this state, only the duplicated group should be selected
- duplicatedGroup = dynamic_cast<UBGraphicsGroupContainerItem*>(selItems.at(0));
- if(NULL != duplicatedGroup){
- duplicatedGroup->setTransform(groupTransform);
- }
- }
- }
- retItem = dynamic_cast<UBGraphicsItem *>(duplicatedGroup);
- break;
- }
+
+ QList<QGraphicsItem*> duplicatedItems;
+ QList<QGraphicsItem*> children = groupItem->childItems();
+ foreach(QGraphicsItem* pIt, children){
+ UBItem* pItem = dynamic_cast<UBItem*>(pIt);
+ if(pItem){ // we diong sync duplication of all childs.
+ QGraphicsItem * itemToGroup = dynamic_cast<QGraphicsItem *>(duplicateItem(pItem, false));
+ if (itemToGroup)
+ duplicatedItems.append(itemToGroup);
+ }
+ }
+ duplicatedGroup = mActiveScene->createGroup(duplicatedItems);
+ duplicatedGroup->setTransform(groupItem->transform());
+ groupItem->setSelected(false);
+
+ retItem = dynamic_cast<UBGraphicsItem *>(duplicatedGroup);
+
+ QGraphicsItem * itemToAdd = dynamic_cast<QGraphicsItem *>(retItem);
+ if (itemToAdd)
+ {
+ mActiveScene->addItem(itemToAdd);
+ itemToAdd->setSelected(true);
+ }
+ }break;
case UBMimeType::UNKNOWN:
{
@@ -668,7 +672,7 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item)
if (retItem)
return retItem;
- UBItem *createdItem = downloadFinished(true, sourceUrl, sourceUrl, contentTypeHeader, pData, itemPos, QSize(itemSize.width(), itemSize.height()), false);
+ UBItem *createdItem = downloadFinished(true, sourceUrl, srcFile, contentTypeHeader, pData, itemPos, QSize(itemSize.width(), itemSize.height()), false);
if (createdItem)
{
createdItem->setSourceUrl(item->sourceUrl());
@@ -983,8 +987,8 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c
}
else if (sUrl.startsWith("file://") || sUrl.startsWith("/"))
{
- QString fileName = url.toLocalFile();
- QUrl formedUrl = sUrl.startsWith("file://") ? sUrl : QUrl::fromLocalFile(sUrl);
+ QUrl formedUrl = sUrl.startsWith("file://") ? url : QUrl::fromLocalFile(sUrl);
+ QString fileName = formedUrl.toLocalFile();
QString contentType = UBFileSystemUtils::mimeTypeFromFileName(fileName);
bool shouldLoadFileData =
diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h
index d7f44e37..aa27b788 100644
--- a/src/board/UBBoardController.h
+++ b/src/board/UBBoardController.h
@@ -159,7 +159,7 @@ class UBBoardController : public UBDocumentContainer
void moveSceneToIndex(int source, int target);
void duplicateScene(int index);
- UBGraphicsItem *duplicateItem(UBItem *item);
+ UBGraphicsItem *duplicateItem(UBItem *item, bool bAsync = true);
void deleteScene(int index);
bool cacheIsVisible() {return mCacheWidgetIsEnabled;}
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 049ee301..afc6026e 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -750,7 +750,7 @@ void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteA
file.write(pData);
file.close();
- UBFeature downloadedFeature = UBFeature(dest.getFullVirtualPath() + "/" + fileName, getIcon( filePath ),
+ UBFeature downloadedFeature = UBFeature(dest.getFullVirtualPath() + "/" + fileName, getIcon( filePath, fileTypeFromUrl(filePath)),
fileName, QUrl::fromLocalFile(filePath), FEATURE_ITEM);
if (downloadedFeature != UBFeature()) {
featuresModel->addItem(downloadedFeature);
diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp
index cc0505cd..38f96dc0 100644
--- a/src/domain/UBGraphicsDelegateFrame.cpp
+++ b/src/domain/UBGraphicsDelegateFrame.cpp
@@ -74,11 +74,9 @@ UBGraphicsDelegateFrame::UBGraphicsDelegateFrame(UBGraphicsItemDelegate* pDelega
mBottomResizeGrip = new QGraphicsRectItem(this);
mBottomResizeGrip->setPen(Qt::NoPen);
mLeftResizeGrip = new QGraphicsRectItem(this);
- mLeftResizeGrip->setToolTip("left");
mLeftResizeGrip->setPen(Qt::NoPen);
mRightResizeGrip = new QGraphicsRectItem(this);
mRightResizeGrip->setPen(Qt::NoPen);
- mRightResizeGrip->setToolTip("Right");
mTopResizeGrip = new QGraphicsRectItem(this);
mTopResizeGrip->setPen(Qt::NoPen);
diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp
index 2bde7364..fa0b0a57 100644
--- a/src/frameworks/UBFileSystemUtils.cpp
+++ b/src/frameworks/UBFileSystemUtils.cpp
@@ -359,7 +359,7 @@ QString UBFileSystemUtils::thumbnailPath(const QString& path)
QString UBFileSystemUtils::extension(const QString& fileName)
{
- QString extension;
+ QString extension("");
int lastDotIndex = fileName.lastIndexOf(".");
@@ -397,6 +397,7 @@ QString UBFileSystemUtils::lastPathComponent(const QString& path)
QString UBFileSystemUtils::mimeTypeFromFileName(const QString& fileName)
{
+ Q_ASSERT(fileName.length());
QString ext = extension(fileName);
if (ext == "xls" || ext == "xlsx") return "application/msexcel";
@@ -853,4 +854,4 @@ QString UBFileSystemUtils::readTextFile(QString path)
}
return "";
-}
\ No newline at end of file
+}
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index e5e6ab69..6ee337cf 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -235,7 +235,7 @@ void UBFeaturesWidget::onDisplayMetadata( QMap<QString,QString> metadata )
if (!imageGatherer)
imageGatherer = new UBDownloadHttpFile(0, this);
- connect(imageGatherer, SIGNAL(downloadFinished(int, bool, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onPreviewLoaded(int, bool, QUrl, QString, QByteArray, QPointF, QSize, bool)));
+ connect(imageGatherer, SIGNAL(downloadFinished(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onPreviewLoaded(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)));
// We send here the request and store its reply in order to be able to cancel it if needed
imageGatherer->get(QUrl(metadata["Url"]), QPoint(0,0), QSize(), false);
@@ -262,10 +262,11 @@ void UBFeaturesWidget::onDisplayMetadata( QMap<QString,QString> metadata )
}
-void UBFeaturesWidget::onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground)
+void UBFeaturesWidget::onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QUrl originalUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground)
{
Q_UNUSED(id);
Q_UNUSED(pSuccess);
+ Q_UNUSED(originalUrl);
Q_UNUSED(isBackground);
Q_UNUSED(pSize);
Q_UNUSED(pPos);
@@ -1044,6 +1045,7 @@ void UBFeatureProperties::onAddToLib()
sDownloadFileDesc desc;
desc.isBackground = false;
desc.modal = false;
+ desc.dest = sDownloadFileDesc::library;
desc.name = QFileInfo( mpElement->getFullPath().toString()).fileName();
qDebug() << desc.name;
desc.srcUrl = mpElement->getFullPath().toString();
diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h
index e4fb9775..b94b3136 100644
--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
@@ -79,7 +79,7 @@ signals:
void sendFileNameList(const QStringList lst);
private slots:
- void onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground);
+ void onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QUrl originalUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground);
void currentSelected( const QModelIndex & );
void searchStarted( const QString & );
void createNewFolder();
diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp
index 656118c4..7d9eca10 100644
--- a/src/gui/UBTeacherGuideWidget.cpp
+++ b/src/gui/UBTeacherGuideWidget.cpp
@@ -553,7 +553,7 @@ void UBTeacherGuidePresentationWidget::showData( QVector<tUBGEElementNode*> data
else if (element->name == "action") {
QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem(mpRootWidgetItem);
newWidgetItem->setText(0, element->attributes.value("task"));
- newWidgetItem->setFlags(Qt::ItemIsEnabled /*| Qt::ItemIsSelectable*/);
+ newWidgetItem->setFlags(Qt::ItemIsEnabled);
QString colorString = element->attributes.value("owner").toInt() == 0 ? "blue" : "green";
UBTGAdaptableText* textWidget = new UBTGAdaptableText(newWidgetItem, 0);
textWidget->bottomMargin(14);