Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40

preferencesAboutTextFull
Claudio Valerio 13 years ago
commit ab73481ab8
  1. 19
      resources/library/interactivities/Cat images.wgt/js/script.js
  2. 19
      resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js
  3. 19
      resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js
  4. 20
      resources/library/interactivities/Cat text.wgt/js/script.js
  5. 24
      resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
  6. 20
      resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js
  7. 5
      resources/library/interactivities/Ordre images.wgt/index.html
  8. 37
      resources/library/interactivities/Ordre images.wgt/js/script.js
  9. 37
      resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js
  10. 38
      resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js

@ -34,12 +34,21 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -131,9 +140,9 @@ function start(){
$("<button class='del_category'>-</button>").appendTo($(this)); $("<button class='del_category'>-</button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this)); $("<button class='add_category'>+</button>").appendTo($(this));
$(this).attr("ondragenter", "return false;") $(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);") .attr("ondrop", "$(this).css(\"background-color\",\"#E6F6FF\"); return onDropTarget(this,event);")
.removeClass("red_cont") .removeClass("red_cont")
.removeClass("green_cont") .removeClass("green_cont")
.addClass("def_cont") .addClass("def_cont")

@ -34,12 +34,21 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -131,9 +140,9 @@ function start(){
$("<button class='del_category'>-</button>").appendTo($(this)); $("<button class='del_category'>-</button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this)); $("<button class='add_category'>+</button>").appendTo($(this));
$(this).attr("ondragenter", "return false;") $(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);") .attr("ondrop", "$(this).css(\"background-color\",\"#E6F6FF\"); return onDropTarget(this,event);")
.removeClass("red_cont") .removeClass("red_cont")
.removeClass("green_cont") .removeClass("green_cont")
.addClass("def_cont") .addClass("def_cont")

@ -34,12 +34,21 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -131,9 +140,9 @@ function start(){
$("<button class='del_category'>-</button>").appendTo($(this)); $("<button class='del_category'>-</button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this)); $("<button class='add_category'>+</button>").appendTo($(this));
$(this).attr("ondragenter", "return false;") $(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);") .attr("ondrop", "$(this).css(\"background-color\",\"#E6F6FF\"); return onDropTarget(this,event);")
.removeClass("red_cont") .removeClass("red_cont")
.removeClass("green_cont") .removeClass("green_cont")
.addClass("def_cont") .addClass("def_cont")

@ -40,12 +40,21 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -202,13 +211,6 @@ function start(){
$(this).parent().remove(); $(this).parent().remove();
} }
}); });
$(".text_cont").live("blur", function(){
exportData();
}).live("keyup", function(e){
if (e.keyCode == 13)
exportData();
});
} }
//export //export

@ -13,8 +13,8 @@ var sankoreLang = {
text: "Texte", text: "Texte",
wgt_name: "Catégoriser des textes", wgt_name: "Catégoriser des textes",
reload: "Recharger", reload: "Recharger",
slate: "Ardoise", slate: "Bois",
pad: "Tablette" pad: "Pad"
}; };
//main function //main function
@ -40,12 +40,21 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -202,13 +211,6 @@ function start(){
$(this).parent().remove(); $(this).parent().remove();
} }
}); });
$(".text_cont").live("blur", function(){
exportData();
}).live("keyup", function(e){
if (e.keyCode == 13)
exportData();
});
} }
//export //export

@ -40,12 +40,21 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -202,13 +211,6 @@ function start(){
$(this).parent().remove(); $(this).parent().remove();
} }
}); });
$(".text_cont").live("blur", function(){
exportData();
}).live("keyup", function(e){
if (e.keyCode == 13)
exportData();
});
} }
//export //export

@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="css/basic.css"/> <link rel="stylesheet" type="text/css" href="css/basic.css"/>
<link rel="stylesheet" href="css/fonts/Lobster/stylesheet.css"> <link rel="stylesheet" href="css/fonts/Lobster/stylesheet.css">
<link rel="stylesheet" href="css/fonts/SF-Toontime/stylesheet.css"> <link rel="stylesheet" href="css/fonts/SF-Toontime/stylesheet.css">
<script type="text/javascript" src="js/jquery-1.6.2.min.js"></script> <script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.9.custom.min.js"></script> <script type="text/javascript" src="js/jquery-ui-1.8.9.custom.min.js"></script>
<script type="text/javascript" src="js/script.js"></script> <script type="text/javascript" src="js/script.js"></script>
@ -17,7 +17,8 @@
} else } else
lang = "en"; lang = "en";
if(lang == "en"){ if(lang == "en"){
sankore.enableDropOnWidget(false); if(window.sankore)
sankore.enableDropOnWidget(false);
start(); start();
} }
else{ else{

@ -34,12 +34,21 @@ function start(){
//events //events
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -204,6 +213,10 @@ function exportData(){
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export)); sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export));
if($("#wgt_display").hasClass("selected"))
sankore.setPreference("odr_des_imgs_state", "display");
else
sankore.setPreference("odr_des_imgs_state", "edit");
} }
//import //import
@ -240,13 +253,19 @@ function importData(data){
img_block.append(hidden_input).append(img); img_block.append(hidden_input).append(img);
tmp_array.push(img_block); tmp_array.push(img_block);
} }
tmp_array = shuffle(tmp_array); if(sankore.preference("odr_des_imgs_state","")){
if(sankore.preference("odr_des_imgs_state","") == "edit")
tmp_array = shuffle(tmp_array);
} else
tmp_array = shuffle(tmp_array);
for(j = 0; j<tmp_array.length;j++) for(j = 0; j<tmp_array.length;j++)
tmp_array[j].appendTo(imgs_container); tmp_array[j].appendTo(imgs_container);
imgs_container.sortable( { imgs_container.sortable().bind('sortupdate', function(event, ui) {
update: checkResult checkResult(event);
} ); });
container.appendTo("#data"); container.appendTo("#data");
imgs_container.trigger("sortupdate")
} }
} }
} }
@ -286,9 +305,9 @@ function showExample(){
tmp_array = shuffle(tmp_array); tmp_array = shuffle(tmp_array);
for(var i = 0; i<tmp_array.length;i++) for(var i = 0; i<tmp_array.length;i++)
tmp_array[i].appendTo(imgs_container); tmp_array[i].appendTo(imgs_container);
imgs_container.sortable( { imgs_container.sortable().bind('sortupdate', function(event, ui) {
update: checkResult checkResult(event);
} ); });
container.appendTo("#data"); container.appendTo("#data");
} }

@ -35,12 +35,21 @@ function start(){
//events //events
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -205,6 +214,10 @@ function exportData(){
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export)); sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export));
if($("#wgt_display").hasClass("selected"))
sankore.setPreference("odr_des_imgs_state", "display");
else
sankore.setPreference("odr_des_imgs_state", "edit");
} }
//import //import
@ -240,13 +253,19 @@ function importData(data){
img_block.append(hidden_input).append(img); img_block.append(hidden_input).append(img);
tmp_array.push(img_block); tmp_array.push(img_block);
} }
tmp_array = shuffle(tmp_array); if(sankore.preference("odr_des_imgs_state","")){
if(sankore.preference("odr_des_imgs_state","") == "edit")
tmp_array = shuffle(tmp_array);
} else
tmp_array = shuffle(tmp_array);
for(j = 0; j<tmp_array.length;j++) for(j = 0; j<tmp_array.length;j++)
tmp_array[j].appendTo(imgs_container); tmp_array[j].appendTo(imgs_container);
imgs_container.sortable( { imgs_container.sortable().bind('sortupdate', function(event, ui) {
update: checkResult checkResult(event);
} ); });
container.appendTo("#data"); container.appendTo("#data");
imgs_container.trigger("sortupdate")
} }
} }
} }
@ -286,9 +305,9 @@ function showExample(){
tmp_array = shuffle(tmp_array); tmp_array = shuffle(tmp_array);
for(var i = 0; i<tmp_array.length;i++) for(var i = 0; i<tmp_array.length;i++)
tmp_array[i].appendTo(imgs_container); tmp_array[i].appendTo(imgs_container);
imgs_container.sortable( { imgs_container.sortable().bind('sortupdate', function(event, ui) {
update: checkResult checkResult(event);
} ); });
container.appendTo("#data"); container.appendTo("#data");
} }

@ -35,12 +35,21 @@ function start(){
//events //events
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
//exportData(); exportData();
} }
} }
$("#wgt_reload").click(function(){ $("#wgt_reload").click(function(){
window.location.reload(); if($("#wgt_display").hasClass("selected")){
$("#wgt_edit").trigger("click");
$("#wgt_display").trigger("click");
} else {
$("#wgt_display").trigger("click");
}
});
$("#wgt_reload, #wgt_display, #wgt_edit").mouseover(function(){
exportData();
}); });
$(".style_select").change(function (event){ $(".style_select").change(function (event){
@ -205,6 +214,10 @@ function exportData(){
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export)); sankore.setPreference("odr_des_imgs", JSON.stringify(array_to_export));
if($("#wgt_display").hasClass("selected"))
sankore.setPreference("odr_des_imgs_state", "display");
else
sankore.setPreference("odr_des_imgs_state", "edit");
} }
//import //import
@ -240,13 +253,19 @@ function importData(data){
img_block.append(hidden_input).append(img); img_block.append(hidden_input).append(img);
tmp_array.push(img_block); tmp_array.push(img_block);
} }
tmp_array = shuffle(tmp_array); if(sankore.preference("odr_des_imgs_state","")){
if(sankore.preference("odr_des_imgs_state","") == "edit")
tmp_array = shuffle(tmp_array);
} else
tmp_array = shuffle(tmp_array);
for(j = 0; j<tmp_array.length;j++) for(j = 0; j<tmp_array.length;j++)
tmp_array[j].appendTo(imgs_container); tmp_array[j].appendTo(imgs_container);
imgs_container.sortable( { imgs_container.sortable().bind('sortupdate', function(event, ui) {
update: checkResult checkResult(event);
} ); });
container.appendTo("#data"); container.appendTo("#data");
imgs_container.trigger("sortupdate")
} }
} }
} }
@ -286,9 +305,9 @@ function showExample(){
tmp_array = shuffle(tmp_array); tmp_array = shuffle(tmp_array);
for(var i = 0; i<tmp_array.length;i++) for(var i = 0; i<tmp_array.length;i++)
tmp_array[i].appendTo(imgs_container); tmp_array[i].appendTo(imgs_container);
imgs_container.sortable( { imgs_container.sortable().bind('sortupdate', function(event, ui) {
update: checkResult checkResult(event);
} ); });
container.appendTo("#data"); container.appendTo("#data");
} }
@ -467,4 +486,3 @@ function onDropTarget(obj, event) {
} }
return false; return false;
} }

Loading…
Cancel
Save