diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index 51369796..cad8daa5 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass 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; } @@ -32,14 +32,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; @@ -288,58 +280,42 @@ 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; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; -} .btl_pad{ background-image: url(../img/pad-top-left.png) !important; @@ -373,43 +349,44 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } +/*new update 26 09 2012*/ + .pad_color{ - color: white !important; + color: #FC9 !important; + text-shadow: none !important; } .pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; + background: url(../img/toolbar-reload.png) left top no-repeat !important; } .pad_edit{ - background-image: url(../img/slate-display.png) !important; + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !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; @@ -419,4 +396,35 @@ 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/Ass images.wgt/img/parameters-bg.png b/resources/library/interactivities/Ass images.wgt/img/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Ass images.wgt/img/parameters-bg.png differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-display.png b/resources/library/interactivities/Ass images.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-edit.png b/resources/library/interactivities/Ass images.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png b/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-help.png b/resources/library/interactivities/Ass images.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png differ diff --git a/resources/library/interactivities/Ass images.wgt/img/toolbar-help.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Ass images.wgt/img/toolbar-help.png differ diff --git a/resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png differ diff --git a/resources/library/interactivities/Ass images.wgt/index.html b/resources/library/interactivities/Ass images.wgt/index.html index dd36faee..cf873ad1 100644 --- a/resources/library/interactivities/Ass images.wgt/index.html +++ b/resources/library/interactivities/Ass images.wgt/index.html @@ -55,11 +55,6 @@
-   @@ -69,7 +64,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/js/script.js b/resources/library/interactivities/Ass images.wgt/js/script.js index f819ddd5..c2322d84 100644 --- a/resources/library/interactivities/Ass images.wgt/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "Select the number \"three\".", 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("associer","")){ @@ -46,11 +49,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"); @@ -71,7 +76,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -82,7 +87,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); @@ -186,8 +191,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); container.find(".imgs_answers").find(".img_block").each(function(){ @@ -196,8 +200,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -279,7 +281,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".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.mode = "edit"; cont_obj.imgs = []; @@ -296,7 +298,7 @@ function exportData(){ } else { $(".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.mode = "display"; cont_obj.imgs = []; @@ -325,7 +327,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); } @@ -340,11 +342,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); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -623,7 +625,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -641,10 +642,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"); @@ -658,10 +659,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"); @@ -675,10 +676,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/Ass images.wgt/locales/fr/index.html b/resources/library/interactivities/Ass images.wgt/locales/fr/index.html index 1fb435c9..d4c628de 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js index cf4e8353..967256d0 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Sélectionner le numéro «trois».", add: "Nouveau bloc", @@ -11,28 +11,28 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content:"

Associer des images

"+ -"

Faire correspondre une image à la consigne indiquée.

"+ + "

Faire correspondre une image à la consigne indiquée.

"+ -"

L’activité s’effectue par un glisser-déposer de l’image dans la zone délimitée. Si le résultat est incorrect, la zone se colore en rouge. Si le résultat est correct, la zone se colore en vert.

"+ + "

L’activité s’effectue par un glisser-déposer de l’image dans la zone délimitée. Si le résultat est incorrect, la zone se colore en rouge. Si le résultat est correct, 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 :

"+ -""+ + "

Le bouton “Modifier” vous permet :

"+ + ""+ -"

En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis

"+ -""+ -"

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.

"+ + "

En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis

"+ + ""+ + "

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.

"+ - -"

Le bouton “Afficher” vous permet d’utiliser l’activité.

" + "

Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.

"+ + "

Le bouton “Afficher” vous permet d’utiliser l’activité.

", + theme: "Thème" }; //main function @@ -44,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","")){ @@ -68,11 +70,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"); @@ -93,7 +97,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -103,7 +107,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); @@ -206,7 +210,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); @@ -216,8 +220,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -299,7 +301,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".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.mode = "edit"; cont_obj.imgs = []; @@ -316,7 +318,7 @@ function exportData(){ } else { $(".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.mode = "display"; cont_obj.imgs = []; @@ -345,7 +347,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); } @@ -360,11 +362,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); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -638,7 +640,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -656,10 +657,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"); @@ -673,10 +674,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"); @@ -690,10 +691,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/Ass images.wgt/locales/ru/index.html b/resources/library/interactivities/Ass images.wgt/locales/ru/index.html index 1fb435c9..d4c628de 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ass images.wgt/locales/ru/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js index 0b840aaa..1ada2d43 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", short_desc: "Выберите число \"три\".", add: "Новый блок", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; @@ -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","")){ @@ -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()); }) @@ -82,7 +87,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); @@ -185,7 +190,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); @@ -195,8 +200,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -278,7 +281,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".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.mode = "edit"; cont_obj.imgs = []; @@ -295,7 +298,7 @@ function exportData(){ } else { $(".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.mode = "display"; cont_obj.imgs = []; @@ -324,7 +327,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); } @@ -339,11 +342,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); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -617,7 +620,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -635,10 +637,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"); @@ -652,10 +654,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"); @@ -669,10 +671,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; } }