diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 0582f8da..0ce11f87 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1637,7 +1637,8 @@ - :/images/toolbar/library.png:/images/toolbar/library.png + :/images/toolbar/group.png + :/images/toolbar/ungroup.png:/images/toolbar/group.png Group Items diff --git a/resources/images/cursors/play.png b/resources/images/cursors/play.png new file mode 100644 index 00000000..25030dd1 Binary files /dev/null and b/resources/images/cursors/play.png differ diff --git a/resources/images/stylusPalette/handPlay.png b/resources/images/stylusPalette/handPlay.png index 999f7703..186c81da 100644 Binary files a/resources/images/stylusPalette/handPlay.png and b/resources/images/stylusPalette/handPlay.png differ diff --git a/resources/images/stylusPalette/handPlayOn.png b/resources/images/stylusPalette/handPlayOn.png index 9191cffa..5b86d97e 100644 Binary files a/resources/images/stylusPalette/handPlayOn.png and b/resources/images/stylusPalette/handPlayOn.png differ diff --git a/resources/images/toolbar/group.png b/resources/images/toolbar/group.png new file mode 100644 index 00000000..95dbf738 Binary files /dev/null and b/resources/images/toolbar/group.png differ diff --git a/resources/images/toolbar/ungroup.png b/resources/images/toolbar/ungroup.png new file mode 100644 index 00000000..48f229a9 Binary files /dev/null and b/resources/images/toolbar/ungroup.png differ diff --git a/resources/images/z_layer_down.svg b/resources/images/z_layer_down.svg new file mode 100644 index 00000000..02908437 --- /dev/null +++ b/resources/images/z_layer_down.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + + + + + + diff --git a/resources/images/z_layer_up.svg b/resources/images/z_layer_up.svg new file mode 100644 index 00000000..746b6c9a --- /dev/null +++ b/resources/images/z_layer_up.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + + + + + + diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index 7c8e2fa3..1af8b6a6 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass images.wgt/css/basic.css @@ -396,5 +396,5 @@ body{ .none_select{ background-color: #333 !important; color: white !important; - background-image: url(../images/ar_down_white.png) !important; + background-image: url(../img/ar_down_white.png) !important; } diff --git a/resources/library/interactivities/Ass sons.wgt/css/basic.css b/resources/library/interactivities/Ass sons.wgt/css/basic.css index ebf0387c..86a7248c 100644 --- a/resources/library/interactivities/Ass sons.wgt/css/basic.css +++ b/resources/library/interactivities/Ass sons.wgt/css/basic.css @@ -439,5 +439,5 @@ body{ .none_select{ background-color: #333 !important; color: white !important; - background-image: url(../images/ar_down_white.png) !important; + background-image: url(../img/ar_down_white.png) !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Cat images.wgt/css/basic.css b/resources/library/interactivities/Cat images.wgt/css/basic.css index 8374bd64..ee34f168 100644 --- a/resources/library/interactivities/Cat images.wgt/css/basic.css +++ b/resources/library/interactivities/Cat images.wgt/css/basic.css @@ -381,5 +381,5 @@ body{ .none_select{ background-color: #333 !important; color: white !important; - background-image: url(../images/ar_down_white.png) !important; + background-image: url(../img/ar_down_white.png) !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Cat text.wgt/css/basic.css b/resources/library/interactivities/Cat text.wgt/css/basic.css index 2885e08e..086731a4 100644 --- a/resources/library/interactivities/Cat text.wgt/css/basic.css +++ b/resources/library/interactivities/Cat text.wgt/css/basic.css @@ -403,5 +403,5 @@ body{ .none_select{ background-color: #333 !important; color: white !important; - background-image: url(../images/ar_down_white.png) !important; + background-image: url(../img/ar_down_white.png) !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Etudier.wgt/css/basic.css b/resources/library/interactivities/Etudier.wgt/css/basic.css index ec2546dd..e87791c8 100644 --- a/resources/library/interactivities/Etudier.wgt/css/basic.css +++ b/resources/library/interactivities/Etudier.wgt/css/basic.css @@ -466,3 +466,17 @@ li>div{ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Etudier.wgt/index.html b/resources/library/interactivities/Etudier.wgt/index.html index a2913915..cfd57663 100644 --- a/resources/library/interactivities/Etudier.wgt/index.html +++ b/resources/library/interactivities/Etudier.wgt/index.html @@ -54,6 +54,7 @@   diff --git a/resources/library/interactivities/Etudier.wgt/js/script.js b/resources/library/interactivities/Etudier.wgt/js/script.js index 1b7f9d25..90a9f3c3 100644 --- a/resources/library/interactivities/Etudier.wgt/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/js/script.js @@ -6,7 +6,8 @@ var sankoreLang = { new_slide: "This is new slide.", wgt_name: "Slider", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; //some flags @@ -28,6 +29,7 @@ function start(){ $("#wgt_name").text(sankoreLang.wgt_name); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("etudier","")){ @@ -40,7 +42,7 @@ function start(){ changeStyle(sankore.preference("etudier_style","")); $(".style_select").val(sankore.preference("etudier_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -513,32 +515,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Etudier.wgt/locales/fr/index.html b/resources/library/interactivities/Etudier.wgt/locales/fr/index.html index 58c723ad..bfcfd56a 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Etudier.wgt/locales/fr/index.html @@ -28,6 +28,7 @@   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 981e4775..2c378bdb 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js @@ -6,7 +6,8 @@ var sankoreLang = { new_slide: "Ceci est une nouvelle diapositive.", wgt_name: "Etudier", slate: "Bois", - pad: "Pad" + pad: "Pad", + none: "Aucun" }; //some flags @@ -28,6 +29,7 @@ function start(){ $("#wgt_name").text(sankoreLang.wgt_name); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("etudier","")){ @@ -40,7 +42,7 @@ function start(){ changeStyle(sankore.preference("etudier_style","")); $(".style_select").val(sankore.preference("etudier_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -514,32 +516,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Etudier.wgt/locales/ru/index.html b/resources/library/interactivities/Etudier.wgt/locales/ru/index.html index 67244de2..72ab9627 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Etudier.wgt/locales/ru/index.html @@ -28,6 +28,7 @@   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 bc12ccc4..11cd85a1 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js @@ -6,7 +6,8 @@ var sankoreLang = { new_slide: "Это - новый слайд.", wgt_name: "Слайдер", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; //some flags @@ -28,6 +29,7 @@ function start(){ $("#wgt_name").text(sankoreLang.wgt_name); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("etudier","")){ @@ -40,7 +42,7 @@ function start(){ changeStyle(sankore.preference("etudier_style","")); $(".style_select").val(sankore.preference("etudier_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -512,32 +514,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css index ecb63981..5ee47f9a 100644 --- a/resources/library/interactivities/Ordre images.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css @@ -349,3 +349,17 @@ body{ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Ordre images.wgt/index.html b/resources/library/interactivities/Ordre images.wgt/index.html index e8e11b60..4719f037 100644 --- a/resources/library/interactivities/Ordre images.wgt/index.html +++ b/resources/library/interactivities/Ordre images.wgt/index.html @@ -54,6 +54,7 @@   diff --git a/resources/library/interactivities/Ordre images.wgt/js/script.js b/resources/library/interactivities/Ordre images.wgt/js/script.js index 114974e0..791b9d28 100644 --- a/resources/library/interactivities/Ordre images.wgt/js/script.js +++ b/resources/library/interactivities/Ordre images.wgt/js/script.js @@ -7,7 +7,8 @@ var sankoreLang = { wgt_name: "Order images", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; //main function @@ -19,6 +20,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -280,7 +282,7 @@ function importData(data){ //example function showExample(){ - changeStyle(1); + changeStyle("3"); var tmp_array = []; var container = $("
"); @@ -417,34 +419,55 @@ function refreshImgNumbers(source){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + 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 d211d3e5..144a3b3a 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html @@ -28,6 +28,7 @@   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 6237e012..02b392b9 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 @@ -8,7 +8,8 @@ var sankoreLang = { wgt_name: "Ordonner des images", reload: "Recharger", slate: "ardoise", - pad: "tablette" + pad: "tablette", + none: "aucun" }; //main function @@ -20,6 +21,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -273,7 +275,7 @@ function importData(data){ //example function showExample(){ - changeStyle(1); + changeStyle("3"); var tmp_array = []; var container = $("
"); @@ -409,34 +411,55 @@ function refreshImgNumbers(source){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + 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 d211d3e5..144a3b3a 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html @@ -28,6 +28,7 @@   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 861a4ea8..d033c1b0 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 @@ -8,7 +8,8 @@ var sankoreLang = { wgt_name: "Верный порядок", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; //main function @@ -20,6 +21,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -273,7 +275,7 @@ function importData(data){ //example function showExample(){ - changeStyle(1); + changeStyle("3"); var tmp_array = []; var container = $("
"); @@ -409,34 +411,55 @@ function refreshImgNumbers(source){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 87d3e2b0..1bcdec7b 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -395,3 +395,17 @@ body{ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Ordre lettres.wgt/index.html b/resources/library/interactivities/Ordre lettres.wgt/index.html index aaf069d9..0715e1a6 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/index.html @@ -54,6 +54,7 @@   diff --git a/resources/library/interactivities/Ordre lettres.wgt/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/js/script.js index 8dc17955..32c7f1df 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/js/script.js @@ -8,7 +8,8 @@ var sankoreLang = { wgt_name: "Order the letters", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; //main function @@ -20,6 +21,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("associer_sound","")){ @@ -32,7 +34,7 @@ function start(){ changeStyle(sankore.preference("ord_let_style","")); $(".style_select").val(sankore.preference("ord_let_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -430,34 +432,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + 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 ef8c9d5c..1ab412a3 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html @@ -28,6 +28,7 @@   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 203f6dd4..3584f83f 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 @@ -8,7 +8,8 @@ var sankoreLang = { wgt_name: "Ordonner les lettres", reload: "Recharger", slate: "Bois", - pad: "Pad" + pad: "Pad", + none: "Aucun" }; //main function @@ -20,6 +21,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("associer_sound","")){ @@ -32,7 +34,7 @@ function start(){ changeStyle(sankore.preference("ord_let_style","")); $(".style_select").val(sankore.preference("ord_let_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -424,34 +426,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/index.html b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/index.html index 261886d7..192e73cf 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/index.html @@ -28,6 +28,7 @@   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 108a369b..befb959f 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 @@ -8,7 +8,8 @@ var sankoreLang = { wgt_name: "Порядок букв", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; @@ -21,6 +22,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("associer_sound","")){ @@ -33,7 +35,7 @@ function start(){ changeStyle(sankore.preference("ord_let_style","")); $(".style_select").val(sankore.preference("ord_let_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -425,34 +427,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre mots.wgt/index.html b/resources/library/interactivities/Ordre mots.wgt/index.html index 7be228c2..9a7cb14b 100644 --- a/resources/library/interactivities/Ordre mots.wgt/index.html +++ b/resources/library/interactivities/Ordre mots.wgt/index.html @@ -65,6 +65,7 @@   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 9cce9af8..09bf56aa 100644 --- a/resources/library/interactivities/Ordre mots.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre mots.wgt/locales/fr/index.html @@ -36,6 +36,7 @@   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 973e684a..f1b68890 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 @@ -33,7 +33,8 @@ var sankoreLang = { wgt_name: "Ordonner des mots", reload: "Recharger", slate: "ardoise", - pad: "tablette" + pad: "tablette", + none: "aucun" }; var word = ""; @@ -70,7 +71,7 @@ $(document).ready(function(){ changeStyle(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -145,6 +146,7 @@ $(document).ready(function(){ $(".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()); @@ -188,34 +190,55 @@ function createWordLetters( word ) //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } 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 9cce9af8..09bf56aa 100644 --- a/resources/library/interactivities/Ordre mots.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ordre mots.wgt/locales/ru/index.html @@ -36,6 +36,7 @@   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 7b4525eb..58b2a419 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 @@ -33,7 +33,8 @@ var sankoreLang = { wgt_name: "Порядок слов", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; var word = ""; @@ -70,7 +71,7 @@ $(document).ready(function(){ changeStyle(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -145,6 +146,7 @@ $(document).ready(function(){ $(".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()); @@ -188,34 +190,55 @@ function createWordLetters( word ) //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js index fd15f644..19bdfbc8 100644 --- a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js +++ b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js @@ -33,7 +33,8 @@ var sankoreLang = { wgt_name: "Order words", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; var word = ""; @@ -69,7 +70,7 @@ $(document).ready(function(){ changeStyle(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -144,6 +145,7 @@ $(document).ready(function(){ $(".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()); @@ -187,34 +189,55 @@ function createWordLetters( word ) //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } 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 8a7f4c62..8be4a1f7 100644 --- a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css +++ b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css @@ -244,3 +244,16 @@ body{ background-image: url(../img/ar_down_white.png) !important; } +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Ordre phrase.wgt/index.html b/resources/library/interactivities/Ordre phrase.wgt/index.html index c5ea718c..b360cad9 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/index.html +++ b/resources/library/interactivities/Ordre phrase.wgt/index.html @@ -62,6 +62,7 @@   diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html index 149c2d2f..33f1b81b 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/index.html @@ -38,6 +38,7 @@   diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js index d7f465fa..2afb7f67 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js +++ b/resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js @@ -28,11 +28,12 @@ function checkResponse() var sankoreLang = { view: "Afficher", edit: "Modifier", - example: "Cette phrase\nest un\nexemple", + example: "Cette phrase\nest un\nexample", wgt_name: "Ordonner des phrases", reload: "Recharger", slate: "ardoise", - pad: "tablette" + pad: "tablette", + none: "aucun" }; @@ -69,7 +70,7 @@ $(document).ready(function(){ changeStyle(sankore.preference("ord_phrases_style","")); $(".style_select").val(sankore.preference("ord_phrases_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -123,6 +124,7 @@ $(document).ready(function(){ $(".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()); @@ -179,34 +181,55 @@ function createElements( sentence ) //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html index 149c2d2f..33f1b81b 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/index.html @@ -38,6 +38,7 @@   diff --git a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js index 7d904fce..f5c72ca3 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js +++ b/resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js @@ -32,7 +32,8 @@ var sankoreLang = { wgt_name: "Порядок фраз", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" } @@ -69,7 +70,7 @@ $(document).ready(function(){ changeStyle(sankore.preference("ord_phrases_style","")); $(".style_select").val(sankore.preference("ord_phrases_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -123,6 +124,7 @@ $(document).ready(function(){ $(".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()); @@ -179,34 +181,55 @@ function createElements( sentence ) //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js b/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js index 9de7bcc5..d55f26eb 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js +++ b/resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js @@ -33,7 +33,8 @@ var sankoreLang = { wgt_name: "Order phrases", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" } @@ -71,7 +72,7 @@ $(document).ready(function(){ changeStyle(sankore.preference("ord_phrases_style","")); $(".style_select").val(sankore.preference("ord_phrases_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -125,6 +126,7 @@ $(document).ready(function(){ $(".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()); @@ -181,34 +183,55 @@ function createElements( sentence ) //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css index 5be10099..d99114b6 100644 --- a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css +++ b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css @@ -248,3 +248,17 @@ body{ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Selectionner.wgt/css/basic.css b/resources/library/interactivities/Selectionner.wgt/css/basic.css index 4206550a..75e7c3aa 100644 --- a/resources/library/interactivities/Selectionner.wgt/css/basic.css +++ b/resources/library/interactivities/Selectionner.wgt/css/basic.css @@ -426,3 +426,17 @@ body{ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Selectionner.wgt/index.html b/resources/library/interactivities/Selectionner.wgt/index.html index 8f7780ad..2d064cae 100644 --- a/resources/library/interactivities/Selectionner.wgt/index.html +++ b/resources/library/interactivities/Selectionner.wgt/index.html @@ -54,6 +54,7 @@   diff --git a/resources/library/interactivities/Selectionner.wgt/js/script.js b/resources/library/interactivities/Selectionner.wgt/js/script.js index 01d3c3a1..b8c299fa 100644 --- a/resources/library/interactivities/Selectionner.wgt/js/script.js +++ b/resources/library/interactivities/Selectionner.wgt/js/script.js @@ -12,7 +12,8 @@ var sankoreLang = { wgt_name: "Select the desired", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; //main function @@ -24,6 +25,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("selectionner","")){ @@ -35,7 +37,7 @@ function start(){ changeStyle(sankore.preference("sel_style","")); $(".style_select").val(sankore.preference("sel_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -409,34 +411,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html b/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html index c4d2501f..ce540ec1 100644 --- a/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Selectionner.wgt/locales/fr/index.html @@ -28,6 +28,7 @@   diff --git a/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js b/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js index bf16c78b..b798bdfb 100644 --- a/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Selectionner.wgt/locales/fr/js/script.js @@ -12,7 +12,8 @@ var sankoreLang = { wgt_name: "Sélectionner", reload: "Recharger", slate: "ardoise", - pad: "tablette" + pad: "tablette", + none: "aucun" }; //main function @@ -24,6 +25,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("selectionner","")){ @@ -35,7 +37,7 @@ function start(){ changeStyle(sankore.preference("sel_style","")); $(".style_select").val(sankore.preference("sel_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -398,34 +400,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html b/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html index ef6ecfa7..6c4d34f9 100644 --- a/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Selectionner.wgt/locales/ru/index.html @@ -28,6 +28,7 @@   diff --git a/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js b/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js index f4870852..33e5c16c 100644 --- a/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Selectionner.wgt/locales/ru/js/script.js @@ -12,7 +12,8 @@ var sankoreLang = { wgt_name: "Выбрать верное", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; //main function @@ -24,6 +25,7 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $(".style_select option[value='1']").text(sankoreLang.slate); $(".style_select option[value='2']").text(sankoreLang.pad); + $(".style_select option[value='3']").text(sankoreLang.none); if(window.sankore){ if(sankore.preference("selectionner","")){ @@ -35,7 +37,7 @@ function start(){ changeStyle(sankore.preference("sel_style","")); $(".style_select").val(sankore.preference("sel_style","")); } else - changeStyle(1) + changeStyle("3") } else showExample(); @@ -396,34 +398,55 @@ function stringToXML(text){ //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Separe phrase.wgt/index.html b/resources/library/interactivities/Separe phrase.wgt/index.html index 39aec3dd..02e74da7 100644 --- a/resources/library/interactivities/Separe phrase.wgt/index.html +++ b/resources/library/interactivities/Separe phrase.wgt/index.html @@ -27,6 +27,7 @@ lang = sankore.locale().substr(0,2); } else lang = "en"; + lang = "fr"; if(lang != "en"){ returnStatus(lang); } @@ -60,6 +61,7 @@   diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html b/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html index 3de192ac..32486fa5 100644 --- a/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Separe phrase.wgt/locales/fr/index.html @@ -38,6 +38,7 @@   diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js index ada805bd..1c7f9eb3 100644 --- a/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js +++ b/resources/library/interactivities/Separe phrase.wgt/locales/fr/scripts/wcontainer.js @@ -5,7 +5,8 @@ var sankoreLang = { wgt_name: "Séparer une phrase", reload: "Recharger", slate: "ardoise", - pad: "tablette" + pad: "tablette", + none: "aucun" }; // if use the "view/edit" button or rely on the api instead diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html b/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html index 374a8df1..f584fd83 100644 --- a/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Separe phrase.wgt/locales/ru/index.html @@ -39,6 +39,7 @@   diff --git a/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js index 161bb48c..880ccd69 100644 --- a/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js +++ b/resources/library/interactivities/Separe phrase.wgt/locales/ru/scripts/wcontainer.js @@ -5,7 +5,8 @@ var sankoreLang = { wgt_name: "Разделить фразу", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; // if use the "view/edit" button or rely on the api instead diff --git a/resources/library/interactivities/Separe phrase.wgt/scripts/app.js b/resources/library/interactivities/Separe phrase.wgt/scripts/app.js index c62559f5..b574bb2f 100644 --- a/resources/library/interactivities/Separe phrase.wgt/scripts/app.js +++ b/resources/library/interactivities/Separe phrase.wgt/scripts/app.js @@ -49,7 +49,7 @@ $(document).ready(function() changeStyle(sankore.preference("spl_phrase_style","")); $(".style_select").val(sankore.preference("spl_phrase_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); @@ -87,6 +87,7 @@ $(document).ready(function() $(".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()); @@ -243,34 +244,55 @@ $(document).ready(function() //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js b/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js index 2615c641..3e59f8cc 100644 --- a/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js +++ b/resources/library/interactivities/Separe phrase.wgt/scripts/wcontainer.js @@ -5,7 +5,8 @@ var sankoreLang = { wgt_name: "Split a phrase", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; // if use the "view/edit" button or rely on the api instead diff --git a/resources/library/interactivities/Separe phrase.wgt/styles/app.css b/resources/library/interactivities/Separe phrase.wgt/styles/app.css index 5fa5e105..a98aef3d 100644 --- a/resources/library/interactivities/Separe phrase.wgt/styles/app.css +++ b/resources/library/interactivities/Separe phrase.wgt/styles/app.css @@ -221,3 +221,17 @@ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/library/interactivities/Separe texte.wgt/index.html b/resources/library/interactivities/Separe texte.wgt/index.html index 6bd093b5..3990e44e 100644 --- a/resources/library/interactivities/Separe texte.wgt/index.html +++ b/resources/library/interactivities/Separe texte.wgt/index.html @@ -63,6 +63,7 @@   diff --git a/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html b/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html index 9cafe97a..c6966082 100644 --- a/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Separe texte.wgt/locales/fr/index.html @@ -38,6 +38,7 @@   diff --git a/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js index be05f117..251b9ebd 100644 --- a/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js +++ b/resources/library/interactivities/Separe texte.wgt/locales/fr/scripts/wcontainer.js @@ -5,7 +5,8 @@ var sankoreLang = { wgt_name: "Séparer un texte", reload: "Recharger", slate: "ardoise", - pad: "tablette" + pad: "tablette", + none: "aucun" }; // if use the "view/edit" button or rely on the api instead diff --git a/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html b/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html index 9cafe97a..c6966082 100644 --- a/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Separe texte.wgt/locales/ru/index.html @@ -38,6 +38,7 @@   diff --git a/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js index fce33cae..1beee2c7 100644 --- a/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js +++ b/resources/library/interactivities/Separe texte.wgt/locales/ru/scripts/wcontainer.js @@ -5,7 +5,8 @@ var sankoreLang = { wgt_name: "Разделить текст", reload: "Обновить", slate: "Узор", - pad: "Планшет" + pad: "Планшет", + none: "Нет" }; // if use the "view/edit" button or rely on the api instead diff --git a/resources/library/interactivities/Separe texte.wgt/scripts/app2.js b/resources/library/interactivities/Separe texte.wgt/scripts/app2.js index 7ba30a47..7ae34291 100644 --- a/resources/library/interactivities/Separe texte.wgt/scripts/app2.js +++ b/resources/library/interactivities/Separe texte.wgt/scripts/app2.js @@ -50,7 +50,7 @@ $(document).ready(function() changeStyle(sankore.preference("spl_text_style","")); $(".style_select").val(sankore.preference("spl_text_style","")); } else - changeStyle(1) + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); @@ -88,6 +88,7 @@ $(document).ready(function() $(".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()); @@ -246,34 +247,55 @@ $(document).ready(function() //changing the style function changeStyle(val){ - if(val == 1){ - $(".b_top_left").removeClass("btl_pad"); - $(".b_top_center").removeClass("btc_pad"); - $(".b_top_right").removeClass("btr_pad"); - $(".b_center_left").removeClass("bcl_pad"); - $(".b_center_right").removeClass("bcr_pad"); - $(".b_bottom_right").removeClass("bbr_pad"); - $(".b_bottom_left").removeClass("bbl_pad"); - $(".b_bottom_center").removeClass("bbc_pad"); - $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); - $("#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"); - } else { - $(".b_top_left").addClass("btl_pad"); - $(".b_top_center").addClass("btc_pad"); - $(".b_top_right").addClass("btr_pad"); - $(".b_center_left").addClass("bcl_pad"); - $(".b_center_right").addClass("bcr_pad"); - $(".b_bottom_right").addClass("bbr_pad"); - $(".b_bottom_left").addClass("bbl_pad"); - $(".b_bottom_center").addClass("bbc_pad"); - $("#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("pad_select"); + switch(val){ + case "1": + $(".b_top_left").removeClass("btl_pad").removeClass("without_back"); + $(".b_top_center").removeClass("btc_pad").removeClass("without_back"); + $(".b_top_right").removeClass("btr_pad").removeClass("without_back"); + $(".b_center_left").removeClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").removeClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").removeClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); + $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); + $("#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"); + break; + case "2": + $(".b_top_left").addClass("btl_pad").removeClass("without_back"); + $(".b_top_center").addClass("btc_pad").removeClass("without_back"); + $(".b_top_right").addClass("btr_pad").removeClass("without_back"); + $(".b_center_left").addClass("bcl_pad").removeClass("without_back"); + $(".b_center_right").addClass("bcr_pad").removeClass("without_back"); + $(".b_bottom_right").addClass("bbr_pad").removeClass("without_back"); + $(".b_bottom_left").addClass("bbl_pad").removeClass("without_back"); + $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); + $("#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("pad_select").removeClass("none_select").val(val); + $("body, html").removeClass("without_radius"); + break; + case "3": + $(".b_top_left").addClass("without_back").removeClass("btl_pad"); + $(".b_top_center").addClass("without_back").removeClass("btc_pad"); + $(".b_top_right").addClass("without_back").removeClass("btr_pad"); + $(".b_center_left").addClass("without_back").removeClass("bcl_pad"); + $(".b_center_right").addClass("without_back").removeClass("bcr_pad"); + $(".b_bottom_right").addClass("without_back").removeClass("bbr_pad"); + $(".b_bottom_left").addClass("without_back").removeClass("bbl_pad"); + $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); + $("#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"); + break; } } diff --git a/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js b/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js index bfaedbfb..a5598ca1 100644 --- a/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js +++ b/resources/library/interactivities/Separe texte.wgt/scripts/wcontainer.js @@ -5,7 +5,8 @@ var sankoreLang = { wgt_name: "Split a text", reload: "Reload", slate: "Wood", - pad: "Pad" + pad: "Pad", + none: "None" }; // if use the "view/edit" button or rely on the api instead diff --git a/resources/library/interactivities/Separe texte.wgt/styles/app.css b/resources/library/interactivities/Separe texte.wgt/styles/app.css index 4b54902a..cba95823 100644 --- a/resources/library/interactivities/Separe texte.wgt/styles/app.css +++ b/resources/library/interactivities/Separe texte.wgt/styles/app.css @@ -221,3 +221,17 @@ color: white !important; background-image: url(../img/ar_down_white.png) !important; } + +.without_radius{ + border-radius: 0 !important; +} + +.without_back{ + background: none !important; +} + +.none_select{ + background-color: #333 !important; + color: white !important; + background-image: url(../img/ar_down_white.png) !important; +} \ No newline at end of file diff --git a/resources/sankore.qrc b/resources/sankore.qrc index d07c048f..d9263dbd 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -42,6 +42,8 @@ images/currentDocument.png images/minus.svg images/plus.svg + images/z_layer_up.svg + images/z_layer_down.svg images/trash.png images/pin.svg images/unpin.svg @@ -49,6 +51,8 @@ images/reload.svg images/frozen.svg images/unfrozen.svg + images/toolbar/group.png + images/toolbar/ungroup.png images/toolbar/window.png images/toolbar/plusBlack.png images/toolbar/plusBlackOn.png @@ -183,6 +187,7 @@ images/cursors/resize.png images/cursors/drawCompass.png images/cursors/drawRulerLine.png + images/cursors/play.png images/print/onepage.png images/print/thumbnails.png images/print/twopages.png diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 1e347acc..c3a47261 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -637,6 +637,12 @@ void UBBoardView::rubberItems() { if (mUBRubberBand) mRubberedItems = items(mUBRubberBand->geometry()); + + foreach(QGraphicsItem *item, mRubberedItems) + { + if (item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type()) + mRubberedItems.removeOne(item); + } } void UBBoardView::moveRubberedItems(QPointF movingVector) @@ -945,7 +951,9 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) } else { - movingItem->setSelected(true); + if ( QGraphicsSvgItem::Type != movingItem->type() + && UBGraphicsDelegateFrame::Type != movingItem->type()) + movingItem->setSelected(true); } } @@ -1360,7 +1368,7 @@ UBBoardView::setToolCursor (int tool) controlViewport->setCursor (UBResources::resources ()->arrowCursor); break; case UBStylusTool::Play: - controlViewport->setCursor (UBResources::resources ()->drawLineRulerCursor); + controlViewport->setCursor (UBResources::resources ()->playCursor); break; case UBStylusTool::Line: controlViewport->setCursor (UBResources::resources ()->penCursor); diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index d48c30dc..e4a7f747 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -137,12 +137,12 @@ void UBGraphicsItemDelegate::init() connect(mMenuButton, SIGNAL(clicked()), this, SLOT(showMenu())); mButtons << mMenuButton; - mZOrderUpButton = new DelegateButton(":/images/plus.svg", mDelegated, mFrame, Qt::BottomLeftSection); + mZOrderUpButton = new DelegateButton(":/images/z_layer_up.svg", mDelegated, mFrame, Qt::BottomLeftSection); connect(mZOrderUpButton, SIGNAL(clicked()), this, SLOT(increaseZLevelUp())); connect(mZOrderUpButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelTop())); mButtons << mZOrderUpButton; - mZOrderDownButton = new DelegateButton(":/images/minus.svg", mDelegated, mFrame, Qt::BottomLeftSection); + mZOrderDownButton = new DelegateButton(":/images/z_layer_down.svg", mDelegated, mFrame, Qt::BottomLeftSection); connect(mZOrderDownButton, SIGNAL(clicked()), this, SLOT(increaseZLevelDown())); connect(mZOrderDownButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelBottom())); mButtons << mZOrderDownButton; diff --git a/src/gui/UBResources.cpp b/src/gui/UBResources.cpp index 0bcad20d..191480f0 100644 --- a/src/gui/UBResources.cpp +++ b/src/gui/UBResources.cpp @@ -60,6 +60,7 @@ void UBResources::init() zoomInCursor = QCursor(QPixmap(":/images/cursors/zoomIn.png"), 9, 9); zoomOutCursor = QCursor(QPixmap(":/images/cursors/zoomOut.png"), 9, 9); arrowCursor = QCursor(Qt::ArrowCursor); + playCursor = QCursor(QPixmap(":/images/cursors/play.png"), 6, 1); textCursor = QCursor(Qt::ArrowCursor); rotateCursor = QCursor(QPixmap(":/images/cursors/rotate.png"), 16, 16); drawLineRulerCursor = QCursor(QPixmap(":/images/cursors/drawRulerLine.png"), 3, 12); diff --git a/src/gui/UBResources.h b/src/gui/UBResources.h index fcba66e3..66a61880 100644 --- a/src/gui/UBResources.h +++ b/src/gui/UBResources.h @@ -47,6 +47,7 @@ class UBResources : public QObject QCursor zoomInCursor; QCursor zoomOutCursor; QCursor arrowCursor; + QCursor playCursor; QCursor textCursor; QCursor rotateCursor; QCursor drawLineRulerCursor;