From 5134200245ac692fe8a6d34951da8da35a994915 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 13:26:39 +0200 Subject: [PATCH 1/9] new style for etudier --- .../interactivities/Etudier.wgt/css/basic.css | 14 ++++ .../interactivities/Etudier.wgt/index.html | 1 + .../interactivities/Etudier.wgt/js/script.js | 81 ++++++++++++------- .../Etudier.wgt/locales/fr/index.html | 1 + .../Etudier.wgt/locales/fr/js/script.js | 81 ++++++++++++------- .../Etudier.wgt/locales/ru/index.html | 1 + .../Etudier.wgt/locales/ru/js/script.js | 81 ++++++++++++------- 7 files changed, 176 insertions(+), 84 deletions(-) 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; } } From 622f179fa805db35530b2f714c411b4705bfa21a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 14:43:28 +0200 Subject: [PATCH 2/9] new style for ordre images and ordre lettres --- .../Ordre images.wgt/css/basic.css | 14 ++++ .../Ordre images.wgt/index.html | 1 + .../Ordre images.wgt/js/script.js | 83 ++++++++++++------- .../Ordre images.wgt/locales/fr/index.html | 1 + .../Ordre images.wgt/locales/fr/js/script.js | 83 ++++++++++++------- .../Ordre images.wgt/locales/ru/index.html | 1 + .../Ordre images.wgt/locales/ru/js/script.js | 83 ++++++++++++------- .../Ordre lettres.wgt/css/basic.css | 14 ++++ .../Ordre lettres.wgt/index.html | 1 + .../Ordre lettres.wgt/js/script.js | 83 ++++++++++++------- .../Ordre lettres.wgt/locales/fr/index.html | 1 + .../Ordre lettres.wgt/locales/fr/js/script.js | 83 ++++++++++++------- .../Ordre lettres.wgt/locales/ru/index.html | 1 + .../Ordre lettres.wgt/locales/ru/js/script.js | 83 ++++++++++++------- 14 files changed, 352 insertions(+), 180 deletions(-) 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; } } From 144161edaa998228674e1daa775f125dc1d799fc Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 14:51:22 +0200 Subject: [PATCH 3/9] new style for ordre mots --- .../interactivities/Ordre mots.wgt/index.html | 1 + .../Ordre mots.wgt/locales/fr/index.html | 1 + .../locales/fr/scripts/template2.js | 83 ++++++++++++------- .../Ordre mots.wgt/locales/ru/index.html | 1 + .../locales/ru/scripts/template2.js | 83 ++++++++++++------- .../Ordre mots.wgt/scripts/template2.js | 83 ++++++++++++------- .../Ordre mots.wgt/styles/of_puppets.css | 13 +++ 7 files changed, 175 insertions(+), 90 deletions(-) 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 From 7b6b3243a84e5a5ba60b15ea8b69ed3dc93e243a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 15:22:15 +0200 Subject: [PATCH 4/9] new style for ordre phrase --- .../Ordre phrase.wgt/index.html | 1 + .../Ordre phrase.wgt/locales/fr/index.html | 1 + .../locales/fr/script/template2.js | 85 ++++++++++++------- .../Ordre phrase.wgt/locales/ru/index.html | 1 + .../locales/ru/script/template2.js | 83 +++++++++++------- .../Ordre phrase.wgt/scripts/template2.js | 83 +++++++++++------- .../Ordre phrase.wgt/styles/of_puppets.css | 14 +++ 7 files changed, 177 insertions(+), 91 deletions(-) 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 From 47df29d128fc0bf8cf39cb3e93b65ffbd730d748 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 15:32:41 +0200 Subject: [PATCH 5/9] new style for selectionner --- .../Selectionner.wgt/css/basic.css | 14 ++++ .../Selectionner.wgt/index.html | 1 + .../Selectionner.wgt/js/script.js | 83 ++++++++++++------- .../Selectionner.wgt/locales/fr/index.html | 1 + .../Selectionner.wgt/locales/fr/js/script.js | 83 ++++++++++++------- .../Selectionner.wgt/locales/ru/index.html | 1 + .../Selectionner.wgt/locales/ru/js/script.js | 83 ++++++++++++------- 7 files changed, 176 insertions(+), 90 deletions(-) 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; } } From 37ae60efcc91726d5c9794282f7975a34694c697 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 15:44:39 +0200 Subject: [PATCH 6/9] new style for separe phrase --- .../Separe phrase.wgt/index.html | 2 + .../Separe phrase.wgt/locales/fr/index.html | 1 + .../locales/fr/scripts/wcontainer.js | 3 +- .../Separe phrase.wgt/locales/ru/index.html | 1 + .../locales/ru/scripts/wcontainer.js | 3 +- .../Separe phrase.wgt/scripts/app.js | 80 ++++++++++++------- .../Separe phrase.wgt/scripts/wcontainer.js | 3 +- .../Separe phrase.wgt/styles/app.css | 14 ++++ 8 files changed, 75 insertions(+), 32 deletions(-) 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 From 48342897df77ac1cb12c500f74f67a94617c5d00 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Jul 2012 15:49:28 +0200 Subject: [PATCH 7/9] new style for separe text --- .../Separe texte.wgt/index.html | 1 + .../Separe texte.wgt/locales/fr/index.html | 1 + .../locales/fr/scripts/wcontainer.js | 3 +- .../Separe texte.wgt/locales/ru/index.html | 1 + .../locales/ru/scripts/wcontainer.js | 3 +- .../Separe texte.wgt/scripts/app2.js | 80 ++++++++++++------- .../Separe texte.wgt/scripts/wcontainer.js | 3 +- .../Separe texte.wgt/styles/app.css | 14 ++++ 8 files changed, 74 insertions(+), 32 deletions(-) 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 From 27f18d0b77b04d38df97dcf58ddcaab8fe053926 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Wed, 18 Jul 2012 18:14:12 +0300 Subject: [PATCH 8/9] SANKORE-742 - new icons for group/ungroup action, play tool and z-layer buttons used. Fixed a bug - grouped items cannot be dragged by itself now. --- resources/forms/mainWindow.ui | 3 ++- resources/images/cursors/play.png | Bin 0 -> 3202 bytes resources/images/stylusPalette/handPlay.png | Bin 444 -> 3006 bytes resources/images/stylusPalette/handPlayOn.png | Bin 603 -> 3356 bytes resources/images/toolbar/group.png | Bin 0 -> 2000 bytes resources/images/toolbar/ungroup.png | Bin 0 -> 2268 bytes resources/images/z_layer_down.svg | 17 +++++++++++++++++ resources/images/z_layer_up.svg | 17 +++++++++++++++++ resources/sankore.qrc | 5 +++++ src/board/UBBoardView.cpp | 12 ++++++++++-- src/domain/UBGraphicsItemDelegate.cpp | 4 ++-- src/gui/UBResources.cpp | 1 + src/gui/UBResources.h | 1 + 13 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 resources/images/cursors/play.png create mode 100644 resources/images/toolbar/group.png create mode 100644 resources/images/toolbar/ungroup.png create mode 100644 resources/images/z_layer_down.svg create mode 100644 resources/images/z_layer_up.svg 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 0000000000000000000000000000000000000000..25030dd13fcd5471b951d04e5904ac55256a8d07 GIT binary patch literal 3202 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 literal 0 HcmV?d00001 diff --git a/resources/images/stylusPalette/handPlay.png b/resources/images/stylusPalette/handPlay.png index 999f7703d66dae1639681e63fc28e21af797d040..186c81da56a5fa276b3cc02ee1fd4f473d8fa84e 100644 GIT binary patch literal 3006 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 literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^3Lq@N1|*eVE!z&H*pj^6UH*dsXT|0>giAM^CGh6EVT@eK}I{QXl0@4-Tu zY1>9nL&MgQMI!Tv$XS;6`Twz)D1FNW_l#d@FqipQOydTSzq-^le%lx3;c>pj4yXTeQ3LZ z)3vB)u^C_eH~4bDkT$gP5kH@}k9Bk2wC?Bw=M21lsEH=z9x;CS(TDk1t9%^e9WRTu zN85XEJj{D(an7@b;oj5K0!!BFFThYxEpd$~Nl7e8wMs5Z1yT$~28M>Z24=cO1|f#V uRwf2k21eQjMpgy}o!0HnC>nC}Q!>*kaclUIX8#|kfx*+&&t;ucLK6TUUan#Q diff --git a/resources/images/stylusPalette/handPlayOn.png b/resources/images/stylusPalette/handPlayOn.png index 9191cffa6fd56a93b1671b4b0522e0cec721baf2..5b86d97e35044c56a2b87a907909f9d54e4e7189 100644 GIT binary patch literal 3356 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 D2Ttn+ diff --git a/resources/images/toolbar/group.png b/resources/images/toolbar/group.png new file mode 100644 index 0000000000000000000000000000000000000000..95dbf738554383886841f8e912e74f0d10019a3e GIT binary patch literal 2000 zcmaJ?dsGu=7N7F6U=TzlAPa=>r~*l50wIqQ9(nMn4MjpVSVTiIzzE5NWH13y8?;&k zv384=0xGZqcF!6u(v`=`V=-O8*9t2b&MK|cN(BT35o%#4R_y+IOeV`3DPzmY;bEju9S0Xsz?hVzQ)DSM937YZN|%G% zW;cyYdIiBUx#ZuHl8E9-d{hmS7*voV14AHENH7%&2HC;vKoT8s$g0ItU+_sGQ4qV-sVs$4qpvRF;tz1qFGC~7@vV+s3rqd zk@#W;6(WhGGDKlPYC!tbj|#HK+(8=kVD)2x72V{NP{+f`kw|5)uj+ zj35>$q%#FV!4g-1%5oI25?kWRf9JB7<(h{)kJ)@PxcK4C=)+2U-qrYEKg+LS0)Q1SRuGw}Gqr9R z`amXhS*+BU#MA^wlcFimL~$FOvB-%`NxXB?*ZAU5QP@tO&mB*_pFgu>$^l$>D+*GI zTKyjPFk+HU6s;Wm<}YW**%d>@_bWQ9a{5+=O)_@W25HhB&i;C(x44V_U1w*fJs|$v zM_6y&Sf90cQ*vO@kFo!=h2iq@a<@O}XVdZ3`TZm%S8<1Wk?=^l^Tbk`QS|b}X_`A4Y8R%c1>PZERE8mDJsZ&V!B}7Mrww~+kvziX@N>ndG`7c1 zhU-(t>U8z#rB>tpT^l{5FK=w6PNuo4-b!qa5LEg!G@NW<#@Sx6olVOIjz@R&20utc$=gD{BXE` zpPZ*!4FWw9t}fIYORqNSwKWYyv(ElOn{J&Oh zF@^UFjk{WI*|}Z{BQ}4k|Hj~I>UV7ZXkvJ0S)g>E3#aYv8{1Mx&P+O87KLdaM~|~s zSAR{&8};ldnV?&io|TMDKW3)){<4kGMp5vBD(9OB>x81Zncd4|hNjkltn;jrVb9VsXHv;quk znO+uF4_0(_ot{`1c;_6&{Y%|X;y~ZFGt3UZYOfXC%4?0&NJ>Y?#e(7~Cu3duuz0Ao zAsL7ho@WM#3sZW=--$r`KN>Kt?i^`3Ek(J7jnmFg-S%LN-bZ7u0_}a!@6df#Z&b?m zBeox(h^ss1ef%FqC!2J2DUbK0@sA4+{Pjume3ol{Nc_Nz#YIE6)o|V1+#GFSV8GLf z{LJ6u>?geM5qjCnQ#baIY~|Db6T}JM@pZ0}oS^~THs&)cL(u6p*|Fm{7wtd*xKVxG Tk09S^eq&>Waf0)_ody2^|4<_# literal 0 HcmV?d00001 diff --git a/resources/images/toolbar/ungroup.png b/resources/images/toolbar/ungroup.png new file mode 100644 index 0000000000000000000000000000000000000000..48f229a970ee6d59acee03157eccf23a7eb132eb GIT binary patch literal 2268 zcmaJ@X;>3k7A**%$Rg5>BEoctAgCd!$^s@30TY&>L5M*RMGT=J!6X%vK*G|3E8qen zZsRDliY!W#0mLx0pbd%$qvF!-4A?-^D1r)TPY{rZT~V>;hfaN8y?XC{=bU@)yZ1-s zhJ^-M&2g9m0Du)cn8iiESoC$AZHBHub0ZF27b*jylG=qLfjbHFNfg8Pi6^9kY zGjNeq4#<%)VWB8EO%AV13*`yYwhCzRINz06A2l5nkibelRxJ@r6?8QN_g2VLd4Xhyv0mG(46BLLd<$5kW5x2&7ZJ=pcms z_~6iN^7sTgmlgOi7kXmggi581P9&;SDuRkkK;(%;h(@CkK@yQf@<0(Did3nRulA5C z7SAZKV1+;~k|{-q6l+lA$05l|1`c)lp#+KSldM$n@tV*JBdYl_B18ZUCCvaioc|A% zNIszzN-q4T-_Hswc&Rd&$b}V1vRr^RE@81Dm5k1m!+a$o=OKuA<`%<*h!Rl<5gC@b zj!J;A9KJv#HALPsI2<}#s!;N!0+`KW;7|>MNEAWzR~ou9sZ65W*|rB}I(Q<*woyo3pE&s|DUvt!lWtu=~ow*8R^X+;-$H zAz$t}G1)WTI6lDEN{XureKWUTbYZ6py8?@^_f}fR;ZGfRuo&<>$aioH3<`=kA_{qB z5%cf4MU3>^9}shj>@+ zW#5VmF75wM&kvD3`_nC8Zn)O@xkar_rlTL# z>~R4gbar{}s_#g#|8+_dWqb#4Nlz|r*O9O7;fcwX!;|YzoHOwlYS!z08a9vKy?OJd zL*yBogZC#?Y;$>i)BNHXR}wIQPajj(aae~Hb{-XmdT<@mKDUwu!dG|MdroL(Ip+Z*Oyo1+VH!sWYbB&xPuF;a_z9-=ek$OD@~t1js$JmZ=!3q|{i z+Y0yIw)9EI_2qkC5{@oh75T2($AUyFKWDS=?U6}>?ODN|S&q$%>^x#art^kg+8b@j z<29Wh4M*0-Ri)1(?Z4Oe_bpYGo13i>tI{^Nk=;+L-VM@TG4gG!PmBIFfApkR>$>1` z_Ll3TRcvvk@bDjSP#X64E}&1>xUYj(@coe0e<>bf}f{Izul zV%@g;4f1`vez2ZhZx^~t8ZDR6FtI8kzPM&Y{_sZgb(0!8GoxpJ;^SfQH%#Hc0!x!) zKi1C1lOt+p-DbO;^n0PJaA~a*c0z+dR*QRP8O41WGqA2=fH4yF%d?)m!@<yw(!b1j$sD?`C!o1Zke?xX_$2})9u?$i;Ma##t$9v znYZx#qh6rJwcYDp%NVCp)0BNi6<7r(TO97&;4W(eZA1sHGO*W&Diq?ltS*D zrFdz!`EHouyrk5rgJ|~aD|HcfvQhn{{pfcUPMdTDPU0dx>4N=Kkl9c25P zvvN!~PYe;c4cma+`uh4sF)=Z%%Xhdx1nn(*P8Aj&bg?z>cik5hOr=t9SC}3tD@brH me?0caDIy|rv)PZC#+HEJzAmXAgV!1UH`oE8EX}GdJO2PqD5`Y; literal 0 HcmV?d00001 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/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; From a8ce51169fc7bea84d270d597dafa45c1c1aca4b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Jul 2012 12:27:32 +0200 Subject: [PATCH 9/9] some style fixes --- resources/library/interactivities/Ass images.wgt/css/basic.css | 2 +- resources/library/interactivities/Ass sons.wgt/css/basic.css | 2 +- resources/library/interactivities/Cat images.wgt/css/basic.css | 2 +- resources/library/interactivities/Cat text.wgt/css/basic.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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