Merge branch 'develop' into claudio-dev

preferencesAboutTextFull
Claudio Valerio 12 years ago
commit 7688ab7e88
  1. 141
      resources/library/interactivities/Cat text.wgt/css/basic.css
  2. BIN
      resources/library/interactivities/Cat text.wgt/img/ar_down.png
  3. BIN
      resources/library/interactivities/Cat text.wgt/img/ar_down_white.png
  4. BIN
      resources/library/interactivities/Cat text.wgt/img/green_point.png
  5. BIN
      resources/library/interactivities/Cat text.wgt/img/parameters-bg.png
  6. BIN
      resources/library/interactivities/Cat text.wgt/img/red_point.png
  7. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-display.png
  8. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-edit.png
  9. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-help-white.png
  10. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-help.png
  11. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-toolbar-help.png
  12. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png
  13. BIN
      resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png
  14. BIN
      resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png
  15. BIN
      resources/library/interactivities/Cat text.wgt/img/toolbar-help.png
  16. BIN
      resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png
  17. 20
      resources/library/interactivities/Cat text.wgt/index.html
  18. 51
      resources/library/interactivities/Cat text.wgt/js/script.js
  19. 19
      resources/library/interactivities/Cat text.wgt/locales/fr/index.html
  20. 79
      resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
  21. 19
      resources/library/interactivities/Cat text.wgt/locales/ru/index.html
  22. 53
      resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js
  23. 133
      resources/library/interactivities/Choisir.wgt/css/basic.css
  24. BIN
      resources/library/interactivities/Choisir.wgt/images/ar_down.png
  25. BIN
      resources/library/interactivities/Choisir.wgt/images/ar_down_white.png
  26. BIN
      resources/library/interactivities/Choisir.wgt/images/parameters-bg.png
  27. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-display.png
  28. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-edit.png
  29. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-help-white.png
  30. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-help.png
  31. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png
  32. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png
  33. BIN
      resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png
  34. BIN
      resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png
  35. BIN
      resources/library/interactivities/Choisir.wgt/images/toolbar-help.png
  36. BIN
      resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png
  37. 19
      resources/library/interactivities/Choisir.wgt/index.html
  38. 19
      resources/library/interactivities/Choisir.wgt/locales/fr/index.html
  39. 178
      resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js
  40. 19
      resources/library/interactivities/Choisir.wgt/locales/ru/index.html
  41. 176
      resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js
  42. 52
      resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
  43. 35
      src/adaptors/UBExportFullPDF.cpp

@ -3,7 +3,7 @@ html, body{
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-radius: 50px; border-radius: 35px;
overflow: hidden; overflow: hidden;
} }
@ -28,14 +28,6 @@ body{
margin: 5px 10px; 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{ #display_text, #edit_text{
height: 19px; height: 19px;
padding: 3px 0 0 0; padding: 3px 0 0 0;
@ -286,57 +278,40 @@ body{
margin: 10px 10px 0 10px; margin: 10px 10px 0 10px;
padding: 0; padding: 0;
float: left; float: left;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer; cursor: pointer;
height: 44px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
float: right; float: right;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; line-height: 32px;
} }
#wgt_display{ #wgt_display{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/toolbar-edit.png) left -32px no-repeat;
background-repeat: no-repeat; color: white;
background-position: top 0;
display: none; display: none;
} }
#wgt_edit{ #wgt_edit{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/slate-toolbar-edit.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload{ #wgt_reload{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-toolbar-reload.png); background: url(../img/slate-toolbar-reload.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 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;
} }
.btl_pad{ .btl_pad{
@ -371,51 +346,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important; background-image: url(../img/pad-bottom-right.png) !important;
} }
.pad_color{ .without_radius{
color: white !important; border-radius: 0 !important;
} }
.pad_reload{ .without_back{
background-image: url(../img/slate-toolbar-reload-white.png) !important; background: none !important;
} }
.pad_edit{ .pad_color{
background-image: url(../img/slate-display.png) !important; color: #FC9 !important;
text-shadow: none !important;
} }
.pad_select{ .pad_reload{
background-color: black !important; background: url(../img/toolbar-reload.png) left top no-repeat !important;
color: white !important;
background-image: url(../img/ar_down_white.png) !important;
} }
.without_radius{ .pad_edit{
border-radius: 0 !important; background: url(../img/toolbar-edit.png) left top no-repeat !important;
} }
.without_back{ .pad_help{
background: none !important; background: url(../img/toolbar-help.png) left top no-repeat !important;
} }
.none_select{ .help_wood{
background-color: #333 !important; background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important; color: white !important;
background-image: url(../img/ar_down_white.png) !important; text-shadow: #7F613F 0 -1px 0 !important;
} }
.pad_help{ .help_pad{
background-image: url(../img/slate-help-white.png) !important; background: url(../img/toolbar-help.png) left -32px no-repeat !important;
color: white !important;
} }
#wgt_help{ #wgt_help{
padding-left: 32px; padding-left: 35px;
background-image: url(../img/slate-help.png); background: url(../img/slate-toolbar-help.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#help{ #help{
width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
display: none; display: none;
@ -424,5 +398,36 @@ body{
} }
.open{ .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;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 721 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 740 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 999 B

@ -16,6 +16,7 @@
lang = sankore.locale().substr(0,2); lang = sankore.locale().substr(0,2);
} else } else
lang = "en"; lang = "en";
lang = "fr";
if(lang == "en"){ if(lang == "en"){
if(window.sankore) if(window.sankore)
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
@ -51,12 +52,7 @@
<div id="wgt_help"></div> <div id="wgt_help"></div>
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></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>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -66,7 +62,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <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> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Display", display: "Close",
edit: "Edit", edit: "Edit",
first_desc: "Fruits", first_desc: "Fruits",
second_desc: "Vegetables", second_desc: "Vegetables",
@ -17,7 +17,8 @@ var sankoreLang = {
pad: "Pad", pad: "Pad",
none: "None", none: "None",
help: "Help", help: "Help",
help_content: "This is an example of help content ..." help_content: "This is an example of help content ...",
theme: "Theme"
}; };
//main function //main function
@ -29,9 +30,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#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='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("categoriser_text","")){ if(sankore.preference("categoriser_text","")){
@ -53,11 +56,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -78,7 +83,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -87,7 +92,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -160,7 +165,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -244,7 +249,7 @@ function exportData(){
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
var img_cont = new Object(); var img_cont = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.mask = $(this).find("input[name='mask']").val();
img_cont.count = $(this).find(".img_block").size(); img_cont.count = $(this).find(".img_block").size();
img_cont.text = $(this).find(".cat_desc").val(); img_cont.text = $(this).find(".cat_desc").val();
@ -266,7 +271,7 @@ function exportData(){
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
var img_cont = new Object(); var img_cont = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.mask = $(this).find("input[name='mask']").val();
img_cont.count = $(this).find("input[name='count']").val(); img_cont.count = $(this).find("input[name='count']").val();
img_cont.text = $(this).find(".cat_desc").val(); img_cont.text = $(this).find(".cat_desc").val();
@ -292,7 +297,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); var cont_obj = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
cont_obj.tmp = "clear"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -307,12 +312,12 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
else { else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -642,10 +647,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".b_top_left").addClass("btl_pad").removeClass("without_back");
@ -659,10 +664,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".b_top_left").addClass("without_back").removeClass("btl_pad");
@ -676,10 +681,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -25,12 +25,7 @@
<div id="wgt_help"></div> <div id="wgt_help"></div>
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></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>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <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> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Afficher", display: "Fermer",
edit: "Modifier", edit: "Modifier",
first_desc: "Fruits", first_desc: "Fruits",
second_desc: "Légumes", second_desc: "Légumes",
@ -18,27 +18,28 @@ var sankoreLang = {
none: "aucun", none: "aucun",
help: "Aide", help: "Aide",
help_content: "<p><h2>Catégoriser des textes</h2></p>"+ help_content: "<p><h2>Catégoriser des textes</h2></p>"+
"<p><h3>Classer des étiquettes de mots en fonction de la dénomination de la catégorie.</h3></p>"+ "<p><h3>Classer des étiquettes de mots en fonction de la dénomination de la catégorie.</h3></p>"+
"<p>L’activité s’effectue par un glisser-déposer de l’étiquette de mots dans la catégorie correspondante. Tant que toutes les étiquettes de mots ne sont pas classées, la zone reste rouge. Une fois que toutes les étiquettes de mots sont classées dans la bonne catégorie, la zone se colore en vert.</p>"+ "<p>L’activité s’effectue par un glisser-déposer de l’étiquette de mots dans la catégorie correspondante. Tant que toutes les étiquettes de mots ne sont pas classées, la zone reste rouge. Une fois que toutes les étiquettes de mots sont classées dans la bonne catégorie, 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>"+ "<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>"+ "<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>"+ "<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>"+ "<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>"+ "<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>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>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>"+ "<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 é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 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>"+ "<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 //main function
@ -50,9 +51,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#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='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("categoriser_text","")){ if(sankore.preference("categoriser_text","")){
@ -74,11 +77,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -99,7 +104,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -108,7 +113,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -181,7 +186,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -265,7 +270,7 @@ function exportData(){
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
var img_cont = new Object(); var img_cont = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.mask = $(this).find("input[name='mask']").val();
img_cont.count = $(this).find(".img_block").size(); img_cont.count = $(this).find(".img_block").size();
img_cont.text = $(this).find(".cat_desc").val(); img_cont.text = $(this).find(".cat_desc").val();
@ -287,7 +292,7 @@ function exportData(){
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
var img_cont = new Object(); var img_cont = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.mask = $(this).find("input[name='mask']").val();
img_cont.count = $(this).find("input[name='count']").val(); img_cont.count = $(this).find("input[name='count']").val();
img_cont.text = $(this).find(".cat_desc").val(); img_cont.text = $(this).find(".cat_desc").val();
@ -313,7 +318,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); var cont_obj = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
cont_obj.tmp = "clear"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -328,12 +333,12 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
else { else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -664,10 +669,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".b_top_left").addClass("btl_pad").removeClass("without_back");
@ -681,10 +686,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".b_top_left").addClass("without_back").removeClass("btl_pad");
@ -698,10 +703,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -25,12 +25,7 @@
<div id="wgt_help"></div> <div id="wgt_help"></div>
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></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>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <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> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Показать", display: "Закрыть",
edit: "Изменить", edit: "Изменить",
first_desc: "Фрукты", first_desc: "Фрукты",
second_desc: "Овощи", second_desc: "Овощи",
@ -17,7 +17,8 @@ var sankoreLang = {
pad: "Планшет", pad: "Планшет",
none: "Нет", none: "Нет",
help: "Помощь", help: "Помощь",
help_content: "Пример текста помощи ..." help_content: "Пример текста помощи ...",
theme: "Тема"
}; };
//main function //main function
@ -29,9 +30,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#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='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("categoriser_text","")){ if(sankore.preference("categoriser_text","")){
@ -53,11 +56,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -78,7 +83,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -87,7 +92,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -160,7 +165,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -244,7 +249,7 @@ function exportData(){
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
var img_cont = new Object(); var img_cont = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.mask = $(this).find("input[name='mask']").val();
img_cont.count = $(this).find(".img_block").size(); img_cont.count = $(this).find(".img_block").size();
img_cont.text = $(this).find(".cat_desc").val(); img_cont.text = $(this).find(".cat_desc").val();
@ -266,7 +271,7 @@ function exportData(){
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
var img_cont = new Object(); var img_cont = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.mask = $(this).find("input[name='mask']").val();
img_cont.count = $(this).find("input[name='count']").val(); img_cont.count = $(this).find("input[name='count']").val();
img_cont.text = $(this).find(".cat_desc").val(); img_cont.text = $(this).find(".cat_desc").val();
@ -292,7 +297,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); var cont_obj = new Object();
cont_obj.style = $(".style_select").find("option:selected").val(); cont_obj.style = $("#style_select").find("option:selected").val();
cont_obj.tmp = "clear"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -307,12 +312,12 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
else { else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -452,7 +457,7 @@ function importData(data){
} }
} }
} }
}); });
checkCorrectness(all_imgs); checkCorrectness(all_imgs);
} }
} }
@ -643,10 +648,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".b_top_left").addClass("btl_pad").removeClass("without_back");
@ -660,10 +665,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".b_top_left").addClass("without_back").removeClass("btl_pad");
@ -677,10 +682,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -16,7 +16,7 @@ html, body{
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-radius: 50px; border-radius: 35px;
overflow: hidden; overflow: hidden;
} }
@ -471,57 +471,40 @@ body{
margin: 10px 10px 0 10px; margin: 10px 10px 0 10px;
padding: 0; padding: 0;
float: left; float: left;
font-family: "Lobster13Regular"; font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer; cursor: pointer;
height: 44px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
float: right; float: right;
font-family: "Lobster13Regular"; font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; line-height: 32px;
} }
#wgt_display{ #wgt_display{
padding-left: 40px; padding-left: 35px;
background-image: url(../images/slate-edit.png); background: url(../images/toolbar-edit.png) left -32px no-repeat;
background-repeat: no-repeat; color: white;
background-position: top 0;
display: none; display: none;
} }
#wgt_edit{ #wgt_edit{
padding-left: 40px; padding-left: 35px;
background-image: url(../images/slate-edit.png); background: url(../images/slate-toolbar-edit.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload{ #wgt_reload{
padding-left: 40px; padding-left: 35px;
background-image: url(../images/slate-toolbar-reload.png); background: url(../images/slate-toolbar-reload.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
}
.style_select{
width: 120px;
font-family: "Lobster13Regular";
font-size: 24px;
float: right;
margin: 10px 20px 0 0;
border-radius: 10px;
background-image: url(../images/ar_down.png);
background-color: #d4aa79;
color: #8c5730;
background-position: 105px 11px;
background-repeat: no-repeat;
-webkit-appearance: menulist-text;
display: none;
} }
.btl_pad{ .btl_pad{
@ -556,51 +539,50 @@ body{
background-image: url(../images/pad-bottom-right.png) !important; background-image: url(../images/pad-bottom-right.png) !important;
} }
.pad_color{ .without_radius{
color: white !important; border-radius: 0 !important;
} }
.pad_reload{ .without_back{
background-image: url(../images/slate-toolbar-reload-white.png) !important; background: none !important;
} }
.pad_edit{ .pad_color{
background-image: url(../images/slate-display.png) !important; color: #FC9 !important;
text-shadow: none !important;
} }
.pad_select{ .pad_reload{
background-color: black !important; background: url(../images/toolbar-reload.png) left top no-repeat !important;
color: white !important;
background-image: url(../images/ar_down_white.png) !important;
} }
.without_radius{ .pad_edit{
border-radius: 0 !important; background: url(../images/toolbar-edit.png) left top no-repeat !important;
} }
.without_back{ .pad_help{
background: none !important; background: url(../images/toolbar-help.png) left top no-repeat !important;
} }
.none_select{ .help_wood{
background-color: #333 !important; background: url(../images/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important; color: white !important;
background-image: url(../images/ar_down_white.png) !important; text-shadow: #7F613F 0 -1px 0 !important;
} }
.pad_help{ .help_pad{
background-image: url(../images/slate-help-white.png) !important; background: url(../images/toolbar-help.png) left -32px no-repeat !important;
color: white !important;
} }
#wgt_help{ #wgt_help{
padding-left: 32px; padding-left: 35px;
background-image: url(../images/slate-help.png); background: url(../images/slate-toolbar-help.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#help{ #help{
width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
display: none; display: none;
@ -609,5 +591,36 @@ body{
} }
.open{ .open{
}
#parameters{
display: none;
padding: 10px 20px;
background: url("../images/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(../images/slate-toolbar-edit.png) left -32px no-repeat !important;
text-shadow: #7F613F 0 -1px 0;
}
.radius_ft{
border-radius: 45px !important;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 999 B

@ -54,12 +54,7 @@ and open the template in the editor.
<div id="wgt_help"></div> <div id="wgt_help"></div>
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></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>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -69,7 +64,17 @@ and open the template in the editor.
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <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> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -29,12 +29,7 @@ and open the template in the editor.
<div id="wgt_help"></div> <div id="wgt_help"></div>
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></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>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -44,7 +39,17 @@ and open the template in the editor.
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <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> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -15,7 +15,7 @@
var sankoreLang = { var sankoreLang = {
edit: "Modifier", edit: "Modifier",
display:"Afficher", display:"Fermer",
question:"La question", question:"La question",
example_question:"Ceci est un exemple de question", example_question:"Ceci est un exemple de question",
answer:"Ceci est une réponse possible", answer:"Ceci est une réponse possible",
@ -61,7 +61,8 @@ var sankoreLang = {
"<p>Pour supprimer un exercice, cliquez sur la croix à droite du numéro de ”Options”.</p>"+ "<p>Pour supprimer un exercice, cliquez sur la croix à droite du numéro de ”Options”.</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 questionArray; var questionArray;
@ -85,10 +86,11 @@ function init(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#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='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#style_select option[value='3']").text(sankoreLang.none);
var tmpl = $("div.inline label").html();
$("div.inline label").html(sankoreLang.theme + tmpl)
//popup message //popup message
var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("#data"); var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("#data");
@ -127,14 +129,14 @@ function init(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); sankore.setPreference("qstArrayData", JSON.stringify(questionArray));
sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val());
} }
} }
if(window.sankore) if(window.sankore)
if(sankore.preference("choisir_style","")){ if(sankore.preference("choisir_style","")){
changeStyle(sankore.preference("choisir_style","")); changeStyle(sankore.preference("choisir_style",""));
$(".style_select").val(sankore.preference("choisir_style","")); $("#style_select").val(sankore.preference("choisir_style",""));
} else } else
changeStyle("3") changeStyle("3")
@ -143,21 +145,21 @@ function init(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
$(this).css("display", "none"); $(this).css("display", "none");
$("#wgt_edit").css("display", "block"); $("#wgt_edit").css("display", "block");
displayData(true); displayData(true);
mode = true; mode = true;
if(window.sankore){ if(window.sankore){
sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); sankore.setPreference("qstArrayData", JSON.stringify(questionArray));
sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val());
} }
} }
} else { } else {
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(this).css("display", "none"); $(this).css("display", "none");
$("#wgt_display").css("display", "block"); $("#wgt_display").css("display", "block");
editData(); editData();
@ -165,15 +167,17 @@ function init(){
} }
} }
}); });
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -192,10 +196,10 @@ function init(){
} }
}); });
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -477,71 +481,71 @@ function init(){
// show questions and answers in display mode // show questions and answers in display mode
function addToPage(array){ function addToPage(array){
var counter = 1; var counter = 1;
for(var i in array){ for(var i in array){
var qstDiv = $("<div class='qstDivDisplay' id='" + array[i].id + "qstDivDisplay'>"); var qstDiv = $("<div class='qstDivDisplay' id='" + array[i].id + "qstDivDisplay'>");
var spanOptConn = $("<div class='spanOptConn'>").appendTo(qstDiv); var spanOptConn = $("<div class='spanOptConn'>").appendTo(qstDiv);
var qstNumber = $("<span class='qstNumber'>" + sankoreLang.question + " " + counter + "</span>").appendTo(spanOptConn); var qstNumber = $("<span class='qstNumber'>" + sankoreLang.question + " " + counter + "</span>").appendTo(spanOptConn);
var qstContent = $("<div class='qstContentDisplay'>" + array[i].text + "</div>").appendTo(qstDiv); var qstContent = $("<div class='qstContentDisplay'>" + array[i].text + "</div>").appendTo(qstDiv);
var ansDiv = $("<div class='ansDiv' id='" + array[i].id + "ansDiv'>").appendTo(qstDiv); var ansDiv = $("<div class='ansDiv' id='" + array[i].id + "ansDiv'>").appendTo(qstDiv);
var ansCount = 1; var ansCount = 1;
var type = array[i].type; var type = array[i].type;
var selInput = $("<select>"); var selInput = $("<select>");
if(type == 3){ if(type == 3){
var newAnswer = $("<div class='newAnswer'>"); var newAnswer = $("<div class='newAnswer'>");
newAnswer.appendTo(ansDiv); newAnswer.appendTo(ansDiv);
var selectSpan = $("<span id='answerText'>").appendTo(newAnswer); var selectSpan = $("<span id='answerText'>").appendTo(newAnswer);
selInput.appendTo(selectSpan); selInput.appendTo(selectSpan);
$("<option value='0'>" + sankoreLang.select_text + "</option>").appendTo(selInput); $("<option value='0'>" + sankoreLang.select_text + "</option>").appendTo(selInput);
} }
for(var j in array[i].answers){ for(var j in array[i].answers){
switch(type){ switch(type){
case "1": case "1":
var local_state = ""; var local_state = "";
var local_color = ""; var local_color = "";
if(begin){ if(begin){
local_state = array[i].answers[j].state; local_state = array[i].answers[j].state;
local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":"");
} }
newAnswer = $("<div class='newAnswer'>"); newAnswer = $("<div class='newAnswer'>");
var ansInput = $("<input type='radio' name='" + counter + "' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer); var ansInput = $("<input type='radio' name='" + counter + "' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer);
var ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer); var ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer);
var ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer); var ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer);
newAnswer.appendTo(ansDiv); newAnswer.appendTo(ansDiv);
break; break;
case "2": case "2":
local_state = ""; local_state = "";
local_color = ""; local_color = "";
if(begin){ if(begin){
local_state = (array[i].answers[j].state)?"checked":""; local_state = (array[i].answers[j].state)?"checked":"";
local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":"");
} }
newAnswer = $("<div class='newAnswer'>"); newAnswer = $("<div class='newAnswer'>");
ansInput = $("<input type='checkbox' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer); ansInput = $("<input type='checkbox' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer);
ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer); ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer);
ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer); ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer);
newAnswer.appendTo(ansDiv); newAnswer.appendTo(ansDiv);
break; break;
case "3": case "3":
local_state = ""; local_state = "";
local_color = ""; local_color = "";
if(begin){ if(begin){
local_state = (array[i].answers[j].state)?"selected":""; local_state = (array[i].answers[j].state)?"selected":"";
local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":""); local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":"");
} }
ansInput = $("<option value='" + array[i].answers[j].value + "' " + local_state + ">" + array[i].answers[j].text + "</option>").appendTo(selInput); ansInput = $("<option value='" + array[i].answers[j].value + "' " + local_state + ">" + array[i].answers[j].text + "</option>").appendTo(selInput);
if(local_state && local_color) if(local_state && local_color)
selInput.css("background-color",local_color); selInput.css("background-color",local_color);
break; break;
} }
ansCount++; ansCount++;
}
qstDiv.appendTo("#data");
counter++;
} }
qstDiv.appendTo("#data"); begin = false;
counter++;
}
begin = false;
} }
} }
@ -746,10 +750,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".b_top_left").addClass("btl_pad").removeClass("without_back");
@ -763,10 +767,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".b_top_left").addClass("without_back").removeClass("btl_pad");
@ -780,10 +784,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -29,12 +29,7 @@ and open the template in the editor.
<div id="wgt_help"></div> <div id="wgt_help"></div>
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></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>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -44,7 +39,17 @@ and open the template in the editor.
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <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> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -15,7 +15,7 @@
var sankoreLang = { var sankoreLang = {
edit: "Изменить", edit: "Изменить",
display:"Показать", display:"Закрыть",
question:"Вопрос", question:"Вопрос",
example_question:"Это пример вопроса", example_question:"Это пример вопроса",
answer:"Это пример ответа", answer:"Это пример ответа",
@ -41,7 +41,8 @@ var sankoreLang = {
pad: "Планшет", pad: "Планшет",
none: "Нет", none: "Нет",
help: "Помощь", help: "Помощь",
help_content: "Пример текста помощи ..." help_content: "Пример текста помощи ...",
theme: "Тема"
}; };
var questionArray; var questionArray;
@ -65,10 +66,11 @@ function init(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#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='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#style_select option[value='3']").text(sankoreLang.none);
var tmpl = $("div.inline label").html();
$("div.inline label").html(sankoreLang.theme + tmpl)
//popup message //popup message
var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("#data"); var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("#data");
@ -107,14 +109,14 @@ function init(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); sankore.setPreference("qstArrayData", JSON.stringify(questionArray));
sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val());
} }
} }
if(window.sankore) if(window.sankore)
if(sankore.preference("choisir_style","")){ if(sankore.preference("choisir_style","")){
changeStyle(sankore.preference("choisir_style","")); changeStyle(sankore.preference("choisir_style",""));
$(".style_select").val(sankore.preference("choisir_style","")); $("#style_select").val(sankore.preference("choisir_style",""));
} else } else
changeStyle("3") changeStyle("3")
@ -123,21 +125,21 @@ function init(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
$(this).css("display", "none"); $(this).css("display", "none");
$("#wgt_edit").css("display", "block"); $("#wgt_edit").css("display", "block");
displayData(true); displayData(true);
mode = true; mode = true;
if(window.sankore){ if(window.sankore){
sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); sankore.setPreference("qstArrayData", JSON.stringify(questionArray));
sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val());
} }
} }
} else { } else {
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(this).css("display", "none"); $(this).css("display", "none");
$("#wgt_display").css("display", "block"); $("#wgt_display").css("display", "block");
editData(); editData();
@ -149,11 +151,13 @@ function init(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -172,10 +176,10 @@ function init(){
} }
}); });
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -457,71 +461,71 @@ function init(){
// show questions and answers in display mode // show questions and answers in display mode
function addToPage(array){ function addToPage(array){
var counter = 1; var counter = 1;
for(var i in array){ for(var i in array){
var qstDiv = $("<div class='qstDivDisplay' id='" + array[i].id + "qstDivDisplay'>"); var qstDiv = $("<div class='qstDivDisplay' id='" + array[i].id + "qstDivDisplay'>");
var spanOptConn = $("<div class='spanOptConn'>").appendTo(qstDiv); var spanOptConn = $("<div class='spanOptConn'>").appendTo(qstDiv);
var qstNumber = $("<span class='qstNumber'>" + sankoreLang.question + " " + counter + "</span>").appendTo(spanOptConn); var qstNumber = $("<span class='qstNumber'>" + sankoreLang.question + " " + counter + "</span>").appendTo(spanOptConn);
var qstContent = $("<div class='qstContentDisplay'>" + array[i].text + "</div>").appendTo(qstDiv); var qstContent = $("<div class='qstContentDisplay'>" + array[i].text + "</div>").appendTo(qstDiv);
var ansDiv = $("<div class='ansDiv' id='" + array[i].id + "ansDiv'>").appendTo(qstDiv); var ansDiv = $("<div class='ansDiv' id='" + array[i].id + "ansDiv'>").appendTo(qstDiv);
var ansCount = 1; var ansCount = 1;
var type = array[i].type; var type = array[i].type;
var selInput = $("<select>"); var selInput = $("<select>");
if(type == 3){ if(type == 3){
var newAnswer = $("<div class='newAnswer'>"); var newAnswer = $("<div class='newAnswer'>");
newAnswer.appendTo(ansDiv); newAnswer.appendTo(ansDiv);
var selectSpan = $("<span id='answerText'>").appendTo(newAnswer); var selectSpan = $("<span id='answerText'>").appendTo(newAnswer);
selInput.appendTo(selectSpan); selInput.appendTo(selectSpan);
$("<option value='0'>" + sankoreLang.select_text + "</option>").appendTo(selInput); $("<option value='0'>" + sankoreLang.select_text + "</option>").appendTo(selInput);
} }
for(var j in array[i].answers){ for(var j in array[i].answers){
switch(type){ switch(type){
case "1": case "1":
var local_state = ""; var local_state = "";
var local_color = ""; var local_color = "";
if(begin){ if(begin){
local_state = array[i].answers[j].state; local_state = array[i].answers[j].state;
local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":"");
} }
newAnswer = $("<div class='newAnswer'>"); newAnswer = $("<div class='newAnswer'>");
var ansInput = $("<input type='radio' name='" + counter + "' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer); var ansInput = $("<input type='radio' name='" + counter + "' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer);
var ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer); var ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer);
var ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer); var ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer);
newAnswer.appendTo(ansDiv); newAnswer.appendTo(ansDiv);
break; break;
case "2": case "2":
local_state = ""; local_state = "";
local_color = ""; local_color = "";
if(begin){ if(begin){
local_state = (array[i].answers[j].state)?"checked":""; local_state = (array[i].answers[j].state)?"checked":"";
local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":"");
} }
newAnswer = $("<div class='newAnswer'>"); newAnswer = $("<div class='newAnswer'>");
ansInput = $("<input type='checkbox' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer); ansInput = $("<input type='checkbox' value='" + array[i].answers[j].value + "' " + local_state + " style='float: left; margin-right: 10px;'/>").appendTo(newAnswer);
ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer); ansSpan = $("<span class='ansSpanDisplay'>" + ansCount + ".</span>").appendTo(newAnswer);
ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer); ansContent = $("<div class='ansContentDisplay' " + local_color + "><span id='answerText'>" + array[i].answers[j].text + "</span></div>").appendTo(newAnswer);
newAnswer.appendTo(ansDiv); newAnswer.appendTo(ansDiv);
break; break;
case "3": case "3":
local_state = ""; local_state = "";
local_color = ""; local_color = "";
if(begin){ if(begin){
local_state = (array[i].answers[j].state)?"selected":""; local_state = (array[i].answers[j].state)?"selected":"";
local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":""); local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":"");
} }
ansInput = $("<option value='" + array[i].answers[j].value + "' " + local_state + ">" + array[i].answers[j].text + "</option>").appendTo(selInput); ansInput = $("<option value='" + array[i].answers[j].value + "' " + local_state + ">" + array[i].answers[j].text + "</option>").appendTo(selInput);
if(local_state && local_color) if(local_state && local_color)
selInput.css("background-color",local_color); selInput.css("background-color",local_color);
break; break;
} }
ansCount++; ansCount++;
}
qstDiv.appendTo("#data");
counter++;
} }
qstDiv.appendTo("#data"); begin = false;
counter++;
}
begin = false;
} }
} }
@ -726,10 +730,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".b_top_left").addClass("btl_pad").removeClass("without_back");
@ -743,10 +747,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".b_top_left").addClass("without_back").removeClass("btl_pad");
@ -760,10 +764,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -15,7 +15,7 @@
var sankoreLang = { var sankoreLang = {
edit: "Edit", edit: "Edit",
display:"Display", display:"Close",
question:"Question", question:"Question",
example_question:"This is an example of the question", example_question:"This is an example of the question",
answer:"This is one possible answer", answer:"This is one possible answer",
@ -41,7 +41,8 @@ var sankoreLang = {
pad: "Pad", pad: "Pad",
none: "None", none: "None",
help: "Help", help: "Help",
help_content: "This is an example of help content ..." help_content: "This is an example of help content ...",
theme: "Theme"
}; };
var questionArray; var questionArray;
@ -65,10 +66,11 @@ function init(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#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='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#style_select option[value='3']").text(sankoreLang.none);
var tmpl = $("div.inline label").html();
$("div.inline label").html(sankoreLang.theme + tmpl)
//popup message //popup message
var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("#data"); var popupText = $("<div id='popupWordInfo' class='popupWordInfo'></div>").appendTo("#data");
@ -107,14 +109,14 @@ function init(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); sankore.setPreference("qstArrayData", JSON.stringify(questionArray));
sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val());
} }
} }
if(window.sankore) if(window.sankore)
if(sankore.preference("choisir_style","")){ if(sankore.preference("choisir_style","")){
changeStyle(sankore.preference("choisir_style","")); changeStyle(sankore.preference("choisir_style",""));
$(".style_select").val(sankore.preference("choisir_style","")); $("#style_select").val(sankore.preference("choisir_style",""));
} else } else
changeStyle("3") changeStyle("3")
@ -123,21 +125,21 @@ function init(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
$(this).css("display", "none"); $(this).css("display", "none");
$("#wgt_edit").css("display", "block"); $("#wgt_edit").css("display", "block");
displayData(true); displayData(true);
mode = true; mode = true;
if(window.sankore){ if(window.sankore){
sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); sankore.setPreference("qstArrayData", JSON.stringify(questionArray));
sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val());
} }
} }
} else { } else {
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(this).css("display", "none"); $(this).css("display", "none");
$("#wgt_display").css("display", "block"); $("#wgt_display").css("display", "block");
editData(); editData();
@ -149,11 +151,13 @@ function init(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -172,10 +176,10 @@ function init(){
} }
}); });
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -726,10 +730,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".b_top_left").addClass("btl_pad").removeClass("without_back");
@ -743,10 +747,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".b_top_left").addClass("without_back").removeClass("btl_pad");
@ -760,10 +764,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -169,6 +169,7 @@ void UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS
MergeDescription mergeInfo; MergeDescription mergeInfo;
int existingPageCount = pDocumentProxy->pageCount(); int existingPageCount = pDocumentProxy->pageCount();
for(int pageIndex = 0 ; pageIndex < existingPageCount; pageIndex++) for(int pageIndex = 0 ; pageIndex < existingPageCount; pageIndex++)
{ {
UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->loadDocumentScene(pDocumentProxy, pageIndex); UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->loadDocumentScene(pDocumentProxy, pageIndex);
@ -180,18 +181,42 @@ void UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS
{ {
QString pdfName = UBPersistenceManager::objectDirectory + "/" + pdfItem->fileUuid().toString() + ".pdf"; QString pdfName = UBPersistenceManager::objectDirectory + "/" + pdfItem->fileUuid().toString() + ".pdf";
QString backgroundPath = pDocumentProxy->persistencePath() + "/" + pdfName; QString backgroundPath = pDocumentProxy->persistencePath() + "/" + pdfName;
QRectF annotationsRect = scene->itemsBoundingRect();
// Original datas
double xAnnotation = qRound(annotationsRect.x());
double yAnnotation = qRound(annotationsRect.y());
double xPdf = qRound(pdfItem->sceneBoundingRect().x());
double yPdf = qRound(pdfItem->sceneBoundingRect().y());
double hPdf = qRound(pdfItem->sceneBoundingRect().height());
// Exportation-transformed datas
double hScaleFactor = pageSize.width()/scene->itemsBoundingRect().width();
double vScaleFactor = pageSize.height()/scene->itemsBoundingRect().height();
double scaleFactor = qMin(hScaleFactor, vScaleFactor);
double xAnnotationsOffset = 0;
double yAnnotationsOffset = 0;
double hPdfTransformed = qRound(hPdf * scaleFactor);
// Here, we force the PDF page to be on the topleft corner of the page
double xPdfOffset = 0;
double yPdfOffset = (hPdf - hPdfTransformed) * mScaleFactor;
// Now we align the items
xPdfOffset += (xPdf - xAnnotation) * scaleFactor * mScaleFactor;
yPdfOffset -= (yPdf - yAnnotation) * scaleFactor * mScaleFactor;
qDebug() << "scene->itemsBoundingRect()" << scene->itemsBoundingRect(); TransformationDescription pdfTransform(xPdfOffset, yPdfOffset, scaleFactor, 0);
qDebug() << "pdfItem->boundingRect()" << pdfItem->boundingRect(); TransformationDescription annotationTransform(xAnnotationsOffset, yAnnotationsOffset, 1, 0);
qDebug() << "pdfItem->sceneBoundingRect()" << pdfItem->sceneBoundingRect();
MergePageDescription pageDescription(pageSize.width() * mScaleFactor, MergePageDescription pageDescription(pageSize.width() * mScaleFactor,
pageSize.height() * mScaleFactor, pageSize.height() * mScaleFactor,
pdfItem->pageNumber(), pdfItem->pageNumber(),
QFile::encodeName(backgroundPath).constData(), QFile::encodeName(backgroundPath).constData(),
TransformationDescription(), pdfTransform,
pageIndex + 1, pageIndex + 1,
TransformationDescription(), annotationTransform,
false, false); false, false);
mergeInfo.push_back(pageDescription); mergeInfo.push_back(pageDescription);

Loading…
Cancel
Save