").appendTo(newAnswer);
+ var ansContent = $("
").appendTo(newAnswer);
+ newAnswer.appendTo(ansDiv);
+ break;
+ case "2":
+ local_state = "";
+ local_color = "";
+ if(begin){
+ 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;'":"");
+ }
+ newAnswer = $("
");
+ ansInput = $("
").appendTo(newAnswer);
+ ansSpan = $("
" + ansCount + ". ").appendTo(newAnswer);
+ ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer);
+ newAnswer.appendTo(ansDiv);
+ break;
+ case "3":
+ local_state = "";
+ local_color = "";
+ if(begin){
+ 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":"");
+ }
+ ansInput = $("
" + array[i].answers[j].text + " ").appendTo(selInput);
+ if(local_state && local_color)
+ selInput.css("background-color",local_color);
+ break;
+ }
+ ansCount++;
+ }
+ qstDiv.appendTo("#data");
+ counter++;
}
- qstDiv.appendTo("#data");
- counter++;
- }
- begin = false;
+ begin = false;
}
}
@@ -726,10 +730,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -743,10 +747,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -760,10 +764,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
index a223b8bd..e04f2e83 100644
--- a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
+++ b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js
@@ -15,7 +15,7 @@
var sankoreLang = {
edit: "Edit",
- display:"Display",
+ display:"Close",
question:"Question",
example_question:"This is an example of the question",
answer:"This is one possible answer",
@@ -41,7 +41,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
var questionArray;
@@ -65,10 +66,11 @@ function init(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
-
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
//popup message
var popupText = $("").appendTo("#data");
@@ -107,14 +109,14 @@ function init(){
if (window.widget) {
window.widget.onleave = function(){
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(sankore.preference("choisir_style","")){
changeStyle(sankore.preference("choisir_style",""));
- $(".style_select").val(sankore.preference("choisir_style",""));
+ $("#style_select").val(sankore.preference("choisir_style",""));
} else
changeStyle("3")
@@ -123,21 +125,21 @@ function init(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
displayData(true);
mode = true;
if(window.sankore){
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 {
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
editData();
@@ -149,11 +151,13 @@ function init(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -172,10 +176,10 @@ function init(){
}
});
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -726,10 +730,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -743,10 +747,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -760,10 +764,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Etudier.wgt/css/basic.css b/resources/library/interactivities/Etudier.wgt/css/basic.css
index 0c107f14..f9516240 100644
--- a/resources/library/interactivities/Etudier.wgt/css/basic.css
+++ b/resources/library/interactivities/Etudier.wgt/css/basic.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -28,14 +28,6 @@ body{
margin: 5px 10px;
}
-.green_point{
- background-image: url(../img/green_point.png);
-}
-
-.red_point{
- background-image: url(../img/red_point.png);
-}
-
#display_text, #edit_text{
height: 19px;
padding: 3px 0 0 0;
@@ -362,57 +354,33 @@ li>div{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
-#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
+#wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -447,58 +415,88 @@ li>div{
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
background-color: #ccc;
- padding: 5px 0 5px 5px;
+ padding: 5px;
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Etudier.wgt/img/ar_down.png b/resources/library/interactivities/Etudier.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/ar_down_white.png b/resources/library/interactivities/Etudier.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/green_point.png b/resources/library/interactivities/Etudier.wgt/img/green_point.png
deleted file mode 100644
index a2a44680..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/green_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Memory.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Etudier.wgt/img/parameters-bg.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/parameters-bg.png
rename to resources/library/interactivities/Etudier.wgt/img/parameters-bg.png
diff --git a/resources/library/interactivities/Etudier.wgt/img/red_point.png b/resources/library/interactivities/Etudier.wgt/img/red_point.png
deleted file mode 100644
index f6daa19a..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/red_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-display.png b/resources/library/interactivities/Etudier.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-edit.png b/resources/library/interactivities/Etudier.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-help-white.png b/resources/library/interactivities/Etudier.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-help.png b/resources/library/interactivities/Etudier.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-help.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-help.png
rename to resources/library/interactivities/Etudier.wgt/img/slate-toolbar-help.png
diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Etudier.wgt/img/toolbar-edit.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-edit.png
rename to resources/library/interactivities/Etudier.wgt/img/toolbar-edit.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Etudier.wgt/img/toolbar-help.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-help.png
rename to resources/library/interactivities/Etudier.wgt/img/toolbar-help.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Etudier.wgt/img/toolbar-reload.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-reload.png
rename to resources/library/interactivities/Etudier.wgt/img/toolbar-reload.png
diff --git a/resources/library/interactivities/Etudier.wgt/index.html b/resources/library/interactivities/Etudier.wgt/index.html
index c21be121..3029c850 100644
--- a/resources/library/interactivities/Etudier.wgt/index.html
+++ b/resources/library/interactivities/Etudier.wgt/index.html
@@ -52,11 +52,6 @@
-
-
@@ -66,6 +61,17 @@
diff --git a/resources/library/interactivities/Etudier.wgt/js/script.js b/resources/library/interactivities/Etudier.wgt/js/script.js
index 476167a4..fe372d38 100644
--- a/resources/library/interactivities/Etudier.wgt/js/script.js
+++ b/resources/library/interactivities/Etudier.wgt/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Display",
+ display: "Close",
edit: "Edit",
text_content: "This is an example. Instead of this text you can put your own content.",
new_txt: "New text block",
@@ -9,7 +9,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
//some flags
@@ -31,9 +32,11 @@ function start(){
$("#wgt_name").text(sankoreLang.wgt_name);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("etudier","")){
@@ -44,7 +47,7 @@ function start(){
showExample();
if(sankore.preference("etudier_style","")){
changeStyle(sankore.preference("etudier_style",""));
- $(".style_select").val(sankore.preference("etudier_style",""));
+ $("#style_select").val(sankore.preference("etudier_style",""));
} else
changeStyle("3")
}
@@ -56,7 +59,7 @@ function start(){
window.widget.onleave = function(){
if(!$("#wgt_help").hasClass("open")){
exportData();
- sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val());
sankore.setPreference("etudier_cur_page", $("#slider").getPage());
sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display"));
sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display"));
@@ -64,19 +67,21 @@ function start(){
}
}
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").hide();
tmp.removeClass("open");
$("#slider").show();
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
exportData();
- sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val());
sankore.setPreference("etudier_cur_page", $("#slider").getPage());
sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display"));
sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display"));
@@ -93,8 +98,10 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
-
+ $("#parameters").css("display","none");
+ var tmpwh = $(window).height();
+ var tmpww = $(window).width();
+ window.resizeTo(tmpww, tmpwh - 44)
$("#slider li>div").each(function(){
var container = $(this);
container.removeAttr("ondragenter")
@@ -143,8 +150,10 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
-
+ $("#parameters").css("display","block");
+ tmpwh = $(window).height();
+ tmpww = $(window).width();
+ window.resizeTo(tmpww, tmpwh + 44)
$("#slider li>div").each(function(){
var container = $(this);
container.attr("ondragenter", "return false;")
@@ -556,10 +565,10 @@ function changeStyle(val){
$(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -572,10 +581,10 @@ function changeStyle(val){
$(".b_bottom_center").addClass("bbc_pad").removeClass("without_back");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -588,10 +597,10 @@ function changeStyle(val){
$(".b_bottom_center").addClass("without_back").removeClass("bbc_pad");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Etudier.wgt/locales/fr/index.html b/resources/library/interactivities/Etudier.wgt/locales/fr/index.html
index a33496df..5d8f1724 100644
--- a/resources/library/interactivities/Etudier.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Etudier.wgt/locales/fr/index.html
@@ -25,12 +25,7 @@
-
-
-
+
@@ -40,6 +35,17 @@
diff --git a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
index 2b10962a..7d6c73a6 100644
--- a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Afficher",
+ display: "Fermer",
edit: "Modifier",
text_content: "Ceci est un exemple. Au lieu de ce texte, vous pouvez mettre votre propre texte ou glisser-déposer une image, un son ou une vidéo.",
new_txt: "Nouveau bloc de texte",
@@ -10,25 +10,26 @@ var sankoreLang = {
none: "Aucun",
help: "Aide",
help_content: "
Etudier "+
-"
Livret de pages. "+
+ "
Livret de pages. "+
-"L’interactivité Etudier permet d’ajouter un livret avec des pages. Ce livret peut être enrichi avec du texte, des images, du son et des vidéos.
"+
+ "L’interactivité Etudier permet d’ajouter un livret avec des pages. Ce livret peut être enrichi avec du texte, des images, du son et des vidéos.
"+
-"Le bouton “Modifier” vous permet :
"+
-"de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
-"de modifier les pages du livret. Le bouton “Modifier” vous permet :
"+
+ "de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
+ "de modifier les pages du livret. Sur chaque page, vous pouvez :
"+
-"insérer des zones de texte avec le bouton “+T” situé en haut à gauche de l’interactivité. (pour modifier ces zones de texte, cliquez à l’intérieur et écrivez du texte), "+
-"insérer des images, sons et vidéos par glisser-déposer de fichiers depuis la bibliothèque jusqu’à l’intérieur de la page du livret, "+
-"déplacer les textes, images, sons et vidéos à l’intérieur de la page en cliquant et en déplaçant la flèche multidirectionnelle qui se situe dans le coin supérieur gauche de chaque élément, "+
-"agrandir la taille d’un élément avec la double flèche en bas à droite de celui-ci, "+
-"supprimer un élément avec la case en haut à droite de celui-ci. Sur chaque page, vous pouvez :
"+
+ "insérer des zones de texte avec le bouton “+T” situé en haut à gauche de l’interactivité. (pour modifier ces zones de texte, cliquez à l’intérieur et écrivez du texte), "+
+ "insérer des images, sons et vidéos par glisser-déposer de fichiers depuis la bibliothèque jusqu’à l’intérieur de la page du livret, "+
+ "déplacer les textes, images, sons et vidéos à l’intérieur de la page en cliquant et en déplaçant la flèche multidirectionnelle qui se situe dans le coin supérieur gauche de chaque élément, "+
+ "agrandir la taille d’un élément avec la double flèche en bas à droite de celui-ci, "+
+ "supprimer un élément avec la case en haut à droite de celui-ci. Pour ajouter une page, cliquez sur la flèche verte accompagnée d’un “+” se trouvant en bas à gauche et à droite.
"+
-"Pour supprimer une page, cliquez sur la croix rouge située en haut à droite de la page.
"+
+ "Pour ajouter une page, cliquez sur la flèche verte accompagnée d’un “+” se trouvant en bas à gauche et à droite.
"+
+ "Pour supprimer une page, cliquez sur la croix rouge située en haut à droite de la page.
"+
-"Le bouton “Afficher” vous permet d’utiliser l’activité.
"
+ "Le bouton “Afficher” vous permet d’utiliser l’activité.
",
+ theme: "Thème"
};
@@ -51,9 +52,11 @@ function start(){
$("#wgt_name").text(sankoreLang.wgt_name);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("etudier","")){
@@ -64,7 +67,7 @@ function start(){
showExample();
if(sankore.preference("etudier_style","")){
changeStyle(sankore.preference("etudier_style",""));
- $(".style_select").val(sankore.preference("etudier_style",""));
+ $("#style_select").val(sankore.preference("etudier_style",""));
} else
changeStyle("3")
}
@@ -76,7 +79,7 @@ function start(){
window.widget.onleave = function(){
if(!$("#wgt_help").hasClass("open")){
exportData();
- sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val());
sankore.setPreference("etudier_cur_page", $("#slider").getPage());
sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display"));
sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display"));
@@ -84,19 +87,21 @@ function start(){
}
}
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").hide();
tmp.removeClass("open");
$("#slider").show();
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
exportData();
- sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val());
sankore.setPreference("etudier_cur_page", $("#slider").getPage());
sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display"));
sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display"));
@@ -113,7 +118,10 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
+ var tmpwh = $(window).height();
+ var tmpww = $(window).width();
+ window.resizeTo(tmpww, tmpwh - 44)
$("#slider li>div").each(function(){
var container = $(this);
@@ -163,7 +171,10 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
+ tmpwh = $(window).height();
+ tmpww = $(window).width();
+ window.resizeTo(tmpww, tmpwh + 44)
$("#slider li>div").each(function(){
var container = $(this);
@@ -577,10 +588,10 @@ function changeStyle(val){
$(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -593,10 +604,10 @@ function changeStyle(val){
$(".b_bottom_center").addClass("bbc_pad").removeClass("without_back");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -609,10 +620,10 @@ function changeStyle(val){
$(".b_bottom_center").addClass("without_back").removeClass("bbc_pad");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Etudier.wgt/locales/ru/index.html b/resources/library/interactivities/Etudier.wgt/locales/ru/index.html
index a33496df..5d8f1724 100644
--- a/resources/library/interactivities/Etudier.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Etudier.wgt/locales/ru/index.html
@@ -25,12 +25,7 @@
-
-
-
+
@@ -40,6 +35,17 @@
diff --git a/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js b/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js
index eb5df17c..0fcfd790 100644
--- a/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js
+++ b/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Показать",
+ display: "Закрыть",
edit: "Изменить",
text_content: "Это - пример. Вместо этого текста вы можете ввести свой собственный контент.",
new_txt: "Новый текстовый блок.",
@@ -9,7 +9,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
//some flags
@@ -31,9 +32,11 @@ function start(){
$("#wgt_name").text(sankoreLang.wgt_name);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("etudier","")){
@@ -44,7 +47,7 @@ function start(){
showExample();
if(sankore.preference("etudier_style","")){
changeStyle(sankore.preference("etudier_style",""));
- $(".style_select").val(sankore.preference("etudier_style",""));
+ $("#style_select").val(sankore.preference("etudier_style",""));
} else
changeStyle("3")
}
@@ -56,7 +59,7 @@ function start(){
window.widget.onleave = function(){
if(!$("#wgt_help").hasClass("open")){
exportData();
- sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val());
sankore.setPreference("etudier_cur_page", $("#slider").getPage());
sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display"));
sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display"));
@@ -64,19 +67,21 @@ function start(){
}
}
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").hide();
tmp.removeClass("open");
$("#slider").show();
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
exportData();
- sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val());
sankore.setPreference("etudier_cur_page", $("#slider").getPage());
sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display"));
sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display"));
@@ -93,7 +98,10 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
+ var tmpwh = $(window).height();
+ var tmpww = $(window).width();
+ window.resizeTo(tmpww, tmpwh - 44)
$("#slider li>div").each(function(){
var container = $(this);
@@ -109,7 +117,8 @@ function start(){
$(this).find(".size_up").remove();
$(this).find(".size_down").remove();
$(this).find(".resize_block").remove();
- $(this).removeAttr("contenteditable").removeClass("block_border");
+ $(this).find(".real_text").removeAttr("contenteditable");
+ $(this).removeClass("block_border");
$(this).css("position","absolute");
});
@@ -142,7 +151,10 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
+ tmpwh = $(window).height();
+ tmpww = $(window).width();
+ window.resizeTo(tmpww, tmpwh + 44)
$("#slider li>div").each(function(){
var container = $(this);
@@ -158,7 +170,8 @@ function start(){
$("").appendTo($(this));
$("
").appendTo($(this));
$("
").appendTo($(this));
- $(this).attr("contenteditable", "true").addClass("block_border");
+ $(this).find(".real_text").attr("contenteditable", "true");
+ $(this).addClass("block_border");
});
container.find(".img_block").each(function(){
@@ -292,7 +305,7 @@ function start(){
//var height = resize_obj.object.parent().height() - resize_obj.top + event.clientY;
resize_obj.left = event.clientX;
resize_obj.top = event.clientY;
- resize_obj.object.parent().width(width).height("");
+ resize_obj.object.parent().width(width);
} else {
width = resize_obj.object.parent().width() - resize_obj.left + event.clientX;
var height = resize_obj.object.parent().height() - resize_obj.top + event.clientY;
@@ -367,13 +380,13 @@ function start(){
$(".add_text").live("click", function(){
var container = $(this).parent();
- var text_block = $("
" + sankoreLang.new_txt + "
").appendTo(container);
+ var text_block = $("
" + sankoreLang.new_txt + "
").appendTo(container);
$("
").appendTo(text_block);
$("
").appendTo(text_block);
$("
").appendTo(text_block);
$("
").appendTo(text_block);
$("
").appendTo(text_block);
- text_block.attr("contenteditable", "true").addClass("block_border");
+ text_block.addClass("block_border");
});
}
@@ -391,7 +404,7 @@ function exportData(){
txt_block.left = $(this).position().left;
txt_block.w = $(this).width();
txt_block.fz = $(this).css("font-size");
- txt_block.val = $(this).text();
+ txt_block.val = $(this).find(".real_text").html();
cont_obj.text.push(txt_block);
});
cont_obj.imgs = [];
@@ -433,7 +446,7 @@ function importData(data){
var div = $("
").appendTo(li);
for(var j in data[i].text){
- var text_div = $("
" + data[i].text[j].val + "
");
+ var text_div = $("
" + data[i].text[j].val + "
");
text_div.draggable().css("position","absolute")
.width(data[i].text[j].w)
.css("top", data[i].text[j].top)
@@ -486,7 +499,7 @@ function showExample(){
var li1 = $("
");
var div1 = $("").appendTo(li1);
- $("
" + sankoreLang.text_content + "
").draggable().appendTo(div1)
+ $("
" + sankoreLang.text_content + "
").draggable().appendTo(div1)
li1.width($("#slider").width()).height($("#slider").height());
$("#slider ul").append(li1);
var li2 = $("
");
@@ -507,7 +520,7 @@ function showExample(){
$("#slider ul").append(li3);
var li4 = $(" ");
var div4 = $("").appendTo(li4);
- $("
" + sankoreLang.text_content + "
").draggable().appendTo(div4);
+ $("
" + sankoreLang.text_content + "
").draggable().appendTo(div4);
var img2 = $("
").draggable().appendTo(div4);
$("
").appendTo(img2);
var audio_block2 = $("
").draggable().appendTo(div4);
@@ -555,10 +568,10 @@ function changeStyle(val){
$(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -571,10 +584,10 @@ function changeStyle(val){
$(".b_bottom_center").addClass("bbc_pad").removeClass("without_back");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -587,10 +600,10 @@ function changeStyle(val){
$(".b_bottom_center").addClass("without_back").removeClass("bbc_pad");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -663,4 +676,4 @@ $(window).resize(function(){
$(this).width(slider.width()).height(slider.height());
});
slider.setSize(slider.width(), slider.height());
-})
+})
\ No newline at end of file
diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css
index 48ab3bb5..930b66f4 100644
--- a/resources/library/interactivities/Ordre images.wgt/css/basic.css
+++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -28,14 +28,6 @@ body{
margin: 5px 10px;
}
-.green_point{
- background-image: url(../img/green_point.png);
-}
-
-.red_point{
- background-image: url(../img/red_point.png);
-}
-
#display_text, #edit_text{
height: 19px;
padding: 3px 0 0 0;
@@ -245,57 +237,40 @@ body{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -330,51 +305,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -383,5 +357,36 @@ body{
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Ordre images.wgt/img/ar_down.png b/resources/library/interactivities/Ordre images.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png b/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/green_point.png b/resources/library/interactivities/Ordre images.wgt/img/green_point.png
deleted file mode 100644
index a2a44680..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/green_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png
rename to resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png
diff --git a/resources/library/interactivities/Ordre images.wgt/img/red_point.png b/resources/library/interactivities/Ordre images.wgt/img/red_point.png
deleted file mode 100644
index f6daa19a..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/red_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-display.png b/resources/library/interactivities/Ordre images.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-edit.png b/resources/library/interactivities/Ordre images.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png b/resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-help.png b/resources/library/interactivities/Ordre images.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png
rename to resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png
diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png
rename to resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png
rename to resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png
rename to resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png
diff --git a/resources/library/interactivities/Ordre images.wgt/index.html b/resources/library/interactivities/Ordre images.wgt/index.html
index 53ab2c3d..5ef629a0 100644
--- a/resources/library/interactivities/Ordre images.wgt/index.html
+++ b/resources/library/interactivities/Ordre images.wgt/index.html
@@ -51,12 +51,7 @@
-
-
-
+
@@ -66,7 +61,17 @@
diff --git a/resources/library/interactivities/Ordre images.wgt/js/script.js b/resources/library/interactivities/Ordre images.wgt/js/script.js
index f0a4ca0c..c19678e4 100644
--- a/resources/library/interactivities/Ordre images.wgt/js/script.js
+++ b/resources/library/interactivities/Ordre images.wgt/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Display",
+ display: "Close",
edit: "Edit",
short_desc: "Place the pictures in ascending order.",
add: "Add new block",
@@ -10,7 +10,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
//main function
@@ -22,9 +23,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("odr_des_imgs","")){
@@ -47,11 +50,13 @@ function start(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -72,7 +77,7 @@ function start(){
exportData();
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -83,7 +88,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -130,7 +135,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
@@ -214,7 +219,7 @@ function exportData(){
}
$(".cont").each(function(){
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.text = $(this).find(".text_cont").text();
cont_obj.right = $(this).find(".imgs_cont>input").val();
cont_obj.imgs = [];
@@ -231,7 +236,7 @@ function exportData(){
if($(".cont").size() == 0){
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";
array_to_export.push(cont_obj);
}
@@ -254,12 +259,12 @@ function importData(data){
for(var i in data){
if(data[i].tmp){
changeStyle(data[i].style);
- $(".style_select").val(data[i].style);
+ $("#style_select").val(data[i].style);
}
else {
if(i == 0){
changeStyle(data[i].style);
- $(".style_select").val(data[i].style);
+ $("#style_select").val(data[i].style);
}
var tmp_array = [];
var container = $("
");
@@ -451,10 +456,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -468,10 +473,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -485,10 +490,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html
index 6151ae43..b8c4d872 100644
--- a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html
@@ -25,12 +25,7 @@
-
-
-
+
@@ -40,7 +35,17 @@
diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js
index ca851845..153d5c08 100644
--- a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js
@@ -1,6 +1,6 @@
var sankoreLang = {
- display: "Afficher",
+ display: "Fermer",
edit: "Modifier",
short_desc: "Placez les images dans l'ordre croissant.",
add: "Nouveau bloc",
@@ -12,28 +12,29 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "
Ordonner des images "+
-"
Classer des images dans l’ordre demandé. "+
+ "
Classer des images dans l’ordre demandé. "+
-"
La consigne indique dans quel ordre les images doivent être classées. Le classement des images s’effectue par un glisser-déposer. Une fois que toutes les images sont correctement classées, la zone se colore en vert.
"+
+ "
La consigne indique dans quel ordre les images doivent être classées. Le classement des images s’effectue par un glisser-déposer. Une fois que toutes les images sont correctement classées, la zone se colore en vert.
"+
-"
Le bouton “Recharger” réinitialise les exercices.
"+
+ "
Le bouton “Recharger” réinitialise les exercices.
"+
-"
Le bouton “Modifier” vous permet :
"+
-"
de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
-"de modifier un exercice ou d’en créer de nouveaux dans la même activité. "+
+ "
Le bouton “Modifier” vous permet :
"+
+ "
de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
+ "de modifier un exercice ou d’en créer de nouveaux dans la même activité. "+
-"
Pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis
"+
-"
insérez une consigne en cliquant sur le champ de texte “Saisir votre consigne ici …”, "+
-"insérez des images dans les zones de dépôt par glisser-déposer des images à partir de votre bibliothèque, "+
-"modifiez éventuellement l’ordre des images par un glisser-déposer de l’image concernée pour la mettre au bon endroit dans la suite. "+
+ "
Pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis
"+
+ "
insérez une consigne en cliquant sur le champ de texte “Saisir votre consigne ici …”, "+
+ "insérez des images dans les zones de dépôt par glisser-déposer des images à partir de votre bibliothèque, "+
+ "modifiez éventuellement l’ordre des images par un glisser-déposer de l’image concernée pour la mettre au bon endroit dans la suite. "+
-"
Pour ajouter une zone image, cliquez sur le gros “+” en bas.
"+
-"
Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.
"+
-"
Pour changer d’image, cliquez sur l’icône située au milieu à droite de l’image.
"+
+ "
Pour ajouter une zone image, cliquez sur le gros “+” en bas.
"+
+ "
Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.
"+
+ "
Pour changer d’image, cliquez sur l’icône située au milieu à droite de l’image.
"+
-"
Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.
"+
+ "
Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.
"+
-"
Le bouton “Afficher” vous permet d’utiliser l’activité.
"
+ "
Le bouton “Afficher” vous permet d’utiliser l’activité.
",
+ theme: "Thème"
};
//main function
@@ -45,9 +46,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("odr_des_imgs","")){
@@ -70,11 +73,13 @@ function start(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -95,7 +100,7 @@ function start(){
exportData();
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -105,7 +110,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -151,7 +156,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
@@ -235,7 +240,7 @@ function exportData(){
}
$(".cont").each(function(){
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.text = $(this).find(".text_cont").text();
cont_obj.right = $(this).find(".imgs_cont>input").val();
cont_obj.imgs = [];
@@ -252,7 +257,7 @@ function exportData(){
if($(".cont").size() == 0){
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";
array_to_export.push(cont_obj);
}
@@ -270,11 +275,11 @@ function importData(data){
for(var i in data){
if(data[i].tmp){
changeStyle(data[i].style);
- $(".style_select").val(data[i].style);
+ $("#style_select").val(data[i].style);
}else{
if(i == 0){
changeStyle(data[i].style);
- $(".style_select").val(data[i].style);
+ $("#style_select").val(data[i].style);
}
var tmp_array = [];
var container = $("
");
@@ -465,10 +470,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -482,10 +487,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -499,10 +504,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html b/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html
index 6151ae43..b8c4d872 100644
--- a/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html
@@ -25,12 +25,7 @@
-
-
-
+
@@ -40,7 +35,17 @@
diff --git a/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js
index 4f709a3c..0bce5739 100644
--- a/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js
+++ b/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js
@@ -1,6 +1,6 @@
var sankoreLang = {
- display: "Показать",
+ display: "Закрыть",
edit: "Изменить",
short_desc: "Расположите картинки в порядке возрастания цифр.",
add: "Новый блок",
@@ -11,7 +11,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
//main function
@@ -23,9 +24,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("odr_des_imgs","")){
@@ -48,11 +51,13 @@ function start(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -73,7 +78,7 @@ function start(){
exportData();
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -83,7 +88,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -129,7 +134,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
@@ -213,7 +218,7 @@ function exportData(){
}
$(".cont").each(function(){
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.text = $(this).find(".text_cont").text();
cont_obj.right = $(this).find(".imgs_cont>input").val();
cont_obj.imgs = [];
@@ -230,7 +235,7 @@ function exportData(){
if($(".cont").size() == 0){
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";
array_to_export.push(cont_obj);
}
@@ -248,11 +253,11 @@ function importData(data){
for(var i in data){
if(data[i].tmp){
changeStyle(data[i].style);
- $(".style_select").val(data[i].style);
+ $("#style_select").val(data[i].style);
}else{
if(i == 0){
changeStyle(data[i].style);
- $(".style_select").val(data[i].style);
+ $("#style_select").val(data[i].style);
}
var tmp_array = [];
var container = $("
");
@@ -443,10 +448,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -460,10 +465,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -477,10 +482,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -518,7 +523,6 @@ function onDropTarget(obj, event) {
tmp_img.attr("height",h);
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
- exportData();
}, 6)
}
else {
diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css
index 4573addc..bd270ede 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css
+++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -28,14 +28,6 @@ body{
margin: 5px 10px;
}
-.green_point{
- background-image: url(../img/green_point.png);
-}
-
-.red_point{
- background-image: url(../img/red_point.png);
-}
-
#display_text, #edit_text{
height: 19px;
padding: 3px 0 0 0;
@@ -306,57 +298,40 @@ body{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -391,51 +366,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -444,5 +418,36 @@ body{
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/green_point.png b/resources/library/interactivities/Ordre lettres.wgt/img/green_point.png
deleted file mode 100644
index a2a44680..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/green_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png b/resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/red_point.png b/resources/library/interactivities/Ordre lettres.wgt/img/red_point.png
deleted file mode 100644
index f6daa19a..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/red_point.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Ordre lettres.wgt/index.html b/resources/library/interactivities/Ordre lettres.wgt/index.html
index 1ccdeec9..a5328ff0 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/index.html
+++ b/resources/library/interactivities/Ordre lettres.wgt/index.html
@@ -52,11 +52,6 @@
-
-
@@ -66,7 +61,17 @@
diff --git a/resources/library/interactivities/Ordre lettres.wgt/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/js/script.js
index d3ca2c70..a9c844d8 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/js/script.js
+++ b/resources/library/interactivities/Ordre lettres.wgt/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Display",
+ display: "Close",
edit: "Edit",
short_desc: "Listen to the sound and make the correct word.",
add: "Add new block",
@@ -11,7 +11,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
//main function
@@ -23,9 +24,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("associer_sound","")){
@@ -36,7 +39,7 @@ function start(){
showExample();
if(sankore.preference("ord_let_style","")){
changeStyle(sankore.preference("ord_let_style",""));
- $(".style_select").val(sankore.preference("ord_let_style",""));
+ $("#style_select").val(sankore.preference("ord_let_style",""));
} else
changeStyle("3")
}
@@ -46,18 +49,20 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
- sankore.setPreference("ord_let_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_let_style", $("#style_select").find("option:selected").val());
}
}
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -78,7 +83,7 @@ function start(){
exportData();
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -89,7 +94,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -124,7 +129,7 @@ function start(){
sankore.enableDropOnWidget(true);
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(".cont").each(function(){
var container = $(this);
$("
").appendTo(container);
@@ -446,10 +451,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -463,10 +468,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -480,10 +485,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html
index 035d2684..cb3d1b52 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html
@@ -26,11 +26,6 @@
-
-
@@ -40,7 +35,17 @@
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js
index 2e85339f..f37ff6a2 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Afficher",
+ display: "Fermer",
edit: "Modifier",
short_desc: "Ecoutez le son et replacer les lettres dans l'ordre.",
add: "Nouveau bloc",
@@ -12,26 +12,27 @@ var sankoreLang = {
none: "Aucun",
help: "Aide",
help_content: "
Ordre des lettres "+
-"
Ordonner des lettres pour reconstituer un mot. "+
+ "
Ordonner des lettres pour reconstituer un mot. "+
-"
L’intégration d’un fichier son (facultatif) permet d’écouter le mot à reconstituer. Lorsque les lettres sont dans le bon ordre, l’interactivité se colore en vert.
"+
+ "
L’intégration d’un fichier son (facultatif) permet d’écouter le mot à reconstituer. Lorsque les lettres sont dans le bon ordre, l’interactivité se colore en vert.
"+
-"
L’activité s’effectue par un glisser-déposer des étiquettes pour remettre les lettres en ordre. NB : vous pouvez également utiliser cette activité avec des chiffres.
"+
+ "
L’activité s’effectue par un glisser-déposer des étiquettes pour remettre les lettres en ordre. NB : vous pouvez également utiliser cette activité avec des chiffres.
"+
-"
Le bouton “Recharger” réinitialise les exercices.
"+
+ "
Le bouton “Recharger” réinitialise les exercices.
"+
-"
Le bouton “Modifier” vous permet :
"+
-"
de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
-"de déterminer le mot à reconstituer. "+
+ "
Le bouton “Modifier” vous permet :
"+
+ "
de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
+ "de déterminer le mot à reconstituer. "+
-"
Pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis
"+
-"
insérez une consigne en cliquant sur le champ de texte “Saisir la consigne ici ...”, "+
-"insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque (facultatif), "+
-"écrivez le mot souhaité à la place de “exemple”. "+
+ "
Pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis
"+
+ "
insérez une consigne en cliquant sur le champ de texte “Saisir la consigne ici ...”, "+
+ "insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque (facultatif), "+
+ "écrivez le mot souhaité à la place de “exemple”. "+
-"
Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.
"+
+ "
Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.
"+
-"
Le bouton “Afficher” vous permet d’utiliser l’activité.
"
+ "
Le bouton “Afficher” vous permet d’utiliser l’activité.
",
+ theme: "Thème"
};
//main function
@@ -43,9 +44,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("associer_sound","")){
@@ -56,7 +59,7 @@ function start(){
showExample();
if(sankore.preference("ord_let_style","")){
changeStyle(sankore.preference("ord_let_style",""));
- $(".style_select").val(sankore.preference("ord_let_style",""));
+ $("#style_select").val(sankore.preference("ord_let_style",""));
} else
changeStyle("3")
}
@@ -66,18 +69,20 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
- sankore.setPreference("ord_let_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_let_style", $("#style_select").find("option:selected").val());
}
}
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -98,7 +103,7 @@ function start(){
exportData();
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -109,7 +114,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -133,7 +138,11 @@ function start(){
tmp_array = shuffle(tmp_array);
for(var i = 0; i
").appendTo(container);
@@ -300,7 +309,7 @@ function importData(data){
var audio_block = $("").appendTo(text);
$("
").appendTo(audio_block);
$("
").appendTo(audio_block);
- var source = $("
").attr("src", "../../" + data[i].audio);
+ var source = $("
").attr("src", data[i].audio);
var audio = $("
").appendTo(audio_block);
audio.append(source);
$("").appendTo(text);
$("").appendTo(audio_block);
$("
").appendTo(audio_block);
- var source = $("
").attr("src", "objects/beep.mp3");
+ var source = $("
").attr("src", "objects/exemple.mp3");
var audio = $("
").appendTo(audio_block);
audio.append(source);
$("
-
-
@@ -40,7 +35,17 @@
diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js
index 3377a85c..05853cd2 100644
--- a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js
+++ b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js
@@ -1,5 +1,5 @@
var sankoreLang = {
- display: "Показать",
+ display: "Закрыть",
edit: "Изменить",
short_desc: "Прослушайте звук и составьте корректное слово.",
add: "Новый блок",
@@ -11,10 +11,10 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
-
//main function
function start(){
@@ -24,9 +24,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content);
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
if(window.sankore){
if(sankore.preference("associer_sound","")){
@@ -37,7 +39,7 @@ function start(){
showExample();
if(sankore.preference("ord_let_style","")){
changeStyle(sankore.preference("ord_let_style",""));
- $(".style_select").val(sankore.preference("ord_let_style",""));
+ $("#style_select").val(sankore.preference("ord_let_style",""));
} else
changeStyle("3")
}
@@ -47,18 +49,20 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
- sankore.setPreference("ord_let_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_let_style", $("#style_select").find("option:selected").val());
}
}
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#data").show();
});
- } else {
+ } else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -79,7 +83,7 @@ function start(){
exportData();
});
- $(".style_select").change(function (event){
+ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
@@ -90,7 +94,7 @@ function start(){
sankore.enableDropOnWidget(false);
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(".add_block").remove();
$(".cont").each(function(){
var container = $(this);
@@ -114,7 +118,11 @@ function start(){
tmp_array = shuffle(tmp_array);
for(var i = 0; i
").appendTo(container);
@@ -281,7 +289,7 @@ function importData(data){
var audio_block = $("").appendTo(text);
$("
").appendTo(audio_block);
$("
").appendTo(audio_block);
- var source = $("
").attr("src", "../../" + data[i].audio);
+ var source = $("
").attr("src", data[i].audio);
var audio = $("
").appendTo(audio_block);
audio.append(source);
$("").appendTo(text);
$("").appendTo(audio_block);
$("
").appendTo(audio_block);
- var source = $("
").attr("src", "objects/beep.mp3");
+ var source = $("
").attr("src", "objects/exemple.mp3");
var audio = $("
").appendTo(audio_block);
audio.append(source);
$("
Words/Letters sortable
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/ar_down.png b/resources/library/interactivities/Ordre mots.wgt/img/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/ar_down_white.png b/resources/library/interactivities/Ordre mots.wgt/img/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/parameters-bg.png b/resources/library/interactivities/Ordre mots.wgt/img/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Ordre mots.wgt/img/parameters-bg.png differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-display.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-edit.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-help-white.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-help.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ordre mots.wgt/img/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre mots.wgt/img/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Ordre mots.wgt/img/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/toolbar-help.png b/resources/library/interactivities/Ordre mots.wgt/img/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Ordre mots.wgt/img/toolbar-help.png differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre mots.wgt/img/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Ordre mots.wgt/img/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Ordre mots.wgt/index.html b/resources/library/interactivities/Ordre mots.wgt/index.html
index 80615e61..0feab107 100644
--- a/resources/library/interactivities/Ordre mots.wgt/index.html
+++ b/resources/library/interactivities/Ordre mots.wgt/index.html
@@ -11,7 +11,7 @@
-
-
-
+
@@ -77,12 +72,21 @@
-
-
+
diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre mots.wgt/locales/fr/index.html
index 8918641f..801b68cb 100644
--- a/resources/library/interactivities/Ordre mots.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Ordre mots.wgt/locales/fr/index.html
@@ -33,12 +33,7 @@
-
-
-
+
@@ -48,7 +43,17 @@
diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
index 73cf4c40..9a64ac27 100644
--- a/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
+++ b/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
@@ -27,7 +27,7 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Afficher",
+ view: "Fermer",
edit: "Modifier",
example: "Il*était*une*fois*...",
wgt_name: "Ordonner des mots",
@@ -37,20 +37,21 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "
Ordonner des mots "+
-"
Ordonner des mots pour reconstituer une phrase. "+
+ "
Ordonner des mots pour reconstituer une phrase. "+
-"Des étiquettes avec des mots sont dans le désordre. Le but est de les remettre en ordre pour avoir un énoncé compréhensible et correct. Lorsque l’énoncé est en ordre, l’interactivité se colore en vert. L’activité s’effectue par un glisser-déposer des étiquettes pour remettre les mots en ordre.
"+
+ "Des étiquettes avec des mots sont dans le désordre. Le but est de les remettre en ordre pour avoir un énoncé compréhensible et correct. Lorsque l’énoncé est en ordre, l’interactivité se colore en vert. L’activité s’effectue par un glisser-déposer des étiquettes pour remettre les mots en ordre.
"+
-"Le bouton “Recharger” réinitialise les exercices.
"+
+ "Le bouton “Recharger” réinitialise les exercices.
"+
-"Le bouton “Modifier” vous permet :
"+
-"de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
-"de déterminer la phrase à reconstituer et les séparations dans l’énoncé. Le bouton “Modifier” vous permet :
"+
+ "de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
+ "de déterminer la phrase à reconstituer et les séparations dans l’énoncé. Pour insérer du texte dans la zone, cliquez sur la zone et saisissez la phrase souhaitée.
"+
-"Pour ajouter des espaces dans la phrase, insérer une étoile * entre chaque mot. Votre texte sera séparé autant de fois qu’il y a d’étoiles. NB : une (*) correspond à un espace. Ne pas en mettre ni au début ni à la fin de votre phrase.
"+
+ "Pour insérer du texte dans la zone, cliquez sur la zone et saisissez la phrase souhaitée.
"+
+ "Pour ajouter des espaces dans la phrase, insérer une étoile * entre chaque mot. Votre texte sera séparé autant de fois qu’il y a d’étoiles. NB : une (*) correspond à un espace. Ne pas en mettre ni au début ni à la fin de votre phrase.
"+
-"Le bouton “Afficher” vous permet d’utiliser l’activité.
"
+ "Le bouton “Afficher” vous permet d’utiliser l’activité.
",
+ theme:"Thème"
};
var word = "";
@@ -80,27 +81,35 @@ var input_width = 606;
var widget_padding = 0;
var min_view_width = 400;
+
$(document).ready(function(){
if(window.sankore){
if(sankore.preference("ord_words_style","")){
changeStyle(sankore.preference("ord_words_style",""));
- $(".style_select").val(sankore.preference("ord_words_style",""));
} else
changeStyle("3")
} else
changeStyle("3")
-
$("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
- $("#help").html(sankoreLang.help_content);
+ $("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
modeView();
@@ -109,7 +118,7 @@ $(document).ready(function(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
modeEdit();
@@ -122,11 +131,13 @@ $(document).ready(function(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -178,15 +189,8 @@ $(document).ready(function(){
$( "#mp_word" ).css( "margin-left", 0 );
}
}
- });
-
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ });
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
})
/*
@@ -239,10 +243,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -256,10 +260,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -273,10 +277,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -406,7 +410,7 @@ function modeEdit()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_words_style", $("#style_select").find("option:selected").val());
if($( "#mp_word .wgt_cont" ).val())
{
modeView();
diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/ru/index.html b/resources/library/interactivities/Ordre mots.wgt/locales/ru/index.html
index 8918641f..e323447f 100644
--- a/resources/library/interactivities/Ordre mots.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Ordre mots.wgt/locales/ru/index.html
@@ -10,8 +10,6 @@
-
-
-
+
@@ -48,7 +41,17 @@
diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js
index 3b267590..b7b04940 100644
--- a/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js
+++ b/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js
@@ -27,7 +27,7 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Показать",
+ view: "Закрыть",
edit: "Изменить",
example: "много*,*много*лет*назад*...",
wgt_name: "Порядок слов",
@@ -36,7 +36,8 @@ var sankoreLang = {
pad: "Планшет",
none: "Нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
var word = "";
@@ -66,11 +67,11 @@ var input_width = 606;
var widget_padding = 0;
var min_view_width = 400;
+
$(document).ready(function(){
if(window.sankore){
if(sankore.preference("ord_words_style","")){
changeStyle(sankore.preference("ord_words_style",""));
- $(".style_select").val(sankore.preference("ord_words_style",""));
} else
changeStyle("3")
} else
@@ -78,14 +79,23 @@ $(document).ready(function(){
$("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
- $("#help").html(sankoreLang.help_content);
+ $("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
modeView();
@@ -94,7 +104,7 @@ $(document).ready(function(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
modeEdit();
@@ -107,11 +117,13 @@ $(document).ready(function(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -163,15 +175,8 @@ $(document).ready(function(){
$( "#mp_word" ).css( "margin-left", 0 );
}
}
- });
-
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ });
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
})
/*
@@ -224,10 +229,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -241,10 +246,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -258,10 +263,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -391,7 +396,7 @@ function modeEdit()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_words_style", $("#style_select").find("option:selected").val());
if($( "#mp_word .wgt_cont" ).val())
{
modeView();
diff --git a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
index db966b89..8c784eab 100644
--- a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
+++ b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
@@ -27,7 +27,7 @@ function checkResponse()
*/
var sankoreLang = {
- view: "Display",
+ view: "Close",
edit: "Edit",
example: "a*long*,*long*time*ago*...",
wgt_name: "Order words",
@@ -36,7 +36,8 @@ var sankoreLang = {
pad: "Pad",
none: "None",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
var word = "";
@@ -66,11 +67,11 @@ var input_width = 606;
var widget_padding = 0;
var min_view_width = 400;
+
$(document).ready(function(){
if(window.sankore){
if(sankore.preference("ord_words_style","")){
changeStyle(sankore.preference("ord_words_style",""));
- $(".style_select").val(sankore.preference("ord_words_style",""));
} else
changeStyle("3")
} else
@@ -78,14 +79,23 @@ $(document).ready(function(){
$("#wgt_display").text(sankoreLang.view);
$("#wgt_edit").text(sankoreLang.edit);
$("#wgt_help").text(sankoreLang.help);
- $("#help").html(sankoreLang.help_content);
+ $("#help").html(sankoreLang.help_content);
+ $("#style_select option[value='1']").text(sankoreLang.slate);
+ $("#style_select option[value='2']").text(sankoreLang.pad);
+ $("#style_select option[value='3']").text(sankoreLang.none);
+ var tmpl = $("div.inline label").html();
+ $("div.inline label").html(sankoreLang.theme + tmpl)
+
+ $("#style_select").change(function (event){
+ changeStyle($(this).find("option:selected").val());
+ })
$("#wgt_display, #wgt_edit").click(function(event){
if(this.id == "wgt_display"){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
$(this).css("display", "none");
$("#wgt_edit").css("display", "block");
modeView();
@@ -94,7 +104,7 @@ $(document).ready(function(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
$(this).css("display", "none");
$("#wgt_display").css("display", "block");
modeEdit();
@@ -107,11 +117,13 @@ $(document).ready(function(){
$("#wgt_help").click(function(){
var tmp = $(this);
if($(this).hasClass("open")){
+ $(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){
tmp.removeClass("open");
$("#ub-widget").show();
});
} else {
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#ub-widget").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
@@ -163,15 +175,8 @@ $(document).ready(function(){
$( "#mp_word" ).css( "margin-left", 0 );
}
}
- });
-
- $(".style_select option[value='1']").text(sankoreLang.slate);
- $(".style_select option[value='2']").text(sankoreLang.pad);
- $(".style_select option[value='3']").text(sankoreLang.none);
+ });
- $(".style_select").change(function (event){
- changeStyle($(this).find("option:selected").val());
- })
})
/*
@@ -224,10 +229,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select option:first").attr('selected',true);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -241,10 +246,10 @@ function changeStyle(val){
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:first").next().attr('selected',true);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -258,10 +263,10 @@ function changeStyle(val){
$("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select option:last").attr('selected',true);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
}
@@ -391,7 +396,7 @@ function modeEdit()
if (window.widget) {
window.widget.onleave = function(){
- sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("ord_words_style", $("#style_select").find("option:selected").val());
if($( "#mp_word .wgt_cont" ).val())
{
modeView();
diff --git a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
index 111e3199..6e3e8e8d 100644
--- a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
+++ b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -45,6 +45,7 @@ body{
}
#mp_word .wgt_cont{
+ margin-top: 20px;
font: 32px tahoma;
letter-spacing: 0.1em;
width: 98%;
@@ -139,57 +140,40 @@ body{
margin: 10px 10px 0 10px;
padding: 0;
float: left;
- /*font-family: "Lobster13Regular";*/
+ font-family: Arial,Helvetica,sans-serif;
font-size: 24px;
- color: #8c5730;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer;
- height: 44px;
margin: 10px 10px 0 0;
float: right;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- color: #8c5730;
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 24px;
+ line-height: 32px;
}
#wgt_display{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/toolbar-edit.png) left -32px no-repeat;
+ color: white;
display: none;
}
#wgt_edit{
- padding-left: 40px;
- background-image: url(../img/slate-edit.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-edit.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_reload{
- padding-left: 40px;
- background-image: url(../img/slate-toolbar-reload.png);
- background-repeat: no-repeat;
- background-position: top 0;
-}
-
-.style_select{
- width: 120px;
- /*font-family: "Lobster13Regular";*/
- font-size: 24px;
- float: right;
- margin: 10px 20px 0 0;
- border-radius: 10px;
- background-image: url(../img/ar_down.png);
- background-color: #d4aa79;
- color: #8c5730;
- background-position: 105px 11px;
- background-repeat: no-repeat;
- -webkit-appearance: menulist-text;
- display: none;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
.btl_pad{
@@ -224,51 +208,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_reload{
- background-image: url(../img/slate-toolbar-reload-white.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_edit{
- background-image: url(../img/slate-display.png) !important;
+.pad_color{
+ color: #FC9 !important;
+ text-shadow: none !important;
}
-.pad_select{
- background-color: black !important;
- color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+.pad_reload{
+ background: url(../img/toolbar-reload.png) left top no-repeat !important;
}
-.without_radius{
- border-radius: 0 !important;
+.pad_edit{
+ background: url(../img/toolbar-edit.png) left top no-repeat !important;
}
-.without_back{
- background: none !important;
+.pad_help{
+ background: url(../img/toolbar-help.png) left top no-repeat !important;
}
-.none_select{
- background-color: #333 !important;
+.help_wood{
+ background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important;
- background-image: url(../img/ar_down_white.png) !important;
+ text-shadow: #7F613F 0 -1px 0 !important;
}
-.pad_help{
- background-image: url(../img/slate-help-white.png) !important;
+.help_pad{
+ background: url(../img/toolbar-help.png) left -32px no-repeat !important;
+ color: white !important;
}
#wgt_help{
- padding-left: 32px;
- background-image: url(../img/slate-help.png);
- background-repeat: no-repeat;
- background-position: top 0;
+ padding-left: 35px;
+ background: url(../img/slate-toolbar-help.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#help{
- width: 100%;
height: 100%;
overflow: auto;
display: none;
@@ -277,5 +260,36 @@ body{
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ padding: 10px 20px;
+ background: url("../img/parameters-bg.png");
+ border-radius: 4px 4px 0 0;
+}
+
+.inline{
+ display: inline-block;
+ font-family: "helvetica neue";
+ font-size: 14px;
+ color: #666;
+}
+
+#parameters label {
+ font-style: italic;
+}
+
+#style_select{
+ margin-left: 10px;
+}
+
+.display_wood{
+ background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important;
+ text-shadow: #7F613F 0 -1px 0;
+}
+
+.radius_ft{
+ border-radius: 45px !important;
}
\ No newline at end of file
diff --git a/resources/library/interactivities/Balance.wgt/config.xml b/resources/nonDistributed/Balance.wgt/config.xml
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/config.xml
rename to resources/nonDistributed/Balance.wgt/config.xml
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/demo.html
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html
rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/demo.html
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css
rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/stylesheet.css
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/demo.html
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/demo.html
diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css
rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css
diff --git a/resources/library/interactivities/Balance.wgt/css/images/balance.png b/resources/nonDistributed/Balance.wgt/css/images/balance.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/balance.png
rename to resources/nonDistributed/Balance.wgt/css/images/balance.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/bg.png b/resources/nonDistributed/Balance.wgt/css/images/bg.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/bg.png
rename to resources/nonDistributed/Balance.wgt/css/images/bg.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/delete.png b/resources/nonDistributed/Balance.wgt/css/images/delete.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/delete.png
rename to resources/nonDistributed/Balance.wgt/css/images/delete.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/graduations.png b/resources/nonDistributed/Balance.wgt/css/images/graduations.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/graduations.png
rename to resources/nonDistributed/Balance.wgt/css/images/graduations.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/pad-bd.png b/resources/nonDistributed/Balance.wgt/css/images/pad-bd.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/pad-bd.png
rename to resources/nonDistributed/Balance.wgt/css/images/pad-bd.png
diff --git a/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/pivot.png b/resources/nonDistributed/Balance.wgt/css/images/pivot.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/pivot.png
rename to resources/nonDistributed/Balance.wgt/css/images/pivot.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/scale.png b/resources/nonDistributed/Balance.wgt/css/images/scale.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/scale.png
rename to resources/nonDistributed/Balance.wgt/css/images/scale.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/scales.png b/resources/nonDistributed/Balance.wgt/css/images/scales.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/scales.png
rename to resources/nonDistributed/Balance.wgt/css/images/scales.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-bd.png b/resources/nonDistributed/Balance.wgt/css/images/slate-bd.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/slate-bd.png
rename to resources/nonDistributed/Balance.wgt/css/images/slate-bd.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-edit.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png
rename to resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-edit.png
diff --git a/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-reload.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png
rename to resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-reload.png
diff --git a/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png differ
diff --git a/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png differ
diff --git a/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight-add.png b/resources/nonDistributed/Balance.wgt/css/images/weight-add.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/weight-add.png
rename to resources/nonDistributed/Balance.wgt/css/images/weight-add.png
diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight.png b/resources/nonDistributed/Balance.wgt/css/images/weight.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/images/weight.png
rename to resources/nonDistributed/Balance.wgt/css/images/weight.png
diff --git a/resources/library/interactivities/Balance.wgt/css/main.css b/resources/nonDistributed/Balance.wgt/css/main.css
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/main.css
rename to resources/nonDistributed/Balance.wgt/css/main.css
diff --git a/resources/library/interactivities/Balance.wgt/css/ubw-help.css b/resources/nonDistributed/Balance.wgt/css/ubw-help.css
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/ubw-help.css
rename to resources/nonDistributed/Balance.wgt/css/ubw-help.css
diff --git a/resources/library/interactivities/Balance.wgt/css/ubw-main.css b/resources/nonDistributed/Balance.wgt/css/ubw-main.css
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/css/ubw-main.css
rename to resources/nonDistributed/Balance.wgt/css/ubw-main.css
diff --git a/resources/library/interactivities/Balance.wgt/help.html b/resources/nonDistributed/Balance.wgt/help.html
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/help.html
rename to resources/nonDistributed/Balance.wgt/help.html
diff --git a/resources/library/interactivities/Balance.wgt/i18n/Messages.properties b/resources/nonDistributed/Balance.wgt/i18n/Messages.properties
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/i18n/Messages.properties
rename to resources/nonDistributed/Balance.wgt/i18n/Messages.properties
diff --git a/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Balance.wgt/i18n/Messages_fr.properties
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties
rename to resources/nonDistributed/Balance.wgt/i18n/Messages_fr.properties
diff --git a/resources/library/interactivities/Balance.wgt/icon.png b/resources/nonDistributed/Balance.wgt/icon.png
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/icon.png
rename to resources/nonDistributed/Balance.wgt/icon.png
diff --git a/resources/library/interactivities/Balance.wgt/index.html b/resources/nonDistributed/Balance.wgt/index.html
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/index.html
rename to resources/nonDistributed/Balance.wgt/index.html
diff --git a/resources/library/interactivities/Balance.wgt/js/help-template.js b/resources/nonDistributed/Balance.wgt/js/help-template.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/help-template.js
rename to resources/nonDistributed/Balance.wgt/js/help-template.js
diff --git a/resources/library/interactivities/Balance.wgt/js/help_fr-template.js b/resources/nonDistributed/Balance.wgt/js/help_fr-template.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/help_fr-template.js
rename to resources/nonDistributed/Balance.wgt/js/help_fr-template.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery-1.7.1.min.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js
rename to resources/nonDistributed/Balance.wgt/js/lib/jquery-1.7.1.min.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery-css-transform.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js
rename to resources/nonDistributed/Balance.wgt/js/lib/jquery-css-transform.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js
rename to resources/nonDistributed/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
rename to resources/nonDistributed/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/modernizr.js b/resources/nonDistributed/Balance.wgt/js/lib/modernizr.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/modernizr.js
rename to resources/nonDistributed/Balance.wgt/js/lib/modernizr.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/mustache.js b/resources/nonDistributed/Balance.wgt/js/lib/mustache.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/mustache.js
rename to resources/nonDistributed/Balance.wgt/js/lib/mustache.js
diff --git a/resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Balance.wgt/js/lib/ubw-main.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js
rename to resources/nonDistributed/Balance.wgt/js/lib/ubw-main.js
diff --git a/resources/library/interactivities/Balance.wgt/js/main.js b/resources/nonDistributed/Balance.wgt/js/main.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/main.js
rename to resources/nonDistributed/Balance.wgt/js/main.js
diff --git a/resources/library/interactivities/Balance.wgt/js/templates.js b/resources/nonDistributed/Balance.wgt/js/templates.js
similarity index 100%
rename from resources/library/interactivities/Balance.wgt/js/templates.js
rename to resources/nonDistributed/Balance.wgt/js/templates.js
diff --git a/resources/library/interactivities/Cadran.wgt/config.xml b/resources/nonDistributed/Cadran.wgt/config.xml
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/config.xml
rename to resources/nonDistributed/Cadran.wgt/config.xml
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/demo.html
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html
rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/demo.html
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css
rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/stylesheet.css
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/demo.html
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/demo.html
diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css
rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css
diff --git a/resources/library/interactivities/Cadran.wgt/css/images/bg.png b/resources/nonDistributed/Cadran.wgt/css/images/bg.png
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/images/bg.png
rename to resources/nonDistributed/Cadran.wgt/css/images/bg.png
diff --git a/resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png b/resources/nonDistributed/Cadran.wgt/css/images/pad-bd.png
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png
rename to resources/nonDistributed/Cadran.wgt/css/images/pad-bd.png
diff --git a/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png differ
diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-bd.png
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png
rename to resources/nonDistributed/Cadran.wgt/css/images/slate-bd.png
diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-edit.png
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png
rename to resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-edit.png
diff --git a/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-reload.png
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png
rename to resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-reload.png
diff --git a/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png differ
diff --git a/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png differ
diff --git a/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Cadran.wgt/css/main.css b/resources/nonDistributed/Cadran.wgt/css/main.css
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/main.css
rename to resources/nonDistributed/Cadran.wgt/css/main.css
diff --git a/resources/library/interactivities/Cadran.wgt/css/ubw-help.css b/resources/nonDistributed/Cadran.wgt/css/ubw-help.css
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/ubw-help.css
rename to resources/nonDistributed/Cadran.wgt/css/ubw-help.css
diff --git a/resources/library/interactivities/Cadran.wgt/css/ubw-main.css b/resources/nonDistributed/Cadran.wgt/css/ubw-main.css
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/css/ubw-main.css
rename to resources/nonDistributed/Cadran.wgt/css/ubw-main.css
diff --git a/resources/library/interactivities/Cadran.wgt/help.html b/resources/nonDistributed/Cadran.wgt/help.html
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/help.html
rename to resources/nonDistributed/Cadran.wgt/help.html
diff --git a/resources/library/interactivities/Cadran.wgt/i18n/Messages.properties b/resources/nonDistributed/Cadran.wgt/i18n/Messages.properties
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/i18n/Messages.properties
rename to resources/nonDistributed/Cadran.wgt/i18n/Messages.properties
diff --git a/resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Cadran.wgt/i18n/Messages_fr.properties
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties
rename to resources/nonDistributed/Cadran.wgt/i18n/Messages_fr.properties
diff --git a/resources/library/interactivities/Cadran.wgt/icon.png b/resources/nonDistributed/Cadran.wgt/icon.png
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/icon.png
rename to resources/nonDistributed/Cadran.wgt/icon.png
diff --git a/resources/library/interactivities/Cadran.wgt/index.html b/resources/nonDistributed/Cadran.wgt/index.html
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/index.html
rename to resources/nonDistributed/Cadran.wgt/index.html
diff --git a/resources/library/interactivities/Cadran.wgt/js/help-template.js b/resources/nonDistributed/Cadran.wgt/js/help-template.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/help-template.js
rename to resources/nonDistributed/Cadran.wgt/js/help-template.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/help_fr-template.js b/resources/nonDistributed/Cadran.wgt/js/help_fr-template.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/help_fr-template.js
rename to resources/nonDistributed/Cadran.wgt/js/help_fr-template.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Cadran.wgt/js/lib/jquery-1.7.1.min.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js
rename to resources/nonDistributed/Cadran.wgt/js/lib/jquery-1.7.1.min.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js b/resources/nonDistributed/Cadran.wgt/js/lib/jquery-css-transform.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js
rename to resources/nonDistributed/Cadran.wgt/js/lib/jquery-css-transform.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
rename to resources/nonDistributed/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js b/resources/nonDistributed/Cadran.wgt/js/lib/modernizr.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js
rename to resources/nonDistributed/Cadran.wgt/js/lib/modernizr.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/mustache.js b/resources/nonDistributed/Cadran.wgt/js/lib/mustache.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/lib/mustache.js
rename to resources/nonDistributed/Cadran.wgt/js/lib/mustache.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Cadran.wgt/js/lib/ubw-main.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js
rename to resources/nonDistributed/Cadran.wgt/js/lib/ubw-main.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/main.js b/resources/nonDistributed/Cadran.wgt/js/main.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/main.js
rename to resources/nonDistributed/Cadran.wgt/js/main.js
diff --git a/resources/library/interactivities/Cadran.wgt/js/templates.js b/resources/nonDistributed/Cadran.wgt/js/templates.js
similarity index 100%
rename from resources/library/interactivities/Cadran.wgt/js/templates.js
rename to resources/nonDistributed/Cadran.wgt/js/templates.js
diff --git a/resources/library/interactivities/Memory.wgt/config.xml b/resources/nonDistributed/Memory.wgt/config.xml
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/config.xml
rename to resources/nonDistributed/Memory.wgt/config.xml
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/demo.html
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/demo.html
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/demo.html
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/stylesheet.css
rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/stylesheet.css
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/demo.html
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/demo.html
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/demo.html
diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css
rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css
diff --git a/resources/library/interactivities/Memory.wgt/css/images/bg.png b/resources/nonDistributed/Memory.wgt/css/images/bg.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/bg.png
rename to resources/nonDistributed/Memory.wgt/css/images/bg.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/drop-label-bg.png b/resources/nonDistributed/Memory.wgt/css/images/drop-label-bg.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/drop-label-bg.png
rename to resources/nonDistributed/Memory.wgt/css/images/drop-label-bg.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/drop-label-ondrop-bg.png b/resources/nonDistributed/Memory.wgt/css/images/drop-label-ondrop-bg.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/drop-label-ondrop-bg.png
rename to resources/nonDistributed/Memory.wgt/css/images/drop-label-ondrop-bg.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/flip.png b/resources/nonDistributed/Memory.wgt/css/images/flip.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/flip.png
rename to resources/nonDistributed/Memory.wgt/css/images/flip.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/mark.png b/resources/nonDistributed/Memory.wgt/css/images/mark.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/mark.png
rename to resources/nonDistributed/Memory.wgt/css/images/mark.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/pad-bd.png b/resources/nonDistributed/Memory.wgt/css/images/pad-bd.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/pad-bd.png
rename to resources/nonDistributed/Memory.wgt/css/images/pad-bd.png
diff --git a/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png differ
diff --git a/resources/library/interactivities/Memory.wgt/css/images/pile-bg.png b/resources/nonDistributed/Memory.wgt/css/images/pile-bg.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/pile-bg.png
rename to resources/nonDistributed/Memory.wgt/css/images/pile-bg.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/result-bg.png b/resources/nonDistributed/Memory.wgt/css/images/result-bg.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/result-bg.png
rename to resources/nonDistributed/Memory.wgt/css/images/result-bg.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-bd.png b/resources/nonDistributed/Memory.wgt/css/images/slate-bd.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/slate-bd.png
rename to resources/nonDistributed/Memory.wgt/css/images/slate-bd.png
diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-edit.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-edit.png
rename to resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-edit.png
diff --git a/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-reload.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-reload.png
rename to resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-reload.png
diff --git a/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png differ
diff --git a/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png differ
diff --git a/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Memory.wgt/css/main.css b/resources/nonDistributed/Memory.wgt/css/main.css
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/main.css
rename to resources/nonDistributed/Memory.wgt/css/main.css
diff --git a/resources/library/interactivities/Memory.wgt/css/ubw-help.css b/resources/nonDistributed/Memory.wgt/css/ubw-help.css
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/ubw-help.css
rename to resources/nonDistributed/Memory.wgt/css/ubw-help.css
diff --git a/resources/library/interactivities/Memory.wgt/css/ubw-main.css b/resources/nonDistributed/Memory.wgt/css/ubw-main.css
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/css/ubw-main.css
rename to resources/nonDistributed/Memory.wgt/css/ubw-main.css
diff --git a/resources/library/interactivities/Memory.wgt/help.html b/resources/nonDistributed/Memory.wgt/help.html
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/help.html
rename to resources/nonDistributed/Memory.wgt/help.html
diff --git a/resources/library/interactivities/Memory.wgt/i18n/Messages.properties b/resources/nonDistributed/Memory.wgt/i18n/Messages.properties
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/i18n/Messages.properties
rename to resources/nonDistributed/Memory.wgt/i18n/Messages.properties
diff --git a/resources/library/interactivities/Memory.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Memory.wgt/i18n/Messages_fr.properties
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/i18n/Messages_fr.properties
rename to resources/nonDistributed/Memory.wgt/i18n/Messages_fr.properties
diff --git a/resources/library/interactivities/Memory.wgt/icon.png b/resources/nonDistributed/Memory.wgt/icon.png
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/icon.png
rename to resources/nonDistributed/Memory.wgt/icon.png
diff --git a/resources/library/interactivities/Memory.wgt/index.html b/resources/nonDistributed/Memory.wgt/index.html
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/index.html
rename to resources/nonDistributed/Memory.wgt/index.html
diff --git a/resources/library/interactivities/Memory.wgt/js/help-template.js b/resources/nonDistributed/Memory.wgt/js/help-template.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/help-template.js
rename to resources/nonDistributed/Memory.wgt/js/help-template.js
diff --git a/resources/library/interactivities/Memory.wgt/js/help_fr-template.js b/resources/nonDistributed/Memory.wgt/js/help_fr-template.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/help_fr-template.js
rename to resources/nonDistributed/Memory.wgt/js/help_fr-template.js
diff --git a/resources/library/interactivities/Memory.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Memory.wgt/js/lib/jquery-1.7.1.min.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/lib/jquery-1.7.1.min.js
rename to resources/nonDistributed/Memory.wgt/js/lib/jquery-1.7.1.min.js
diff --git a/resources/library/interactivities/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
rename to resources/nonDistributed/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
diff --git a/resources/library/interactivities/Memory.wgt/js/lib/modernizr.js b/resources/nonDistributed/Memory.wgt/js/lib/modernizr.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/lib/modernizr.js
rename to resources/nonDistributed/Memory.wgt/js/lib/modernizr.js
diff --git a/resources/library/interactivities/Memory.wgt/js/lib/mustache.js b/resources/nonDistributed/Memory.wgt/js/lib/mustache.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/lib/mustache.js
rename to resources/nonDistributed/Memory.wgt/js/lib/mustache.js
diff --git a/resources/library/interactivities/Memory.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Memory.wgt/js/lib/ubw-main.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/lib/ubw-main.js
rename to resources/nonDistributed/Memory.wgt/js/lib/ubw-main.js
diff --git a/resources/library/interactivities/Memory.wgt/js/main.js b/resources/nonDistributed/Memory.wgt/js/main.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/main.js
rename to resources/nonDistributed/Memory.wgt/js/main.js
diff --git a/resources/library/interactivities/Memory.wgt/js/templates.js b/resources/nonDistributed/Memory.wgt/js/templates.js
similarity index 100%
rename from resources/library/interactivities/Memory.wgt/js/templates.js
rename to resources/nonDistributed/Memory.wgt/js/templates.js
diff --git a/resources/library/interactivities/Morpion.wgt/config.xml b/resources/nonDistributed/Morpion.wgt/config.xml
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/config.xml
rename to resources/nonDistributed/Morpion.wgt/config.xml
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/demo.html
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/demo.html
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css
rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/stylesheet.css
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/demo.html
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/demo.html
diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css
rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/bg.png b/resources/nonDistributed/Morpion.wgt/css/images/bg.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/bg.png
rename to resources/nonDistributed/Morpion.wgt/css/images/bg.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png b/resources/nonDistributed/Morpion.wgt/css/images/pad-bd.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png
rename to resources/nonDistributed/Morpion.wgt/css/images/pad-bd.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png differ
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/player1.png b/resources/nonDistributed/Morpion.wgt/css/images/player1.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/player1.png
rename to resources/nonDistributed/Morpion.wgt/css/images/player1.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/player2.png b/resources/nonDistributed/Morpion.wgt/css/images/player2.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/player2.png
rename to resources/nonDistributed/Morpion.wgt/css/images/player2.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/result-bg.png b/resources/nonDistributed/Morpion.wgt/css/images/result-bg.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/result-bg.png
rename to resources/nonDistributed/Morpion.wgt/css/images/result-bg.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-bd.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png
rename to resources/nonDistributed/Morpion.wgt/css/images/slate-bd.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-edit.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png
rename to resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-edit.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-reload.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png
rename to resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-reload.png
diff --git a/resources/library/interactivities/Morpion.wgt/css/images/submit.png b/resources/nonDistributed/Morpion.wgt/css/images/submit.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/images/submit.png
rename to resources/nonDistributed/Morpion.wgt/css/images/submit.png
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png differ
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png differ
diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Morpion.wgt/css/main.css b/resources/nonDistributed/Morpion.wgt/css/main.css
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/main.css
rename to resources/nonDistributed/Morpion.wgt/css/main.css
diff --git a/resources/library/interactivities/Morpion.wgt/css/ubw-help.css b/resources/nonDistributed/Morpion.wgt/css/ubw-help.css
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/ubw-help.css
rename to resources/nonDistributed/Morpion.wgt/css/ubw-help.css
diff --git a/resources/library/interactivities/Morpion.wgt/css/ubw-main.css b/resources/nonDistributed/Morpion.wgt/css/ubw-main.css
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/css/ubw-main.css
rename to resources/nonDistributed/Morpion.wgt/css/ubw-main.css
diff --git a/resources/library/interactivities/Morpion.wgt/help.html b/resources/nonDistributed/Morpion.wgt/help.html
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/help.html
rename to resources/nonDistributed/Morpion.wgt/help.html
diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties b/resources/nonDistributed/Morpion.wgt/i18n/Messages.properties
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/i18n/Messages.properties
rename to resources/nonDistributed/Morpion.wgt/i18n/Messages.properties
diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Morpion.wgt/i18n/Messages_fr.properties
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties
rename to resources/nonDistributed/Morpion.wgt/i18n/Messages_fr.properties
diff --git a/resources/library/interactivities/Morpion.wgt/icon.png b/resources/nonDistributed/Morpion.wgt/icon.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/icon.png
rename to resources/nonDistributed/Morpion.wgt/icon.png
diff --git a/resources/library/interactivities/Morpion.wgt/images/failed.png b/resources/nonDistributed/Morpion.wgt/images/failed.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/images/failed.png
rename to resources/nonDistributed/Morpion.wgt/images/failed.png
diff --git a/resources/library/interactivities/Morpion.wgt/images/succeed.png b/resources/nonDistributed/Morpion.wgt/images/succeed.png
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/images/succeed.png
rename to resources/nonDistributed/Morpion.wgt/images/succeed.png
diff --git a/resources/library/interactivities/Morpion.wgt/index.html b/resources/nonDistributed/Morpion.wgt/index.html
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/index.html
rename to resources/nonDistributed/Morpion.wgt/index.html
diff --git a/resources/library/interactivities/Morpion.wgt/js/help-template.js b/resources/nonDistributed/Morpion.wgt/js/help-template.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/help-template.js
rename to resources/nonDistributed/Morpion.wgt/js/help-template.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/help_fr-template.js b/resources/nonDistributed/Morpion.wgt/js/help_fr-template.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/help_fr-template.js
rename to resources/nonDistributed/Morpion.wgt/js/help_fr-template.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Morpion.wgt/js/lib/jquery-1.7.1.min.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js
rename to resources/nonDistributed/Morpion.wgt/js/lib/jquery-1.7.1.min.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
rename to resources/nonDistributed/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js b/resources/nonDistributed/Morpion.wgt/js/lib/modernizr.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js
rename to resources/nonDistributed/Morpion.wgt/js/lib/modernizr.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/mustache.js b/resources/nonDistributed/Morpion.wgt/js/lib/mustache.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/lib/mustache.js
rename to resources/nonDistributed/Morpion.wgt/js/lib/mustache.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Morpion.wgt/js/lib/ubw-main.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js
rename to resources/nonDistributed/Morpion.wgt/js/lib/ubw-main.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/main.js b/resources/nonDistributed/Morpion.wgt/js/main.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/main.js
rename to resources/nonDistributed/Morpion.wgt/js/main.js
diff --git a/resources/library/interactivities/Morpion.wgt/js/templates.js b/resources/nonDistributed/Morpion.wgt/js/templates.js
similarity index 100%
rename from resources/library/interactivities/Morpion.wgt/js/templates.js
rename to resources/nonDistributed/Morpion.wgt/js/templates.js
diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp
index 6fa04c34..d06c95a7 100644
--- a/src/adaptors/UBCFFSubsetAdaptor.cpp
+++ b/src/adaptors/UBCFFSubsetAdaptor.cpp
@@ -249,6 +249,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &elem
painter.end();
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
+
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ svgItem->setUuid(QUuid(uuid));
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -299,6 +304,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgEllipse(const QDomElement &e
painter.end();
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
+
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ svgItem->setUuid(QUuid(uuid));
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -379,7 +389,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e
QUuid itemGroupUuid(element.attribute(aId).left(QUuid().toString().length()-1));
if (!itemUuid.isNull() && (itemGroupUuid!=itemUuid)) // reimported from UBZ
{
- UBGraphicsPolygonItem *graphicsPolygon = new UBGraphicsPolygonItem(polygon);
+ UBGraphicsPolygonItem *graphicsPolygon = mCurrentScene->polygonToPolygonItem(polygon);
graphicsPolygon->setBrush(brush);
@@ -393,6 +403,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e
mCurrentScene->addItem(graphicsPolygon);
graphicsPolygon->setUuid(itemUuid);
+ mRefToUuidMap.insert(element.attribute(aId), itemUuid);
}
else // single CFF
@@ -413,6 +424,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
QTransform transform;
QString textTransform = element.attribute(aTransform);
+
+ QUuid uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ svgItem->setUuid(uuid);
svgItem->resetTransform();
if (!textTransform.isNull()) {
@@ -506,6 +521,9 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement &
}
mCurrentScene->addItem(graphicsPolygon);
+ graphicsPolygon->setUuid(itemUuid);
+ mRefToUuidMap.insert(element.attribute(aId), itemUuid);
+
}
else // simple CFF
{
@@ -523,6 +541,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement &
//add resulting svg file to scene
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
+
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ svgItem->setUuid(QUuid(uuid));
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -675,6 +698,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgText(const QDomElement &elem
//add resulting svg file to scene
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ svgItem->setUuid(QUuid(uuid));
+
svgItem->resetTransform();
repositionSvgItem(svgItem, width, height, x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, svgItem);
@@ -788,6 +815,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgTextarea(const QDomElement &
UBGraphicsTextItem *svgItem = mCurrentScene->addTextHtml(doc.toHtml());
svgItem->resize(width, height);
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ svgItem->setUuid(QUuid(uuid));
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -837,6 +868,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &ele
}
UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix, NULL);
+
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ pixItem->setUuid(QUuid(uuid));
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -884,6 +920,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
UBGraphicsWidgetItem *flashItem = mCurrentScene->addW3CWidget(QUrl::fromLocalFile(flashUrl));
flashItem->setSourceUrl(urlPath);
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
+ flashItem->setUuid(QUuid(uuid));
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -921,14 +961,15 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &ele
concreteUrl = QUrl::fromLocalFile(audioPath);
}
- QUuid uuid = QUuid::createUuid();
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
QString destFile;
bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(
mCurrentScene->document(),
concreteUrl.toLocalFile(),
UBPersistenceManager::audioDirectory,
- uuid,
+ QUuid(uuid),
destFile);
if (!b)
{
@@ -937,6 +978,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &ele
concreteUrl = QUrl::fromLocalFile(destFile);
UBGraphicsMediaItem *audioItem = mCurrentScene->addAudio(concreteUrl, false);
+
QTransform transform;
QString textTransform = parentOfAudio.attribute(aTransform);
@@ -974,15 +1016,15 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele
concreteUrl = QUrl::fromLocalFile(videoPath);
}
- QUuid uuid = QUuid::createUuid();
-
+ QString uuid = QUuid::createUuid().toString();
+ mRefToUuidMap.insert(element.attribute(aId), uuid);
QString destFile;
bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(
mCurrentScene->document(),
concreteUrl.toLocalFile(),
UBPersistenceManager::videoDirectory,
- uuid,
+ QUuid(uuid),
destFile);
if (!b)
{
@@ -991,6 +1033,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele
concreteUrl = QUrl::fromLocalFile(destFile);
UBGraphicsMediaItem *videoItem = mCurrentScene->addVideo(concreteUrl, false);
+
QTransform transform;
QString textTransform = element.attribute(aTransform);
@@ -1126,13 +1169,15 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro
group->addToGroup(parseIwbGroup(currentStrokeElement));
else
{
- QString uuid = currentStrokeElement.attribute(aRef);
+
+ QString ref = currentStrokeElement.attribute(aRef);
+ QString uuid = mRefToUuidMap[ref];
if (!uuid.isEmpty())
{
- if (uuid.size() > QUuid().toString().length()) // create stroke group
+ if (ref.size() > QUuid().toString().length()) // create stroke group
{
- currentStrokeIdentifier = uuid.left(QUuid().toString().length()-1);
- UBGraphicsPolygonItem *strokeByUuid = qgraphicsitem_cast(mCurrentScene->itemForUuid(QUuid(uuid.right(QUuid().toString().length()))));
+ currentStrokeIdentifier = ref.left(QUuid().toString().length()-1);
+ UBGraphicsPolygonItem *strokeByUuid = qgraphicsitem_cast(mCurrentScene->itemForUuid(QUuid(ref.right(QUuid().toString().length()))));
if (strokeByUuid)
strokesGroupsContainer.insert(currentStrokeIdentifier, strokeByUuid);
@@ -1146,7 +1191,7 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro
- foreach (QString key, strokesGroupsContainer.keys())
+ foreach (QString key, strokesGroupsContainer.keys().toSet())
{
UBGraphicsStrokesGroup* pStrokesGroup = new UBGraphicsStrokesGroup();
UBGraphicsStroke *currentStroke = new UBGraphicsStroke();
@@ -1163,13 +1208,17 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro
}
if (currentStroke->polygons().empty())
delete currentStroke;
+
if (pStrokesGroup->childItems().count())
mCurrentScene->addItem(pStrokesGroup);
else
delete pStrokesGroup;
if (pStrokesGroup)
- group->addToGroup(pStrokesGroup);
+ {
+ QGraphicsItem *strokeGroup = qgraphicsitem_cast(pStrokesGroup);
+ groupContainer.append(strokeGroup);
+ }
}
foreach(QGraphicsItem* item, groupContainer)
@@ -1179,7 +1228,7 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro
{
mCurrentScene->addItem(group);
- if (!groupContainer.count())
+ if (1 == group->childItems().count())
{
group->destroy(false);
}
diff --git a/src/adaptors/UBCFFSubsetAdaptor.h b/src/adaptors/UBCFFSubsetAdaptor.h
index ca389a49..3a6f89a6 100644
--- a/src/adaptors/UBCFFSubsetAdaptor.h
+++ b/src/adaptors/UBCFFSubsetAdaptor.h
@@ -74,6 +74,7 @@ private:
QDomDocument mDOMdoc;
QDomNode mCurrentDOMElement;
QHash persistedItems;
+ QMap mRefToUuidMap;
QDir mTmpFlashDir;
void addItemToGSection(QGraphicsItem *item);
diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp
index a65b703a..75dd32c7 100644
--- a/src/adaptors/UBExportFullPDF.cpp
+++ b/src/adaptors/UBExportFullPDF.cpp
@@ -169,6 +169,7 @@ void UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS
MergeDescription mergeInfo;
int existingPageCount = pDocumentProxy->pageCount();
+
for(int pageIndex = 0 ; pageIndex < existingPageCount; 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 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();
- qDebug() << "pdfItem->boundingRect()" << pdfItem->boundingRect();
- qDebug() << "pdfItem->sceneBoundingRect()" << pdfItem->sceneBoundingRect();
+ TransformationDescription pdfTransform(xPdfOffset, yPdfOffset, scaleFactor, 0);
+ TransformationDescription annotationTransform(xAnnotationsOffset, yAnnotationsOffset, 1, 0);
MergePageDescription pageDescription(pageSize.width() * mScaleFactor,
pageSize.height() * mScaleFactor,
pdfItem->pageNumber(),
QFile::encodeName(backgroundPath).constData(),
- TransformationDescription(),
+ pdfTransform,
pageIndex + 1,
- TransformationDescription(),
+ annotationTransform,
false, false);
mergeInfo.push_back(pageDescription);
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index 04bff654..17e25564 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -555,6 +555,10 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
if (polygonItem)
{
+ mScene->addItem(polygonItem);
+
+ polygonItem->setUuid(uuidFromSvg);
+
if (annotationGroup)
{
polygonItem->setStroke(annotationGroup);
@@ -991,31 +995,45 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup()
{
- UBGraphicsGroupContainerItem *result = new UBGraphicsGroupContainerItem();
-
+ UBGraphicsGroupContainerItem *group = new UBGraphicsGroupContainerItem();
+ QMultiMap strokesGroupsContainer;
+ QList groupContainer;
+ QString currentStrokeIdentifier;
+
QUuid groupUuid = QUuid(mXmlReader.attributes().value(aId).toString());
mXmlReader.readNext();
- while (!mXmlReader.atEnd()) {
+ while (!mXmlReader.atEnd())
+ {
if (mXmlReader.isEndElement()) {
mXmlReader.readNext();
- result->setUuid(groupUuid);
- if (!result->childItems().count()) {
- delete result;
- result = 0;
- }
break;
- } else if (mXmlReader.isStartElement()) {
- if (mXmlReader.name() == tGroup) {
+ } else if (mXmlReader.isStartElement())
+ {
+ if (mXmlReader.name() == tGroup)
+ {
qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId);
UBGraphicsGroupContainerItem *curGroup = readGroup();
- if (curGroup) {
- result->addToGroup(curGroup);
- }
- } else if (mXmlReader.name() == tElement) {
+ if (curGroup)
+ groupContainer.append(curGroup);
+ }
+ else if (mXmlReader.name() == tElement)
+ {
+ QString id = mXmlReader.attributes().value(aId).toString();
+ QString itemId = id.right(QUuid().toString().size());
+ QString groupId = id.left(QUuid().toString().size());
+
QGraphicsItem *curItem = readElementFromGroup();
- if (curItem) {
- result->addToGroup(curItem);
+
+ UBGraphicsPolygonItem *curPolygon = qgraphicsitem_cast(curItem);
+
+ if (curPolygon && !groupId.isEmpty() && !itemId.isEmpty() && itemId != groupId)
+ {
+ strokesGroupsContainer.insert(groupId, curPolygon);
+ }
+ else // item
+ {
+ groupContainer.append(curItem);
}
}else {
mXmlReader.skipCurrentElement();
@@ -1025,7 +1043,49 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup()
}
}
- return result;
+ foreach (QString key, strokesGroupsContainer.keys().toSet())
+ {
+ UBGraphicsStrokesGroup* pStrokesGroup = new UBGraphicsStrokesGroup();
+ UBGraphicsStroke *currentStroke = new UBGraphicsStroke();
+ foreach(UBGraphicsPolygonItem* poly, strokesGroupsContainer.values(key))
+ {
+ if (poly)
+ {
+ mScene->removeItem(poly);
+ mScene->removeItemFromDeletion(poly);
+ poly->setStrokesGroup(pStrokesGroup);
+ poly->setStroke(currentStroke);
+ pStrokesGroup->addToGroup(poly);
+ }
+ }
+ if (currentStroke->polygons().empty())
+ delete currentStroke;
+
+ if (pStrokesGroup->childItems().count())
+ mScene->addItem(pStrokesGroup);
+ else
+ delete pStrokesGroup;
+
+ if (pStrokesGroup)
+ {
+ QGraphicsItem *strokeGroup = qgraphicsitem_cast(pStrokesGroup);
+ groupContainer.append(strokeGroup);
+ }
+ }
+
+ foreach(QGraphicsItem* item, groupContainer)
+ group->addToGroup(item);
+
+ if (group->childItems().count())
+ {
+ mScene->addItem(group);
+
+ if (1 == group->childItems().count())
+ {
+ group->destroy(false);
+ }
+ }
+ return group;
}
void UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroupRoot()
@@ -1053,8 +1113,9 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroupRoot()
QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup()
{
QGraphicsItem *result = 0;
-
- result = mScene->itemForUuid(QUuid(mXmlReader.attributes().value(aId).toString()));
+ QString id = mXmlReader.attributes().value(aId).toString();
+ QString uuid = id.right(QUuid().toString().size());
+ result = mScene->itemForUuid(QUuid(uuid));
mXmlReader.skipCurrentElement();
mXmlReader.readNext();
diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index a2043121..580ef897 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -216,14 +216,17 @@ QString UBApplication::checkLanguageAvailabilityForSankore(QString &language)
void UBApplication::setupTranslators(QStringList args)
{
- QString forcedLanguage;
+ QString forcedLanguage("");
if(args.contains("-lang"))
forcedLanguage=args.at(args.indexOf("-lang") + 1);
- else{
- QString setLanguage = UBSettings::settings()->appPreferredLanguage->get().toString();
- if(!setLanguage.isEmpty())
- forcedLanguage = setLanguage;
- }
+// TODO claudio: this has been commented because some of the translation seem to be loaded at this time
+// especially tools name. This is a workaround and we have to be able to load settings without
+// impacting the translations
+// else{
+// QString setLanguage = UBSettings::settings()->appPreferredLanguage->get().toString();
+// if(!setLanguage.isEmpty())
+// forcedLanguage = setLanguage;
+// }
QString language("");
@@ -242,7 +245,6 @@ void UBApplication::setupTranslators(QStringList args)
else{
mApplicationTranslator = new QTranslator(this);
mQtGuiTranslator = new QTranslator(this);
-
mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language));
installTranslator(mApplicationTranslator);
@@ -256,7 +258,6 @@ void UBApplication::setupTranslators(QStringList args)
}
if(!qtGuiTranslationPath.isEmpty()){
- qDebug() << "qtGuiTranslationPath " << qtGuiTranslationPath;
mQtGuiTranslator->load(qtGuiTranslationPath);
installTranslator(mQtGuiTranslator);
}
diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp
index 17695734..e6740443 100644
--- a/src/desktop/UBDesktopPalette.cpp
+++ b/src/desktop/UBDesktopPalette.cpp
@@ -29,7 +29,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett
{
QList actions;
- mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show Uniboard"), this);
+ mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show Open-Sankore"), this);
connect(mActionUniboard, SIGNAL(triggered()), this, SIGNAL(uniboardClick()));
actions << mActionUniboard;
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index 621dc9a4..99bfe301 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -1713,6 +1713,7 @@ QRectF UBGraphicsScene::normalizedSceneRect(qreal ratio)
QGraphicsItem *UBGraphicsScene::itemForUuid(QUuid uuid)
{
QGraphicsItem *result = 0;
+ QString ui = uuid.toString();
//simple search before implementing container for fast access
foreach (QGraphicsItem *item, items()) {
diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h
index 6d496369..1b0a54db 100644
--- a/src/domain/UBGraphicsScene.h
+++ b/src/domain/UBGraphicsScene.h
@@ -302,6 +302,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
static QUuid getPersonalUuid(QGraphicsItem *item);
+ UBGraphicsPolygonItem* polygonToPolygonItem(const QPolygonF pPolygon);
+
public slots:
void initStroke();
void hideEraser();
@@ -338,7 +340,6 @@ public slots:
UBGraphicsPolygonItem* lineToPolygonItem(const QLineF& pLine, const qreal& pWidth);
UBGraphicsPolygonItem* arcToPolygonItem(const QLineF& pStartRadius, qreal pSpanAngle, qreal pWidth);
- UBGraphicsPolygonItem* polygonToPolygonItem(const QPolygonF pPolygon);
void initPolygonItem(UBGraphicsPolygonItem*);
diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp
index a56fe901..656118c4 100644
--- a/src/gui/UBTeacherGuideWidget.cpp
+++ b/src/gui/UBTeacherGuideWidget.cpp
@@ -551,9 +551,9 @@ void UBTeacherGuidePresentationWidget::showData( QVector data
else if (element->name == "comment")
mpComment->showText(element->attributes.value("value"));
else if (element->name == "action") {
- QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem( mpRootWidgetItem);
+ QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem(mpRootWidgetItem);
newWidgetItem->setText(0, element->attributes.value("task"));
- newWidgetItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+ newWidgetItem->setFlags(Qt::ItemIsEnabled /*| Qt::ItemIsSelectable*/);
QString colorString = element->attributes.value("owner").toInt() == 0 ? "blue" : "green";
UBTGAdaptableText* textWidget = new UBTGAdaptableText(newWidgetItem, 0);
textWidget->bottomMargin(14);
@@ -679,7 +679,9 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons
mpLayout->addWidget(mpPageNumberLabel);
mpScrollArea = new QScrollArea();
+ mpScrollArea->setFocusPolicy(Qt::NoFocus);
mpContainerWidget = new QWidget();
+ mpContainerWidget->setFocusPolicy(Qt::NoFocus);
mpContainerWidgetLayout = new QVBoxLayout();
mpLayout->addWidget(mpScrollArea);
diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp
index db2d8bf7..587bc817 100644
--- a/src/gui/UBTeacherGuideWidgetsTools.cpp
+++ b/src/gui/UBTeacherGuideWidgetsTools.cpp
@@ -164,7 +164,7 @@ void UBTGAdaptableText::keyReleaseEvent(QKeyEvent* e)
void UBTGAdaptableText::showEvent(QShowEvent* e)
{
Q_UNUSED(e);
- if(!mIsUpdatingSize && mHasPlaceHolder && toPlainText().isEmpty() && !isReadOnly()){
+ if(!mIsUpdatingSize && !hasFocus() && mHasPlaceHolder && toPlainText().isEmpty() && !isReadOnly()){
setTextColor(QColor(Qt::lightGray));
setPlainText(mPlaceHolderText);
}
@@ -193,7 +193,8 @@ void UBTGAdaptableText::onTextChanged()
if(documentSize < mMinimumHeight){
setFixedHeight(mMinimumHeight);
- }else{
+ }
+ else{
setFixedHeight(documentSize+mBottomMargin);
}
@@ -237,12 +238,14 @@ void UBTGAdaptableText::focusInEvent(QFocusEvent* e)
QTextEdit::focusInEvent(e);
}
-void UBTGAdaptableText::focusOutEvent(QFocusEvent* e){
+void UBTGAdaptableText::focusOutEvent(QFocusEvent* e)
+{
managePlaceholder(false);
QTextEdit::focusOutEvent(e);
}
-void UBTGAdaptableText::managePlaceholder(bool focus){
+void UBTGAdaptableText::managePlaceholder(bool focus)
+{
if(focus){
if(toPlainText() == mPlaceHolderText){
setTextColor(QColor(Qt::black));
@@ -258,7 +261,8 @@ void UBTGAdaptableText::managePlaceholder(bool focus){
}
}
-void UBTGAdaptableText::setCursorToTheEnd(){
+void UBTGAdaptableText::setCursorToTheEnd()
+{
QTextDocument* doc = document();
if(NULL != doc){
QTextBlock block = doc->lastBlock();
diff --git a/src/tools/UBGraphicsAristo.cpp b/src/tools/UBGraphicsAristo.cpp
index 61762774..40c27ae5 100644
--- a/src/tools/UBGraphicsAristo.cpp
+++ b/src/tools/UBGraphicsAristo.cpp
@@ -31,7 +31,7 @@
#include "core/memcheck.h"
const QRectF UBGraphicsAristo::sDefaultRect = QRectF(0, 0, 800, 500);
-const UBGraphicsAristo::Orientation UBGraphicsAristo::sDefaultOrientation = UBGraphicsAristo::Bottom;
+const UBGraphicsAristo::Orientation UBGraphicsAristo::sDefaultOrientation = UBGraphicsAristo::Top;
UBGraphicsAristo::UBGraphicsAristo()
: UBAbstractDrawRuler()
@@ -62,12 +62,14 @@ UBGraphicsAristo::UBGraphicsAristo()
mRotateSvgItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Control));
mMarkerSvgItem = new QGraphicsSvgItem(":/images/angleMarker.svg", this);
- mMarkerSvgItem->setVisible(false);
mMarkerSvgItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool));
mMarkerSvgItem->setVisible(true);
create(*this);
- setBoundingRect(sDefaultRect);
+
+ setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::CppTool)); //Necessary to set if we want z value to be assigned correctly
+ setFlag(QGraphicsItem::ItemIsSelectable, false);
+
setOrientation(sDefaultOrientation);
}
@@ -78,43 +80,55 @@ UBGraphicsAristo::~UBGraphicsAristo()
/*
* setOrientation() modify the tool orientation.
- * makeGeometryChange() is called so points are recomputed, control items are positionnated and shape is determined according to this modification.
+ * Apexes coordinates are alors recomputed.
*/
void UBGraphicsAristo::setOrientation(Orientation orientation)
{
+ /* substracting difference to zero [2pi] twice, to obtain the desired angle */
+ mMarkerAngle -= 2 * (mMarkerAngle - (int)(mMarkerAngle/360)*360) - 360;
+
+ bool wasUndefined = mOrientation == Undefined;
mOrientation = orientation;
- makeGeometryChange();
+
+ if (wasUndefined)
+ calculatePoints(sDefaultRect);
+ else
+ calculatePoints(boundingRect());
}
/* calculatePoints() is used to calculate polygon's apexes coordinates.
* This function handles orientation changes too.
+ * Items are repositionated and path is redeterminates.
*/
-void UBGraphicsAristo::calculatePoints()
+void UBGraphicsAristo::calculatePoints(QRectF bounds)
{
switch (mOrientation) {
case Bottom:
- C.setX(boundingRect().center().x());
- C.setY(boundingRect().bottom());
+ C.setX(bounds.center().x());
+ C.setY(bounds.bottom());
- A.setX(boundingRect().left());
- A.setY(boundingRect().bottom() - boundingRect().width() / 2);
+ A.setX(bounds.left());
+ A.setY(bounds.bottom() - bounds.width() / 2);
- B.setX(boundingRect().right());
- B.setY(boundingRect().bottom() - boundingRect().width() / 2);
+ B.setX(bounds.right());
+ B.setY(bounds.bottom() - bounds.width() / 2);
break;
case Top:
- C.setX(boundingRect().center().x());
- C.setY(boundingRect().top());
+ C.setX(bounds.center().x());
+ C.setY(bounds.top());
- A.setX(boundingRect().left());
- A.setY(boundingRect().top() + boundingRect().width() / 2);
+ A.setX(bounds.left());
+ A.setY(bounds.top() + bounds.width() / 2);
- B.setX(boundingRect().right());
- B.setY(boundingRect().top() + boundingRect().width() / 2);
+ B.setX(bounds.right());
+ B.setY(bounds.top() + bounds.width() / 2);
break;
default:
break;
}
+
+ setItemsPos();
+ setPath(determinePath());
}
/*
@@ -142,39 +156,49 @@ QPainterPath UBGraphicsAristo::determinePath()
QPolygonF polygon;
polygon << A << B << C;
- path.addPolygon(polygon);
- path.addPath(mResizeSvgItem->shape().translated(mResizeSvgItem->pos()));
- path.addPath(mMarkerSvgItem->shape().translated(mMarkerSvgItem->pos()));
+ qreal rotationAngle = mOrientation == Bottom ? mMarkerAngle : mMarkerAngle - 360 * (int)(mMarkerAngle / 360);
+ QTransform t;
+ t.rotate(rotationAngle);
+ bool markerIsInPolygon = true;
+ if ((mOrientation == Bottom && mMarkerAngle < 90) || (mOrientation == Top && mMarkerAngle < 270))
+ markerIsInPolygon = polygon.containsPoint(t.map(markerButtonRect().topLeft()) + rotationCenter(), Qt::OddEvenFill);
+ else
+ markerIsInPolygon = polygon.containsPoint(t.map(markerButtonRect().bottomLeft()) + rotationCenter(), Qt::OddEvenFill);
- return path;
-}
+ path.moveTo(A);
-/*
- * setBoundingRect() is a helper to set the given rectangle as the new shape to limit apexes coordinates.
- * This is useful when instanciating or resizing the object.
- * makeGeometryChange() is called so points are recomputed, control items are positionnated and shape is determined according to this modification.
- * Setting bounds' width less than 300 is not allowed.
- */
-void UBGraphicsAristo::setBoundingRect(QRectF boundingRect)
-{
- if (boundingRect.width() < 300)
- return;
+ QRectF mappedRect = t.mapRect(markerButtonRect());
+ path.lineTo(QPointF(mappedRect.translated(rotationCenter()).left(), A.y()));
+ if (!markerIsInPolygon) {
+ if (mOrientation == Top) {
+ path.lineTo(QPointF(mappedRect.translated(rotationCenter()).left(), mappedRect.translated(rotationCenter()).bottom()));
+ path.lineTo(QPointF(mappedRect.translated(rotationCenter()).right(), mappedRect.translated(rotationCenter()).bottom()));
+ }
+ else if (mOrientation == Bottom) {
+ path.lineTo(QPointF(mappedRect.translated(rotationCenter()).left(), mappedRect.translated(rotationCenter()).top()));
+ path.lineTo(QPointF(mappedRect.translated(rotationCenter()).right(), mappedRect.translated(rotationCenter()).top()));
+ }
+ }
+ path.lineTo(QPointF(mappedRect.translated(rotationCenter()).right(), A.y()));
- QPainterPath path;
- path.addRect(boundingRect);
- setPath(path);
- if (mOrientation != Undefined)
- makeGeometryChange();
-}
+ path.lineTo(QPointF(resizeButtonRect().translated(rotationCenter()).left(), A.y()));
+ if (mOrientation == Top) {
+ path.lineTo(QPointF(resizeButtonRect().translated(rotationCenter()).left(), resizeButtonRect().translated(rotationCenter()).bottom()));
+ path.lineTo(QPointF(resizeButtonRect().translated(rotationCenter()).right(), resizeButtonRect().translated(rotationCenter()).bottom()));
+ }
+ else if (mOrientation == Bottom) {
+ path.lineTo(QPointF(resizeButtonRect().translated(rotationCenter()).left(), resizeButtonRect().translated(rotationCenter()).top()));
+ path.lineTo(QPointF(resizeButtonRect().translated(rotationCenter()).right(), resizeButtonRect().translated(rotationCenter()).top()));
+ }
+ path.lineTo(QPointF(resizeButtonRect().translated(rotationCenter()).right(), A.y()));
-void UBGraphicsAristo::makeGeometryChange()
-{
- calculatePoints();
- setItemsPos();
- setPath(determinePath());
-}
+ path.lineTo(B);
+ path.lineTo(C);
+ path.lineTo(A);
+ return path;
+}
UBItem* UBGraphicsAristo::deepCopy(void) const
{
@@ -191,7 +215,6 @@ void UBGraphicsAristo::copyItemParameters(UBItem *copy) const
/* TODO: copy all members */
cp->setPos(this->pos());
cp->setTransform(this->transform());
- cp->setBoundingRect(boundingRect());
cp->setOrientation(mOrientation);
cp->mRotatedAngle = mRotatedAngle;
cp->mMarkerAngle = mMarkerAngle;
@@ -501,7 +524,8 @@ QRectF UBGraphicsAristo::hFlipRect() const
QRectF UBGraphicsAristo::markerButtonRect() const
{
- return QRectF (radius()/2 - mMarkerSvgItem->boundingRect().width(), - mMarkerSvgItem->boundingRect().height()/2, mMarkerSvgItem->boundingRect().width(), mMarkerSvgItem->boundingRect().height());
+ qreal y = - mMarkerSvgItem->boundingRect().height()/2;
+ return QRectF (radius()/2 - mMarkerSvgItem->boundingRect().width(), y, mMarkerSvgItem->boundingRect().width(), mMarkerSvgItem->boundingRect().height());
}
QRectF UBGraphicsAristo::resizeButtonRect() const
@@ -580,7 +604,7 @@ void UBGraphicsAristo::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
else if (mResizing) {
QPointF delta = event->pos() - event->lastPos();
- setBoundingRect(QRectF(boundingRect().topLeft(), QSizeF(boundingRect().width() + delta.x(), boundingRect().height() + delta.x())));
+ calculatePoints(QRectF(boundingRect().topLeft(), QSizeF(boundingRect().width() + delta.x(), boundingRect().height() + delta.x())));
}
else if(mMarking) {
qreal angle = currentLine.angleTo(lastLine);
@@ -611,6 +635,8 @@ void UBGraphicsAristo::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (mResizing || mRotating || mMarking)
{
+ if (mMarking)
+ setPath(determinePath());
mResizing = false;
mRotating = false;
mMarking = false;
@@ -623,9 +649,7 @@ void UBGraphicsAristo::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
hide();
emit hidden();
break;
- case HorizontalFlip:
- /* substracting difference to zero [2pi] twice, to obtain the desired angle */
- mMarkerAngle -= 2 * (mMarkerAngle - (int)(mMarkerAngle/360)*360) - 360;
+ case HorizontalFlip:
/* setting new orientation */
switch(mOrientation) {
case Bottom:
diff --git a/src/tools/UBGraphicsAristo.h b/src/tools/UBGraphicsAristo.h
index 8d23d7e5..2d7af92b 100644
--- a/src/tools/UBGraphicsAristo.h
+++ b/src/tools/UBGraphicsAristo.h
@@ -66,8 +66,7 @@ public:
Undefined
};
- void setOrientation(Orientation orientation);
- void setBoundingRect(QRectF boundingRect);
+ void setOrientation(Orientation orientation);
virtual UBItem* deepCopy() const;
virtual void copyItemParameters(UBItem *copy) const;
@@ -113,10 +112,9 @@ private:
QTransform calculateRotationTransform();
void rotateAroundCenter(QTransform& transform, QPointF center);
- void calculatePoints();
+ void calculatePoints(QRectF bounds);
QPainterPath determinePath();
void setItemsPos();
- void makeGeometryChange();
QBrush fillBrush() const;
void paintGraduations(QPainter *painter);