diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/sankore_ar.ts index f968263f..b8f8da2e 100644 --- a/resources/i18n/sankore_ar.ts +++ b/resources/i18n/sankore_ar.ts @@ -999,10 +999,6 @@ UBDesktopPalette - - Show Uniboard - اظهار Uniboard - Capture Part of the Screen التقاط جزء من الشاشة @@ -1023,6 +1019,10 @@ Show Desktop on Secondary Screen اظهار سطح المكتب على الشاشة الثانوية + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_bg.ts b/resources/i18n/sankore_bg.ts index d91721df..762d5632 100644 --- a/resources/i18n/sankore_bg.ts +++ b/resources/i18n/sankore_bg.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Покажи Uniboard - Capture Part of the Screen Снимай част от екрана @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Покажи работния плот на втория екран + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_ca.ts b/resources/i18n/sankore_ca.ts index e834ed9a..1f72cc63 100644 --- a/resources/i18n/sankore_ca.ts +++ b/resources/i18n/sankore_ca.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Mostra l'Uniboard - Capture Part of the Screen Captura part de la pantalla @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Mostra l'escriptori a la pantalla secundària + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_cs.ts b/resources/i18n/sankore_cs.ts index 996b0efd..1fd6cf2a 100644 --- a/resources/i18n/sankore_cs.ts +++ b/resources/i18n/sankore_cs.ts @@ -1016,14 +1016,14 @@ Capture Part of the Screen Zachytit část obrazovky - - Show Uniboard - Zobrazit Uniboard - Show Board on Secondary Screen Zobrazit tabuli na druhé obrazovce + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/sankore_da.ts index 9ecd53d7..a1fbd5f0 100644 --- a/resources/i18n/sankore_da.ts +++ b/resources/i18n/sankore_da.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Vis Uniboard - Capture Part of the Screen Klip del af skærmen @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Vis skrivebord på sekundær skærm + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/sankore_de.ts index 66561e7e..44025bc7 100644 --- a/resources/i18n/sankore_de.ts +++ b/resources/i18n/sankore_de.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Uniboard anzeigen - Capture Part of the Screen Teil des Bildschirms erfassen @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Desktop auf zweitem Bildschirm anzeigen + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_el.ts b/resources/i18n/sankore_el.ts index 7493a349..5dc08fe1 100644 --- a/resources/i18n/sankore_el.ts +++ b/resources/i18n/sankore_el.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Εμφάνιση του Uniboard - Capture Part of the Screen Λήψη στιγμιότυπου μέρους της οθόνης @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Εμφάνιση της Επιφάνειας Εργασίας στη δευτερεύουσα οθόνη + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/sankore_en.ts index 777fff1d..1ab20cad 100644 --- a/resources/i18n/sankore_en.ts +++ b/resources/i18n/sankore_en.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - - Capture Part of the Screen @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/sankore_en_UK.ts index de1feb6a..e5af0865 100644 --- a/resources/i18n/sankore_en_UK.ts +++ b/resources/i18n/sankore_en_UK.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - - Capture Part of the Screen @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/sankore_es.ts index c4bedb1f..f7959826 100644 --- a/resources/i18n/sankore_es.ts +++ b/resources/i18n/sankore_es.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Mostrar Uniboard - Capture Part of the Screen Capturar parte de la pantalla @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Mostrar escritorio en la pantalla secundaria + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 94da0ee4..6b2894cf 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -999,11 +999,6 @@ UBDesktopPalette - - Show Uniboard - Attention : dans la version en anglais le terme Uniboard devrait être remplacé par open-Sankoré ! - Afficher Open-Sankoré - Capture Part of the Screen Capturer une partie de l'écran @@ -1024,6 +1019,10 @@ Show Desktop on Secondary Screen Afficher le bureau sur l'écran secondaire + + Show Open-Sankore + Afficher Open-Sankoré + UBDocumentController diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index 94da0ee4..6b2894cf 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -999,11 +999,6 @@ UBDesktopPalette - - Show Uniboard - Attention : dans la version en anglais le terme Uniboard devrait être remplacé par open-Sankoré ! - Afficher Open-Sankoré - Capture Part of the Screen Capturer une partie de l'écran @@ -1024,6 +1019,10 @@ Show Desktop on Secondary Screen Afficher le bureau sur l'écran secondaire + + Show Open-Sankore + Afficher Open-Sankoré + UBDocumentController diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/sankore_it.ts index c041d0ed..2566a2f0 100644 --- a/resources/i18n/sankore_it.ts +++ b/resources/i18n/sankore_it.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Mostra Uniboard - Capture Part of the Screen Cattura parte della schermata @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Mostra il desktop sullo schermo secondario + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/sankore_iw.ts index e8844096..71bb6236 100644 --- a/resources/i18n/sankore_iw.ts +++ b/resources/i18n/sankore_iw.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - הצג Uniboard - Capture Part of the Screen לכד חלק מהמסך @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen הצג את שולחן העבודה על מסך משני + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/sankore_ja.ts index d15cee05..53d31fa9 100644 --- a/resources/i18n/sankore_ja.ts +++ b/resources/i18n/sankore_ja.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Uniboard表示 - Capture Part of the Screen 画面の一部をキャプチャ @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen サブスクリーンにデスクトップを表示 + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/sankore_ko.ts index f37e3275..30406471 100644 --- a/resources/i18n/sankore_ko.ts +++ b/resources/i18n/sankore_ko.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - 유니보드 보이기 - Capture Part of the Screen 화면 일부 캡처 @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen 보조 화면에 바탕 화면 보이기 + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_mg.ts b/resources/i18n/sankore_mg.ts index f2f58f7a..9b347d0e 100644 --- a/resources/i18n/sankore_mg.ts +++ b/resources/i18n/sankore_mg.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Asehoy ny Uniboard - Capture Part of the Screen Maka ampahan'ny efijery @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Aseho ny sehatr'asa amin'ny efijery faharoa + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/sankore_nb.ts index 980ee822..ffe62895 100644 --- a/resources/i18n/sankore_nb.ts +++ b/resources/i18n/sankore_nb.ts @@ -1000,10 +1000,6 @@ UBDesktopPalette - - Show Uniboard - Vis Uniboard - Capture Part of the Screen Ta bilde av en del av skjermen @@ -1024,6 +1020,10 @@ Show Desktop on Secondary Screen Vis skrivebord på annen skjerm + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/sankore_nl.ts index a8d5b5ce..25471356 100644 --- a/resources/i18n/sankore_nl.ts +++ b/resources/i18n/sankore_nl.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Uniboard weergeven - Capture Part of the Screen Afdruk deel van scherm @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Desktop op bijscherm weergeven + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/sankore_pl.ts index 7447a12d..756a4adb 100644 --- a/resources/i18n/sankore_pl.ts +++ b/resources/i18n/sankore_pl.ts @@ -1002,10 +1002,6 @@ UBDesktopPalette - - Show Uniboard - Pokaż Uniboard - Capture Part of the Screen Przechwyć część ekranu @@ -1026,6 +1022,10 @@ Show Desktop on Secondary Screen Pokaż pulpit na ekranie podrzędnym + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/sankore_pt.ts index 0df640a2..b685f171 100644 --- a/resources/i18n/sankore_pt.ts +++ b/resources/i18n/sankore_pt.ts @@ -1000,10 +1000,6 @@ UBDesktopPalette - - Show Uniboard - Mostrar Uniboard - Capture Part of the Screen Capturar Parte do Ecrã @@ -1024,6 +1020,10 @@ Show Desktop on Secondary Screen Mostrar Ambiente de Trabalho num Ecrã Secundário + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_rm.ts b/resources/i18n/sankore_rm.ts index b6f7d258..ec1f7644 100644 --- a/resources/i18n/sankore_rm.ts +++ b/resources/i18n/sankore_rm.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - - Capture Part of the Screen @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/sankore_ro.ts index 4717d96c..3fe91340 100644 --- a/resources/i18n/sankore_ro.ts +++ b/resources/i18n/sankore_ro.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Afişare Uniboard - Capture Part of the Screen Capturare parte de ecran @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Afişare desktop pe ecran secundar + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/sankore_ru.ts index 3da00209..c3bd0d65 100644 --- a/resources/i18n/sankore_ru.ts +++ b/resources/i18n/sankore_ru.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Показать Uniboard - Capture Part of the Screen Сделать снимок части экрана @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Показать раб. стол на втором экране + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_sk.ts b/resources/i18n/sankore_sk.ts index 2abdedfd..ab4dfd6e 100644 --- a/resources/i18n/sankore_sk.ts +++ b/resources/i18n/sankore_sk.ts @@ -1016,14 +1016,14 @@ Capture Part of the Screen Označiť časť obrazovky - - Show Uniboard - Zobraziť Uniboard - Show Board on Secondary Screen Zobraziť tabuľu na druhej obrazovke + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/sankore_sv.ts index 30c626fb..f96ec2c4 100644 --- a/resources/i18n/sankore_sv.ts +++ b/resources/i18n/sankore_sv.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Visa Uniboard - Capture Part of the Screen Fånga en del av skärmen @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Visa skrivbordet på den sekundära skärmen + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_tr.ts b/resources/i18n/sankore_tr.ts index 1cebe4c5..0790888f 100755 --- a/resources/i18n/sankore_tr.ts +++ b/resources/i18n/sankore_tr.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - Uniboard'u Göster - Capture Part of the Screen Ekranın Bir Bölümünü Yakala @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen Masaüstünü İkincil Ekranda Göster + + Show Open-Sankore + + UBDocumentController diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/sankore_zh.ts index c5317571..6033c385 100644 --- a/resources/i18n/sankore_zh.ts +++ b/resources/i18n/sankore_zh.ts @@ -998,10 +998,6 @@ UBDesktopPalette - - Show Uniboard - 显示演示板 - Capture Part of the Screen 部分截图 @@ -1022,6 +1018,10 @@ Show Desktop on Secondary Screen 在第二屏幕显示桌面 + + Show Open-Sankore + + UBDocumentController diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index 51369796..cad8daa5 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass images.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -32,14 +32,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -288,58 +280,42 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; -} .btl_pad{ background-image: url(../img/pad-top-left.png) !important; @@ -373,43 +349,44 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } +/*new update 26 09 2012*/ + .pad_color{ - color: white !important; + color: #FC9 !important; + text-shadow: none !important; } .pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; + background: url(../img/toolbar-reload.png) left top no-repeat !important; } .pad_edit{ - background-image: url(../img/slate-display.png) !important; + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -419,4 +396,35 @@ body{ .open{ +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Ass images.wgt/img/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Ass images.wgt/img/parameters-bg.png diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-display.png b/resources/library/interactivities/Ass images.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-edit.png b/resources/library/interactivities/Ass images.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png b/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-help.png b/resources/library/interactivities/Ass images.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Ass images.wgt/img/toolbar-help.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Ass images.wgt/index.html b/resources/library/interactivities/Ass images.wgt/index.html index dd36faee..cf873ad1 100644 --- a/resources/library/interactivities/Ass images.wgt/index.html +++ b/resources/library/interactivities/Ass images.wgt/index.html @@ -55,11 +55,6 @@
-   @@ -69,7 +64,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/js/script.js b/resources/library/interactivities/Ass images.wgt/js/script.js index f819ddd5..c2322d84 100644 --- a/resources/library/interactivities/Ass images.wgt/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "Select the number \"three\".", add: "Add new block", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -22,9 +23,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer","")){ @@ -46,11 +49,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -71,7 +76,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -82,7 +87,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -186,8 +191,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); - + $("#parameters").css("display", "block"); $(".cont").each(function(){ var container = $(this); container.find(".imgs_answers").find(".img_block").each(function(){ @@ -196,8 +200,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -279,7 +281,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "edit"; cont_obj.imgs = []; @@ -296,7 +298,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "display"; cont_obj.imgs = []; @@ -325,7 +327,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -340,11 +342,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -623,7 +625,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -641,10 +642,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -658,10 +659,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -675,10 +676,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/index.html b/resources/library/interactivities/Ass images.wgt/locales/fr/index.html index 1fb435c9..d4c628de 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js index cf4e8353..967256d0 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Sélectionner le numéro «trois».", add: "Nouveau bloc", @@ -11,28 +11,28 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content:"

Associer des images

"+ -"

Faire correspondre une image à la consigne indiquée.

"+ + "

Faire correspondre une image à la consigne indiquée.

"+ -"

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

"+ + "

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

"+ -"

Le bouton “Recharger” réinitialise les exercices.

"+ + "

Le bouton “Recharger” réinitialise les exercices.

"+ -"

Le bouton “Modifier” vous permet :

"+ -"
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
  • "+ -"
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ + "

Le bouton “Modifier” vous permet :

"+ + "
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
  • "+ + "
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ -"

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

"+ -"
  • insérez une consigne en cliquant sur le champ de texte “Saisir la consigne ici ...”,
  • "+ -"
  • ajoutez des zones image en cliquant sur le gros signe + en dessous,
  • "+ -"
  • insérez des images dans ces zones par glisser-déposer des images à partir de votre bibliothèque,
  • "+ -"
  • définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.
"+ -"

Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.

"+ -"

Pour changer d’image, cliquez sur l’icône située au milieu à droite de l’image.

"+ + "

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

"+ + "
  • insérez une consigne en cliquant sur le champ de texte “Saisir la consigne ici ...”,
  • "+ + "
  • ajoutez des zones image en cliquant sur le gros signe + en dessous,
  • "+ + "
  • insérez des images dans ces zones par glisser-déposer des images à partir de votre bibliothèque,
  • "+ + "
  • définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.
"+ + "

Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.

"+ + "

Pour changer d’image, cliquez sur l’icône située au milieu à droite de l’image.

"+ -"

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

"+ - -"

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

" + "

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

"+ + "

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

", + theme: "Thème" }; //main function @@ -44,9 +44,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer","")){ @@ -68,11 +70,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -93,7 +97,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -103,7 +107,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -206,7 +210,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display", "block"); $(".cont").each(function(){ var container = $(this); @@ -216,8 +220,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -299,7 +301,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "edit"; cont_obj.imgs = []; @@ -316,7 +318,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "display"; cont_obj.imgs = []; @@ -345,7 +347,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -360,11 +362,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -638,7 +640,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -656,10 +657,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -673,10 +674,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -690,10 +691,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ass images.wgt/locales/ru/index.html b/resources/library/interactivities/Ass images.wgt/locales/ru/index.html index 1fb435c9..d4c628de 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ass images.wgt/locales/ru/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js index 0b840aaa..1ada2d43 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", short_desc: "Выберите число \"три\".", add: "Новый блок", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; @@ -23,9 +24,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer","")){ @@ -47,11 +50,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -72,7 +77,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -82,7 +87,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -185,7 +190,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display", "block"); $(".cont").each(function(){ var container = $(this); @@ -195,8 +200,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -278,7 +281,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "edit"; cont_obj.imgs = []; @@ -295,7 +298,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "display"; cont_obj.imgs = []; @@ -324,7 +327,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -339,11 +342,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -617,7 +620,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -635,10 +637,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -652,10 +654,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -669,10 +671,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ass sons.wgt/css/basic.css b/resources/library/interactivities/Ass sons.wgt/css/basic.css index 9045c831..210ad969 100644 --- a/resources/library/interactivities/Ass sons.wgt/css/basic.css +++ b/resources/library/interactivities/Ass sons.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -28,14 +28,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -323,41 +315,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .style_select{ @@ -408,51 +399,50 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../img/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_reload{ + background: url(../img/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -461,5 +451,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Ass sons.wgt/img/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Ass sons.wgt/img/parameters-bg.png diff --git a/resources/library/interactivities/Ass sons.wgt/img/slate-display.png b/resources/library/interactivities/Ass sons.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Ass sons.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Ass sons.wgt/img/slate-edit.png b/resources/library/interactivities/Ass sons.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Ass sons.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Ass sons.wgt/img/slate-help-white.png b/resources/library/interactivities/Ass sons.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Ass sons.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass sons.wgt/img/slate-help.png b/resources/library/interactivities/Ass sons.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Ass sons.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-help.png diff --git a/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Ass sons.wgt/img/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Ass sons.wgt/img/toolbar-edit.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Ass sons.wgt/img/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Ass sons.wgt/img/toolbar-help.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Ass sons.wgt/img/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Ass sons.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Ass sons.wgt/index.html b/resources/library/interactivities/Ass sons.wgt/index.html index 1aec98d8..5cbaf925 100644 --- a/resources/library/interactivities/Ass sons.wgt/index.html +++ b/resources/library/interactivities/Ass sons.wgt/index.html @@ -51,12 +51,7 @@
-
- +
  @@ -66,7 +61,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass sons.wgt/js/script.js b/resources/library/interactivities/Ass sons.wgt/js/script.js index c93936a9..3b8f3efa 100644 --- a/resources/library/interactivities/Ass sons.wgt/js/script.js +++ b/resources/library/interactivities/Ass sons.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "How many signals do you hear?", add: "Add new block", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -22,9 +23,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer_sound","")){ @@ -35,7 +38,7 @@ function start(){ showExample(); if(sankore.preference("as_snd_style","")){ changeStyle(sankore.preference("as_snd_style","")); - $(".style_select").val(sankore.preference("as_snd_style","")); + $("#style_select").val(sankore.preference("as_snd_style","")); } else changeStyle("3") } @@ -46,18 +49,20 @@ function start(){ if (window.widget) { window.widget.onleave = function(){ exportData(); - sankore.setPreference("as_snd_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("as_snd_style", $("#style_select").find("option:selected").val()); } } $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -78,7 +83,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -89,7 +94,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -195,7 +200,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display", "block"); $(".cont").each(function(){ var container = $(this); @@ -777,10 +782,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -794,10 +799,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -811,10 +816,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ass sons.wgt/locales/fr/index.html b/resources/library/interactivities/Ass sons.wgt/locales/fr/index.html index 38c7a8c7..017e4471 100644 --- a/resources/library/interactivities/Ass sons.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ass sons.wgt/locales/fr/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js index e2aff630..184c4822 100644 --- a/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Combien de signaux entendez-vous?", add: "Nouveau bloc", @@ -11,28 +11,29 @@ var sankoreLang = { none: "Aucun", help: "Aide", help_content: "

Associer aux sons

"+ -"

Faire correspondre une image à un son.

"+ + "

Faire correspondre une image à un son.

"+ -"

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

"+ + "

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

"+ -"

Le bouton “Recharger” réinitialise les exercices.

"+ + "

Le bouton “Recharger” réinitialise les exercices.

"+ -"

Le bouton “Modifier” vous permet :

"+ -"
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
  • "+ -"
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ + "

Le bouton “Modifier” vous permet :

"+ + "
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
  • "+ + "
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ -"

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

"+ -"
  • insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+ -"
  • insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,
  • "+ -"
  • ajoutez des zones image en cliquant sur le gros signe + en dessous,
  • "+ -"
  • insérez des images par glisser-déposer des images à partir de votre bibliothèque,
  • "+ -"
  • définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.
"+ -"

Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.

"+ -"

Pour remplacer un son, glissez-déposez simplement un nouveau son.

"+ + "

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

"+ + "
  • insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+ + "
  • insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,
  • "+ + "
  • ajoutez des zones image en cliquant sur le gros signe + en dessous,
  • "+ + "
  • insérez des images par glisser-déposer des images à partir de votre bibliothèque,
  • "+ + "
  • définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.
"+ + "

Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.

"+ + "

Pour remplacer un son, glissez-déposez simplement un nouveau son.

"+ -"

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

"+ + "

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

"+ -"

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

" + "

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

", + theme: "Thème" }; @@ -45,9 +46,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer_sound","")){ @@ -58,7 +61,7 @@ function start(){ showExample(); if(sankore.preference("as_snd_style","")){ changeStyle(sankore.preference("as_snd_style","")); - $(".style_select").val(sankore.preference("as_snd_style","")); + $("#style_select").val(sankore.preference("as_snd_style","")); } else changeStyle("3") } @@ -69,18 +72,20 @@ function start(){ if (window.widget) { window.widget.onleave = function(){ exportData(); - sankore.setPreference("as_snd_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("as_snd_style", $("#style_select").find("option:selected").val()); } } $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -101,7 +106,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -112,7 +117,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -218,7 +223,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -785,10 +790,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -802,10 +807,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -819,10 +824,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ass sons.wgt/locales/ru/index.html b/resources/library/interactivities/Ass sons.wgt/locales/ru/index.html index 1fb435c9..d4c628de 100644 --- a/resources/library/interactivities/Ass sons.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ass sons.wgt/locales/ru/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass sons.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ass sons.wgt/locales/ru/js/script.js index f8ae3dfb..911c3af8 100644 --- a/resources/library/interactivities/Ass sons.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ass sons.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", short_desc: "Сколько сигналов вы слышите?", add: "Новый блок", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; //main function @@ -22,9 +23,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer_sound","")){ @@ -35,7 +38,7 @@ function start(){ showExample(); if(sankore.preference("as_snd_style","")){ changeStyle(sankore.preference("as_snd_style","")); - $(".style_select").val(sankore.preference("as_snd_style","")); + $("#style_select").val(sankore.preference("as_snd_style","")); } else changeStyle("3") } @@ -46,18 +49,20 @@ function start(){ if (window.widget) { window.widget.onleave = function(){ exportData(); - sankore.setPreference("as_snd_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("as_snd_style", $("#style_select").find("option:selected").val()); } } $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -78,7 +83,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -89,7 +94,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -195,7 +200,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -689,7 +694,7 @@ function addContainer(){ audio_block.attr("ondragenter", "return false;") .attr("ondragleave", "$(this).removeClass('audio_gray'); return false;") .attr("ondragover", "$(this).addClass('audio_gray'); return false;") - .attr("ondrop", "$(this).removeClass('audio_gray'); return onDropAudio(this,event);"); + .attr("ondrop", "$(this).removeClass('audio_gray'); return onDropAudio(this,event);"); $("
").appendTo(audio_block); $("
").appendTo(audio_block); var source = $("").attr("src", ""); @@ -762,10 +767,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -779,10 +784,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -796,10 +801,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } @@ -850,7 +855,7 @@ function onDropAudio(obj, event) { textData = stringToXML(textData); var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent; var tmp_type = textData.getElementsByTagName("type")[0].firstChild.textContent; - if(tmp_type.substr(0, 5) == "audio"){ + if(tmp_type.substr(0, 5) == "audio"){ var audio_block = $(obj); $(obj).find("audio").remove(); audio_block.find(":first-child").removeClass("stop").addClass("play"); diff --git a/resources/library/interactivities/Cat images.wgt/css/basic.css b/resources/library/interactivities/Cat images.wgt/css/basic.css index 1fd13dc1..a808c635 100644 --- a/resources/library/interactivities/Cat images.wgt/css/basic.css +++ b/resources/library/interactivities/Cat images.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -28,14 +28,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -264,57 +256,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; -} - -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -349,51 +324,50 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../img/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_reload{ + background: url(../img/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -402,5 +376,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Cat images.wgt/img/ar_down.png b/resources/library/interactivities/Cat images.wgt/img/ar_down.png deleted file mode 100644 index a20fab4f..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/ar_down.png and /dev/null differ diff --git a/resources/library/interactivities/Cat images.wgt/img/ar_down_white.png b/resources/library/interactivities/Cat images.wgt/img/ar_down_white.png deleted file mode 100644 index 4a1d133b..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Memory.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Cat images.wgt/img/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Cat images.wgt/img/parameters-bg.png diff --git a/resources/library/interactivities/Cat images.wgt/img/slate-display.png b/resources/library/interactivities/Cat images.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Cat images.wgt/img/slate-edit.png b/resources/library/interactivities/Cat images.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Cat images.wgt/img/slate-help-white.png b/resources/library/interactivities/Cat images.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat images.wgt/img/slate-help.png b/resources/library/interactivities/Cat images.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Cat images.wgt/img/slate-toolbar-help.png diff --git a/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Cat images.wgt/img/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Cat images.wgt/img/toolbar-edit.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Cat images.wgt/img/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Cat images.wgt/img/toolbar-help.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Cat images.wgt/img/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Cat images.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Cat images.wgt/index.html b/resources/library/interactivities/Cat images.wgt/index.html index 688bb52f..ba84f225 100644 --- a/resources/library/interactivities/Cat images.wgt/index.html +++ b/resources/library/interactivities/Cat images.wgt/index.html @@ -51,12 +51,7 @@
-
- +
  @@ -66,7 +61,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Cat images.wgt/js/script.js b/resources/library/interactivities/Cat images.wgt/js/script.js index ecf2d8aa..cf2f6d0c 100644 --- a/resources/library/interactivities/Cat images.wgt/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", first_desc: "Odd numbers", second_desc: "Even numbers", @@ -11,7 +11,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -23,9 +24,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_images","")){ @@ -47,11 +50,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -72,7 +77,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -81,7 +86,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); if(window.sankore) sankore.enableDropOnWidget(false); $(".add_block").remove(); @@ -152,7 +157,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); if(window.sankore) sankore.enableDropOnWidget(true); $(".cont").each(function(){ @@ -234,7 +239,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "edit"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -258,7 +263,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "display"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -292,7 +297,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -307,11 +312,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -625,10 +630,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -642,10 +647,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -659,10 +664,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Cat images.wgt/locales/fr/index.html b/resources/library/interactivities/Cat images.wgt/locales/fr/index.html index 7d188794..d8c5b635 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Cat images.wgt/locales/fr/index.html @@ -25,12 +25,7 @@
-
- +
  @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js index aad7172e..5b20fcd1 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", first_desc: "Les nombres impairs", second_desc: "Les nombres pairs", @@ -12,25 +12,26 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content: "

Catégoriser des images

"+ -"

Classer des images en fonction de la dénomination de la catégorie.

"+ + "

Classer des images en fonction de la dénomination de la catégorie.

"+ -"

L’activité s’effectue par un glisser-déposer de l’image dans la catégorie correspondante. Tant que toutes les images d’une catégorie ne sont pas classées, la zone reste rouge. Une fois que toutes les images sont classées dans la bonne catégorie, la zone se colore en vert.

"+ -"

Le bouton “Recharger” réinitialise les exercices.

"+ + "

L’activité s’effectue par un glisser-déposer de l’image dans la catégorie correspondante. Tant que toutes les images d’une catégorie ne sont pas classées, la zone reste rouge. Une fois que toutes les images sont classées dans la bonne catégorie, la zone se colore en vert.

"+ + "

Le bouton “Recharger” réinitialise les exercices.

"+ -"

Le bouton “Modifier” vous permet :

"+ -"
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun) ,
  • "+ -"
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ + "

Le bouton “Modifier” vous permet :

"+ + "
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun) ,
  • "+ + "
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ -"

En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, une zone bleue apparaît, c’est une catégorie, puis

"+ -"
  • insérez le nom de la catégorie (par exemple “fruits”, “légumes”, “mammifères”...) en cliquant dans le champ de texte “Saisir le nom de la catégorie ici …”,
  • "+ -"
  • insérez des images dans la catégorie par glisser-déposer des images à partir de votre bibliothèque,
  • "+ -"
  • ajoutez ensuite une catégorie (ou plusieurs) en cliquant sur le signe “+” situé à droite de la catégorie, complétez par son nom et ajoutez des images.
"+ -"

Pour supprimer une image, cliquez sur la croix située dans le coin supérieur droit de l’image.

"+ -"

Pour supprimer une catégorie, cliquez sur le signe “-” situé à droite de celle-ci.

"+ + "

En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, une zone bleue apparaît, c’est une catégorie, puis

"+ + "
  • insérez le nom de la catégorie (par exemple “fruits”, “légumes”, “mammifères”...) en cliquant dans le champ de texte “Saisir le nom de la catégorie ici …”,
  • "+ + "
  • insérez des images dans la catégorie par glisser-déposer des images à partir de votre bibliothèque,
  • "+ + "
  • ajoutez ensuite une catégorie (ou plusieurs) en cliquant sur le signe “+” situé à droite de la catégorie, complétez par son nom et ajoutez des images.
"+ + "

Pour supprimer une image, cliquez sur la croix située dans le coin supérieur droit de l’image.

"+ + "

Pour supprimer une catégorie, cliquez sur le signe “-” situé à droite de celle-ci.

"+ -"

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

"+ + "

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

"+ -"

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

" + "

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

", + theme: "Thème" }; //main function @@ -42,9 +43,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_images","")){ @@ -66,11 +69,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -91,7 +96,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -100,7 +105,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); sankore.enableDropOnWidget(false); $(".add_block").remove(); $(".cont").each(function(){ @@ -170,7 +175,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); sankore.enableDropOnWidget(true); $(".cont").each(function(){ var container = $(this); @@ -251,7 +256,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "edit"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -275,7 +280,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "display"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -309,7 +314,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -324,11 +329,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -656,10 +661,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -673,10 +678,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -690,10 +695,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Cat images.wgt/locales/ru/index.html b/resources/library/interactivities/Cat images.wgt/locales/ru/index.html index 10f242f8..66f8ca12 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Cat images.wgt/locales/ru/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js index dc92f1e6..06844011 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", first_desc: "Нечетные числа", second_desc: "Четные числа", @@ -11,7 +11,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; //main function @@ -23,9 +24,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_images","")){ @@ -47,11 +50,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -72,7 +77,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -81,7 +86,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); sankore.enableDropOnWidget(false); $(".add_block").remove(); $(".cont").each(function(){ @@ -151,7 +156,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); sankore.enableDropOnWidget(true); $(".cont").each(function(){ var container = $(this); @@ -232,7 +237,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "edit"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -244,8 +249,7 @@ function exportData(){ $(this).find(".img_block").each(function(){ var img_obj = new Object(); img_obj.value = $(this).find("input").val(); - img_obj.link = $(this).find("img").attr("src").replace("../../",""); - ; + img_obj.link = $(this).find("img").attr("src").replace("../../",""); img_obj.ht = $(this).find("img").height(); img_obj.wd = $(this).find("img").width(); img_cont.imgs.push(img_obj); @@ -257,7 +261,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "display"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -269,8 +273,7 @@ function exportData(){ $(this).find(".img_block").each(function(){ var img_obj = new Object(); img_obj.value = $(this).find("input").val(); - img_obj.link = $(this).find("img").attr("src").replace("../../",""); - ; + img_obj.link = $(this).find("img").attr("src").replace("../../",""); img_obj.ht = $(this).find("img").height(); img_obj.wd = $(this).find("img").width(); img_cont.imgs.push(img_obj); @@ -281,8 +284,7 @@ function exportData(){ $(this).find(".all_imgs .img_block").each(function(){ var img = new Object(); img.value = $(this).find("input").val(); - img.link = $(this).find("img").attr("src").replace("../../",""); - ; + img.link = $(this).find("img").attr("src").replace("../../",""); img.ht = $(this).find("img").height(); img.wd = $(this).find("img").width(); cont_obj.all_imgs.push(img); @@ -293,7 +295,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -308,11 +310,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -640,10 +642,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -657,10 +659,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -674,10 +676,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } @@ -689,7 +691,7 @@ function returnId(){ } //a func for checking when smth will drop -function checkOnDrop(dest){ +function checkOnDrop(dest){ var tmp_count = dest.find("input[name='count']").val(); var tmp_mask = dest.find("input[name='mask']").val(); if(dest.find(".img_block").size() == tmp_count){ diff --git a/resources/library/interactivities/Cat text.wgt/css/basic.css b/resources/library/interactivities/Cat text.wgt/css/basic.css index e73ae42c..849093d5 100644 --- a/resources/library/interactivities/Cat text.wgt/css/basic.css +++ b/resources/library/interactivities/Cat text.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -28,14 +28,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -286,57 +278,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; -} - -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -371,51 +346,50 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../img/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_reload{ + background: url(../img/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -424,5 +398,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Cat text.wgt/img/ar_down.png b/resources/library/interactivities/Cat text.wgt/img/ar_down.png deleted file mode 100644 index a20fab4f..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/ar_down.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/ar_down_white.png b/resources/library/interactivities/Cat text.wgt/img/ar_down_white.png deleted file mode 100644 index 4a1d133b..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/green_point.png b/resources/library/interactivities/Cat text.wgt/img/green_point.png deleted file mode 100644 index a2a44680..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/green_point.png and /dev/null differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Cat text.wgt/img/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Cat text.wgt/img/parameters-bg.png diff --git a/resources/library/interactivities/Cat text.wgt/img/red_point.png b/resources/library/interactivities/Cat text.wgt/img/red_point.png deleted file mode 100644 index f6daa19a..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/red_point.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-display.png b/resources/library/interactivities/Cat text.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-edit.png b/resources/library/interactivities/Cat text.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-help-white.png b/resources/library/interactivities/Cat text.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-help.png b/resources/library/interactivities/Cat text.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Cat text.wgt/img/slate-toolbar-help.png diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Cat text.wgt/img/toolbar-help.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Cat text.wgt/index.html b/resources/library/interactivities/Cat text.wgt/index.html index 688bb52f..9dddb48e 100644 --- a/resources/library/interactivities/Cat text.wgt/index.html +++ b/resources/library/interactivities/Cat text.wgt/index.html @@ -16,6 +16,7 @@ lang = sankore.locale().substr(0,2); } else lang = "en"; + lang = "fr"; if(lang == "en"){ if(window.sankore) sankore.enableDropOnWidget(false); @@ -51,12 +52,7 @@
-
- +
  @@ -66,7 +62,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Cat text.wgt/js/script.js b/resources/library/interactivities/Cat text.wgt/js/script.js index 0dededfa..a53fc178 100644 --- a/resources/library/interactivities/Cat text.wgt/js/script.js +++ b/resources/library/interactivities/Cat text.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", first_desc: "Fruits", second_desc: "Vegetables", @@ -17,7 +17,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -29,9 +30,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_text","")){ @@ -53,11 +56,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -78,7 +83,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -87,7 +92,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -160,7 +165,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -244,7 +249,7 @@ function exportData(){ cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ var img_cont = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.count = $(this).find(".img_block").size(); img_cont.text = $(this).find(".cat_desc").val(); @@ -266,7 +271,7 @@ function exportData(){ cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ var img_cont = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.count = $(this).find("input[name='count']").val(); img_cont.text = $(this).find(".cat_desc").val(); @@ -292,7 +297,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -307,12 +312,12 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -642,10 +647,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -659,10 +664,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -676,10 +681,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Cat text.wgt/locales/fr/index.html b/resources/library/interactivities/Cat text.wgt/locales/fr/index.html index 3636c4ab..d8651420 100644 --- a/resources/library/interactivities/Cat text.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Cat text.wgt/locales/fr/index.html @@ -25,12 +25,7 @@
-
- +
  @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js b/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js index 606f4a4a..90cbd71c 100644 --- a/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", first_desc: "Fruits", second_desc: "Légumes", @@ -18,27 +18,28 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content: "

Catégoriser des textes

"+ -"

Classer des étiquettes de mots en fonction de la dénomination de la catégorie.

"+ + "

Classer des étiquettes de mots en fonction de la dénomination de la catégorie.

"+ -"

L’activité s’effectue par un glisser-déposer de l’étiquette de mots dans la catégorie correspondante. Tant que toutes les étiquettes de mots ne sont pas classées, la zone reste rouge. Une fois que toutes les étiquettes de mots sont classées dans la bonne catégorie, la zone se colore en vert.

"+ + "

L’activité s’effectue par un glisser-déposer de l’étiquette de mots dans la catégorie correspondante. Tant que toutes les étiquettes de mots ne sont pas classées, la zone reste rouge. Une fois que toutes les étiquettes de mots sont classées dans la bonne catégorie, la zone se colore en vert.

"+ -"

Le bouton “Recharger” réinitialise les exercices.

"+ + "

Le bouton “Recharger” réinitialise les exercices.

"+ -"

Le bouton “Modifier” vous permet :

"+ -"
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
  • "+ -"
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ + "

Le bouton “Modifier” vous permet :

"+ + "
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
  • "+ + "
  • de modifier un exercice ou d’en créer de nouveaux dans la même activité.
"+ -"

En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, une zone bleue apparaît, c’est une catégorie, puis.

"+ -"
  • insérez le nom de la catégorie (par exemple “fruits”, “légumes”, “mammifères”...) en cliquant dans le champ de texte “Saisir le nom de la catégorie ici …”,
  • "+ -"
  • cliquez sur le gros “+” situé à gauche de la catégorie ce qui vous permet de rajouter des étiquettes de mots,
  • "+ -"
  • entrez des mots dans ces étiquettes,
  • "+ -"
  • ajoutez ensuite une catégorie (ou plusieurs) en cliquant sur le signe “+” situé à droite de la catégorie, complétez par son nom et ajoutez des étiquettes de mots.
"+ -"

Pour supprimer une étiquette de mots, cliquez sur la croix située dans le coin supérieur droit de celle-ci.

"+ -"

Pour supprimer une catégorie, cliquez sur le signe “-” situé à droite de celle-ci.

"+ + "

En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, une zone bleue apparaît, c’est une catégorie, puis.

"+ + "
  • insérez le nom de la catégorie (par exemple “fruits”, “légumes”, “mammifères”...) en cliquant dans le champ de texte “Saisir le nom de la catégorie ici …”,
  • "+ + "
  • cliquez sur le gros “+” situé à gauche de la catégorie ce qui vous permet de rajouter des étiquettes de mots,
  • "+ + "
  • entrez des mots dans ces étiquettes,
  • "+ + "
  • ajoutez ensuite une catégorie (ou plusieurs) en cliquant sur le signe “+” situé à droite de la catégorie, complétez par son nom et ajoutez des étiquettes de mots.
"+ + "

Pour supprimer une étiquette de mots, cliquez sur la croix située dans le coin supérieur droit de celle-ci.

"+ + "

Pour supprimer une catégorie, cliquez sur le signe “-” situé à droite de celle-ci.

"+ -"

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

"+ + "

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

"+ -"

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

" + "

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

", + theme: "Thème" }; //main function @@ -50,9 +51,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_text","")){ @@ -74,11 +77,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -99,7 +104,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -108,7 +113,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -181,7 +186,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -265,7 +270,7 @@ function exportData(){ cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ var img_cont = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.count = $(this).find(".img_block").size(); img_cont.text = $(this).find(".cat_desc").val(); @@ -287,7 +292,7 @@ function exportData(){ cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ var img_cont = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.count = $(this).find("input[name='count']").val(); img_cont.text = $(this).find(".cat_desc").val(); @@ -313,7 +318,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -328,12 +333,12 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -664,10 +669,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -681,10 +686,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -698,10 +703,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Cat text.wgt/locales/ru/index.html b/resources/library/interactivities/Cat text.wgt/locales/ru/index.html index 27c62f8d..561bec51 100644 --- a/resources/library/interactivities/Cat text.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Cat text.wgt/locales/ru/index.html @@ -25,12 +25,7 @@
-
- +
  @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js b/resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js index 86bef6bd..7a4ac961 100644 --- a/resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", first_desc: "Фрукты", second_desc: "Овощи", @@ -17,7 +17,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; //main function @@ -29,9 +30,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_text","")){ @@ -53,11 +56,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -78,7 +83,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -87,7 +92,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -160,7 +165,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -244,7 +249,7 @@ function exportData(){ cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ var img_cont = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.count = $(this).find(".img_block").size(); img_cont.text = $(this).find(".cat_desc").val(); @@ -266,7 +271,7 @@ function exportData(){ cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ var img_cont = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); img_cont.mask = $(this).find("input[name='mask']").val(); img_cont.count = $(this).find("input[name='count']").val(); img_cont.text = $(this).find(".cat_desc").val(); @@ -292,7 +297,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -307,12 +312,12 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -452,7 +457,7 @@ function importData(data){ } } } - }); + }); checkCorrectness(all_imgs); } } @@ -643,10 +648,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -660,10 +665,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -677,10 +682,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Balance.wgt/config.xml b/resources/nonDistributed/Balance.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Balance.wgt/config.xml rename to resources/nonDistributed/Balance.wgt/config.xml diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/demo.html rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Balance.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/Lobster/stylesheet.css rename to resources/nonDistributed/Balance.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/demo.html rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/nonDistributed/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Balance.wgt/css/images/balance.png b/resources/nonDistributed/Balance.wgt/css/images/balance.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/balance.png rename to resources/nonDistributed/Balance.wgt/css/images/balance.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/bg.png b/resources/nonDistributed/Balance.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/bg.png rename to resources/nonDistributed/Balance.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/delete.png b/resources/nonDistributed/Balance.wgt/css/images/delete.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/delete.png rename to resources/nonDistributed/Balance.wgt/css/images/delete.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/graduations.png b/resources/nonDistributed/Balance.wgt/css/images/graduations.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/graduations.png rename to resources/nonDistributed/Balance.wgt/css/images/graduations.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/pad-bd.png b/resources/nonDistributed/Balance.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/pad-bd.png rename to resources/nonDistributed/Balance.wgt/css/images/pad-bd.png diff --git a/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/pivot.png b/resources/nonDistributed/Balance.wgt/css/images/pivot.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/pivot.png rename to resources/nonDistributed/Balance.wgt/css/images/pivot.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/scale.png b/resources/nonDistributed/Balance.wgt/css/images/scale.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/scale.png rename to resources/nonDistributed/Balance.wgt/css/images/scale.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/scales.png b/resources/nonDistributed/Balance.wgt/css/images/scales.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/scales.png rename to resources/nonDistributed/Balance.wgt/css/images/scales.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-bd.png b/resources/nonDistributed/Balance.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-bd.png rename to resources/nonDistributed/Balance.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-edit.png rename to resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-reload.png rename to resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png differ diff --git a/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png differ diff --git a/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight-add.png b/resources/nonDistributed/Balance.wgt/css/images/weight-add.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/weight-add.png rename to resources/nonDistributed/Balance.wgt/css/images/weight-add.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight.png b/resources/nonDistributed/Balance.wgt/css/images/weight.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/weight.png rename to resources/nonDistributed/Balance.wgt/css/images/weight.png diff --git a/resources/library/interactivities/Balance.wgt/css/main.css b/resources/nonDistributed/Balance.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/main.css rename to resources/nonDistributed/Balance.wgt/css/main.css diff --git a/resources/library/interactivities/Balance.wgt/css/ubw-help.css b/resources/nonDistributed/Balance.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/ubw-help.css rename to resources/nonDistributed/Balance.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Balance.wgt/css/ubw-main.css b/resources/nonDistributed/Balance.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/ubw-main.css rename to resources/nonDistributed/Balance.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Balance.wgt/help.html b/resources/nonDistributed/Balance.wgt/help.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/help.html rename to resources/nonDistributed/Balance.wgt/help.html diff --git a/resources/library/interactivities/Balance.wgt/i18n/Messages.properties b/resources/nonDistributed/Balance.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Balance.wgt/i18n/Messages.properties rename to resources/nonDistributed/Balance.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Balance.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Balance.wgt/i18n/Messages_fr.properties rename to resources/nonDistributed/Balance.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Balance.wgt/icon.png b/resources/nonDistributed/Balance.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/icon.png rename to resources/nonDistributed/Balance.wgt/icon.png diff --git a/resources/library/interactivities/Balance.wgt/index.html b/resources/nonDistributed/Balance.wgt/index.html similarity index 100% rename from resources/library/interactivities/Balance.wgt/index.html rename to resources/nonDistributed/Balance.wgt/index.html diff --git a/resources/library/interactivities/Balance.wgt/js/help-template.js b/resources/nonDistributed/Balance.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/help-template.js rename to resources/nonDistributed/Balance.wgt/js/help-template.js diff --git a/resources/library/interactivities/Balance.wgt/js/help_fr-template.js b/resources/nonDistributed/Balance.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/help_fr-template.js rename to resources/nonDistributed/Balance.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-1.7.1.min.js rename to resources/nonDistributed/Balance.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery-css-transform.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-css-transform.js rename to resources/nonDistributed/Balance.wgt/js/lib/jquery-css-transform.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js rename to resources/nonDistributed/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/nonDistributed/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/modernizr.js b/resources/nonDistributed/Balance.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/modernizr.js rename to resources/nonDistributed/Balance.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/mustache.js b/resources/nonDistributed/Balance.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/mustache.js rename to resources/nonDistributed/Balance.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Balance.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/lib/ubw-main.js rename to resources/nonDistributed/Balance.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Balance.wgt/js/main.js b/resources/nonDistributed/Balance.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/main.js rename to resources/nonDistributed/Balance.wgt/js/main.js diff --git a/resources/library/interactivities/Balance.wgt/js/templates.js b/resources/nonDistributed/Balance.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Balance.wgt/js/templates.js rename to resources/nonDistributed/Balance.wgt/js/templates.js diff --git a/resources/library/interactivities/Cadran.wgt/config.xml b/resources/nonDistributed/Cadran.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Cadran.wgt/config.xml rename to resources/nonDistributed/Cadran.wgt/config.xml diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/demo.html rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/Lobster/stylesheet.css rename to resources/nonDistributed/Cadran.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/demo.html rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/nonDistributed/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Cadran.wgt/css/images/bg.png b/resources/nonDistributed/Cadran.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/bg.png rename to resources/nonDistributed/Cadran.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png b/resources/nonDistributed/Cadran.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/pad-bd.png rename to resources/nonDistributed/Cadran.wgt/css/images/pad-bd.png diff --git a/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png differ diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-bd.png rename to resources/nonDistributed/Cadran.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-edit.png rename to resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-reload.png rename to resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png differ diff --git a/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png differ diff --git a/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png differ diff --git a/resources/library/interactivities/Cadran.wgt/css/main.css b/resources/nonDistributed/Cadran.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/main.css rename to resources/nonDistributed/Cadran.wgt/css/main.css diff --git a/resources/library/interactivities/Cadran.wgt/css/ubw-help.css b/resources/nonDistributed/Cadran.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/ubw-help.css rename to resources/nonDistributed/Cadran.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Cadran.wgt/css/ubw-main.css b/resources/nonDistributed/Cadran.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/ubw-main.css rename to resources/nonDistributed/Cadran.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Cadran.wgt/help.html b/resources/nonDistributed/Cadran.wgt/help.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/help.html rename to resources/nonDistributed/Cadran.wgt/help.html diff --git a/resources/library/interactivities/Cadran.wgt/i18n/Messages.properties b/resources/nonDistributed/Cadran.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Cadran.wgt/i18n/Messages.properties rename to resources/nonDistributed/Cadran.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Cadran.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Cadran.wgt/i18n/Messages_fr.properties rename to resources/nonDistributed/Cadran.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Cadran.wgt/icon.png b/resources/nonDistributed/Cadran.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/icon.png rename to resources/nonDistributed/Cadran.wgt/icon.png diff --git a/resources/library/interactivities/Cadran.wgt/index.html b/resources/nonDistributed/Cadran.wgt/index.html similarity index 100% rename from resources/library/interactivities/Cadran.wgt/index.html rename to resources/nonDistributed/Cadran.wgt/index.html diff --git a/resources/library/interactivities/Cadran.wgt/js/help-template.js b/resources/nonDistributed/Cadran.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/help-template.js rename to resources/nonDistributed/Cadran.wgt/js/help-template.js diff --git a/resources/library/interactivities/Cadran.wgt/js/help_fr-template.js b/resources/nonDistributed/Cadran.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/help_fr-template.js rename to resources/nonDistributed/Cadran.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Cadran.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery-1.7.1.min.js rename to resources/nonDistributed/Cadran.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js b/resources/nonDistributed/Cadran.wgt/js/lib/jquery-css-transform.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery-css-transform.js rename to resources/nonDistributed/Cadran.wgt/js/lib/jquery-css-transform.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/nonDistributed/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js b/resources/nonDistributed/Cadran.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/modernizr.js rename to resources/nonDistributed/Cadran.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/mustache.js b/resources/nonDistributed/Cadran.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/mustache.js rename to resources/nonDistributed/Cadran.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Cadran.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/lib/ubw-main.js rename to resources/nonDistributed/Cadran.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Cadran.wgt/js/main.js b/resources/nonDistributed/Cadran.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/main.js rename to resources/nonDistributed/Cadran.wgt/js/main.js diff --git a/resources/library/interactivities/Cadran.wgt/js/templates.js b/resources/nonDistributed/Cadran.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Cadran.wgt/js/templates.js rename to resources/nonDistributed/Cadran.wgt/js/templates.js diff --git a/resources/library/interactivities/Memory.wgt/config.xml b/resources/nonDistributed/Memory.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Memory.wgt/config.xml rename to resources/nonDistributed/Memory.wgt/config.xml diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/demo.html rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Memory.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/Lobster/stylesheet.css rename to resources/nonDistributed/Memory.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/demo.html rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/nonDistributed/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Memory.wgt/css/images/bg.png b/resources/nonDistributed/Memory.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/bg.png rename to resources/nonDistributed/Memory.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/drop-label-bg.png b/resources/nonDistributed/Memory.wgt/css/images/drop-label-bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/drop-label-bg.png rename to resources/nonDistributed/Memory.wgt/css/images/drop-label-bg.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/drop-label-ondrop-bg.png b/resources/nonDistributed/Memory.wgt/css/images/drop-label-ondrop-bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/drop-label-ondrop-bg.png rename to resources/nonDistributed/Memory.wgt/css/images/drop-label-ondrop-bg.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/flip.png b/resources/nonDistributed/Memory.wgt/css/images/flip.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/flip.png rename to resources/nonDistributed/Memory.wgt/css/images/flip.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/mark.png b/resources/nonDistributed/Memory.wgt/css/images/mark.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/mark.png rename to resources/nonDistributed/Memory.wgt/css/images/mark.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/pad-bd.png b/resources/nonDistributed/Memory.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/pad-bd.png rename to resources/nonDistributed/Memory.wgt/css/images/pad-bd.png diff --git a/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png differ diff --git a/resources/library/interactivities/Memory.wgt/css/images/pile-bg.png b/resources/nonDistributed/Memory.wgt/css/images/pile-bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/pile-bg.png rename to resources/nonDistributed/Memory.wgt/css/images/pile-bg.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/result-bg.png b/resources/nonDistributed/Memory.wgt/css/images/result-bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/result-bg.png rename to resources/nonDistributed/Memory.wgt/css/images/result-bg.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-bd.png b/resources/nonDistributed/Memory.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/slate-bd.png rename to resources/nonDistributed/Memory.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-edit.png rename to resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-reload.png rename to resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png differ diff --git a/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png differ diff --git a/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png differ diff --git a/resources/library/interactivities/Memory.wgt/css/main.css b/resources/nonDistributed/Memory.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/main.css rename to resources/nonDistributed/Memory.wgt/css/main.css diff --git a/resources/library/interactivities/Memory.wgt/css/ubw-help.css b/resources/nonDistributed/Memory.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/ubw-help.css rename to resources/nonDistributed/Memory.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Memory.wgt/css/ubw-main.css b/resources/nonDistributed/Memory.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/ubw-main.css rename to resources/nonDistributed/Memory.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Memory.wgt/help.html b/resources/nonDistributed/Memory.wgt/help.html similarity index 100% rename from resources/library/interactivities/Memory.wgt/help.html rename to resources/nonDistributed/Memory.wgt/help.html diff --git a/resources/library/interactivities/Memory.wgt/i18n/Messages.properties b/resources/nonDistributed/Memory.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Memory.wgt/i18n/Messages.properties rename to resources/nonDistributed/Memory.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Memory.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Memory.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Memory.wgt/i18n/Messages_fr.properties rename to resources/nonDistributed/Memory.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Memory.wgt/icon.png b/resources/nonDistributed/Memory.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/icon.png rename to resources/nonDistributed/Memory.wgt/icon.png diff --git a/resources/library/interactivities/Memory.wgt/index.html b/resources/nonDistributed/Memory.wgt/index.html similarity index 100% rename from resources/library/interactivities/Memory.wgt/index.html rename to resources/nonDistributed/Memory.wgt/index.html diff --git a/resources/library/interactivities/Memory.wgt/js/help-template.js b/resources/nonDistributed/Memory.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/help-template.js rename to resources/nonDistributed/Memory.wgt/js/help-template.js diff --git a/resources/library/interactivities/Memory.wgt/js/help_fr-template.js b/resources/nonDistributed/Memory.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/help_fr-template.js rename to resources/nonDistributed/Memory.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Memory.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Memory.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/lib/jquery-1.7.1.min.js rename to resources/nonDistributed/Memory.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/nonDistributed/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Memory.wgt/js/lib/modernizr.js b/resources/nonDistributed/Memory.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/lib/modernizr.js rename to resources/nonDistributed/Memory.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Memory.wgt/js/lib/mustache.js b/resources/nonDistributed/Memory.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/lib/mustache.js rename to resources/nonDistributed/Memory.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Memory.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Memory.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/lib/ubw-main.js rename to resources/nonDistributed/Memory.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Memory.wgt/js/main.js b/resources/nonDistributed/Memory.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/main.js rename to resources/nonDistributed/Memory.wgt/js/main.js diff --git a/resources/library/interactivities/Memory.wgt/js/templates.js b/resources/nonDistributed/Memory.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Memory.wgt/js/templates.js rename to resources/nonDistributed/Memory.wgt/js/templates.js diff --git a/resources/library/interactivities/Morpion.wgt/config.xml b/resources/nonDistributed/Morpion.wgt/config.xml similarity index 100% rename from resources/library/interactivities/Morpion.wgt/config.xml rename to resources/nonDistributed/Morpion.wgt/config.xml diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/demo.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/demo.html rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/demo.html diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css b/resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/stylesheet.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/Lobster/stylesheet.css rename to resources/nonDistributed/Morpion.wgt/css/fonts/Lobster/stylesheet.css diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/demo.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/demo.html rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/demo.html diff --git a/resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css b/resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css rename to resources/nonDistributed/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css diff --git a/resources/library/interactivities/Morpion.wgt/css/images/bg.png b/resources/nonDistributed/Morpion.wgt/css/images/bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/bg.png rename to resources/nonDistributed/Morpion.wgt/css/images/bg.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png b/resources/nonDistributed/Morpion.wgt/css/images/pad-bd.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/pad-bd.png rename to resources/nonDistributed/Morpion.wgt/css/images/pad-bd.png diff --git a/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/player1.png b/resources/nonDistributed/Morpion.wgt/css/images/player1.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/player1.png rename to resources/nonDistributed/Morpion.wgt/css/images/player1.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/player2.png b/resources/nonDistributed/Morpion.wgt/css/images/player2.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/player2.png rename to resources/nonDistributed/Morpion.wgt/css/images/player2.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/result-bg.png b/resources/nonDistributed/Morpion.wgt/css/images/result-bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/result-bg.png rename to resources/nonDistributed/Morpion.wgt/css/images/result-bg.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-bd.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-bd.png rename to resources/nonDistributed/Morpion.wgt/css/images/slate-bd.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-edit.png rename to resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-edit.png diff --git a/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-reload.png rename to resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-reload.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/submit.png b/resources/nonDistributed/Morpion.wgt/css/images/submit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/submit.png rename to resources/nonDistributed/Morpion.wgt/css/images/submit.png diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png differ diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png differ diff --git a/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png differ diff --git a/resources/library/interactivities/Morpion.wgt/css/main.css b/resources/nonDistributed/Morpion.wgt/css/main.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/main.css rename to resources/nonDistributed/Morpion.wgt/css/main.css diff --git a/resources/library/interactivities/Morpion.wgt/css/ubw-help.css b/resources/nonDistributed/Morpion.wgt/css/ubw-help.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/ubw-help.css rename to resources/nonDistributed/Morpion.wgt/css/ubw-help.css diff --git a/resources/library/interactivities/Morpion.wgt/css/ubw-main.css b/resources/nonDistributed/Morpion.wgt/css/ubw-main.css similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/ubw-main.css rename to resources/nonDistributed/Morpion.wgt/css/ubw-main.css diff --git a/resources/library/interactivities/Morpion.wgt/help.html b/resources/nonDistributed/Morpion.wgt/help.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/help.html rename to resources/nonDistributed/Morpion.wgt/help.html diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages.properties b/resources/nonDistributed/Morpion.wgt/i18n/Messages.properties similarity index 100% rename from resources/library/interactivities/Morpion.wgt/i18n/Messages.properties rename to resources/nonDistributed/Morpion.wgt/i18n/Messages.properties diff --git a/resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties b/resources/nonDistributed/Morpion.wgt/i18n/Messages_fr.properties similarity index 100% rename from resources/library/interactivities/Morpion.wgt/i18n/Messages_fr.properties rename to resources/nonDistributed/Morpion.wgt/i18n/Messages_fr.properties diff --git a/resources/library/interactivities/Morpion.wgt/icon.png b/resources/nonDistributed/Morpion.wgt/icon.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/icon.png rename to resources/nonDistributed/Morpion.wgt/icon.png diff --git a/resources/library/interactivities/Morpion.wgt/images/failed.png b/resources/nonDistributed/Morpion.wgt/images/failed.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/images/failed.png rename to resources/nonDistributed/Morpion.wgt/images/failed.png diff --git a/resources/library/interactivities/Morpion.wgt/images/succeed.png b/resources/nonDistributed/Morpion.wgt/images/succeed.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/images/succeed.png rename to resources/nonDistributed/Morpion.wgt/images/succeed.png diff --git a/resources/library/interactivities/Morpion.wgt/index.html b/resources/nonDistributed/Morpion.wgt/index.html similarity index 100% rename from resources/library/interactivities/Morpion.wgt/index.html rename to resources/nonDistributed/Morpion.wgt/index.html diff --git a/resources/library/interactivities/Morpion.wgt/js/help-template.js b/resources/nonDistributed/Morpion.wgt/js/help-template.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/help-template.js rename to resources/nonDistributed/Morpion.wgt/js/help-template.js diff --git a/resources/library/interactivities/Morpion.wgt/js/help_fr-template.js b/resources/nonDistributed/Morpion.wgt/js/help_fr-template.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/help_fr-template.js rename to resources/nonDistributed/Morpion.wgt/js/help_fr-template.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js b/resources/nonDistributed/Morpion.wgt/js/lib/jquery-1.7.1.min.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/jquery-1.7.1.min.js rename to resources/nonDistributed/Morpion.wgt/js/lib/jquery-1.7.1.min.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js b/resources/nonDistributed/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js rename to resources/nonDistributed/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js b/resources/nonDistributed/Morpion.wgt/js/lib/modernizr.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/modernizr.js rename to resources/nonDistributed/Morpion.wgt/js/lib/modernizr.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/mustache.js b/resources/nonDistributed/Morpion.wgt/js/lib/mustache.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/mustache.js rename to resources/nonDistributed/Morpion.wgt/js/lib/mustache.js diff --git a/resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js b/resources/nonDistributed/Morpion.wgt/js/lib/ubw-main.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/lib/ubw-main.js rename to resources/nonDistributed/Morpion.wgt/js/lib/ubw-main.js diff --git a/resources/library/interactivities/Morpion.wgt/js/main.js b/resources/nonDistributed/Morpion.wgt/js/main.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/main.js rename to resources/nonDistributed/Morpion.wgt/js/main.js diff --git a/resources/library/interactivities/Morpion.wgt/js/templates.js b/resources/nonDistributed/Morpion.wgt/js/templates.js similarity index 100% rename from resources/library/interactivities/Morpion.wgt/js/templates.js rename to resources/nonDistributed/Morpion.wgt/js/templates.js diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index 17695734..e6740443 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -29,7 +29,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett { QList actions; - mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show Uniboard"), this); + mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show Open-Sankore"), this); connect(mActionUniboard, SIGNAL(triggered()), this, SIGNAL(uniboardClick())); actions << mActionUniboard;