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/Ordre images.wgt/img/parameters-bg.png b/resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png differ 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/Ordre images.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png differ 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/Ordre images.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png differ 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 :

"+ -""+ + "

Le bouton “Modifier” vous permet :

"+ + ""+ -"

Pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis

"+ -""+ + "

Pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis

"+ + ""+ -"

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 {