From 22d819d8a68daad20ef2f4fa5ca3d8ea3018b22c Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 27 Sep 2012 11:45:55 +0200 Subject: [PATCH 01/20] fixed issue with windows library --- release.win7.vc9.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index 1e704303..fd453081 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -63,6 +63,9 @@ REM echo %LAST_TAG_VERSION% nmake release-install IF NOT EXIST build\win32\release\product\Open-Sankore.exe GOTO EXIT_WITH_ERROR +xcopy C:\OpenSankore\lib\*.dll build\win32\release\product\ +xcopy %QT_DIR%\lib\QtOpenGL4.dll build\win32\release\product\ + set CUSTOMIZATIONS=build\win32\release\product\customizations mkdir %CUSTOMIZATIONS% xcopy /s resources\customizations %CUSTOMIZATIONS% @@ -81,7 +84,6 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%" set INSTALL_DIRECTORY=install\win32\ - xcopy *.pdf %INSTALL_DIRECTORY% cd %INSTALL_DIRECTORY% call %SEVEN_ZIP_EXE% a Open-Sankor_Windows_%VERSION%.zip *.exe *.pdf From 14c6e396cbedbb6e0308dd95b83ca30811622b3c Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 27 Sep 2012 16:02:34 +0200 Subject: [PATCH 02/20] fixed translations issue --- resources/i18n/sankore_ar.ts | 8 ++++---- resources/i18n/sankore_bg.ts | 8 ++++---- resources/i18n/sankore_ca.ts | 8 ++++---- resources/i18n/sankore_cs.ts | 8 ++++---- resources/i18n/sankore_da.ts | 8 ++++---- resources/i18n/sankore_de.ts | 8 ++++---- resources/i18n/sankore_el.ts | 8 ++++---- resources/i18n/sankore_en.ts | 8 ++++---- resources/i18n/sankore_en_UK.ts | 8 ++++---- resources/i18n/sankore_es.ts | 8 ++++---- resources/i18n/sankore_fr.ts | 9 ++++----- resources/i18n/sankore_fr_CH.ts | 9 ++++----- resources/i18n/sankore_it.ts | 8 ++++---- resources/i18n/sankore_iw.ts | 8 ++++---- resources/i18n/sankore_ja.ts | 8 ++++---- resources/i18n/sankore_ko.ts | 8 ++++---- resources/i18n/sankore_mg.ts | 8 ++++---- resources/i18n/sankore_nb.ts | 8 ++++---- resources/i18n/sankore_nl.ts | 8 ++++---- resources/i18n/sankore_pl.ts | 8 ++++---- resources/i18n/sankore_pt.ts | 8 ++++---- resources/i18n/sankore_rm.ts | 8 ++++---- resources/i18n/sankore_ro.ts | 8 ++++---- resources/i18n/sankore_ru.ts | 8 ++++---- resources/i18n/sankore_sk.ts | 8 ++++---- resources/i18n/sankore_sv.ts | 8 ++++---- resources/i18n/sankore_tr.ts | 8 ++++---- resources/i18n/sankore_zh.ts | 8 ++++---- src/desktop/UBDesktopPalette.cpp | 2 +- 29 files changed, 113 insertions(+), 115 deletions(-) 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/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; From 7bfb635a4dd218561053afd105667d307ed3a2da Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 27 Sep 2012 16:05:26 +0200 Subject: [PATCH 03/20] removed widgets that crash the application --- .../Balance.wgt/config.xml | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.eot | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.svg | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.ttf | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.woff | Bin .../Balance.wgt/css/fonts/Lobster/demo.html | 0 .../Balance.wgt/css/fonts/Lobster/stylesheet.css | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.eot | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.svg | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.ttf | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Blotch-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.woff | Bin .../SF_Toontime_Blotch_Italic-webfont.eot | Bin .../SF_Toontime_Blotch_Italic-webfont.svg | 0 .../SF_Toontime_Blotch_Italic-webfont.ttf | Bin .../SF_Toontime_Blotch_Italic-webfont.woff | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg | 0 .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf | Bin .../SF_Toontime_Bold_Italic-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Italic-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.woff | Bin .../Balance.wgt/css/fonts/SF-Toontime/demo.html | 0 .../css/fonts/SF-Toontime/stylesheet.css | 0 .../Balance.wgt/css/images/balance.png | Bin .../Balance.wgt/css/images/bg.png | Bin .../Balance.wgt/css/images/delete.png | Bin .../Balance.wgt/css/images/graduations.png | Bin .../Balance.wgt/css/images/pad-bd.png | Bin .../Balance.wgt/css/images/parameters-bg.png | Bin .../Balance.wgt/css/images/pivot.png | Bin .../Balance.wgt/css/images/scale.png | Bin .../Balance.wgt/css/images/scales.png | Bin .../Balance.wgt/css/images/slate-bd.png | Bin .../Balance.wgt/css/images/slate-toolbar-edit.png | Bin .../Balance.wgt/css/images/slate-toolbar-help.png | Bin .../Balance.wgt/css/images/slate-toolbar-reload.png | Bin .../Balance.wgt/css/images/toolbar-edit.png | Bin .../Balance.wgt/css/images/toolbar-help.png | Bin .../Balance.wgt/css/images/toolbar-reload.png | Bin .../Balance.wgt/css/images/weight-add.png | Bin .../Balance.wgt/css/images/weight.png | Bin .../Balance.wgt/css/main.css | 0 .../Balance.wgt/css/ubw-help.css | 0 .../Balance.wgt/css/ubw-main.css | 0 .../Balance.wgt/help.html | 0 .../Balance.wgt/i18n/Messages.properties | 0 .../Balance.wgt/i18n/Messages_fr.properties | 0 .../Balance.wgt/icon.png | Bin .../Balance.wgt/index.html | 0 .../Balance.wgt/js/help-template.js | 0 .../Balance.wgt/js/help_fr-template.js | 0 .../Balance.wgt/js/lib/jquery-1.7.1.min.js | 0 .../Balance.wgt/js/lib/jquery-css-transform.js | 0 .../js/lib/jquery-ui-1.8.17.custom.min.js | 0 .../js/lib/jquery.i18n.properties-min-1.0.9.js | 0 .../Balance.wgt/js/lib/modernizr.js | 0 .../Balance.wgt/js/lib/mustache.js | 0 .../Balance.wgt/js/lib/ubw-main.js | 0 .../Balance.wgt/js/main.js | 0 .../Balance.wgt/js/templates.js | 0 .../Cadran.wgt/config.xml | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.eot | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.svg | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.ttf | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.woff | Bin .../Cadran.wgt/css/fonts/Lobster/demo.html | 0 .../Cadran.wgt/css/fonts/Lobster/stylesheet.css | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.eot | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.svg | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.ttf | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Blotch-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.woff | Bin .../SF_Toontime_Blotch_Italic-webfont.eot | Bin .../SF_Toontime_Blotch_Italic-webfont.svg | 0 .../SF_Toontime_Blotch_Italic-webfont.ttf | Bin .../SF_Toontime_Blotch_Italic-webfont.woff | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg | 0 .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf | Bin .../SF_Toontime_Bold_Italic-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Italic-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.woff | Bin .../Cadran.wgt/css/fonts/SF-Toontime/demo.html | 0 .../Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css | 0 .../Cadran.wgt/css/images/bg.png | Bin .../Cadran.wgt/css/images/pad-bd.png | Bin .../Cadran.wgt/css/images/parameters-bg.png | Bin .../Cadran.wgt/css/images/slate-bd.png | Bin .../Cadran.wgt/css/images/slate-toolbar-edit.png | Bin .../Cadran.wgt/css/images/slate-toolbar-help.png | Bin .../Cadran.wgt/css/images/slate-toolbar-reload.png | Bin .../Cadran.wgt/css/images/toolbar-edit.png | Bin .../Cadran.wgt/css/images/toolbar-help.png | Bin .../Cadran.wgt/css/images/toolbar-reload.png | Bin .../Cadran.wgt/css/main.css | 0 .../Cadran.wgt/css/ubw-help.css | 0 .../Cadran.wgt/css/ubw-main.css | 0 .../Cadran.wgt/help.html | 0 .../Cadran.wgt/i18n/Messages.properties | 0 .../Cadran.wgt/i18n/Messages_fr.properties | 0 .../Cadran.wgt/icon.png | Bin .../Cadran.wgt/index.html | 0 .../Cadran.wgt/js/help-template.js | 0 .../Cadran.wgt/js/help_fr-template.js | 0 .../Cadran.wgt/js/lib/jquery-1.7.1.min.js | 0 .../Cadran.wgt/js/lib/jquery-css-transform.js | 0 .../js/lib/jquery.i18n.properties-min-1.0.9.js | 0 .../Cadran.wgt/js/lib/modernizr.js | 0 .../Cadran.wgt/js/lib/mustache.js | 0 .../Cadran.wgt/js/lib/ubw-main.js | 0 .../Cadran.wgt/js/main.js | 0 .../Cadran.wgt/js/templates.js | 0 .../Memory.wgt/config.xml | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.eot | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.svg | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.ttf | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.woff | Bin .../css/fonts/Lobster/SIL Open Font License 1.1.txt | 0 .../Memory.wgt/css/fonts/Lobster/demo.html | 0 .../Memory.wgt/css/fonts/Lobster/stylesheet.css | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.eot | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.svg | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.ttf | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Blotch-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.woff | Bin .../SF_Toontime_Blotch_Italic-webfont.eot | Bin .../SF_Toontime_Blotch_Italic-webfont.svg | 0 .../SF_Toontime_Blotch_Italic-webfont.ttf | Bin .../SF_Toontime_Blotch_Italic-webfont.woff | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg | 0 .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf | Bin .../SF_Toontime_Bold_Italic-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Italic-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.woff | Bin .../css/fonts/SF-Toontime/ShyFonts Font License.txt | 0 .../Memory.wgt/css/fonts/SF-Toontime/demo.html | 0 .../Memory.wgt/css/fonts/SF-Toontime/stylesheet.css | 0 .../Memory.wgt/css/images/bg.png | Bin .../Memory.wgt/css/images/drop-label-bg.png | Bin .../Memory.wgt/css/images/drop-label-ondrop-bg.png | Bin .../Memory.wgt/css/images/flip.png | Bin .../Memory.wgt/css/images/mark.png | Bin .../Memory.wgt/css/images/pad-bd.png | Bin .../Memory.wgt/css/images/parameters-bg.png | Bin .../Memory.wgt/css/images/pile-bg.png | Bin .../Memory.wgt/css/images/result-bg.png | Bin .../Memory.wgt/css/images/slate-bd.png | Bin .../Memory.wgt/css/images/slate-toolbar-edit.png | Bin .../Memory.wgt/css/images/slate-toolbar-help.png | Bin .../Memory.wgt/css/images/slate-toolbar-reload.png | Bin .../Memory.wgt/css/images/toolbar-edit.png | Bin .../Memory.wgt/css/images/toolbar-help.png | Bin .../Memory.wgt/css/images/toolbar-reload.png | Bin .../Memory.wgt/css/main.css | 0 .../Memory.wgt/css/ubw-help.css | 0 .../Memory.wgt/css/ubw-main.css | 0 .../Memory.wgt/help.html | 0 .../Memory.wgt/i18n/Messages.properties | 0 .../Memory.wgt/i18n/Messages_fr.properties | 0 .../Memory.wgt/icon.png | Bin .../Memory.wgt/index.html | 0 .../Memory.wgt/js/help-template.js | 0 .../Memory.wgt/js/help_fr-template.js | 0 .../Memory.wgt/js/lib/jquery-1.7.1.min.js | 0 .../js/lib/jquery.i18n.properties-min-1.0.9.js | 0 .../Memory.wgt/js/lib/modernizr.js | 0 .../Memory.wgt/js/lib/mustache.js | 0 .../Memory.wgt/js/lib/ubw-main.js | 0 .../Memory.wgt/js/main.js | 0 .../Memory.wgt/js/templates.js | 0 .../Morpion.wgt/config.xml | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.eot | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.svg | 0 .../css/fonts/Lobster/Lobster_1.3-webfont.ttf | Bin .../css/fonts/Lobster/Lobster_1.3-webfont.woff | Bin .../css/fonts/Lobster/SIL Open Font License 1.1.txt | 0 .../Morpion.wgt/css/fonts/Lobster/demo.html | 0 .../Morpion.wgt/css/fonts/Lobster/stylesheet.css | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.eot | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.svg | 0 .../css/fonts/SF-Toontime/SF_Toontime-webfont.ttf | Bin .../css/fonts/SF-Toontime/SF_Toontime-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Blotch-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Blotch-webfont.woff | Bin .../SF_Toontime_Blotch_Italic-webfont.eot | Bin .../SF_Toontime_Blotch_Italic-webfont.svg | 0 .../SF_Toontime_Blotch_Italic-webfont.ttf | Bin .../SF_Toontime_Blotch_Italic-webfont.woff | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg | 0 .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf | Bin .../fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf | Bin .../SF_Toontime_Bold_Italic-webfont.woff | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.eot | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.svg | 0 .../SF-Toontime/SF_Toontime_Italic-webfont.ttf | Bin .../SF-Toontime/SF_Toontime_Italic-webfont.woff | Bin .../css/fonts/SF-Toontime/ShyFonts Font License.txt | 0 .../Morpion.wgt/css/fonts/SF-Toontime/demo.html | 0 .../css/fonts/SF-Toontime/stylesheet.css | 0 .../Morpion.wgt/css/images/bg.png | Bin .../Morpion.wgt/css/images/pad-bd.png | Bin .../Morpion.wgt/css/images/parameters-bg.png | Bin .../Morpion.wgt/css/images/player1.png | Bin .../Morpion.wgt/css/images/player2.png | Bin .../Morpion.wgt/css/images/result-bg.png | Bin .../Morpion.wgt/css/images/slate-bd.png | Bin .../Morpion.wgt/css/images/slate-toolbar-edit.png | Bin .../Morpion.wgt/css/images/slate-toolbar-help.png | Bin .../Morpion.wgt/css/images/slate-toolbar-reload.png | Bin .../Morpion.wgt/css/images/submit.png | Bin .../Morpion.wgt/css/images/toolbar-edit.png | Bin .../Morpion.wgt/css/images/toolbar-help.png | Bin .../Morpion.wgt/css/images/toolbar-reload.png | Bin .../Morpion.wgt/css/main.css | 0 .../Morpion.wgt/css/ubw-help.css | 0 .../Morpion.wgt/css/ubw-main.css | 0 .../Morpion.wgt/help.html | 0 .../Morpion.wgt/i18n/Messages.properties | 0 .../Morpion.wgt/i18n/Messages_fr.properties | 0 .../Morpion.wgt/icon.png | Bin .../Morpion.wgt/images/failed.png | Bin .../Morpion.wgt/images/succeed.png | Bin .../Morpion.wgt/index.html | 0 .../Morpion.wgt/js/help-template.js | 0 .../Morpion.wgt/js/help_fr-template.js | 0 .../Morpion.wgt/js/lib/jquery-1.7.1.min.js | 0 .../js/lib/jquery.i18n.properties-min-1.0.9.js | 0 .../Morpion.wgt/js/lib/modernizr.js | 0 .../Morpion.wgt/js/lib/mustache.js | 0 .../Morpion.wgt/js/lib/ubw-main.js | 0 .../Morpion.wgt/js/main.js | 0 .../Morpion.wgt/js/templates.js | 0 267 files changed, 0 insertions(+), 0 deletions(-) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/config.xml (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/Lobster/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/Lobster/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/balance.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/delete.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/graduations.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/pad-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/parameters-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/pivot.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/scale.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/scales.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/slate-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/slate-toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/slate-toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/slate-toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/weight-add.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/images/weight.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/main.css (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/ubw-help.css (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/css/ubw-main.css (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/help.html (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/i18n/Messages.properties (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/i18n/Messages_fr.properties (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/icon.png (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/index.html (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/help-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/help_fr-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/jquery-1.7.1.min.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/jquery-css-transform.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/modernizr.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/mustache.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/lib/ubw-main.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/main.js (100%) rename resources/{library/interactivities => nonDistributed}/Balance.wgt/js/templates.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/config.xml (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/Lobster/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/Lobster/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/fonts/SF-Toontime/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/pad-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/parameters-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/slate-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/slate-toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/slate-toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/slate-toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/images/toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/main.css (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/ubw-help.css (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/css/ubw-main.css (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/help.html (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/i18n/Messages.properties (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/i18n/Messages_fr.properties (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/icon.png (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/index.html (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/help-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/help_fr-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/lib/jquery-1.7.1.min.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/lib/jquery-css-transform.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/lib/modernizr.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/lib/mustache.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/lib/ubw-main.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/main.js (100%) rename resources/{library/interactivities => nonDistributed}/Cadran.wgt/js/templates.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/config.xml (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/Lobster/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/fonts/SF-Toontime/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/drop-label-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/drop-label-ondrop-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/flip.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/mark.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/pad-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/parameters-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/pile-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/result-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/slate-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/slate-toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/slate-toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/slate-toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/images/toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/main.css (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/ubw-help.css (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/css/ubw-main.css (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/help.html (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/i18n/Messages.properties (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/i18n/Messages_fr.properties (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/icon.png (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/index.html (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/help-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/help_fr-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/lib/jquery-1.7.1.min.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/lib/modernizr.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/lib/mustache.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/lib/ubw-main.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/main.js (100%) rename resources/{library/interactivities => nonDistributed}/Memory.wgt/js/templates.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/config.xml (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/SIL Open Font License 1.1.txt (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/Lobster/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/ShyFonts Font License.txt (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/demo.html (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/fonts/SF-Toontime/stylesheet.css (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/pad-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/parameters-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/player1.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/player2.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/result-bg.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/slate-bd.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/slate-toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/slate-toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/slate-toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/submit.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/toolbar-edit.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/toolbar-help.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/images/toolbar-reload.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/main.css (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/ubw-help.css (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/css/ubw-main.css (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/help.html (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/i18n/Messages.properties (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/i18n/Messages_fr.properties (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/icon.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/images/failed.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/images/succeed.png (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/index.html (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/help-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/help_fr-template.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/lib/jquery-1.7.1.min.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/lib/modernizr.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/lib/mustache.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/lib/ubw-main.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/main.js (100%) rename resources/{library/interactivities => nonDistributed}/Morpion.wgt/js/templates.js (100%) 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/library/interactivities/Balance.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png rename to resources/nonDistributed/Balance.wgt/css/images/parameters-bg.png 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/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png rename to resources/nonDistributed/Balance.wgt/css/images/slate-toolbar-help.png 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/library/interactivities/Balance.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png rename to resources/nonDistributed/Balance.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png rename to resources/nonDistributed/Balance.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png rename to resources/nonDistributed/Balance.wgt/css/images/toolbar-reload.png 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/library/interactivities/Cadran.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/parameters-bg.png rename to resources/nonDistributed/Cadran.wgt/css/images/parameters-bg.png 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/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/slate-toolbar-help.png rename to resources/nonDistributed/Cadran.wgt/css/images/slate-toolbar-help.png 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/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-edit.png rename to resources/nonDistributed/Cadran.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-help.png rename to resources/nonDistributed/Cadran.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Cadran.wgt/css/images/toolbar-reload.png rename to resources/nonDistributed/Cadran.wgt/css/images/toolbar-reload.png 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/library/interactivities/Memory.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/parameters-bg.png rename to resources/nonDistributed/Memory.wgt/css/images/parameters-bg.png 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/library/interactivities/Memory.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/slate-toolbar-help.png rename to resources/nonDistributed/Memory.wgt/css/images/slate-toolbar-help.png 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/library/interactivities/Memory.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-edit.png rename to resources/nonDistributed/Memory.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-help.png rename to resources/nonDistributed/Memory.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Memory.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Memory.wgt/css/images/toolbar-reload.png rename to resources/nonDistributed/Memory.wgt/css/images/toolbar-reload.png 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/library/interactivities/Morpion.wgt/css/images/parameters-bg.png b/resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png rename to resources/nonDistributed/Morpion.wgt/css/images/parameters-bg.png 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/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png rename to resources/nonDistributed/Morpion.wgt/css/images/slate-toolbar-help.png 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/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png rename to resources/nonDistributed/Morpion.wgt/css/images/toolbar-edit.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png rename to resources/nonDistributed/Morpion.wgt/css/images/toolbar-help.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png b/resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png rename to resources/nonDistributed/Morpion.wgt/css/images/toolbar-reload.png 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 From 6586fb08d0bbcf77abdca63ae5b91a28d5c78917 Mon Sep 17 00:00:00 2001 From: maximXbs Date: Thu, 27 Sep 2012 17:48:28 +0200 Subject: [PATCH 04/20] updated 'Cat text' app --- .../Cat text.wgt/css/basic.css | 141 +++++++++--------- .../Cat text.wgt/img/ar_down.png | Bin 529 -> 0 bytes .../Cat text.wgt/img/ar_down_white.png | Bin 142 -> 0 bytes .../Cat text.wgt/img/green_point.png | Bin 721 -> 0 bytes .../Cat text.wgt/img/parameters-bg.png | Bin 0 -> 4256 bytes .../Cat text.wgt/img/red_point.png | Bin 740 -> 0 bytes .../Cat text.wgt/img/slate-display.png | Bin 532 -> 0 bytes .../Cat text.wgt/img/slate-edit.png | Bin 1907 -> 0 bytes .../Cat text.wgt/img/slate-help-white.png | Bin 553 -> 0 bytes .../Cat text.wgt/img/slate-help.png | Bin 1795 -> 0 bytes .../Cat text.wgt/img/slate-toolbar-help.png | Bin 0 -> 1697 bytes .../img/slate-toolbar-reload-white.png | Bin 1619 -> 0 bytes .../Cat text.wgt/img/slate-toolbar-reload.png | Bin 2110 -> 2289 bytes .../Cat text.wgt/img/toolbar-edit.png | Bin 0 -> 732 bytes .../Cat text.wgt/img/toolbar-help.png | Bin 0 -> 707 bytes .../Cat text.wgt/img/toolbar-reload.png | Bin 0 -> 999 bytes .../interactivities/Cat text.wgt/index.html | 20 ++- .../interactivities/Cat text.wgt/js/script.js | 51 ++++--- .../Cat text.wgt/locales/fr/index.html | 19 ++- .../Cat text.wgt/locales/fr/js/script.js | 79 +++++----- .../Cat text.wgt/locales/ru/index.html | 19 ++- .../Cat text.wgt/locales/ru/js/script.js | 53 ++++--- 22 files changed, 209 insertions(+), 173 deletions(-) delete mode 100644 resources/library/interactivities/Cat text.wgt/img/ar_down.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/ar_down_white.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/green_point.png create mode 100644 resources/library/interactivities/Cat text.wgt/img/parameters-bg.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/red_point.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/slate-display.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/slate-edit.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/slate-help-white.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/slate-help.png create mode 100644 resources/library/interactivities/Cat text.wgt/img/slate-toolbar-help.png delete mode 100644 resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png create mode 100644 resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png create mode 100644 resources/library/interactivities/Cat text.wgt/img/toolbar-help.png create mode 100644 resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png 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 a20fab4f36a5d0f7e7a48e67ce9335c1a76a005d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)tGP4h z+%xyi(97qKUw8MsXF#K%IhY_2F%T0FmI=FS7s>4>0pJM{Jq374%m_IHYlYl0IS1#$ zGJGbM3psHfKI-)P`yF?15ANVDy1hPxV`Hfl>Sc-VA3uy(b{oExX_T~XcGrdL?ZbO; z0Pp?*-2MPX8Yk0Vzu&N?)>l~^T~t+xs#K^J3#dGWOkz~V@z2k17b=%S0n<|)1jp9Y zKP0OI$K339&@;nLsk<4=#cf{cgO6C|3zl_v8Ki8@T(`IZC zP$uC~7AHvOA?C9Q{@z?;eD(E++IKN3(QJgZl4nuqzhZ#Ti 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 4a1d133b72676983e994ef76f99f777714560e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^AT~b-8<4#FKaLMbNtU=qlmzFem6RtIr7}3Ct|)b8>35cdc>t?ftpS zuS$LgQr8A$HQVt)xCXQbrS8`6A1kME>z$;6DIMRmF?fA)e&fNF>T+LiK_^PUIASN9 zR69^+pDosEx2NaVcbd*`C#P$K1e95AjMbkn&f;=M?J~`B?H(8-KxyuVIQr0z2hfan zVXjtR^(nYvtwUl93o{qQ>lBVyByyTIz#_*~%N-!e=$c@V8aNpq1_AmnJ@RhJz=MY< z1~*#~6ItXea(8(WWeVGgauBBgQ3Me4zzVa(b^Mf)+(kqiD8&o2&NR(5r7~I;&+6u= z^ZFU!Oal>TBoq2P;m83hp47Z3i|M~24SCXROoTCi?H+L%JHvzyGE&0Ul98CEnVTX} zF6Mo34ncTwmn42CezDz+#3!vh7MWZyDlEu+fS71lT=GL8&uut#UkK5qog`W9C*d!& zC5W;Fi7RS8D?#!0Tj!t}jDuIEO#^0=E%d24tM<4#>^#w~x?iR#ehgTEIT0*DD6248 zo(5UQ&oK^Ou!g?{7H2z4;K1%2C#|K5sIG+J#M98D+3W!Et{O{vFT(Eo6rwc*(*OM! zMFMx!Go3dP4mTzFcadD*%2{(Lb4XJwXQ@_fa~f75g(9bw$?_*l&WD^TXG5qt3`H94|67uV zl+$Es{#LD;qJ}Alm0{@r{_ncp@4deFdambvp8I~@`+eW<`thT#$_ly)AP`6y>*nMQ z^vM4kL=Jc#Tz?+}bl}Tq>o$DQr3Y%{a9zeSfA)~ zv2h_Wcn~T)Ius9cA;jS0qGK*xhGBecFFl&H1MIZ_x5LEXLt+Wh7hxv|L_EmK&fLP< z+|uep?(PNTKT_&+lIjPhM%{uR$H!Uv z`Uu!9>ykbn!O}#(?xYQi&ag$(%xGWV#+H^?{hZI@f8!~`bkBH-(0(i4-xPbpayEX4 zEzTI5Kyd{Ik;e|Rslv{2#)ERa7X%f^CGg|E#nZ?oXh*0VaG^C`V zrR79m8(`7h~#Y6co|umHm)nFVnhiM(IP z!q7a%3R^%00;1fd3ExPVH!NF-r|$@wRWp{5r+j@C4DS(ifoY)BB_tQgUS6UJV*@MD zkXcEPARe$h9q#K}(tu#a@*juh9c26X`Zmue0vST74@yBJE5K+6OdLH9d^LdV6UO(??SFVe$Tv{5T+YLHr5dG6s<& zVQO1wchc^oA?{`be{H~fJf+OryBwcwB3&$a@~j)-VT+@7(tNp(4m)JlCi9hbTCcru z^A4AZTCv~SNIs#NwZ`O1m>(E8vz?7(0I%$j*AnJ(t+12qO|K})Qq92UWx2nJrvMBj zpVe{>8I0te^e>-@-=XDPruup z7kfZ@t!A&Mzib}@vW<+=mi9Cw@a#T`0fvi@Qv_8_*JS|=KZ%L*6RYzQ_Y%XuDCYyY zjg$7{;%C_*fQ3txvlslQNhlc4YVLqZcF zyN%diO$dRf%J62;&*!0jQW!ef+nZz4UsV)H5uBtBD)2?4BIL_cd~pEx-{23VJBPQ} z6TPgzg8bmWo#i0~_c6?BA;f4R2XU{Ork^gF2PeCKHG(U_RX!YBsuK9uTw zmv}mmi=Pu-*nXgc#HrLGon>^V|dJ9;#Kp^ z?7E(V&woXvdT9bnmt$kbvhvXwInHAY8y1B?5gJgn7kd6ZtR}F6Ybw31j;W$8(9(1$6-sS>p3G-Z;wirY28e>=0WC@`O*B*6r(r^LyoQs_N)tqV_aHVw` zXpC*aeKMt3z^+c~^Bo@`w!#&r4(nqr8en6?u3k@8CtUT`6;lf4~54=uqAm<@kT7Wff zx&?7tIps)A+nm%QP1xETQT5$}%VXH8V`SfT2^9HxWITbrfL}xws#$&0X(A*TDnw2q z*?;Uc-TL>-iIDe+r;QIKj5iSwOHnrL%f^o8dJ%~Aw9>vbrM_BH;BRKz-W|JK4Cbnp zBP*7uq-2UKk74Fr2#6cPBkUCWuW3`%lX+fITHEh$pdo;Mi>#g1O%M6kNX3R38e#uL z(f#cb0xQZ?uu}1@vVb7J>FD{uBJzR|Ci#cj>vA%eXX04&aU@&Yc~(awZJ_BukJZ<^ zV=3VZ@u7+r6exB+ z>d3*|bhgHR>1NUI(Jo+QESxS>($f$D=;2(e-aB7jUdm2dw%?kS%s;C@aRCjkHr41h zx45(Dx0abGe|`Q^pHQM{1a`HUJd((xvc}dk=6t9WM zv%!_F{$UXF9cP|Byv-$5-gb`6&oSEmS@vHNQ7vOCJER>8u_z6nPOBY+zQ}$8lK~_R zq4;AT>rFzKw#RA%8PKNL&drz#(v-&l`J7ld_ar1j}3n&@dxWz>asMJ5RJesw~uJ z585bJHVxJ0Jgq-jtQXv0(dLg0D1SM)_0`?f{%;{}F!Z3-t88$(rK$X=o0*xmbBOr> z7j2Z3Yl+y{MN;-C**US*NoR^$9AQmI-%;rcuGtW;D=p_+>K=rnP+0Anmy~U^v_u8XxiUzB_u&enG3Jq(_UR1RuGk&M7<79tk*7Nr zvm5neEiW`=rn`@y`e);-`#lG{UZcuWA)hZ{k_-*H1`7!myK@~BrD;sF zFh#ju0v;C6rOe7d{FZC;tKbZX2kZvwJ-Qxl%8Q3D%C9b16M|pK%a{y2mp{R=u{(#) z^r$7QzJueXYd(q}gh1!?hvK5`p49dJ5o^Ag+@bTF^*p5=?m7Cmh1BQJn9v@V^r!pn zahzKZz#-wKF`%pk*`c~1F3EN%LrK{Awv(3n{f$yfUCfznA96P92J%wY*A@EGii6e2 zpe{#ibpGWNUk~l8lFG2hm6qcl1}`8SthX#jJW>9!xyys>GbO`gR8C8bT^;r}-MuY% zud5vWuGog2fw1@u12GfR&n&QzY?cRKe8aLzw^pDEWA>`dqO`VLY)?9xz4*w!ZqmNB zk$QzNlO3{>p+2b*a5wmaon6uF|OW!l^t5xwsoD%jm*rUjy}gjBlLTWM|pY($SLJND&j zRLh^P5v+bwi$E7~XhP;W0yvB>cF;M8?6Z_Tcc$b~+#i0@tzgiFUvCXMz4n1M#zClC zWiMCRsB%xQ4wPffRhZT+?5)|I355i4ct+NMs9%k`_8s`}QF0%J!|`^z7zLZ2G8 zz#(R;%-CqcaQ#S^3+L9x8^y_EmYZF*-~lz zM`$|cK8jr9FWEuiXgJ)S?i?)$8=GDb3E13YTF@v7=g^wF!{sG`D+3O(WtyXkcVede?aq<~re zljW+14zujy9P`7)*X%urh3jR`->iDZf?X4Djm!o^37)pC@_JRAysyH-06 z7@Tbtu8~f@sK07xHT4ZuqINUxnEio2`r531OAT1IZLa~5x4Af4FoA}2M}t;$VY6*5i3V}^P*Mr= z(V~;SzpEP;>o$+;T94N4f1i_Pq3(DGYa-}i*5yDqaNDO8N}RkWz_XOKM&Iz+>(yTe z$@Ivo@AqvEoN!g>W6ql&ZlYcc!{$Ecf~R_Z9H2W>M;8_66kDN+AwT_9A(+oAh(Jwi z8Lr0{eoJ@MUt)!K0jTmC&Ojzoh*pTW+0uo-q#jp3WBqD0%#pY?7d(8D`re z^`UE02ftb*5!X+i+9D?H_b?PyrMkP{uUz55JD<_rwB%Uz^PA@i`ynn?szr~d6?QOVvr@t(| z+AJXoWLNgxgq3WMEj>~#)K~!LhGMP~j(<`49>1;gM zr*IzowH~I0b#X!}s*JFkIdlYY%-d!rjnV~YpoGKX_Jq8#i;M9qM#p|FrGRC}zE9e3 z3Me+_cPA`GPFi;)kB0=|g;hpr9|OeK(EJh68LV9Z`g40VSShq|YOwW>cx#v5+bwlw zJDpP{a(jRKBt=imP?DyKAp2rV>c}Peg!OG(LdVVb$Gq$4&V6o*QdV{;$7?&K-Yf8s zSz7>8o5^qHbzOFwR3@g+hV0MHs*H9|y~tZTFF;ZCN5y+1ndD#$hXa7ETL6gTWhTjyfMHyD+>_8YCl$KHO|ROy1&ReE50aRaw+q;*#Kl5Y_|(& zG)U+l=sk!ifm*wLK514jHiidJ3Mpz@>CMistuxuT?@Qjfw@mU~qz{uCa@HI=did_d z^u+bpby}GJ2DBD@8pF`B!I_<@_Kl7AU+$?+_FxYVAn;`D#F2%`srsB>djkd8^5n$R z1nU4i0`S_v_{h}3`#)D9DvEp|NOB~&+1_{cz$jdE>z}|D3cQG@VsMP|U=bLUkp0;L zz4n>xRqqHHpAMW9X?&{HfXnRf4`G88=inWMMsm&tWg0E1GYLA^pw-3*i=#QNqjgD3 zx+HaXI`0yIjFv!l1L%8p4Z((BWf2O)ps)%AxEUFVSt&RkBBmZx!-N1?8V!+#URZiy z$bqJEt}o#I0A+q$dIuTVGDbjYH8jywp^2iyFAT(F+mR~vY?4H%5ST$MEr*1Yq-qIXq?^}a zyW}cU4-21u@Noqcc~-PQYkfbgVBJyL07ru>La621-8s~I=9KW+S{Jte*k!8wzg+kCB2o_nrCH|O?vbRXS~Bb zuCOdyhMnz42<%@81h^cCM2eDX6^mk?rO6eUq!&=gL1y$is(cBpdsfb6J*9B`7hnKZ WDw06KPZvZ0000007@qS@dvOgaA8U<@5=ML{NmA_|LEYxxg-C(3j(%+?VyDN@L7)R2%x$G zsyl!f%VA*8nwjsY>HtzK2Z0Z7Ui_z;14y+T2B_iyaxMS+_s?aD9YBfYKuUlj2T*D` zMcI&IpF>MRvK&AS%gJ^CwJayg0o1gdWCu{&a*`ZC3(JXi0Ie)1+5x@A!P8$px%-FO zmJ{uO3rBZ6`TgtX4_2}a+m|~wu*JkoT5QAzp$7O&@l^;8mkB1Jb$zw#{c*4?-eE{W?P{62dcJ; zr4%*nLA1F`2m=QfPdvC032EUP>{~zAJS?k`BFo{yfD2zcbMP&4Fauk(|5r?|{(o}M z+6SP7Nlvhnlm_tR{R2QeffCDM4qzlu?SdpPf^s7i9{>jR1#0yhh;hJZ=al9EAiw}1 WxhI7T;&QP70000J?Gxv$9bOTect!?{?08< zN?hvX;OPJWfD=ESC!j{q^3JfMzUrKu2h`v}#)`=0xQx_@RTvO0#nUj5uMn@p1ejQ= z+t7`L1Aq-E7m7#`x(t!v3WnH%VQ3Wu#Rh=z#acovS&xxm8n#ZZjG+B-^f(QaOCxA2 zIVg-0F<81hK1YQu&q)+Ya@I?@QrhB3FkFjJ0t$>2gIYzVQjKUMXwP&JYHrzvXy7vl zxjusS+>{7S0%LF$267lMT>=NgU@()xWCw+Wgam>tmKbdn?x2-0XY3=NxstJXnGE|+W3V6o^Fg09vnNwJo$RL`GO;9+Ws zN=}e+TnSnf#c6mJ89}3*K2JeGyp&a{UzCX|7^D>w5R(C0Qkn#!=>J0%ikE0LDZpO& z{ZC=FP)A^p08`^xDhYLPviX)!1QMgd#3Zf~;&|p{6_e6&5?80=1Q@fN1Fn=SrMO1@ z42_})U#TX=N(sj2MbIcdLoSyhF}x5ShqHvm<-oB_W-OB%7Z(y63bWavalu?(EO(O2 z!zEb?Oi501rLVZ`DY=$LP!LpP9;T9KW70Skt^l7UjL4_<0#B*;f-9Zc3v)^?M45ps z$NH~hp4_5($1;7{wAA8d+ha>aN`4^P+{?-|ntN-*HQx)6TATclZsO zo&Fx|-2@w`qA@lHZwR=N+Zm@kM()CieUF6j;@u z)mi($s_Ysvx4W0z_|a%I-kmsd`n$gx%6iMvq#cE>+C1~I!bkC=j@Ke9y34+lpX6OO zXN{YVLI+|JqM4(EH*dZK0ZN_9zS>AbgtOE=W%4d;Ch`fL$EeKN)-=9-`HC9acSx8 zbHfe+YYP2)*757zy}9~}F3sClx|W|lGxp6A7yCw}U0j#zcW6gI!{`sg-Mpq@0`?9r zI{8uSv0oOt48Bp`a`51plR{yL5B}6?A zn6+53i74n3D8uy*faXX_P-Ns!MPbcr9*&;Smml8kTUhv^*(-3Tmz%ysXfnT}n zS3@r1|K+6%kiUS72|H8u1LTW{Lf1JdS`d>v4N6Qnu+_cDrU-h519XxnWlyUk}jQt8p z=&zWj`@f?)hRmBjc+fG@{DtW) zE9k9Mk*#ASIIF&>sA%r)F@HOhXn#Zx41Cbi($dc(E7i(b0o5j9XGHaD@B#zpioNaL z-V0;wDznGF{;}Hn`rbKhq5CUj2b?!9-j) z(t)e-1*S()rv8gt&fa~}v$N#)Aa@-KUrlR>ygu#lc*cbdc?pQK8DAy7RoHC(ciOmn ZDi8|3Y4kkxbj0!-_pb~$&L3vDaAXI=gPRvNf*c8S$Ood*7f2B<470o|&+qb$b4UIY z13>CP>OuPOnGLstkOR8%{g1qObmu=Q0HhwIk75S^eUb3s#)bdn0FXYAeu^Bhd-aTS z|0w`a{dn!bn+;`^bqp!VV#MfYB#=_6QA{$9mV`ss0iQp-IZBD)pWhRqpFlQo_)i&d zptvOb{rlHea%_g`qr4~v(gJ_~{<%zwYKh_U?Zrw@-n>WPS6;vE1r zEP==XNFXwOfiY3-0T}r6=l54;W)?17>VZN3jfI7ko0J9#3n|%Z%fg=f0wNOHxa2>) zd2yfQyh>~ofWWf{H{at6dyqT{S)6cfhz|IL#UD~4PjM7%n%~7BDX)rC{`te(3^a`b zU{mWgfu`7NQlo$*2LQ!35XgcXNOb^7*$@Qgcjh%IY8cj{i{HO-zB#dcQXRSjs2T-O r^#wS5UqE6-M>qsV8zl4q009O7eJ4TJ=dcL@00000NkvXXu0mjfuXXIg 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 069052d0061dacbeaa3bd022259a5db0e37a9f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1795 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 literal 0 HcmV?d00001 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 78d146ec37fd55bc97dbac2bf21e599468ee8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8pIh$D;n7J8P zI>Ge14w>EaktaqCUE zeMXd{ME$g&z>Gq{!c_^51snY4TFqGcLLjQ(k}BKWT(|8URw)zHiUpPV%6ybN9$az| zmu;Sc#D(ln%u|sTI=_3w%fVq$30uq+-Wr*9>1G+|L*tQ*8A<3KdPL!+jr;j zyPNI^?l>Rxp=xiU$?=&!&#b?m?K{Re;o6oTci2uHuq-+4#ku0izm_8tZol1k;`!%% z;ZByeIC;BvdFM4@+U;$ZUw-yu+3!qAh)ffylanGm54`^_&&$TFd03vI{mjOFEP7!Ret4N3Q(;gIHk&>5PTAf# z`$@Zlx$<9B{;iv@E}bmI!Pd;WvsnEJhi9t_pG)!aN5MP9I+z*{1f0t*D=(kEZn;BW zW0OIF)!eMLVXs5qw3#=0ElpbFuQ=1EF6>F0dC#v)rBQ3WZ)*P#zx1}uo~w58#TBW~ zm|9}2?A|LZnV0Xp;9|y<#ESkeSF=p5B@aH>B;V`idFW;rL(t*Ly_XGz&V9~Ze;~oY zW^vp8sRBP#OLW9ecjxvzwkl2A{Bxzjyt8TXGgyv2E)0BeJ7-&a#FKxv%aW=iUaN&X&+75LUZLyb_4t6%LZ9WqX;HC>cO0K}C{;QZ+BU?z zo8YnfVQ6Hp-%}TLq0TeU1BxQohOK`pAo@7g;nhLsSNjh>Ewbc0{v+8!W}aS_!@_^F zuXpbFEIa-5SB|B3rnah0K53WakhOMJfuedt|G$R0g-e4nH{(tuF)I_U^4vQ~# zT))8{lzqKLB<}NU&Xrj;(pOuw6XK`DdOc;ieq@bwi1Z%blhz6SRpKvJlru7Z{Jhz< les}r7ySG2opO9x{WB7J{-|3FTiSIzgyr-+5%Q~loCIA;2bXNcX 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 685a5cb2a93933036bec2353f4e1291358ec3ca1..844169a963567982f39336dcff5b0c56568f58ce 100644 GIT binary patch literal 2289 zcmV000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200>D* zL_t(&f$f-oY*W`2$G`XevSWTZ2@nE>7|2Mpl*FtpZCR)t!P+rRg9%EvbX9^!VVX7p z8WNeRG%x%ZNE0IJD%Nf*37ytzV?a=+vB5S%L)Ne%;;n3jk_smXl0hJWB+q_7&;E!V zY{!lrvcW$b>B;Zi=X<}Od+zbQ=a>-@9;R^*Rs9hF03p7CF&6V&T~R6nsM~SyOkbq! zwO5w71wrrva075jk_1&%14QH}qNbhiw)m3?#>X5R(GUetv+g;!D2i9+K?ndG$EtK)pGHIw1OcXLLf3U< zW=_F3U;N4$Q534#+%-*c-D&|qzxb<_j~6YFkDq9EpZ9+Pj^iMT;zR(y-?ef1=XG80 z6Gic!R=oJm4a;1rs%_IW4IIY}yBq*|d+%WH8x1W&L3zCRu!)5)A7lA1En4wqPu&a4 zzX(wjVObUwMaktjRuwIt5P-<~nZx0LBuQa!aNv0!cDo&-C_+`WZLe1@btMCc7@POv zmPI9nTjtMw42&_@Y&HPcTwPJ>jQ-w;C8+wrdIcDY1tNlwkr5#q`m`*Vx{mD)&8Zk5 z6qMIpKlA2_e_#CUdBzwF!?0y#Im-d;PYNIwzPu{s$YZeF-02%1FIsTra(f4KU5DLf zTOSSZf8UDP{I!7z4*MlwXgNcwS`hvIft&@|S}D z=Xt2A3XZYewcqxRITl`fWr>^P_-z>(83+c0C|EETIn%T1QUWm7>Za0Xzu=FY_o5`( z1%Yp_S@&Gp5IZ+4^V;pUW=+$eC<-P_aNya+#V0X;Z6HP~Sw29Y{l@#}Qy-l=`}dDw znkI%45n*6(P}$4#eBJhj<~}5_og0=p4a3;Xaa;{!463Svh_L4CFDUNf!lJYR0DwA< z$c;z-P;>751vnfIsHzH46rt8<0uIoeZ z!#kWPiqJF-q9~$dVF5f#pSqiwow+F@4vaA?j`2j`up6eiufKoLd%o>o=(yU2uI`)A zG#!>@Vd8`gOr4sAg3q~7STGOH?92uLwam3T5Hp#vWW@4sDQAflKn+79gg-Z>&7f6H-_eV#z$JG-f`r<+n) zUr#qRzO$QTpT{5eR&u>$0J6`sDsa&sGw4{YyR)6%u6?yX8X_$K+2?T{daL$Eit(=y z(NQ9*316p(s5kygA!Q&2A}xS@Ti5PMHeruiTb7l*k4_FBB6TNnvT_z?DM$NgxDP2_rnj~4aIw5 z1OO2=js_66v;Y7g6de3xq*F*4pr8EkTi+cO;D2pIDcL!TBllWJNnM^R{e1(G``Po0#$BFIoSaz_ zc^tH53JjqmS*En@-zz%+D)7sMhArEd51k^zJvWB@hM5UnQt1K+I@ra1a;Un$g|aj_%HO z0Kkkn`EV61f~(LyJnMMz@OZIr(m4x=Xj6P7rDK+5-XWsOQT5UR2zPYTP}-HQ)l-6F zJMADG1;hoQ0{7~I$p8O=@YM+57-KAuq<^g5XtRD0_RveSM*#l?BwzixKjlZG00000 LNkvXXu0mjfx#&Pd literal 2110 zcmaJ?dpMN&9)IPULP##F%)TzQVlKvI3?q{qH!AU7rX(x^@3SCarV%3VJMx2>8?fK(4@AJIx@A7;;pYQGSJa5i{eLgzc zX4(J%==k|k7>X68e6=(bUvYBsykap$yhD*dI0i{%i6DT?fukXmADzgcs0+aUzv6FdhR}Q$x1LZCyDg^it!a_;;@d7bXN&-LV5*2&pH3md|fFL{) z_(xKq0S8cCun0mqp|SRCtTPtnj6>t_jxH`Pb|?od4vWD$U~mrhI2R(`fr!PTK0cr# znurraWKgIdV<}D~Fb+Y4L<}Y|F%g}JN5i6649?ZnRjJ|NV6Q;fi<1NhOKL9=TdpZk zATe9S6(U?%fKn>5qG1U_0u`D5Q37B1Nmd~K*d|58FjAHfgF|DLC9MGi0{%ag&;NuL zBMj)zeE+AgI4DU7VHl7YmWbGj!NpiALkWpqB8Y{+q97QKU+dz5I2eJ&aj+2O73hQt z;R-l#qWA+kAb{v65F;!B8}g%&Km{Mo<#LE#1S)}oCpf!0VZCuUZydqZ#g*bpcEIDj z_B!Kn&TCu>%$D#W0kX#B{K<7$m#Z`aU#N&ofkfOR5Qi#)`KS*C6S?c>;<&EfM=odm zT%6YBVid_>lwv!TOA^$jt_3;ju**OX8P$^oD_)9J9RL$2fBKz4t>mXtnfX zCTH=~3$vOfy9VqesDhx15g3?a?>skiv{n@Obd%}_~SD+n8j;di)UX{ zyg94a#&OuVC=xEJEWZMT=B-Z`|0SDUc=9}D`q7j0`BuG(h9=vs+B?zpOQylLMs*Dh zCl3^5Kkk0?I47EzSw7F#tZat939bp!m=L{f50T|wl77?3>q(J4d{~xNI5f7fAgPpq zr=q5%?z&n6^Hpvu2=v{N8`{H`>!Poe4E>-oYNNvKMT$mH*_##Mj9aZ=UKT zLg5+xv2n-FyF)slq2;#r4Jm({>3MND&-CBnLP-hlGa}8#P`vw;QPyWYWsg1dBjh#4 z$9GUy!7>SOyCP4XL-4da{LC(E?}$~IcjSH9*w~onMzvp_C9Smlj*bio(-r1>Bs~|z z{9}18EAn!vU2AV|uSxzL0}MUmg5+w%{+9IJ8R#x_yJ1A!c#-Prja|03bAdyk@qkRm z!=L=zz}nBM%7m)XG5&VtX14$sxP3dvB)GotqI2f*5$_Wv;gON>SiSn|yJrkW2F*%U zULwS8i`SX7#=H*oR7@-V(6@9Z(_E%i+1cq%!&?_rS683tpzq_Rh(tf09N53@MqfaT zS`^lVTGi%#Z_;w-XrgxN5HT#!+WPX;)YNz`K$A2q)(p`#s-{jxjmuwVel1QjGgcGQ z&J6!?5gMk=dO$`%^6zxPwADFms=XO z=x)-=kJU^~Yjb`6c4E2IFwGPA-t!dJ*0+RVOegC#c&qgtc25VV2~AV&!U#`~oy~^w z^0G3|2Ryj%UBVF`66>ZxBy;;e?>G|(KdB9Qye%B~%e9=Hj8@9z`C32Tm#7WXqIS;* zs}#52_3HM}dcP}K86HuMDsEWVt|QAmDwoSyF)@=C-a$-8!p|`b-=mI}kFGuy+Sx7` z`B+c5&3@^U+UCl+!5A%F7GE>ntnpVp0*Pc_&7=N!`n19KwY3|XM>cDxSbssv$z>% diff --git a/resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..daa338cd9bad28014559c72dab05555471ed402b GIT binary patch literal 732 zcmV<20wev2P)hPu2Ds07A#D z+(`)m10Mn0JJUZ@+pnq%MBp|%ES8NwDOLk#-~e!sr^msc6xo3pa5tZ@SZX^c-ho6o z06e&ZB7qF}i)0IA!gl~p>L5#?0N!D-JQN8?!jlC`;HvFkz>@@Oz-J58g3l7D2|p`P z8~&=mCE!tkOTnW827U+NPfd7GfZKJ0>63S=?e7451Mpk}9uxr30C=|7DAo1@fG#3Y z1bh} z^05>ix)tAeWB=B=!&DC&0NNI&WPE`=rmvk=Z9huGLQ(H8r|$x9UZ75YfIRIFC>8Aw zfaLK{3Qkh7L*3U0(z`UC0k;6t*GAaUDm zv{_eH15)rT0ZDkWKndKe&lf0#7YRtfvjwE!Spt&qWC3Y-l0Xf3s(>bWAi0-<&lceH zYekZc8Lx~?5j;iUE6Ibmu!%^_hNlP&B*(zwRS7&rz!u*o@PK_TJVn6G##wBSAqzfB zfMgdq=g~R;Y@Ro3;YFgD1q%&8O?(WPGBdSVDd`TL85dhqT2qH4N*IktZ1@II2I(YR4)WAlv zvU%qR&X@!VPJr&J6|ez*ghT^dppdL=FCxGNZ-6^P@E)%~&i!NSBU#Tt9T^*vt~(P|%gu7`!?=FJha~9{6Sqo?DucISV8!Tj0q^e|G$^U+W6=&|TFs{tr0D zn`GtcogeTY{2@7k0{HHEzmIV?MZg+=cl?8)4fjZ138$>U6Oen}H~&I_Zwqq#0!Ns# z1)=mZrC*QeGz8FHb<620w~?$ojJO|=hS2?H{W|fyC9-)1SKyz?OFd_PpxdkuIiRjt*AT2)sj{}ur*_}&=2$KKgpL_iZ6yhk%zfT|V~ zgZC(W{*%uKEY0W=-Rf*QTz?%{1n|Gl2dst2T7r*J2mKobq%Fk*5r>%ImKC`8@Lh^BEZML#?@q@t?dBCZ7*{$}PBp`GD#z=jH<W1u002ovPDHLkV1mUGDkT5_ literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png new file mode 100644 index 0000000000000000000000000000000000000000..340d7371f204e07c5e1e7202160cbd20eb2bbaff GIT binary patch literal 999 zcmV8xO?{jC#X3A z<^rQ6j=F<){f31acLnk3NI;JEztL3;=ED0r;h&G?5}pfEjSuu_%CNV5XvU@m_!&_+lvS zGi=KfkeD6`29P2<1@1bOm((tAl*iOtGP3^n3d9XW5P%ffNGo=&I0vp(l;$ofDY6sl zZJM|sY_F!dOJ2EO@>1E?rnsVF@H=Em>=u+$6d29P2f16LmXhZ?R|RFqxl`C@$SI(F}sZF#_Sdu2ZG0hGq|spmg$1$YVp_`N9r9sNul zc?iJ5xIUC33yOXonNo*hm+sDNcu$?-z{+T$V$>6jtT;Xojsw@m^#PD;g`vh{+U~A! z2ULe;Mro_5gc;{{Dc-445mWDr2m>KcG}_e*h6_{j6sbsb!(>6A>w;UrG^4d;l$b zJpj3-bf`RPZ+QXy6_Lnh`vZDgg0?_JMjb1@7m?UUB_byx@?g!W8czgmfr!jJ#!C@d z`^NWx{BX_f1rU+3$9N;N5C9D^wdaNaEPDV%M8*Rk?u>br?S;-$unBQ^G%@Xce1AZx zl6`-mqd(vTu=XteK(Kv(U<>_$I&ymZ1HMokTkpY}`vbBb*2h7CNb00xMzG*db3@0Z zZCjRW_BsG;FARdv^DATii@o|z0FV1BJ?71bQpb8%Hcj;Nu!6);xS9TdQi}$_Hqe`l zMC8J;q7Zozt2P|81=hrgv|r3VxfMs+9=rt(1!F?`19cX3&2QW5TJ<($=U+y9fPeFJ V^_8`m{=5JH002ovPDHLkV1m
-
- +
  @@ -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; } } From 4dad29344d7f5b435e11b2082e6aa74a0ef4cad1 Mon Sep 17 00:00:00 2001 From: maximXbs Date: Thu, 27 Sep 2012 18:11:18 +0200 Subject: [PATCH 05/20] updated 'choisir' app --- .../interactivities/Choisir.wgt/css/basic.css | 133 +++++++------ .../Choisir.wgt/images/ar_down.png | Bin 529 -> 0 bytes .../Choisir.wgt/images/ar_down_white.png | Bin 142 -> 0 bytes .../Choisir.wgt/images/parameters-bg.png | Bin 0 -> 4256 bytes .../Choisir.wgt/images/slate-display.png | Bin 532 -> 0 bytes .../Choisir.wgt/images/slate-edit.png | Bin 1907 -> 0 bytes .../Choisir.wgt/images/slate-help-white.png | Bin 553 -> 0 bytes .../Choisir.wgt/images/slate-help.png | Bin 1795 -> 0 bytes .../Choisir.wgt/images/slate-toolbar-help.png | Bin 0 -> 1697 bytes .../images/slate-toolbar-reload-white.png | Bin 1619 -> 0 bytes .../images/slate-toolbar-reload.png | Bin 2110 -> 2289 bytes .../Choisir.wgt/images/toolbar-edit.png | Bin 0 -> 732 bytes .../Choisir.wgt/images/toolbar-help.png | Bin 0 -> 707 bytes .../Choisir.wgt/images/toolbar-reload.png | Bin 0 -> 999 bytes .../interactivities/Choisir.wgt/index.html | 19 +- .../Choisir.wgt/locales/fr/index.html | 19 +- .../locales/fr/scripts/selQuestionApp.js | 178 +++++++++--------- .../Choisir.wgt/locales/ru/index.html | 19 +- .../locales/ru/scripts/selQuestionApp.js | 176 ++++++++--------- .../Choisir.wgt/scripts/selQuestionApp.js | 52 ++--- 20 files changed, 318 insertions(+), 278 deletions(-) delete mode 100644 resources/library/interactivities/Choisir.wgt/images/ar_down.png delete mode 100644 resources/library/interactivities/Choisir.wgt/images/ar_down_white.png create mode 100644 resources/library/interactivities/Choisir.wgt/images/parameters-bg.png delete mode 100644 resources/library/interactivities/Choisir.wgt/images/slate-display.png delete mode 100644 resources/library/interactivities/Choisir.wgt/images/slate-edit.png delete mode 100644 resources/library/interactivities/Choisir.wgt/images/slate-help-white.png delete mode 100644 resources/library/interactivities/Choisir.wgt/images/slate-help.png create mode 100644 resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png delete mode 100644 resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png create mode 100644 resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png create mode 100644 resources/library/interactivities/Choisir.wgt/images/toolbar-help.png create mode 100644 resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png diff --git a/resources/library/interactivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css index b40b8bb7..ad7c7371 100644 --- a/resources/library/interactivities/Choisir.wgt/css/basic.css +++ b/resources/library/interactivities/Choisir.wgt/css/basic.css @@ -16,7 +16,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -471,57 +471,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(../images/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../images/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../images/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../images/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../images/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(../images/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(../images/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -556,51 +539,50 @@ body{ background-image: url(../images/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../images/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../images/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(../images/ar_down_white.png) !important; +.pad_reload{ + background: url(../images/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../images/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../images/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../images/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../images/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../images/slate-help-white.png) !important; +.help_pad{ + background: url(../images/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../images/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../images/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; @@ -609,5 +591,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../images/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(../images/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/Choisir.wgt/images/ar_down.png b/resources/library/interactivities/Choisir.wgt/images/ar_down.png deleted file mode 100644 index a20fab4f36a5d0f7e7a48e67ce9335c1a76a005d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)tGP4h z+%xyi(97qKUw8MsXF#K%IhY_2F%T0FmI=FS7s>4>0pJM{Jq374%m_IHYlYl0IS1#$ zGJGbM3psHfKI-)P`yF?15ANVDy1hPxV`Hfl>Sc-VA3uy(b{oExX_T~XcGrdL?ZbO; z0Pp?*-2MPX8Yk0Vzu&N?)>l~^T~t+xs#K^J3#dGWOkz~V@z2k17b=%S0n<|)1jp9Y zKP0OI$K339&@;nLsk<4=#cf{cgO6C|3zl_v8Ki8@T(`IZC zP$uC~7AHvOA?C9Q{@z?;eD(E++IKN3(QJgZl4nuqzhZ#Ti diff --git a/resources/library/interactivities/Choisir.wgt/images/ar_down_white.png b/resources/library/interactivities/Choisir.wgt/images/ar_down_white.png deleted file mode 100644 index 4a1d133b72676983e994ef76f99f777714560e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 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 WxhI7T;&QP70000J?Gxv$9bOTect!?{?08< zN?hvX;OPJWfD=ESC!j{q^3JfMzUrKu2h`v}#)`=0xQx_@RTvO0#nUj5uMn@p1ejQ= z+t7`L1Aq-E7m7#`x(t!v3WnH%VQ3Wu#Rh=z#acovS&xxm8n#ZZjG+B-^f(QaOCxA2 zIVg-0F<81hK1YQu&q)+Ya@I?@QrhB3FkFjJ0t$>2gIYzVQjKUMXwP&JYHrzvXy7vl zxjusS+>{7S0%LF$267lMT>=NgU@()xWCw+Wgam>tmKbdn?x2-0XY3=NxstJXnGE|+W3V6o^Fg09vnNwJo$RL`GO;9+Ws zN=}e+TnSnf#c6mJ89}3*K2JeGyp&a{UzCX|7^D>w5R(C0Qkn#!=>J0%ikE0LDZpO& z{ZC=FP)A^p08`^xDhYLPviX)!1QMgd#3Zf~;&|p{6_e6&5?80=1Q@fN1Fn=SrMO1@ z42_})U#TX=N(sj2MbIcdLoSyhF}x5ShqHvm<-oB_W-OB%7Z(y63bWavalu?(EO(O2 z!zEb?Oi501rLVZ`DY=$LP!LpP9;T9KW70Skt^l7UjL4_<0#B*;f-9Zc3v)^?M45ps z$NH~hp4_5($1;7{wAA8d+ha>aN`4^P+{?-|ntN-*HQx)6TATclZsO zo&Fx|-2@w`qA@lHZwR=N+Zm@kM()CieUF6j;@u z)mi($s_Ysvx4W0z_|a%I-kmsd`n$gx%6iMvq#cE>+C1~I!bkC=j@Ke9y34+lpX6OO zXN{YVLI+|JqM4(EH*dZK0ZN_9zS>AbgtOE=W%4d;Ch`fL$EeKN)-=9-`HC9acSx8 zbHfe+YYP2)*757zy}9~}F3sClx|W|lGxp6A7yCw}U0j#zcW6gI!{`sg-Mpq@0`?9r zI{8uSv0oOt48Bp`a`51plR{yL5B}6?A zn6+53i74n3D8uy*faXX_P-Ns!MPbcr9*&;Smml8kTUhv^*(-3Tmz%ysXfnT}n zS3@r1|K+6%kiUS72|H8u1LTW{Lf1JdS`d>v4N6Qnu+_cDrU-h519XxnWlyUk}jQt8p z=&zWj`@f?)hRmBjc+fG@{DtW) zE9k9Mk*#ASIIF&>sA%r)F@HOhXn#Zx41Cbi($dc(E7i(b0o5j9XGHaD@B#zpioNaL z-V0;wDznGF{;}Hn`rbKhq5CUj2b?!9-j) z(t)e-1*S()rv8gt&fa~}v$N#)Aa@-KUrlR>ygu#lc*cbdc?pQK8DAy7RoHC(ciOmn ZDi8|3Y4kkxbj0!-_pb~$&L3vDaAXI=gPRvNf*c8S$Ood*7f2B<470o|&+qb$b4UIY z13>CP>OuPOnGLstkOR8%{g1qObmu=Q0HhwIk75S^eUb3s#)bdn0FXYAeu^Bhd-aTS z|0w`a{dn!bn+;`^bqp!VV#MfYB#=_6QA{$9mV`ss0iQp-IZBD)pWhRqpFlQo_)i&d zptvOb{rlHea%_g`qr4~v(gJ_~{<%zwYKh_U?Zrw@-n>WPS6;vE1r zEP==XNFXwOfiY3-0T}r6=l54;W)?17>VZN3jfI7ko0J9#3n|%Z%fg=f0wNOHxa2>) zd2yfQyh>~ofWWf{H{at6dyqT{S)6cfhz|IL#UD~4PjM7%n%~7BDX)rC{`te(3^a`b zU{mWgfu`7NQlo$*2LQ!35XgcXNOb^7*$@Qgcjh%IY8cj{i{HO-zB#dcQXRSjs2T-O r^#wS5UqE6-M>qsV8zl4q009O7eJ4TJ=dcL@00000NkvXXu0mjfuXXIg diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-help.png b/resources/library/interactivities/Choisir.wgt/images/slate-help.png deleted file mode 100644 index 069052d0061dacbeaa3bd022259a5db0e37a9f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1795 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 literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec37fd55bc97dbac2bf21e599468ee8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8pIh$D;n7J8P zI>Ge14w>EaktaqCUE zeMXd{ME$g&z>Gq{!c_^51snY4TFqGcLLjQ(k}BKWT(|8URw)zHiUpPV%6ybN9$az| zmu;Sc#D(ln%u|sTI=_3w%fVq$30uq+-Wr*9>1G+|L*tQ*8A<3KdPL!+jr;j zyPNI^?l>Rxp=xiU$?=&!&#b?m?K{Re;o6oTci2uHuq-+4#ku0izm_8tZol1k;`!%% z;ZByeIC;BvdFM4@+U;$ZUw-yu+3!qAh)ffylanGm54`^_&&$TFd03vI{mjOFEP7!Ret4N3Q(;gIHk&>5PTAf# z`$@Zlx$<9B{;iv@E}bmI!Pd;WvsnEJhi9t_pG)!aN5MP9I+z*{1f0t*D=(kEZn;BW zW0OIF)!eMLVXs5qw3#=0ElpbFuQ=1EF6>F0dC#v)rBQ3WZ)*P#zx1}uo~w58#TBW~ zm|9}2?A|LZnV0Xp;9|y<#ESkeSF=p5B@aH>B;V`idFW;rL(t*Ly_XGz&V9~Ze;~oY zW^vp8sRBP#OLW9ecjxvzwkl2A{Bxzjyt8TXGgyv2E)0BeJ7-&a#FKxv%aW=iUaN&X&+75LUZLyb_4t6%LZ9WqX;HC>cO0K}C{;QZ+BU?z zo8YnfVQ6Hp-%}TLq0TeU1BxQohOK`pAo@7g;nhLsSNjh>Ewbc0{v+8!W}aS_!@_^F zuXpbFEIa-5SB|B3rnah0K53WakhOMJfuedt|G$R0g-e4nH{(tuF)I_U^4vQ~# zT))8{lzqKLB<}NU&Xrj;(pOuw6XK`DdOc;ieq@bwi1Z%blhz6SRpKvJlru7Z{Jhz< les}r7ySG2opO9x{WB7J{-|3FTiSIzgyr-+5%Q~loCIA;2bXNcX diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png index 685a5cb2a93933036bec2353f4e1291358ec3ca1..844169a963567982f39336dcff5b0c56568f58ce 100644 GIT binary patch literal 2289 zcmV000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200>D* zL_t(&f$f-oY*W`2$G`XevSWTZ2@nE>7|2Mpl*FtpZCR)t!P+rRg9%EvbX9^!VVX7p z8WNeRG%x%ZNE0IJD%Nf*37ytzV?a=+vB5S%L)Ne%;;n3jk_smXl0hJWB+q_7&;E!V zY{!lrvcW$b>B;Zi=X<}Od+zbQ=a>-@9;R^*Rs9hF03p7CF&6V&T~R6nsM~SyOkbq! zwO5w71wrrva075jk_1&%14QH}qNbhiw)m3?#>X5R(GUetv+g;!D2i9+K?ndG$EtK)pGHIw1OcXLLf3U< zW=_F3U;N4$Q534#+%-*c-D&|qzxb<_j~6YFkDq9EpZ9+Pj^iMT;zR(y-?ef1=XG80 z6Gic!R=oJm4a;1rs%_IW4IIY}yBq*|d+%WH8x1W&L3zCRu!)5)A7lA1En4wqPu&a4 zzX(wjVObUwMaktjRuwIt5P-<~nZx0LBuQa!aNv0!cDo&-C_+`WZLe1@btMCc7@POv zmPI9nTjtMw42&_@Y&HPcTwPJ>jQ-w;C8+wrdIcDY1tNlwkr5#q`m`*Vx{mD)&8Zk5 z6qMIpKlA2_e_#CUdBzwF!?0y#Im-d;PYNIwzPu{s$YZeF-02%1FIsTra(f4KU5DLf zTOSSZf8UDP{I!7z4*MlwXgNcwS`hvIft&@|S}D z=Xt2A3XZYewcqxRITl`fWr>^P_-z>(83+c0C|EETIn%T1QUWm7>Za0Xzu=FY_o5`( z1%Yp_S@&Gp5IZ+4^V;pUW=+$eC<-P_aNya+#V0X;Z6HP~Sw29Y{l@#}Qy-l=`}dDw znkI%45n*6(P}$4#eBJhj<~}5_og0=p4a3;Xaa;{!463Svh_L4CFDUNf!lJYR0DwA< z$c;z-P;>751vnfIsHzH46rt8<0uIoeZ z!#kWPiqJF-q9~$dVF5f#pSqiwow+F@4vaA?j`2j`up6eiufKoLd%o>o=(yU2uI`)A zG#!>@Vd8`gOr4sAg3q~7STGOH?92uLwam3T5Hp#vWW@4sDQAflKn+79gg-Z>&7f6H-_eV#z$JG-f`r<+n) zUr#qRzO$QTpT{5eR&u>$0J6`sDsa&sGw4{YyR)6%u6?yX8X_$K+2?T{daL$Eit(=y z(NQ9*316p(s5kygA!Q&2A}xS@Ti5PMHeruiTb7l*k4_FBB6TNnvT_z?DM$NgxDP2_rnj~4aIw5 z1OO2=js_66v;Y7g6de3xq*F*4pr8EkTi+cO;D2pIDcL!TBllWJNnM^R{e1(G``Po0#$BFIoSaz_ zc^tH53JjqmS*En@-zz%+D)7sMhArEd51k^zJvWB@hM5UnQt1K+I@ra1a;Un$g|aj_%HO z0Kkkn`EV61f~(LyJnMMz@OZIr(m4x=Xj6P7rDK+5-XWsOQT5UR2zPYTP}-HQ)l-6F zJMADG1;hoQ0{7~I$p8O=@YM+57-KAuq<^g5XtRD0_RveSM*#l?BwzixKjlZG00000 LNkvXXu0mjfx#&Pd literal 2110 zcmaJ?dpMN&9)IPULP##F%)TzQVlKvI3?q{qH!AU7rX(x^@3SCarV%3VJMx2>8?fK(4@AJIx@A7;;pYQGSJa5i{eLgzc zX4(J%==k|k7>X68e6=(bUvYBsykap$yhD*dI0i{%i6DT?fukXmADzgcs0+aUzv6FdhR}Q$x1LZCyDg^it!a_;;@d7bXN&-LV5*2&pH3md|fFL{) z_(xKq0S8cCun0mqp|SRCtTPtnj6>t_jxH`Pb|?od4vWD$U~mrhI2R(`fr!PTK0cr# znurraWKgIdV<}D~Fb+Y4L<}Y|F%g}JN5i6649?ZnRjJ|NV6Q;fi<1NhOKL9=TdpZk zATe9S6(U?%fKn>5qG1U_0u`D5Q37B1Nmd~K*d|58FjAHfgF|DLC9MGi0{%ag&;NuL zBMj)zeE+AgI4DU7VHl7YmWbGj!NpiALkWpqB8Y{+q97QKU+dz5I2eJ&aj+2O73hQt z;R-l#qWA+kAb{v65F;!B8}g%&Km{Mo<#LE#1S)}oCpf!0VZCuUZydqZ#g*bpcEIDj z_B!Kn&TCu>%$D#W0kX#B{K<7$m#Z`aU#N&ofkfOR5Qi#)`KS*C6S?c>;<&EfM=odm zT%6YBVid_>lwv!TOA^$jt_3;ju**OX8P$^oD_)9J9RL$2fBKz4t>mXtnfX zCTH=~3$vOfy9VqesDhx15g3?a?>skiv{n@Obd%}_~SD+n8j;di)UX{ zyg94a#&OuVC=xEJEWZMT=B-Z`|0SDUc=9}D`q7j0`BuG(h9=vs+B?zpOQylLMs*Dh zCl3^5Kkk0?I47EzSw7F#tZat939bp!m=L{f50T|wl77?3>q(J4d{~xNI5f7fAgPpq zr=q5%?z&n6^Hpvu2=v{N8`{H`>!Poe4E>-oYNNvKMT$mH*_##Mj9aZ=UKT zLg5+xv2n-FyF)slq2;#r4Jm({>3MND&-CBnLP-hlGa}8#P`vw;QPyWYWsg1dBjh#4 z$9GUy!7>SOyCP4XL-4da{LC(E?}$~IcjSH9*w~onMzvp_C9Smlj*bio(-r1>Bs~|z z{9}18EAn!vU2AV|uSxzL0}MUmg5+w%{+9IJ8R#x_yJ1A!c#-Prja|03bAdyk@qkRm z!=L=zz}nBM%7m)XG5&VtX14$sxP3dvB)GotqI2f*5$_Wv;gON>SiSn|yJrkW2F*%U zULwS8i`SX7#=H*oR7@-V(6@9Z(_E%i+1cq%!&?_rS683tpzq_Rh(tf09N53@MqfaT zS`^lVTGi%#Z_;w-XrgxN5HT#!+WPX;)YNz`K$A2q)(p`#s-{jxjmuwVel1QjGgcGQ z&J6!?5gMk=dO$`%^6zxPwADFms=XO z=x)-=kJU^~Yjb`6c4E2IFwGPA-t!dJ*0+RVOegC#c&qgtc25VV2~AV&!U#`~oy~^w z^0G3|2Ryj%UBVF`66>ZxBy;;e?>G|(KdB9Qye%B~%e9=Hj8@9z`C32Tm#7WXqIS;* zs}#52_3HM}dcP}K86HuMDsEWVt|QAmDwoSyF)@=C-a$-8!p|`b-=mI}kFGuy+Sx7` z`B+c5&3@^U+UCl+!5A%F7GE>ntnpVp0*Pc_&7=N!`n19KwY3|XM>cDxSbssv$z>% diff --git a/resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png b/resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..daa338cd9bad28014559c72dab05555471ed402b GIT binary patch literal 732 zcmV<20wev2P)hPu2Ds07A#D z+(`)m10Mn0JJUZ@+pnq%MBp|%ES8NwDOLk#-~e!sr^msc6xo3pa5tZ@SZX^c-ho6o z06e&ZB7qF}i)0IA!gl~p>L5#?0N!D-JQN8?!jlC`;HvFkz>@@Oz-J58g3l7D2|p`P z8~&=mCE!tkOTnW827U+NPfd7GfZKJ0>63S=?e7451Mpk}9uxr30C=|7DAo1@fG#3Y z1bh} z^05>ix)tAeWB=B=!&DC&0NNI&WPE`=rmvk=Z9huGLQ(H8r|$x9UZ75YfIRIFC>8Aw zfaLK{3Qkh7L*3U0(z`UC0k;6t*GAaUDm zv{_eH15)rT0ZDkWKndKe&lf0#7YRtfvjwE!Spt&qWC3Y-l0Xf3s(>bWAi0-<&lceH zYekZc8Lx~?5j;iUE6Ibmu!%^_hNlP&B*(zwRS7&rz!u*o@PK_TJVn6G##wBSAqzfB zfMgdq=g~R;Y@Ro3;YFgD1q%&8O?(WPGBdSVDd`TL85dhqT2qH4N*IktZ1@II2I(YR4)WAlv zvU%qR&X@!VPJr&J6|ez*ghT^dppdL=FCxGNZ-6^P@E)%~&i!NSBU#Tt9T^*vt~(P|%gu7`!?=FJha~9{6Sqo?DucISV8!Tj0q^e|G$^U+W6=&|TFs{tr0D zn`GtcogeTY{2@7k0{HHEzmIV?MZg+=cl?8)4fjZ138$>U6Oen}H~&I_Zwqq#0!Ns# z1)=mZrC*QeGz8FHb<620w~?$ojJO|=hS2?H{W|fyC9-)1SKyz?OFd_PpxdkuIiRjt*AT2)sj{}ur*_}&=2$KKgpL_iZ6yhk%zfT|V~ zgZC(W{*%uKEY0W=-Rf*QTz?%{1n|Gl2dst2T7r*J2mKobq%Fk*5r>%ImKC`8@Lh^BEZML#?@q@t?dBCZ7*{$}PBp`GD#z=jH<W1u002ovPDHLkV1mUGDkT5_ literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png b/resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png new file mode 100644 index 0000000000000000000000000000000000000000..340d7371f204e07c5e1e7202160cbd20eb2bbaff GIT binary patch literal 999 zcmV8xO?{jC#X3A z<^rQ6j=F<){f31acLnk3NI;JEztL3;=ED0r;h&G?5}pfEjSuu_%CNV5XvU@m_!&_+lvS zGi=KfkeD6`29P2<1@1bOm((tAl*iOtGP3^n3d9XW5P%ffNGo=&I0vp(l;$ofDY6sl zZJM|sY_F!dOJ2EO@>1E?rnsVF@H=Em>=u+$6d29P2f16LmXhZ?R|RFqxl`C@$SI(F}sZF#_Sdu2ZG0hGq|spmg$1$YVp_`N9r9sNul zc?iJ5xIUC33yOXonNo*hm+sDNcu$?-z{+T$V$>6jtT;Xojsw@m^#PD;g`vh{+U~A! z2ULe;Mro_5gc;{{Dc-445mWDr2m>KcG}_e*h6_{j6sbsb!(>6A>w;UrG^4d;l$b zJpj3-bf`RPZ+QXy6_Lnh`vZDgg0?_JMjb1@7m?UUB_byx@?g!W8czgmfr!jJ#!C@d z`^NWx{BX_f1rU+3$9N;N5C9D^wdaNaEPDV%M8*Rk?u>br?S;-$unBQ^G%@Xce1AZx zl6`-mqd(vTu=XteK(Kv(U<>_$I&ymZ1HMokTkpY}`vbBb*2h7CNb00xMzG*db3@0Z zZCjRW_BsG;FARdv^DATii@o|z0FV1BJ?71bQpb8%Hcj;Nu!6);xS9TdQi}$_Hqe`l zMC8J;q7Zozt2P|81=hrgv|r3VxfMs+9=rt(1!F?`19cX3&2QW5TJ<($=U+y9fPeFJ V^_8`m{=5JH002ovPDHLkV1m
-
- +
  @@ -69,7 +64,17 @@ and open the template in the editor.
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Choisir.wgt/locales/fr/index.html b/resources/library/interactivities/Choisir.wgt/locales/fr/index.html index cafbc283..4336853c 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Choisir.wgt/locales/fr/index.html @@ -29,12 +29,7 @@ and open the template in the editor.
-
- +
  @@ -44,7 +39,17 @@ and open the template in the editor.
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js index 4de4b35a..6c976c50 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js @@ -15,7 +15,7 @@ var sankoreLang = { edit: "Modifier", - display:"Afficher", + display:"Fermer", question:"La question", example_question:"Ceci est un exemple de question", answer:"Ceci est une réponse possible", @@ -61,7 +61,8 @@ var sankoreLang = { "

Pour supprimer un exercice, cliquez sur la croix à droite du numéro de ”Options”.

"+ -"

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

" +"

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

", +theme: "Thème" }; var questionArray; @@ -85,10 +86,11 @@ function init(){ $("#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) //popup message var popupText = $("
").appendTo("#data"); @@ -127,14 +129,14 @@ function init(){ if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } if(window.sankore) if(sankore.preference("choisir_style","")){ changeStyle(sankore.preference("choisir_style","")); - $(".style_select").val(sankore.preference("choisir_style","")); + $("#style_select").val(sankore.preference("choisir_style","")); } else changeStyle("3") @@ -143,21 +145,21 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(this).css("display", "none"); $("#wgt_edit").css("display", "block"); displayData(true); mode = true; if(window.sankore){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(this).css("display", "none"); $("#wgt_display").css("display", "block"); editData(); @@ -165,15 +167,17 @@ function init(){ } } }); - + $("#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"); @@ -192,10 +196,10 @@ function init(){ } }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -477,71 +481,71 @@ function init(){ // show questions and answers in display mode function addToPage(array){ - var counter = 1; - for(var i in array){ + var counter = 1; + for(var i in array){ - var qstDiv = $("
"); - var spanOptConn = $("
").appendTo(qstDiv); - var qstNumber = $("" + sankoreLang.question + " " + counter + "").appendTo(spanOptConn); - var qstContent = $("
" + array[i].text + "
").appendTo(qstDiv); - var ansDiv = $("
").appendTo(qstDiv); + var qstDiv = $("
"); + var spanOptConn = $("
").appendTo(qstDiv); + var qstNumber = $("" + sankoreLang.question + " " + counter + "").appendTo(spanOptConn); + var qstContent = $("
" + array[i].text + "
").appendTo(qstDiv); + var ansDiv = $("
").appendTo(qstDiv); - var ansCount = 1; - var type = array[i].type; - var selInput = $("").appendTo(newAnswer); - var ansSpan = $("" + ansCount + ".").appendTo(newAnswer); - var ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); - newAnswer.appendTo(ansDiv); - break; - case "2": - local_state = ""; - local_color = ""; - if(begin){ - local_state = (array[i].answers[j].state)?"checked":""; - local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); - } - newAnswer = $("
"); - ansInput = $("").appendTo(newAnswer); - ansSpan = $("" + ansCount + ".").appendTo(newAnswer); - ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); - newAnswer.appendTo(ansDiv); - break; - case "3": - local_state = ""; - local_color = ""; - if(begin){ - local_state = (array[i].answers[j].state)?"selected":""; - local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":""); - } - ansInput = $("").appendTo(selInput); - if(local_state && local_color) - selInput.css("background-color",local_color); - break; - } - ansCount++; + var ansCount = 1; + var type = array[i].type; + var selInput = $("").appendTo(newAnswer); + var ansSpan = $("" + ansCount + ".").appendTo(newAnswer); + var ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); + newAnswer.appendTo(ansDiv); + break; + case "2": + local_state = ""; + local_color = ""; + if(begin){ + local_state = (array[i].answers[j].state)?"checked":""; + local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); + } + newAnswer = $("
"); + ansInput = $("").appendTo(newAnswer); + ansSpan = $("" + ansCount + ".").appendTo(newAnswer); + ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); + newAnswer.appendTo(ansDiv); + break; + case "3": + local_state = ""; + local_color = ""; + if(begin){ + local_state = (array[i].answers[j].state)?"selected":""; + local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":""); + } + ansInput = $("").appendTo(selInput); + if(local_state && local_color) + selInput.css("background-color",local_color); + break; + } + ansCount++; + } + qstDiv.appendTo("#data"); + counter++; } - qstDiv.appendTo("#data"); - counter++; - } - begin = false; + begin = false; } } @@ -746,10 +750,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"); @@ -763,10 +767,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"); @@ -780,10 +784,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; } } \ No newline at end of file diff --git a/resources/library/interactivities/Choisir.wgt/locales/ru/index.html b/resources/library/interactivities/Choisir.wgt/locales/ru/index.html index cafbc283..4336853c 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Choisir.wgt/locales/ru/index.html @@ -29,12 +29,7 @@ and open the template in the editor.
-
- +
  @@ -44,7 +39,17 @@ and open the template in the editor.
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js index 1bf362ec..5c75cf3a 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js @@ -15,7 +15,7 @@ var sankoreLang = { edit: "Изменить", - display:"Показать", + display:"Закрыть", question:"Вопрос", example_question:"Это пример вопроса", answer:"Это пример ответа", @@ -41,7 +41,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; var questionArray; @@ -65,10 +66,11 @@ function init(){ $("#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) //popup message var popupText = $("
").appendTo("#data"); @@ -107,14 +109,14 @@ function init(){ if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } if(window.sankore) if(sankore.preference("choisir_style","")){ changeStyle(sankore.preference("choisir_style","")); - $(".style_select").val(sankore.preference("choisir_style","")); + $("#style_select").val(sankore.preference("choisir_style","")); } else changeStyle("3") @@ -123,21 +125,21 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(this).css("display", "none"); $("#wgt_edit").css("display", "block"); displayData(true); mode = true; if(window.sankore){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(this).css("display", "none"); $("#wgt_display").css("display", "block"); editData(); @@ -149,11 +151,13 @@ function init(){ $("#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"); @@ -172,10 +176,10 @@ function init(){ } }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -457,71 +461,71 @@ function init(){ // show questions and answers in display mode function addToPage(array){ - var counter = 1; - for(var i in array){ + var counter = 1; + for(var i in array){ - var qstDiv = $("
"); - var spanOptConn = $("
").appendTo(qstDiv); - var qstNumber = $("" + sankoreLang.question + " " + counter + "").appendTo(spanOptConn); - var qstContent = $("
" + array[i].text + "
").appendTo(qstDiv); - var ansDiv = $("
").appendTo(qstDiv); + var qstDiv = $("
"); + var spanOptConn = $("
").appendTo(qstDiv); + var qstNumber = $("" + sankoreLang.question + " " + counter + "").appendTo(spanOptConn); + var qstContent = $("
" + array[i].text + "
").appendTo(qstDiv); + var ansDiv = $("
").appendTo(qstDiv); - var ansCount = 1; - var type = array[i].type; - var selInput = $("").appendTo(newAnswer); - var ansSpan = $("" + ansCount + ".").appendTo(newAnswer); - var ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); - newAnswer.appendTo(ansDiv); - break; - case "2": - local_state = ""; - local_color = ""; - if(begin){ - local_state = (array[i].answers[j].state)?"checked":""; - local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); - } - newAnswer = $("
"); - ansInput = $("").appendTo(newAnswer); - ansSpan = $("" + ansCount + ".").appendTo(newAnswer); - ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); - newAnswer.appendTo(ansDiv); - break; - case "3": - local_state = ""; - local_color = ""; - if(begin){ - local_state = (array[i].answers[j].state)?"selected":""; - local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":""); - } - ansInput = $("").appendTo(selInput); - if(local_state && local_color) - selInput.css("background-color",local_color); - break; - } - ansCount++; + var ansCount = 1; + var type = array[i].type; + var selInput = $("").appendTo(newAnswer); + var ansSpan = $("" + ansCount + ".").appendTo(newAnswer); + var ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); + newAnswer.appendTo(ansDiv); + break; + case "2": + local_state = ""; + local_color = ""; + if(begin){ + local_state = (array[i].answers[j].state)?"checked":""; + local_color = (array[i].rightAns.replace(/,/g,"").indexOf(array[i].answers[j].value + " ", 0) != -1)?((array[i].answers[j].was)?"style='background-color: #6c0;'":""):((array[i].answers[j].was)?"style='background-color: red;'":""); + } + newAnswer = $("
"); + ansInput = $("").appendTo(newAnswer); + ansSpan = $("" + ansCount + ".").appendTo(newAnswer); + ansContent = $("
" + array[i].answers[j].text + "
").appendTo(newAnswer); + newAnswer.appendTo(ansDiv); + break; + case "3": + local_state = ""; + local_color = ""; + if(begin){ + local_state = (array[i].answers[j].state)?"selected":""; + local_color = (array[i].answers[j].value == array[i].rightAns)?((array[i].answers[j].was)?"#6c0":""):((array[i].answers[j].was)?"red":""); + } + ansInput = $("").appendTo(selInput); + if(local_state && local_color) + selInput.css("background-color",local_color); + break; + } + ansCount++; + } + qstDiv.appendTo("#data"); + counter++; } - qstDiv.appendTo("#data"); - counter++; - } - begin = false; + begin = false; } } @@ -726,10 +730,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"); @@ -743,10 +747,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"); @@ -760,10 +764,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; } } \ No newline at end of file diff --git a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js index a223b8bd..e04f2e83 100644 --- a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js @@ -15,7 +15,7 @@ var sankoreLang = { edit: "Edit", - display:"Display", + display:"Close", question:"Question", example_question:"This is an example of the question", answer:"This is one possible answer", @@ -41,7 +41,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" }; var questionArray; @@ -65,10 +66,11 @@ function init(){ $("#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) //popup message var popupText = $("
").appendTo("#data"); @@ -107,14 +109,14 @@ function init(){ if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } if(window.sankore) if(sankore.preference("choisir_style","")){ changeStyle(sankore.preference("choisir_style","")); - $(".style_select").val(sankore.preference("choisir_style","")); + $("#style_select").val(sankore.preference("choisir_style","")); } else changeStyle("3") @@ -123,21 +125,21 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(this).css("display", "none"); $("#wgt_edit").css("display", "block"); displayData(true); mode = true; if(window.sankore){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(this).css("display", "none"); $("#wgt_display").css("display", "block"); editData(); @@ -149,11 +151,13 @@ function init(){ $("#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"); @@ -172,10 +176,10 @@ function init(){ } }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -726,10 +730,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"); @@ -743,10 +747,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"); @@ -760,10 +764,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; } } From 0c0f9e15a6e921887e1e6ddfcaee0d0ef1ad2ae2 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 28 Sep 2012 10:16:38 +0200 Subject: [PATCH 06/20] added a check to verify is the focus is already there when the widget it appears --- src/gui/UBTeacherGuideWidgetsTools.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp index db2d8bf7..587bc817 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.cpp +++ b/src/gui/UBTeacherGuideWidgetsTools.cpp @@ -164,7 +164,7 @@ void UBTGAdaptableText::keyReleaseEvent(QKeyEvent* e) void UBTGAdaptableText::showEvent(QShowEvent* e) { Q_UNUSED(e); - if(!mIsUpdatingSize && mHasPlaceHolder && toPlainText().isEmpty() && !isReadOnly()){ + if(!mIsUpdatingSize && !hasFocus() && mHasPlaceHolder && toPlainText().isEmpty() && !isReadOnly()){ setTextColor(QColor(Qt::lightGray)); setPlainText(mPlaceHolderText); } @@ -193,7 +193,8 @@ void UBTGAdaptableText::onTextChanged() if(documentSize < mMinimumHeight){ setFixedHeight(mMinimumHeight); - }else{ + } + else{ setFixedHeight(documentSize+mBottomMargin); } @@ -237,12 +238,14 @@ void UBTGAdaptableText::focusInEvent(QFocusEvent* e) QTextEdit::focusInEvent(e); } -void UBTGAdaptableText::focusOutEvent(QFocusEvent* e){ +void UBTGAdaptableText::focusOutEvent(QFocusEvent* e) +{ managePlaceholder(false); QTextEdit::focusOutEvent(e); } -void UBTGAdaptableText::managePlaceholder(bool focus){ +void UBTGAdaptableText::managePlaceholder(bool focus) +{ if(focus){ if(toPlainText() == mPlaceHolderText){ setTextColor(QColor(Qt::black)); @@ -258,7 +261,8 @@ void UBTGAdaptableText::managePlaceholder(bool focus){ } } -void UBTGAdaptableText::setCursorToTheEnd(){ +void UBTGAdaptableText::setCursorToTheEnd() +{ QTextDocument* doc = document(); if(NULL != doc){ QTextBlock block = doc->lastBlock(); From 3d28de7539c576ccfbc46c6f60ce5081e09eb1e8 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 28 Sep 2012 10:39:34 +0200 Subject: [PATCH 07/20] Fixed issue 1112 --- src/adaptors/UBExportFullPDF.cpp | 35 +++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index a65b703a..75dd32c7 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -169,6 +169,7 @@ void UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS MergeDescription mergeInfo; int existingPageCount = pDocumentProxy->pageCount(); + for(int pageIndex = 0 ; pageIndex < existingPageCount; pageIndex++) { UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->loadDocumentScene(pDocumentProxy, pageIndex); @@ -180,18 +181,42 @@ void UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS { QString pdfName = UBPersistenceManager::objectDirectory + "/" + pdfItem->fileUuid().toString() + ".pdf"; QString backgroundPath = pDocumentProxy->persistencePath() + "/" + pdfName; + QRectF annotationsRect = scene->itemsBoundingRect(); + + // Original datas + double xAnnotation = qRound(annotationsRect.x()); + double yAnnotation = qRound(annotationsRect.y()); + double xPdf = qRound(pdfItem->sceneBoundingRect().x()); + double yPdf = qRound(pdfItem->sceneBoundingRect().y()); + double hPdf = qRound(pdfItem->sceneBoundingRect().height()); + + // Exportation-transformed datas + double hScaleFactor = pageSize.width()/scene->itemsBoundingRect().width(); + double vScaleFactor = pageSize.height()/scene->itemsBoundingRect().height(); + double scaleFactor = qMin(hScaleFactor, vScaleFactor); + + double xAnnotationsOffset = 0; + double yAnnotationsOffset = 0; + double hPdfTransformed = qRound(hPdf * scaleFactor); + + // Here, we force the PDF page to be on the topleft corner of the page + double xPdfOffset = 0; + double yPdfOffset = (hPdf - hPdfTransformed) * mScaleFactor; + + // Now we align the items + xPdfOffset += (xPdf - xAnnotation) * scaleFactor * mScaleFactor; + yPdfOffset -= (yPdf - yAnnotation) * scaleFactor * mScaleFactor; - qDebug() << "scene->itemsBoundingRect()" << scene->itemsBoundingRect(); - qDebug() << "pdfItem->boundingRect()" << pdfItem->boundingRect(); - qDebug() << "pdfItem->sceneBoundingRect()" << pdfItem->sceneBoundingRect(); + TransformationDescription pdfTransform(xPdfOffset, yPdfOffset, scaleFactor, 0); + TransformationDescription annotationTransform(xAnnotationsOffset, yAnnotationsOffset, 1, 0); MergePageDescription pageDescription(pageSize.width() * mScaleFactor, pageSize.height() * mScaleFactor, pdfItem->pageNumber(), QFile::encodeName(backgroundPath).constData(), - TransformationDescription(), + pdfTransform, pageIndex + 1, - TransformationDescription(), + annotationTransform, false, false); mergeInfo.push_back(pageDescription); From b67edcf505deb7d3a7f448a2d93fbc4f30a05e78 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 28 Sep 2012 10:50:34 +0200 Subject: [PATCH 08/20] fixed issue of focus on title page --- src/gui/UBTeacherGuideWidget.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index a56fe901..561156be 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -679,7 +679,9 @@ UBTeacherGuidePageZeroWidget::UBTeacherGuidePageZeroWidget(QWidget* parent, cons mpLayout->addWidget(mpPageNumberLabel); mpScrollArea = new QScrollArea(); + mpScrollArea->setFocusPolicy(Qt::NoFocus); mpContainerWidget = new QWidget(); + mpContainerWidget->setFocusPolicy(Qt::NoFocus); mpContainerWidgetLayout = new QVBoxLayout(); mpLayout->addWidget(mpScrollArea); From 2666115b1982cd5b74c6cd58336a5b08d379180d Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Fri, 28 Sep 2012 12:23:05 +0300 Subject: [PATCH 09/20] Finished import cff and export to cff. Import ubz works bad with groups. --- plugins/cffadaptor/src/UBCFFAdaptor.cpp | 12 ++- plugins/cffadaptor/src/UBCFFConstants.h | 7 +- src/adaptors/UBCFFSubsetAdaptor.cpp | 5 +- src/adaptors/UBSvgSubsetAdaptor.cpp | 100 ++++++++++++++++++------ src/domain/UBGraphicsScene.cpp | 1 + src/domain/UBGraphicsScene.h | 3 +- 6 files changed, 100 insertions(+), 28 deletions(-) diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index 66840940..106d2457 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -1273,6 +1273,13 @@ bool UBCFFAdaptor::UBToCFFConverter::setCFFAttribute(const QString &attributeNam { setGeometryFromUBZ(ubzElement, svgElement); } + else + if (attributeName.contains(aUBZUuid)) + { + + QString id = "{" +ubzElement.attribute(aUBZParent)+"}" + "{"+ubzElement.attribute(aUBZUuid)+"}"; + svgElement.setAttribute(aID, id); + } else if (attributeName.contains(aUBZHref)||attributeName.contains(aSrc)) { @@ -1822,7 +1829,10 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZPolygon(const QDomElement &element, if (0 < iwbElementPart.attributes().count()) { - QString id = QUuid::createUuid().toString(); + QString id = svgElementPart.attribute(aUBZUuid); + if (id.isEmpty()) + id = QUuid::createUuid().toString(); + svgElementPart.setAttribute(aID, id); iwbElementPart.setAttribute(aRef, id); diff --git a/plugins/cffadaptor/src/UBCFFConstants.h b/plugins/cffadaptor/src/UBCFFConstants.h index 92e85c42..69de92dd 100644 --- a/plugins/cffadaptor/src/UBCFFConstants.h +++ b/plugins/cffadaptor/src/UBCFFConstants.h @@ -68,6 +68,7 @@ const QString aBackground = "background"; const QString aCrossedBackground = "crossed-background"; const QString aUBZType = "type"; const QString aUBZUuid = "uuid"; +const QString aUBZParent = "parent"; const QString aFill = "fill"; // IWB attribute contans color to fill const QString aID = "id"; // ID of any svg element can be placed in to iwb section @@ -335,8 +336,10 @@ stroke-lineshape-end \ const QString ubzElementAttributesToConvert(" \ xlink:href, \ src, \ -transform \ -"); +transform, \ +uuid \ +" +); // additional attributes. Have references in SVG section. const QString svgElementAttributes(" \ diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 6fa04c34..7b17f0b0 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -379,9 +379,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e QUuid itemGroupUuid(element.attribute(aId).left(QUuid().toString().length()-1)); if (!itemUuid.isNull() && (itemGroupUuid!=itemUuid)) // reimported from UBZ { - UBGraphicsPolygonItem *graphicsPolygon = new UBGraphicsPolygonItem(polygon); + UBGraphicsPolygonItem *graphicsPolygon = mCurrentScene->polygonToPolygonItem(polygon); graphicsPolygon->setBrush(brush); + //graphicsPolygon->setPen(pen); QTransform transform; QString textTransform = element.attribute(aTransform); @@ -1131,7 +1132,7 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro { if (uuid.size() > QUuid().toString().length()) // create stroke group { - currentStrokeIdentifier = uuid.left(QUuid().toString().length()-1); + currentStrokeIdentifier = uuid.left(QUuid().toString().length()); UBGraphicsPolygonItem *strokeByUuid = qgraphicsitem_cast(mCurrentScene->itemForUuid(QUuid(uuid.right(QUuid().toString().length())))); if (strokeByUuid) diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 04bff654..3eaf2335 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -555,6 +555,10 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (polygonItem) { + mScene->addItem(polygonItem); + + polygonItem->setUuid(uuidFromSvg); + if (annotationGroup) { polygonItem->setStroke(annotationGroup); @@ -991,31 +995,42 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() { - UBGraphicsGroupContainerItem *result = new UBGraphicsGroupContainerItem(); - + UBGraphicsGroupContainerItem *group = new UBGraphicsGroupContainerItem(); + QMultiMap strokesGroupsContainer; + QList groupContainer; + QString currentStrokeIdentifier; + QUuid groupUuid = QUuid(mXmlReader.attributes().value(aId).toString()); mXmlReader.readNext(); - while (!mXmlReader.atEnd()) { - if (mXmlReader.isEndElement()) { - mXmlReader.readNext(); - result->setUuid(groupUuid); - if (!result->childItems().count()) { - delete result; - result = 0; - } - break; - } else if (mXmlReader.isStartElement()) { - if (mXmlReader.name() == tGroup) { + while (!mXmlReader.atEnd()) + { + if (mXmlReader.isStartElement()) + { + if (mXmlReader.name() == tGroup) + { qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId); UBGraphicsGroupContainerItem *curGroup = readGroup(); - if (curGroup) { - result->addToGroup(curGroup); - } - } else if (mXmlReader.name() == tElement) { + if (curGroup) + group->addToGroup(curGroup); + } + else if (mXmlReader.name() == tElement) + { + QString id = mXmlReader.attributes().value(aId).toString(); + QString itemId = id.right(QUuid().toString().size()); + QString groupId = id.left(QUuid().toString().size()); + QGraphicsItem *curItem = readElementFromGroup(); - if (curItem) { - result->addToGroup(curItem); + + UBGraphicsPolygonItem *curPolygon = qgraphicsitem_cast(curItem); + + if (curPolygon && !groupId.isEmpty() && !itemId.isEmpty() && itemId != groupId) + { + strokesGroupsContainer.insert(groupId, curPolygon); + } + else // item + { + group->addToGroup(curItem); } }else { mXmlReader.skipCurrentElement(); @@ -1025,7 +1040,47 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } } - return result; + + foreach (QString key, strokesGroupsContainer.keys()) + { + UBGraphicsStrokesGroup* pStrokesGroup = new UBGraphicsStrokesGroup(); + UBGraphicsStroke *currentStroke = new UBGraphicsStroke(); + foreach(UBGraphicsPolygonItem* poly, strokesGroupsContainer.values(key)) + { + if (poly) + { + mScene->removeItem(poly); + mScene->removeItemFromDeletion(poly); + poly->setStrokesGroup(pStrokesGroup); + poly->setStroke(currentStroke); + pStrokesGroup->addToGroup(poly); + } + } + if (currentStroke->polygons().empty()) + delete currentStroke; + if (pStrokesGroup->childItems().count()) + mScene->addItem(pStrokesGroup); + else + delete pStrokesGroup; + + if (pStrokesGroup) + group->addToGroup(pStrokesGroup); + } + + foreach(QGraphicsItem* item, groupContainer) + group->addToGroup(item); + + if (group->childItems().count()) + { + mScene->addItem(group); + + if (!groupContainer.count()) + { + group->destroy(false); + } + } + + return group; } void UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroupRoot() @@ -1053,8 +1108,9 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroupRoot() QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup() { QGraphicsItem *result = 0; - - result = mScene->itemForUuid(QUuid(mXmlReader.attributes().value(aId).toString())); + QString id = mXmlReader.attributes().value(aId).toString(); + QString uuid = id.right(QUuid().toString().size()); + result = mScene->itemForUuid(QUuid(uuid)); mXmlReader.skipCurrentElement(); mXmlReader.readNext(); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 621dc9a4..99bfe301 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1713,6 +1713,7 @@ QRectF UBGraphicsScene::normalizedSceneRect(qreal ratio) QGraphicsItem *UBGraphicsScene::itemForUuid(QUuid uuid) { QGraphicsItem *result = 0; + QString ui = uuid.toString(); //simple search before implementing container for fast access foreach (QGraphicsItem *item, items()) { diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index 6d496369..1b0a54db 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -302,6 +302,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem static QUuid getPersonalUuid(QGraphicsItem *item); + UBGraphicsPolygonItem* polygonToPolygonItem(const QPolygonF pPolygon); + public slots: void initStroke(); void hideEraser(); @@ -338,7 +340,6 @@ public slots: UBGraphicsPolygonItem* lineToPolygonItem(const QLineF& pLine, const qreal& pWidth); UBGraphicsPolygonItem* arcToPolygonItem(const QLineF& pStartRadius, qreal pSpanAngle, qreal pWidth); - UBGraphicsPolygonItem* polygonToPolygonItem(const QPolygonF pPolygon); void initPolygonItem(UBGraphicsPolygonItem*); From c72b6dc69ba89134700a6333a043b59bf4b99c15 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 28 Sep 2012 11:30:12 +0200 Subject: [PATCH 10/20] fixed background on preview widget for task items --- src/gui/UBTeacherGuideWidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index 561156be..656118c4 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -551,9 +551,9 @@ void UBTeacherGuidePresentationWidget::showData( QVector data else if (element->name == "comment") mpComment->showText(element->attributes.value("value")); else if (element->name == "action") { - QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem( mpRootWidgetItem); + QTreeWidgetItem* newWidgetItem = new QTreeWidgetItem(mpRootWidgetItem); newWidgetItem->setText(0, element->attributes.value("task")); - newWidgetItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable); + newWidgetItem->setFlags(Qt::ItemIsEnabled /*| Qt::ItemIsSelectable*/); QString colorString = element->attributes.value("owner").toInt() == 0 ? "blue" : "green"; UBTGAdaptableText* textWidget = new UBTGAdaptableText(newWidgetItem, 0); textWidget->bottomMargin(14); From 5a434ba6672ded85f359c3d6a69cfb2fa79232a8 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 28 Sep 2012 12:09:23 +0200 Subject: [PATCH 11/20] fixed issue related to translation loading --- src/core/UBApplication.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index a2043121..580ef897 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -216,14 +216,17 @@ QString UBApplication::checkLanguageAvailabilityForSankore(QString &language) void UBApplication::setupTranslators(QStringList args) { - QString forcedLanguage; + QString forcedLanguage(""); if(args.contains("-lang")) forcedLanguage=args.at(args.indexOf("-lang") + 1); - else{ - QString setLanguage = UBSettings::settings()->appPreferredLanguage->get().toString(); - if(!setLanguage.isEmpty()) - forcedLanguage = setLanguage; - } +// TODO claudio: this has been commented because some of the translation seem to be loaded at this time +// especially tools name. This is a workaround and we have to be able to load settings without +// impacting the translations +// else{ +// QString setLanguage = UBSettings::settings()->appPreferredLanguage->get().toString(); +// if(!setLanguage.isEmpty()) +// forcedLanguage = setLanguage; +// } QString language(""); @@ -242,7 +245,6 @@ void UBApplication::setupTranslators(QStringList args) else{ mApplicationTranslator = new QTranslator(this); mQtGuiTranslator = new QTranslator(this); - mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language)); installTranslator(mApplicationTranslator); @@ -256,7 +258,6 @@ void UBApplication::setupTranslators(QStringList args) } if(!qtGuiTranslationPath.isEmpty()){ - qDebug() << "qtGuiTranslationPath " << qtGuiTranslationPath; mQtGuiTranslator->load(qtGuiTranslationPath); installTranslator(mQtGuiTranslator); } From ae900677bd98b35df30ac7f4b4346f53e33f9a79 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Fri, 28 Sep 2012 13:55:00 +0300 Subject: [PATCH 12/20] Reimported cff reads fine. Groups reads fine for strokes. --- src/adaptors/UBCFFSubsetAdaptor.cpp | 18 ++++++++++++------ src/adaptors/UBSvgSubsetAdaptor.cpp | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 7b17f0b0..e0584b4d 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -249,6 +249,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &elem painter.end(); UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); + svgItem->setUuid(QUuid::createUuid()); QTransform transform; QString textTransform = element.attribute(aTransform); @@ -299,6 +300,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgEllipse(const QDomElement &e painter.end(); UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); + svgItem->setUuid(QUuid::createUuid()); QTransform transform; QString textTransform = element.attribute(aTransform); @@ -382,7 +384,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e UBGraphicsPolygonItem *graphicsPolygon = mCurrentScene->polygonToPolygonItem(polygon); graphicsPolygon->setBrush(brush); - //graphicsPolygon->setPen(pen); QTransform transform; QString textTransform = element.attribute(aTransform); @@ -414,7 +415,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); QTransform transform; QString textTransform = element.attribute(aTransform); - + svgItem->setUuid(QUuid::createUuid()); svgItem->resetTransform(); if (!textTransform.isNull()) { transform = transformFromString(textTransform, svgItem); @@ -524,6 +525,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement & //add resulting svg file to scene UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); + svgItem->setUuid(QUuid::createUuid()); QTransform transform; QString textTransform = element.attribute(aTransform); @@ -1132,7 +1134,7 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro { if (uuid.size() > QUuid().toString().length()) // create stroke group { - currentStrokeIdentifier = uuid.left(QUuid().toString().length()); + currentStrokeIdentifier = uuid.left(QUuid().toString().length()-1); UBGraphicsPolygonItem *strokeByUuid = qgraphicsitem_cast(mCurrentScene->itemForUuid(QUuid(uuid.right(QUuid().toString().length())))); if (strokeByUuid) @@ -1147,7 +1149,7 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro - foreach (QString key, strokesGroupsContainer.keys()) + foreach (QString key, strokesGroupsContainer.keys().toSet()) { UBGraphicsStrokesGroup* pStrokesGroup = new UBGraphicsStrokesGroup(); UBGraphicsStroke *currentStroke = new UBGraphicsStroke(); @@ -1164,13 +1166,17 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro } if (currentStroke->polygons().empty()) delete currentStroke; + if (pStrokesGroup->childItems().count()) mCurrentScene->addItem(pStrokesGroup); else delete pStrokesGroup; if (pStrokesGroup) - group->addToGroup(pStrokesGroup); + { + QGraphicsItem *strokeGroup = qgraphicsitem_cast(pStrokesGroup); + groupContainer.append(strokeGroup); + } } foreach(QGraphicsItem* item, groupContainer) @@ -1180,7 +1186,7 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro { mCurrentScene->addItem(group); - if (!groupContainer.count()) + if (1 == group->childItems().count()) { group->destroy(false); } diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 3eaf2335..8f0efe67 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1005,7 +1005,10 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() mXmlReader.readNext(); while (!mXmlReader.atEnd()) { - if (mXmlReader.isStartElement()) + if (mXmlReader.isEndElement()) { + mXmlReader.readNext(); + break; + } else if (mXmlReader.isStartElement()) { if (mXmlReader.name() == tGroup) { @@ -1030,7 +1033,7 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } else // item { - group->addToGroup(curItem); + groupContainer.append(curItem); } }else { mXmlReader.skipCurrentElement(); @@ -1040,8 +1043,7 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } } - - foreach (QString key, strokesGroupsContainer.keys()) + foreach (QString key, strokesGroupsContainer.keys().toSet()) { UBGraphicsStrokesGroup* pStrokesGroup = new UBGraphicsStrokesGroup(); UBGraphicsStroke *currentStroke = new UBGraphicsStroke(); @@ -1058,13 +1060,17 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } if (currentStroke->polygons().empty()) delete currentStroke; + if (pStrokesGroup->childItems().count()) mScene->addItem(pStrokesGroup); else delete pStrokesGroup; if (pStrokesGroup) - group->addToGroup(pStrokesGroup); + { + QGraphicsItem *strokeGroup = qgraphicsitem_cast(pStrokesGroup); + groupContainer.append(strokeGroup); + } } foreach(QGraphicsItem* item, groupContainer) @@ -1074,12 +1080,11 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() { mScene->addItem(group); - if (!groupContainer.count()) + if (1 == group->childItems().count()) { group->destroy(false); } } - return group; } From 664f1fbc43deaa8066ec4bc99cd66234a625fa33 Mon Sep 17 00:00:00 2001 From: maximXbs Date: Fri, 28 Sep 2012 14:56:59 +0200 Subject: [PATCH 13/20] updated 'Etudier' app --- .../interactivities/Etudier.wgt/css/basic.css | 144 +++++++++--------- .../Etudier.wgt/img/ar_down.png | Bin 529 -> 0 bytes .../Etudier.wgt/img/ar_down_white.png | Bin 142 -> 0 bytes .../Etudier.wgt/img/green_point.png | Bin 721 -> 0 bytes .../Etudier.wgt/img/parameters-bg.png | Bin 0 -> 4256 bytes .../Etudier.wgt/img/red_point.png | Bin 740 -> 0 bytes .../Etudier.wgt/img/slate-display.png | Bin 532 -> 0 bytes .../Etudier.wgt/img/slate-edit.png | Bin 1907 -> 0 bytes .../Etudier.wgt/img/slate-help-white.png | Bin 553 -> 0 bytes .../Etudier.wgt/img/slate-help.png | Bin 1795 -> 0 bytes .../Etudier.wgt/img/slate-toolbar-help.png | Bin 0 -> 1697 bytes .../img/slate-toolbar-reload-white.png | Bin 1619 -> 0 bytes .../Etudier.wgt/img/slate-toolbar-reload.png | Bin 2110 -> 2289 bytes .../Etudier.wgt/img/toolbar-edit.png | Bin 0 -> 732 bytes .../Etudier.wgt/img/toolbar-help.png | Bin 0 -> 707 bytes .../Etudier.wgt/img/toolbar-reload.png | Bin 0 -> 999 bytes .../interactivities/Etudier.wgt/index.html | 16 +- .../interactivities/Etudier.wgt/js/script.js | 53 ++++--- .../Etudier.wgt/locales/fr/index.html | 18 ++- .../Etudier.wgt/locales/fr/js/script.js | 77 ++++++---- .../Etudier.wgt/locales/ru/index.html | 18 ++- .../Etudier.wgt/locales/ru/js/script.js | 73 +++++---- 22 files changed, 224 insertions(+), 175 deletions(-) delete mode 100644 resources/library/interactivities/Etudier.wgt/img/ar_down.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/ar_down_white.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/green_point.png create mode 100644 resources/library/interactivities/Etudier.wgt/img/parameters-bg.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/red_point.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/slate-display.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/slate-edit.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/slate-help-white.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/slate-help.png create mode 100644 resources/library/interactivities/Etudier.wgt/img/slate-toolbar-help.png delete mode 100644 resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png create mode 100644 resources/library/interactivities/Etudier.wgt/img/toolbar-edit.png create mode 100644 resources/library/interactivities/Etudier.wgt/img/toolbar-help.png create mode 100644 resources/library/interactivities/Etudier.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Etudier.wgt/css/basic.css b/resources/library/interactivities/Etudier.wgt/css/basic.css index 0c107f14..f9516240 100644 --- a/resources/library/interactivities/Etudier.wgt/css/basic.css +++ b/resources/library/interactivities/Etudier.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; @@ -362,57 +354,33 @@ li>div{ 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{ +#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; -} - -#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-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -447,58 +415,88 @@ li>div{ 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; background-color: #ccc; - padding: 5px 0 5px 5px; + padding: 5px; } .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/Etudier.wgt/img/ar_down.png b/resources/library/interactivities/Etudier.wgt/img/ar_down.png deleted file mode 100644 index a20fab4f36a5d0f7e7a48e67ce9335c1a76a005d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)tGP4h z+%xyi(97qKUw8MsXF#K%IhY_2F%T0FmI=FS7s>4>0pJM{Jq374%m_IHYlYl0IS1#$ zGJGbM3psHfKI-)P`yF?15ANVDy1hPxV`Hfl>Sc-VA3uy(b{oExX_T~XcGrdL?ZbO; z0Pp?*-2MPX8Yk0Vzu&N?)>l~^T~t+xs#K^J3#dGWOkz~V@z2k17b=%S0n<|)1jp9Y zKP0OI$K339&@;nLsk<4=#cf{cgO6C|3zl_v8Ki8@T(`IZC zP$uC~7AHvOA?C9Q{@z?;eD(E++IKN3(QJgZl4nuqzhZ#Ti diff --git a/resources/library/interactivities/Etudier.wgt/img/ar_down_white.png b/resources/library/interactivities/Etudier.wgt/img/ar_down_white.png deleted file mode 100644 index 4a1d133b72676983e994ef76f99f777714560e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 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 WxhI7T;&QP70000J?Gxv$9bOTect!?{?08< zN?hvX;OPJWfD=ESC!j{q^3JfMzUrKu2h`v}#)`=0xQx_@RTvO0#nUj5uMn@p1ejQ= z+t7`L1Aq-E7m7#`x(t!v3WnH%VQ3Wu#Rh=z#acovS&xxm8n#ZZjG+B-^f(QaOCxA2 zIVg-0F<81hK1YQu&q)+Ya@I?@QrhB3FkFjJ0t$>2gIYzVQjKUMXwP&JYHrzvXy7vl zxjusS+>{7S0%LF$267lMT>=NgU@()xWCw+Wgam>tmKbdn?x2-0XY3=NxstJXnGE|+W3V6o^Fg09vnNwJo$RL`GO;9+Ws zN=}e+TnSnf#c6mJ89}3*K2JeGyp&a{UzCX|7^D>w5R(C0Qkn#!=>J0%ikE0LDZpO& z{ZC=FP)A^p08`^xDhYLPviX)!1QMgd#3Zf~;&|p{6_e6&5?80=1Q@fN1Fn=SrMO1@ z42_})U#TX=N(sj2MbIcdLoSyhF}x5ShqHvm<-oB_W-OB%7Z(y63bWavalu?(EO(O2 z!zEb?Oi501rLVZ`DY=$LP!LpP9;T9KW70Skt^l7UjL4_<0#B*;f-9Zc3v)^?M45ps z$NH~hp4_5($1;7{wAA8d+ha>aN`4^P+{?-|ntN-*HQx)6TATclZsO zo&Fx|-2@w`qA@lHZwR=N+Zm@kM()CieUF6j;@u z)mi($s_Ysvx4W0z_|a%I-kmsd`n$gx%6iMvq#cE>+C1~I!bkC=j@Ke9y34+lpX6OO zXN{YVLI+|JqM4(EH*dZK0ZN_9zS>AbgtOE=W%4d;Ch`fL$EeKN)-=9-`HC9acSx8 zbHfe+YYP2)*757zy}9~}F3sClx|W|lGxp6A7yCw}U0j#zcW6gI!{`sg-Mpq@0`?9r zI{8uSv0oOt48Bp`a`51plR{yL5B}6?A zn6+53i74n3D8uy*faXX_P-Ns!MPbcr9*&;Smml8kTUhv^*(-3Tmz%ysXfnT}n zS3@r1|K+6%kiUS72|H8u1LTW{Lf1JdS`d>v4N6Qnu+_cDrU-h519XxnWlyUk}jQt8p z=&zWj`@f?)hRmBjc+fG@{DtW) zE9k9Mk*#ASIIF&>sA%r)F@HOhXn#Zx41Cbi($dc(E7i(b0o5j9XGHaD@B#zpioNaL z-V0;wDznGF{;}Hn`rbKhq5CUj2b?!9-j) z(t)e-1*S()rv8gt&fa~}v$N#)Aa@-KUrlR>ygu#lc*cbdc?pQK8DAy7RoHC(ciOmn ZDi8|3Y4kkxbj0!-_pb~$&L3vDaAXI=gPRvNf*c8S$Ood*7f2B<470o|&+qb$b4UIY z13>CP>OuPOnGLstkOR8%{g1qObmu=Q0HhwIk75S^eUb3s#)bdn0FXYAeu^Bhd-aTS z|0w`a{dn!bn+;`^bqp!VV#MfYB#=_6QA{$9mV`ss0iQp-IZBD)pWhRqpFlQo_)i&d zptvOb{rlHea%_g`qr4~v(gJ_~{<%zwYKh_U?Zrw@-n>WPS6;vE1r zEP==XNFXwOfiY3-0T}r6=l54;W)?17>VZN3jfI7ko0J9#3n|%Z%fg=f0wNOHxa2>) zd2yfQyh>~ofWWf{H{at6dyqT{S)6cfhz|IL#UD~4PjM7%n%~7BDX)rC{`te(3^a`b zU{mWgfu`7NQlo$*2LQ!35XgcXNOb^7*$@Qgcjh%IY8cj{i{HO-zB#dcQXRSjs2T-O r^#wS5UqE6-M>qsV8zl4q009O7eJ4TJ=dcL@00000NkvXXu0mjfuXXIg diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-help.png b/resources/library/interactivities/Etudier.wgt/img/slate-help.png deleted file mode 100644 index 069052d0061dacbeaa3bd022259a5db0e37a9f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1795 zcmaJ?Yfuws6kQ%FAfUs`V%6>}AZQ`UCO}LiA%P?U8VVsuP)1ymg+xd;B#Q|FDK9}0 z8N@1s4oc9DRuQEwqAdt&i&AZiqUGTrC}=y1Kv4#(6uUvd{wUp<-S08yoO|y5?l-$P zB7B3L&2k$60PI3Tcp_p1O|R8L;;S_nUJ-*U&X?d(SR$@NG$_E8VF@T0szj1d5sJvt zQ`^u00I&cRVhJu0ZemI?B?&QMNP4B3U;{uvpk9qglTjQ@K$8?I7BupGGXyGREGWiL zND-=oQMn?-ph2Sy;bN&FS;~+>fow29&m;ttD2{-7Wr|A6)U%*zT_!O%ZIdBz8iFUY zp!cRE!U!-J)1aUqiQ*%r_)|cCm;}>&>2$g`NTt9OGKETpsXj2BNux3;6maH&h-eyF zB2&Z@%)}yAEJ%*yY9^Vi)9FY$8VS=RkzoddVbY*deF%h)HeH1ydLNb6ZB~JYYNZ;5 z8dqQ{(4>eYU}-oDBAmWYL8+dTRcU9+L==pyN7Q7PL@}i_3ls|fAF5Q&p|!XO{owaM zg|*^zHA)ttS}aW?B@Qmp%@j(_4A!6sj%magmNHw#2swshS~;c$gQNVw7==oP>9o^m zp^zD>(&C6piiYx75Wy!Y6f!2mpC*8P>ApOe0mCpK=K8_G!Twxs5TDNA(ip+BTplJ( zQ=%$-mMijbiz!<{9dT@>dkOv^LwGq%Ow+L$fjfc z*D=p-5xrxY&NVHum}`4fMfAFcXlh6v9!K1j^iUpGtnV3$5y~C8A65R{=k6<1bcmgb z?mN|=s;;Z^5Y<6m{Ptj@$lGSs$wiU8(e`6JABgn|`eLnNyubI1hs)$;v0>?FVWiE; zJCr@EkEZPGY&6FI5$e#ek(5Qbok**gxI!N}T47Z(aA8Zq%^fTJJi!>+>*0vb=(bdW zQ)`cVB#c7TK8~u9FEq=w zjgCeo=0L6`aA#nBaSjz!Jn(;cHf(fi_wbq+%OgQoxj=#_8|f8x4DtZM+V-SkzJ)Qx z|JL%nw7goYnsYU;+uvrg*}Sl{vk4nq1j(+WN9(W@MmLwt67aBRfL& zdr9%9=7*t@G#no-4pD6?3G3Rj0L(+H(d+9b!`tt{om*3%{Z;wpQRYh5oXO;qb@|}&BeSBtV*>m%b98Oi7 z9Zcy=DH6cSl%_cgub0zd7DKmf6xU@a7G@+%tZ~xY&$WO|Q%B zZ%=Lgx;ac&ztrAhYO3SL;8^n{&0*>t000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200sF; zL_t(&f$djKY*bYg{_ef+Z-&|q(9%Lf5RkS>N2CdV36vJ&LKf0SMI$U6ipGRRVWDv$ zV1XDzXF&u`9%@cdO0P&MlK|j(9u!4^=XoH6!1scb61uL#wrx;K2XtL; z{NRh9)A{fViUCbkdtBE|GRD9;2LM=>1;!W{V<3bCZgw08@pv4R(xhYCJz?0P1U@{t zE9G*&gAf8KB{WR~r4)=YSe6CHabQ^%q?90pKv5KM&LM<=ZWudGzx{lwC<5i>OWP@> z;GDy89GIpF*L9(38Wcqdyx{+*l!8(UDJ3$Q43;lTv=>F-{{3_V0K{T3NGYMJDq^u1 zT-OEXJP0r;B|OiA5CW7^XqpC1(=eHyZYYX?qA0RW-;2P16DbQp!Llj6^5_AKWy}dHL)Inv@b!N?4W! zN@w91W3X)-j^l*EhZCsT@HB)FLAv=-?#F|!>i`hszvp>DmKcVC+M2b+5!kkQ<5d8` z>3sJBfa|*OJTGvwA9#Ky*tU)Ox^-8J^FZDDW6Am&FvbFRQ%Vtw#pY#!>$)&a6Ts}X zNhy)6uR$_dd#oq|WbLcHFEnqvv@}r)LI^0Oa9uYDNX|Jt&kKT32m#JHR#vUROM99x zVcovoq6h#$NlE;`q0}n_i9~7OUd9+yRfVD`P!t7@wHr}@^EBJ2PHZ0465CQ;Z%df6uV{*ga@tDy_*1Vkd*NP$l0OXn1 z(_1$``|gq@@gN(75QxQM0RdH2p{feD@7R1osokFj5LyQceh>Ka=f#g_?%bV-`vK^? zT?hdo1Xfj5WRiQ2E%Eik@Izlj56h3g{60K6IaTjxh2uCuaL&dB8=kB0m+V{;`Aw)Q ztlG~6&+~#NQBg6yLd@pv2qH-{qOMZSW{%JOOeK}+VGL)Z17HJ6o@REJ^A zmB?A(4u0L8G3}N=uHOv0p|0z&EDPJVJcrVBDEvpO~u~HWx&W0RVXC(7p$XVZb#_sD=Ru0T2Subsro)bAFy~KI1?E z9(dfc=(FJy0*g){@_63S*3=9j1)vo`*_@>*0Nnt(I?i71^*=tcI?&P9lmO86bnT{= zO*>yiT|*=ESkQH0n==@^eg*w~KValm{{;Z4jzwzYqeQM_T&E$A$_r?#uYtknB9t(pNNrj<%-M$Y6gY{6M4t$ z(EXDk`@_;uO4(dY8fNzwR|#F$xwsI^*?q;AVku?9^Z1P@#tm_QaRRiFb>g~nLqxqx$bhA}0cOW*T&Mp4wqH=g%=`N?piysAFedU|4f zIM>?$N|Y-AfZHRtCiD6J_QboZq?FzH2uLZrqYzlocz*6o`>C~c4aXn;K0J8+^uhN(oj0C` r;YapBcF)lqr#~7M|H*j1=mh=+SUN~Huv8Y*00000NkvXXu0mjf859-D literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec37fd55bc97dbac2bf21e599468ee8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8pIh$D;n7J8P zI>Ge14w>EaktaqCUE zeMXd{ME$g&z>Gq{!c_^51snY4TFqGcLLjQ(k}BKWT(|8URw)zHiUpPV%6ybN9$az| zmu;Sc#D(ln%u|sTI=_3w%fVq$30uq+-Wr*9>1G+|L*tQ*8A<3KdPL!+jr;j zyPNI^?l>Rxp=xiU$?=&!&#b?m?K{Re;o6oTci2uHuq-+4#ku0izm_8tZol1k;`!%% z;ZByeIC;BvdFM4@+U;$ZUw-yu+3!qAh)ffylanGm54`^_&&$TFd03vI{mjOFEP7!Ret4N3Q(;gIHk&>5PTAf# z`$@Zlx$<9B{;iv@E}bmI!Pd;WvsnEJhi9t_pG)!aN5MP9I+z*{1f0t*D=(kEZn;BW zW0OIF)!eMLVXs5qw3#=0ElpbFuQ=1EF6>F0dC#v)rBQ3WZ)*P#zx1}uo~w58#TBW~ zm|9}2?A|LZnV0Xp;9|y<#ESkeSF=p5B@aH>B;V`idFW;rL(t*Ly_XGz&V9~Ze;~oY zW^vp8sRBP#OLW9ecjxvzwkl2A{Bxzjyt8TXGgyv2E)0BeJ7-&a#FKxv%aW=iUaN&X&+75LUZLyb_4t6%LZ9WqX;HC>cO0K}C{;QZ+BU?z zo8YnfVQ6Hp-%}TLq0TeU1BxQohOK`pAo@7g;nhLsSNjh>Ewbc0{v+8!W}aS_!@_^F zuXpbFEIa-5SB|B3rnah0K53WakhOMJfuedt|G$R0g-e4nH{(tuF)I_U^4vQ~# zT))8{lzqKLB<}NU&Xrj;(pOuw6XK`DdOc;ieq@bwi1Z%blhz6SRpKvJlru7Z{Jhz< les}r7ySG2opO9x{WB7J{-|3FTiSIzgyr-+5%Q~loCIA;2bXNcX diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png index 685a5cb2a93933036bec2353f4e1291358ec3ca1..844169a963567982f39336dcff5b0c56568f58ce 100644 GIT binary patch literal 2289 zcmV000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200>D* zL_t(&f$f-oY*W`2$G`XevSWTZ2@nE>7|2Mpl*FtpZCR)t!P+rRg9%EvbX9^!VVX7p z8WNeRG%x%ZNE0IJD%Nf*37ytzV?a=+vB5S%L)Ne%;;n3jk_smXl0hJWB+q_7&;E!V zY{!lrvcW$b>B;Zi=X<}Od+zbQ=a>-@9;R^*Rs9hF03p7CF&6V&T~R6nsM~SyOkbq! zwO5w71wrrva075jk_1&%14QH}qNbhiw)m3?#>X5R(GUetv+g;!D2i9+K?ndG$EtK)pGHIw1OcXLLf3U< zW=_F3U;N4$Q534#+%-*c-D&|qzxb<_j~6YFkDq9EpZ9+Pj^iMT;zR(y-?ef1=XG80 z6Gic!R=oJm4a;1rs%_IW4IIY}yBq*|d+%WH8x1W&L3zCRu!)5)A7lA1En4wqPu&a4 zzX(wjVObUwMaktjRuwIt5P-<~nZx0LBuQa!aNv0!cDo&-C_+`WZLe1@btMCc7@POv zmPI9nTjtMw42&_@Y&HPcTwPJ>jQ-w;C8+wrdIcDY1tNlwkr5#q`m`*Vx{mD)&8Zk5 z6qMIpKlA2_e_#CUdBzwF!?0y#Im-d;PYNIwzPu{s$YZeF-02%1FIsTra(f4KU5DLf zTOSSZf8UDP{I!7z4*MlwXgNcwS`hvIft&@|S}D z=Xt2A3XZYewcqxRITl`fWr>^P_-z>(83+c0C|EETIn%T1QUWm7>Za0Xzu=FY_o5`( z1%Yp_S@&Gp5IZ+4^V;pUW=+$eC<-P_aNya+#V0X;Z6HP~Sw29Y{l@#}Qy-l=`}dDw znkI%45n*6(P}$4#eBJhj<~}5_og0=p4a3;Xaa;{!463Svh_L4CFDUNf!lJYR0DwA< z$c;z-P;>751vnfIsHzH46rt8<0uIoeZ z!#kWPiqJF-q9~$dVF5f#pSqiwow+F@4vaA?j`2j`up6eiufKoLd%o>o=(yU2uI`)A zG#!>@Vd8`gOr4sAg3q~7STGOH?92uLwam3T5Hp#vWW@4sDQAflKn+79gg-Z>&7f6H-_eV#z$JG-f`r<+n) zUr#qRzO$QTpT{5eR&u>$0J6`sDsa&sGw4{YyR)6%u6?yX8X_$K+2?T{daL$Eit(=y z(NQ9*316p(s5kygA!Q&2A}xS@Ti5PMHeruiTb7l*k4_FBB6TNnvT_z?DM$NgxDP2_rnj~4aIw5 z1OO2=js_66v;Y7g6de3xq*F*4pr8EkTi+cO;D2pIDcL!TBllWJNnM^R{e1(G``Po0#$BFIoSaz_ zc^tH53JjqmS*En@-zz%+D)7sMhArEd51k^zJvWB@hM5UnQt1K+I@ra1a;Un$g|aj_%HO z0Kkkn`EV61f~(LyJnMMz@OZIr(m4x=Xj6P7rDK+5-XWsOQT5UR2zPYTP}-HQ)l-6F zJMADG1;hoQ0{7~I$p8O=@YM+57-KAuq<^g5XtRD0_RveSM*#l?BwzixKjlZG00000 LNkvXXu0mjfx#&Pd literal 2110 zcmaJ?dpMN&9)IPULP##F%)TzQVlKvI3?q{qH!AU7rX(x^@3SCarV%3VJMx2>8?fK(4@AJIx@A7;;pYQGSJa5i{eLgzc zX4(J%==k|k7>X68e6=(bUvYBsykap$yhD*dI0i{%i6DT?fukXmADzgcs0+aUzv6FdhR}Q$x1LZCyDg^it!a_;;@d7bXN&-LV5*2&pH3md|fFL{) z_(xKq0S8cCun0mqp|SRCtTPtnj6>t_jxH`Pb|?od4vWD$U~mrhI2R(`fr!PTK0cr# znurraWKgIdV<}D~Fb+Y4L<}Y|F%g}JN5i6649?ZnRjJ|NV6Q;fi<1NhOKL9=TdpZk zATe9S6(U?%fKn>5qG1U_0u`D5Q37B1Nmd~K*d|58FjAHfgF|DLC9MGi0{%ag&;NuL zBMj)zeE+AgI4DU7VHl7YmWbGj!NpiALkWpqB8Y{+q97QKU+dz5I2eJ&aj+2O73hQt z;R-l#qWA+kAb{v65F;!B8}g%&Km{Mo<#LE#1S)}oCpf!0VZCuUZydqZ#g*bpcEIDj z_B!Kn&TCu>%$D#W0kX#B{K<7$m#Z`aU#N&ofkfOR5Qi#)`KS*C6S?c>;<&EfM=odm zT%6YBVid_>lwv!TOA^$jt_3;ju**OX8P$^oD_)9J9RL$2fBKz4t>mXtnfX zCTH=~3$vOfy9VqesDhx15g3?a?>skiv{n@Obd%}_~SD+n8j;di)UX{ zyg94a#&OuVC=xEJEWZMT=B-Z`|0SDUc=9}D`q7j0`BuG(h9=vs+B?zpOQylLMs*Dh zCl3^5Kkk0?I47EzSw7F#tZat939bp!m=L{f50T|wl77?3>q(J4d{~xNI5f7fAgPpq zr=q5%?z&n6^Hpvu2=v{N8`{H`>!Poe4E>-oYNNvKMT$mH*_##Mj9aZ=UKT zLg5+xv2n-FyF)slq2;#r4Jm({>3MND&-CBnLP-hlGa}8#P`vw;QPyWYWsg1dBjh#4 z$9GUy!7>SOyCP4XL-4da{LC(E?}$~IcjSH9*w~onMzvp_C9Smlj*bio(-r1>Bs~|z z{9}18EAn!vU2AV|uSxzL0}MUmg5+w%{+9IJ8R#x_yJ1A!c#-Prja|03bAdyk@qkRm z!=L=zz}nBM%7m)XG5&VtX14$sxP3dvB)GotqI2f*5$_Wv;gON>SiSn|yJrkW2F*%U zULwS8i`SX7#=H*oR7@-V(6@9Z(_E%i+1cq%!&?_rS683tpzq_Rh(tf09N53@MqfaT zS`^lVTGi%#Z_;w-XrgxN5HT#!+WPX;)YNz`K$A2q)(p`#s-{jxjmuwVel1QjGgcGQ z&J6!?5gMk=dO$`%^6zxPwADFms=XO z=x)-=kJU^~Yjb`6c4E2IFwGPA-t!dJ*0+RVOegC#c&qgtc25VV2~AV&!U#`~oy~^w z^0G3|2Ryj%UBVF`66>ZxBy;;e?>G|(KdB9Qye%B~%e9=Hj8@9z`C32Tm#7WXqIS;* zs}#52_3HM}dcP}K86HuMDsEWVt|QAmDwoSyF)@=C-a$-8!p|`b-=mI}kFGuy+Sx7` z`B+c5&3@^U+UCl+!5A%F7GE>ntnpVp0*Pc_&7=N!`n19KwY3|XM>cDxSbssv$z>% diff --git a/resources/library/interactivities/Etudier.wgt/img/toolbar-edit.png b/resources/library/interactivities/Etudier.wgt/img/toolbar-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..daa338cd9bad28014559c72dab05555471ed402b GIT binary patch literal 732 zcmV<20wev2P)hPu2Ds07A#D z+(`)m10Mn0JJUZ@+pnq%MBp|%ES8NwDOLk#-~e!sr^msc6xo3pa5tZ@SZX^c-ho6o z06e&ZB7qF}i)0IA!gl~p>L5#?0N!D-JQN8?!jlC`;HvFkz>@@Oz-J58g3l7D2|p`P z8~&=mCE!tkOTnW827U+NPfd7GfZKJ0>63S=?e7451Mpk}9uxr30C=|7DAo1@fG#3Y z1bh} z^05>ix)tAeWB=B=!&DC&0NNI&WPE`=rmvk=Z9huGLQ(H8r|$x9UZ75YfIRIFC>8Aw zfaLK{3Qkh7L*3U0(z`UC0k;6t*GAaUDm zv{_eH15)rT0ZDkWKndKe&lf0#7YRtfvjwE!Spt&qWC3Y-l0Xf3s(>bWAi0-<&lceH zYekZc8Lx~?5j;iUE6Ibmu!%^_hNlP&B*(zwRS7&rz!u*o@PK_TJVn6G##wBSAqzfB zfMgdq=g~R;Y@Ro3;YFgD1q%&8O?(WPGBdSVDd`TL85dhqT2qH4N*IktZ1@II2I(YR4)WAlv zvU%qR&X@!VPJr&J6|ez*ghT^dppdL=FCxGNZ-6^P@E)%~&i!NSBU#Tt9T^*vt~(P|%gu7`!?=FJha~9{6Sqo?DucISV8!Tj0q^e|G$^U+W6=&|TFs{tr0D zn`GtcogeTY{2@7k0{HHEzmIV?MZg+=cl?8)4fjZ138$>U6Oen}H~&I_Zwqq#0!Ns# z1)=mZrC*QeGz8FHb<620w~?$ojJO|=hS2?H{W|fyC9-)1SKyz?OFd_PpxdkuIiRjt*AT2)sj{}ur*_}&=2$KKgpL_iZ6yhk%zfT|V~ zgZC(W{*%uKEY0W=-Rf*QTz?%{1n|Gl2dst2T7r*J2mKobq%Fk*5r>%ImKC`8@Lh^BEZML#?@q@t?dBCZ7*{$}PBp`GD#z=jH<W1u002ovPDHLkV1mUGDkT5_ literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Etudier.wgt/img/toolbar-reload.png b/resources/library/interactivities/Etudier.wgt/img/toolbar-reload.png new file mode 100644 index 0000000000000000000000000000000000000000..340d7371f204e07c5e1e7202160cbd20eb2bbaff GIT binary patch literal 999 zcmV8xO?{jC#X3A z<^rQ6j=F<){f31acLnk3NI;JEztL3;=ED0r;h&G?5}pfEjSuu_%CNV5XvU@m_!&_+lvS zGi=KfkeD6`29P2<1@1bOm((tAl*iOtGP3^n3d9XW5P%ffNGo=&I0vp(l;$ofDY6sl zZJM|sY_F!dOJ2EO@>1E?rnsVF@H=Em>=u+$6d29P2f16LmXhZ?R|RFqxl`C@$SI(F}sZF#_Sdu2ZG0hGq|spmg$1$YVp_`N9r9sNul zc?iJ5xIUC33yOXonNo*hm+sDNcu$?-z{+T$V$>6jtT;Xojsw@m^#PD;g`vh{+U~A! z2ULe;Mro_5gc;{{Dc-445mWDr2m>KcG}_e*h6_{j6sbsb!(>6A>w;UrG^4d;l$b zJpj3-bf`RPZ+QXy6_Lnh`vZDgg0?_JMjb1@7m?UUB_byx@?g!W8czgmfr!jJ#!C@d z`^NWx{BX_f1rU+3$9N;N5C9D^wdaNaEPDV%M8*Rk?u>br?S;-$unBQ^G%@Xce1AZx zl6`-mqd(vTu=XteK(Kv(U<>_$I&ymZ1HMokTkpY}`vbBb*2h7CNb00xMzG*db3@0Z zZCjRW_BsG;FARdv^DATii@o|z0FV1BJ?71bQpb8%Hcj;Nu!6);xS9TdQi}$_Hqe`l zMC8J;q7Zozt2P|81=hrgv|r3VxfMs+9=rt(1!F?`19cX3&2QW5TJ<($=U+y9fPeFJ V^_8`m{=5JH002ovPDHLkV1m
-   @@ -66,6 +61,17 @@
+
+
+ +
+
diff --git a/resources/library/interactivities/Etudier.wgt/js/script.js b/resources/library/interactivities/Etudier.wgt/js/script.js index 476167a4..fe372d38 100644 --- a/resources/library/interactivities/Etudier.wgt/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", text_content: "This is an example. Instead of this text you can put your own content.", new_txt: "New text block", @@ -9,7 +9,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" }; //some flags @@ -31,9 +32,11 @@ function start(){ $("#wgt_name").text(sankoreLang.wgt_name); $("#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("etudier","")){ @@ -44,7 +47,7 @@ function start(){ showExample(); if(sankore.preference("etudier_style","")){ changeStyle(sankore.preference("etudier_style","")); - $(".style_select").val(sankore.preference("etudier_style","")); + $("#style_select").val(sankore.preference("etudier_style","")); } else changeStyle("3") } @@ -56,7 +59,7 @@ function start(){ window.widget.onleave = function(){ if(!$("#wgt_help").hasClass("open")){ exportData(); - sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val()); sankore.setPreference("etudier_cur_page", $("#slider").getPage()); sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display")); sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display")); @@ -64,19 +67,21 @@ function start(){ } } - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").hide(); tmp.removeClass("open"); $("#slider").show(); } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); exportData(); - sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val()); sankore.setPreference("etudier_cur_page", $("#slider").getPage()); sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display")); sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display")); @@ -93,8 +98,10 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); - + $("#parameters").css("display","none"); + var tmpwh = $(window).height(); + var tmpww = $(window).width(); + window.resizeTo(tmpww, tmpwh - 44) $("#slider li>div").each(function(){ var container = $(this); container.removeAttr("ondragenter") @@ -143,8 +150,10 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); - + $("#parameters").css("display","block"); + tmpwh = $(window).height(); + tmpww = $(window).width(); + window.resizeTo(tmpww, tmpwh + 44) $("#slider li>div").each(function(){ var container = $(this); container.attr("ondragenter", "return false;") @@ -556,10 +565,10 @@ function changeStyle(val){ $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); $("#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"); @@ -572,10 +581,10 @@ function changeStyle(val){ $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); $("#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"); @@ -588,10 +597,10 @@ function changeStyle(val){ $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); $("#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("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/Etudier.wgt/locales/fr/index.html b/resources/library/interactivities/Etudier.wgt/locales/fr/index.html index a33496df..5d8f1724 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Etudier.wgt/locales/fr/index.html @@ -25,12 +25,7 @@
-
- +
  @@ -40,6 +35,17 @@
+
+
+ +
+
diff --git a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js index 2b10962a..7d6c73a6 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", text_content: "Ceci est un exemple. Au lieu de ce texte, vous pouvez mettre votre propre texte ou glisser-déposer une image, un son ou une vidéo.", new_txt: "Nouveau bloc de texte", @@ -10,25 +10,26 @@ var sankoreLang = { none: "Aucun", help: "Aide", help_content: "

Etudier

"+ -"

Livret de pages.

"+ + "

Livret de pages.

"+ -"

L’interactivité Etudier permet d’ajouter un livret avec des pages. Ce livret peut être enrichi avec du texte, des images, du son et des vidéos.

"+ + "

L’interactivité Etudier permet d’ajouter un livret avec des pages. Ce livret peut être enrichi avec du texte, des images, du son et des vidéos.

"+ -"

Le bouton “Modifier” vous permet :

"+ -"
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
    • "+ -"
  • de modifier les pages du livret.
"+ + "

Le bouton “Modifier” vous permet :

"+ + "
  • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
    • "+ + "
  • de modifier les pages du livret.
"+ -"

Sur chaque page, vous pouvez :

"+ -"
  • insérer des zones de texte avec le bouton “+T” situé en haut à gauche de l’interactivité. (pour modifier ces zones de texte, cliquez à l’intérieur et écrivez du texte),
    • "+ -"
  • insérer des images, sons et vidéos par glisser-déposer de fichiers depuis la bibliothèque jusqu’à l’intérieur de la page du livret,
    • "+ -"
  • déplacer les textes, images, sons et vidéos à l’intérieur de la page en cliquant et en déplaçant la flèche multidirectionnelle qui se situe dans le coin supérieur gauche de chaque élément,
    • "+ -"
  • agrandir la taille d’un élément avec la double flèche en bas à droite de celui-ci,
    • "+ -"
  • supprimer un élément avec la case en haut à droite de celui-ci.
"+ + "

Sur chaque page, vous pouvez :

"+ + "
  • insérer des zones de texte avec le bouton “+T” situé en haut à gauche de l’interactivité. (pour modifier ces zones de texte, cliquez à l’intérieur et écrivez du texte),
    • "+ + "
  • insérer des images, sons et vidéos par glisser-déposer de fichiers depuis la bibliothèque jusqu’à l’intérieur de la page du livret,
    • "+ + "
  • déplacer les textes, images, sons et vidéos à l’intérieur de la page en cliquant et en déplaçant la flèche multidirectionnelle qui se situe dans le coin supérieur gauche de chaque élément,
    • "+ + "
  • agrandir la taille d’un élément avec la double flèche en bas à droite de celui-ci,
    • "+ + "
  • supprimer un élément avec la case en haut à droite de celui-ci.
"+ -"

Pour ajouter une page, cliquez sur la flèche verte accompagnée d’un “+” se trouvant en bas à gauche et à droite.

"+ -"

Pour supprimer une page, cliquez sur la croix rouge située en haut à droite de la page.

"+ + "

Pour ajouter une page, cliquez sur la flèche verte accompagnée d’un “+” se trouvant en bas à gauche et à droite.

"+ + "

Pour supprimer une page, cliquez sur la croix rouge située en haut à droite de la page.

"+ -"

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

" + "

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

", + theme: "Thème" }; @@ -51,9 +52,11 @@ function start(){ $("#wgt_name").text(sankoreLang.wgt_name); $("#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("etudier","")){ @@ -64,7 +67,7 @@ function start(){ showExample(); if(sankore.preference("etudier_style","")){ changeStyle(sankore.preference("etudier_style","")); - $(".style_select").val(sankore.preference("etudier_style","")); + $("#style_select").val(sankore.preference("etudier_style","")); } else changeStyle("3") } @@ -76,7 +79,7 @@ function start(){ window.widget.onleave = function(){ if(!$("#wgt_help").hasClass("open")){ exportData(); - sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val()); sankore.setPreference("etudier_cur_page", $("#slider").getPage()); sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display")); sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display")); @@ -84,19 +87,21 @@ function start(){ } } - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").hide(); tmp.removeClass("open"); $("#slider").show(); } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); exportData(); - sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val()); sankore.setPreference("etudier_cur_page", $("#slider").getPage()); sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display")); sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display")); @@ -113,7 +118,10 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); + var tmpwh = $(window).height(); + var tmpww = $(window).width(); + window.resizeTo(tmpww, tmpwh - 44) $("#slider li>div").each(function(){ var container = $(this); @@ -163,7 +171,10 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); + tmpwh = $(window).height(); + tmpww = $(window).width(); + window.resizeTo(tmpww, tmpwh + 44) $("#slider li>div").each(function(){ var container = $(this); @@ -577,10 +588,10 @@ function changeStyle(val){ $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); $("#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"); @@ -593,10 +604,10 @@ function changeStyle(val){ $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); $("#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"); @@ -609,10 +620,10 @@ function changeStyle(val){ $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); $("#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("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/Etudier.wgt/locales/ru/index.html b/resources/library/interactivities/Etudier.wgt/locales/ru/index.html index a33496df..5d8f1724 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Etudier.wgt/locales/ru/index.html @@ -25,12 +25,7 @@
-
- +
  @@ -40,6 +35,17 @@
+
+
+ +
+
diff --git a/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js b/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js index eb5df17c..0fcfd790 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", text_content: "Это - пример. Вместо этого текста вы можете ввести свой собственный контент.", new_txt: "Новый текстовый блок.", @@ -9,7 +9,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; //some flags @@ -31,9 +32,11 @@ function start(){ $("#wgt_name").text(sankoreLang.wgt_name); $("#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("etudier","")){ @@ -44,7 +47,7 @@ function start(){ showExample(); if(sankore.preference("etudier_style","")){ changeStyle(sankore.preference("etudier_style","")); - $(".style_select").val(sankore.preference("etudier_style","")); + $("#style_select").val(sankore.preference("etudier_style","")); } else changeStyle("3") } @@ -56,7 +59,7 @@ function start(){ window.widget.onleave = function(){ if(!$("#wgt_help").hasClass("open")){ exportData(); - sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val()); sankore.setPreference("etudier_cur_page", $("#slider").getPage()); sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display")); sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display")); @@ -64,19 +67,21 @@ function start(){ } } - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").hide(); tmp.removeClass("open"); $("#slider").show(); } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); exportData(); - sankore.setPreference("etudier_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("etudier_style", $("#style_select").find("option:selected").val()); sankore.setPreference("etudier_cur_page", $("#slider").getPage()); sankore.setPreference("etudier_left_nav", $("#prevBtn a").css("display")); sankore.setPreference("etudier_right_nav", $("#nextBtn a").css("display")); @@ -93,7 +98,10 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); + var tmpwh = $(window).height(); + var tmpww = $(window).width(); + window.resizeTo(tmpww, tmpwh - 44) $("#slider li>div").each(function(){ var container = $(this); @@ -109,7 +117,8 @@ function start(){ $(this).find(".size_up").remove(); $(this).find(".size_down").remove(); $(this).find(".resize_block").remove(); - $(this).removeAttr("contenteditable").removeClass("block_border"); + $(this).find(".real_text").removeAttr("contenteditable"); + $(this).removeClass("block_border"); $(this).css("position","absolute"); }); @@ -142,7 +151,10 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); + tmpwh = $(window).height(); + tmpww = $(window).width(); + window.resizeTo(tmpww, tmpwh + 44) $("#slider li>div").each(function(){ var container = $(this); @@ -158,7 +170,8 @@ function start(){ $("
").appendTo($(this)); $("
").appendTo($(this)); $("
").appendTo($(this)); - $(this).attr("contenteditable", "true").addClass("block_border"); + $(this).find(".real_text").attr("contenteditable", "true"); + $(this).addClass("block_border"); }); container.find(".img_block").each(function(){ @@ -292,7 +305,7 @@ function start(){ //var height = resize_obj.object.parent().height() - resize_obj.top + event.clientY; resize_obj.left = event.clientX; resize_obj.top = event.clientY; - resize_obj.object.parent().width(width).height(""); + resize_obj.object.parent().width(width); } else { width = resize_obj.object.parent().width() - resize_obj.left + event.clientX; var height = resize_obj.object.parent().height() - resize_obj.top + event.clientY; @@ -367,13 +380,13 @@ function start(){ $(".add_text").live("click", function(){ var container = $(this).parent(); - var text_block = $("
" + sankoreLang.new_txt + "
").appendTo(container); + var text_block = $("
" + sankoreLang.new_txt + "
").appendTo(container); $("
").appendTo(text_block); $("
").appendTo(text_block); $("
").appendTo(text_block); $("
").appendTo(text_block); $("
").appendTo(text_block); - text_block.attr("contenteditable", "true").addClass("block_border"); + text_block.addClass("block_border"); }); } @@ -391,7 +404,7 @@ function exportData(){ txt_block.left = $(this).position().left; txt_block.w = $(this).width(); txt_block.fz = $(this).css("font-size"); - txt_block.val = $(this).text(); + txt_block.val = $(this).find(".real_text").html(); cont_obj.text.push(txt_block); }); cont_obj.imgs = []; @@ -433,7 +446,7 @@ function importData(data){ var div = $("
").appendTo(li); for(var j in data[i].text){ - var text_div = $("
" + data[i].text[j].val + "
"); + var text_div = $("
" + data[i].text[j].val + "
"); text_div.draggable().css("position","absolute") .width(data[i].text[j].w) .css("top", data[i].text[j].top) @@ -486,7 +499,7 @@ function showExample(){ var li1 = $("
  • "); var div1 = $("
    ").appendTo(li1); - $("
    " + sankoreLang.text_content + "
    ").draggable().appendTo(div1) + $("
    " + sankoreLang.text_content + "
    ").draggable().appendTo(div1) li1.width($("#slider").width()).height($("#slider").height()); $("#slider ul").append(li1); var li2 = $("
  • "); @@ -507,7 +520,7 @@ function showExample(){ $("#slider ul").append(li3); var li4 = $("
  • "); var div4 = $("
    ").appendTo(li4); - $("
    " + sankoreLang.text_content + "
    ").draggable().appendTo(div4); + $("
    " + sankoreLang.text_content + "
    ").draggable().appendTo(div4); var img2 = $("
    ").draggable().appendTo(div4); $("").appendTo(img2); var audio_block2 = $("
    ").draggable().appendTo(div4); @@ -555,10 +568,10 @@ function changeStyle(val){ $(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back"); $("#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"); @@ -571,10 +584,10 @@ function changeStyle(val){ $(".b_bottom_center").addClass("bbc_pad").removeClass("without_back"); $("#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"); @@ -587,10 +600,10 @@ function changeStyle(val){ $(".b_bottom_center").addClass("without_back").removeClass("bbc_pad"); $("#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("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; } } @@ -663,4 +676,4 @@ $(window).resize(function(){ $(this).width(slider.width()).height(slider.height()); }); slider.setSize(slider.width(), slider.height()); -}) +}) \ No newline at end of file From 862bb62cff3ae69e9d05c10c7818739537cc56d1 Mon Sep 17 00:00:00 2001 From: maximXbs Date: Fri, 28 Sep 2012 15:35:20 +0200 Subject: [PATCH 14/20] updated 'Ordre images' app --- .../Ordre images.wgt/css/basic.css | 141 +++++++++--------- .../Ordre images.wgt/img/ar_down.png | Bin 529 -> 0 bytes .../Ordre images.wgt/img/ar_down_white.png | Bin 142 -> 0 bytes .../Ordre images.wgt/img/green_point.png | Bin 721 -> 0 bytes .../Ordre images.wgt/img/parameters-bg.png | Bin 0 -> 4256 bytes .../Ordre images.wgt/img/red_point.png | Bin 740 -> 0 bytes .../Ordre images.wgt/img/slate-display.png | Bin 532 -> 0 bytes .../Ordre images.wgt/img/slate-edit.png | Bin 1907 -> 0 bytes .../Ordre images.wgt/img/slate-help-white.png | Bin 553 -> 0 bytes .../Ordre images.wgt/img/slate-help.png | Bin 1795 -> 0 bytes .../img/slate-toolbar-help.png | Bin 0 -> 1697 bytes .../img/slate-toolbar-reload-white.png | Bin 1619 -> 0 bytes .../img/slate-toolbar-reload.png | Bin 2110 -> 2289 bytes .../Ordre images.wgt/img/toolbar-edit.png | Bin 0 -> 732 bytes .../Ordre images.wgt/img/toolbar-help.png | Bin 0 -> 707 bytes .../Ordre images.wgt/img/toolbar-reload.png | Bin 0 -> 999 bytes .../Ordre images.wgt/index.html | 19 ++- .../Ordre images.wgt/js/script.js | 49 +++--- .../Ordre images.wgt/locales/fr/index.html | 19 ++- .../Ordre images.wgt/locales/fr/js/script.js | 77 +++++----- .../Ordre images.wgt/locales/ru/index.html | 19 ++- .../Ordre images.wgt/locales/ru/js/script.js | 50 ++++--- 22 files changed, 204 insertions(+), 170 deletions(-) delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/ar_down.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/green_point.png create mode 100644 resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/red_point.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/slate-display.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/slate-edit.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/slate-help.png create mode 100644 resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png delete mode 100644 resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png create mode 100644 resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png create mode 100644 resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png create mode 100644 resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css index 48ab3bb5..930b66f4 100644 --- a/resources/library/interactivities/Ordre images.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -28,14 +28,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -245,57 +237,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; -} - -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -330,51 +305,50 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../img/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_reload{ + background: url(../img/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -383,5 +357,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Ordre images.wgt/img/ar_down.png b/resources/library/interactivities/Ordre images.wgt/img/ar_down.png deleted file mode 100644 index a20fab4f36a5d0f7e7a48e67ce9335c1a76a005d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)tGP4h z+%xyi(97qKUw8MsXF#K%IhY_2F%T0FmI=FS7s>4>0pJM{Jq374%m_IHYlYl0IS1#$ zGJGbM3psHfKI-)P`yF?15ANVDy1hPxV`Hfl>Sc-VA3uy(b{oExX_T~XcGrdL?ZbO; z0Pp?*-2MPX8Yk0Vzu&N?)>l~^T~t+xs#K^J3#dGWOkz~V@z2k17b=%S0n<|)1jp9Y zKP0OI$K339&@;nLsk<4=#cf{cgO6C|3zl_v8Ki8@T(`IZC zP$uC~7AHvOA?C9Q{@z?;eD(E++IKN3(QJgZl4nuqzhZ#Ti diff --git a/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png b/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png deleted file mode 100644 index 4a1d133b72676983e994ef76f99f777714560e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 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 WxhI7T;&QP70000J?Gxv$9bOTect!?{?08< zN?hvX;OPJWfD=ESC!j{q^3JfMzUrKu2h`v}#)`=0xQx_@RTvO0#nUj5uMn@p1ejQ= z+t7`L1Aq-E7m7#`x(t!v3WnH%VQ3Wu#Rh=z#acovS&xxm8n#ZZjG+B-^f(QaOCxA2 zIVg-0F<81hK1YQu&q)+Ya@I?@QrhB3FkFjJ0t$>2gIYzVQjKUMXwP&JYHrzvXy7vl zxjusS+>{7S0%LF$267lMT>=NgU@()xWCw+Wgam>tmKbdn?x2-0XY3=NxstJXnGE|+W3V6o^Fg09vnNwJo$RL`GO;9+Ws zN=}e+TnSnf#c6mJ89}3*K2JeGyp&a{UzCX|7^D>w5R(C0Qkn#!=>J0%ikE0LDZpO& z{ZC=FP)A^p08`^xDhYLPviX)!1QMgd#3Zf~;&|p{6_e6&5?80=1Q@fN1Fn=SrMO1@ z42_})U#TX=N(sj2MbIcdLoSyhF}x5ShqHvm<-oB_W-OB%7Z(y63bWavalu?(EO(O2 z!zEb?Oi501rLVZ`DY=$LP!LpP9;T9KW70Skt^l7UjL4_<0#B*;f-9Zc3v)^?M45ps z$NH~hp4_5($1;7{wAA8d+ha>aN`4^P+{?-|ntN-*HQx)6TATclZsO zo&Fx|-2@w`qA@lHZwR=N+Zm@kM()CieUF6j;@u z)mi($s_Ysvx4W0z_|a%I-kmsd`n$gx%6iMvq#cE>+C1~I!bkC=j@Ke9y34+lpX6OO zXN{YVLI+|JqM4(EH*dZK0ZN_9zS>AbgtOE=W%4d;Ch`fL$EeKN)-=9-`HC9acSx8 zbHfe+YYP2)*757zy}9~}F3sClx|W|lGxp6A7yCw}U0j#zcW6gI!{`sg-Mpq@0`?9r zI{8uSv0oOt48Bp`a`51plR{yL5B}6?A zn6+53i74n3D8uy*faXX_P-Ns!MPbcr9*&;Smml8kTUhv^*(-3Tmz%ysXfnT}n zS3@r1|K+6%kiUS72|H8u1LTW{Lf1JdS`d>v4N6Qnu+_cDrU-h519XxnWlyUk}jQt8p z=&zWj`@f?)hRmBjc+fG@{DtW) zE9k9Mk*#ASIIF&>sA%r)F@HOhXn#Zx41Cbi($dc(E7i(b0o5j9XGHaD@B#zpioNaL z-V0;wDznGF{;}Hn`rbKhq5CUj2b?!9-j) z(t)e-1*S()rv8gt&fa~}v$N#)Aa@-KUrlR>ygu#lc*cbdc?pQK8DAy7RoHC(ciOmn ZDi8|3Y4kkxbj0!-_pb~$&L3vDaAXI=gPRvNf*c8S$Ood*7f2B<470o|&+qb$b4UIY z13>CP>OuPOnGLstkOR8%{g1qObmu=Q0HhwIk75S^eUb3s#)bdn0FXYAeu^Bhd-aTS z|0w`a{dn!bn+;`^bqp!VV#MfYB#=_6QA{$9mV`ss0iQp-IZBD)pWhRqpFlQo_)i&d zptvOb{rlHea%_g`qr4~v(gJ_~{<%zwYKh_U?Zrw@-n>WPS6;vE1r zEP==XNFXwOfiY3-0T}r6=l54;W)?17>VZN3jfI7ko0J9#3n|%Z%fg=f0wNOHxa2>) zd2yfQyh>~ofWWf{H{at6dyqT{S)6cfhz|IL#UD~4PjM7%n%~7BDX)rC{`te(3^a`b zU{mWgfu`7NQlo$*2LQ!35XgcXNOb^7*$@Qgcjh%IY8cj{i{HO-zB#dcQXRSjs2T-O r^#wS5UqE6-M>qsV8zl4q009O7eJ4TJ=dcL@00000NkvXXu0mjfuXXIg diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-help.png b/resources/library/interactivities/Ordre images.wgt/img/slate-help.png deleted file mode 100644 index 069052d0061dacbeaa3bd022259a5db0e37a9f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1795 zcmaJ?Yfuws6kQ%FAfUs`V%6>}AZQ`UCO}LiA%P?U8VVsuP)1ymg+xd;B#Q|FDK9}0 z8N@1s4oc9DRuQEwqAdt&i&AZiqUGTrC}=y1Kv4#(6uUvd{wUp<-S08yoO|y5?l-$P zB7B3L&2k$60PI3Tcp_p1O|R8L;;S_nUJ-*U&X?d(SR$@NG$_E8VF@T0szj1d5sJvt zQ`^u00I&cRVhJu0ZemI?B?&QMNP4B3U;{uvpk9qglTjQ@K$8?I7BupGGXyGREGWiL zND-=oQMn?-ph2Sy;bN&FS;~+>fow29&m;ttD2{-7Wr|A6)U%*zT_!O%ZIdBz8iFUY zp!cRE!U!-J)1aUqiQ*%r_)|cCm;}>&>2$g`NTt9OGKETpsXj2BNux3;6maH&h-eyF zB2&Z@%)}yAEJ%*yY9^Vi)9FY$8VS=RkzoddVbY*deF%h)HeH1ydLNb6ZB~JYYNZ;5 z8dqQ{(4>eYU}-oDBAmWYL8+dTRcU9+L==pyN7Q7PL@}i_3ls|fAF5Q&p|!XO{owaM zg|*^zHA)ttS}aW?B@Qmp%@j(_4A!6sj%magmNHw#2swshS~;c$gQNVw7==oP>9o^m zp^zD>(&C6piiYx75Wy!Y6f!2mpC*8P>ApOe0mCpK=K8_G!Twxs5TDNA(ip+BTplJ( zQ=%$-mMijbiz!<{9dT@>dkOv^LwGq%Ow+L$fjfc z*D=p-5xrxY&NVHum}`4fMfAFcXlh6v9!K1j^iUpGtnV3$5y~C8A65R{=k6<1bcmgb z?mN|=s;;Z^5Y<6m{Ptj@$lGSs$wiU8(e`6JABgn|`eLnNyubI1hs)$;v0>?FVWiE; zJCr@EkEZPGY&6FI5$e#ek(5Qbok**gxI!N}T47Z(aA8Zq%^fTJJi!>+>*0vb=(bdW zQ)`cVB#c7TK8~u9FEq=w zjgCeo=0L6`aA#nBaSjz!Jn(;cHf(fi_wbq+%OgQoxj=#_8|f8x4DtZM+V-SkzJ)Qx z|JL%nw7goYnsYU;+uvrg*}Sl{vk4nq1j(+WN9(W@MmLwt67aBRfL& zdr9%9=7*t@G#no-4pD6?3G3Rj0L(+H(d+9b!`tt{om*3%{Z;wpQRYh5oXO;qb@|}&BeSBtV*>m%b98Oi7 z9Zcy=DH6cSl%_cgub0zd7DKmf6xU@a7G@+%tZ~xY&$WO|Q%B zZ%=Lgx;ac&ztrAhYO3SL;8^n{&0*>t000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200sF; zL_t(&f$djKY*bYg{_ef+Z-&|q(9%Lf5RkS>N2CdV36vJ&LKf0SMI$U6ipGRRVWDv$ zV1XDzXF&u`9%@cdO0P&MlK|j(9u!4^=XoH6!1scb61uL#wrx;K2XtL; z{NRh9)A{fViUCbkdtBE|GRD9;2LM=>1;!W{V<3bCZgw08@pv4R(xhYCJz?0P1U@{t zE9G*&gAf8KB{WR~r4)=YSe6CHabQ^%q?90pKv5KM&LM<=ZWudGzx{lwC<5i>OWP@> z;GDy89GIpF*L9(38Wcqdyx{+*l!8(UDJ3$Q43;lTv=>F-{{3_V0K{T3NGYMJDq^u1 zT-OEXJP0r;B|OiA5CW7^XqpC1(=eHyZYYX?qA0RW-;2P16DbQp!Llj6^5_AKWy}dHL)Inv@b!N?4W! zN@w91W3X)-j^l*EhZCsT@HB)FLAv=-?#F|!>i`hszvp>DmKcVC+M2b+5!kkQ<5d8` z>3sJBfa|*OJTGvwA9#Ky*tU)Ox^-8J^FZDDW6Am&FvbFRQ%Vtw#pY#!>$)&a6Ts}X zNhy)6uR$_dd#oq|WbLcHFEnqvv@}r)LI^0Oa9uYDNX|Jt&kKT32m#JHR#vUROM99x zVcovoq6h#$NlE;`q0}n_i9~7OUd9+yRfVD`P!t7@wHr}@^EBJ2PHZ0465CQ;Z%df6uV{*ga@tDy_*1Vkd*NP$l0OXn1 z(_1$``|gq@@gN(75QxQM0RdH2p{feD@7R1osokFj5LyQceh>Ka=f#g_?%bV-`vK^? zT?hdo1Xfj5WRiQ2E%Eik@Izlj56h3g{60K6IaTjxh2uCuaL&dB8=kB0m+V{;`Aw)Q ztlG~6&+~#NQBg6yLd@pv2qH-{qOMZSW{%JOOeK}+VGL)Z17HJ6o@REJ^A zmB?A(4u0L8G3}N=uHOv0p|0z&EDPJVJcrVBDEvpO~u~HWx&W0RVXC(7p$XVZb#_sD=Ru0T2Subsro)bAFy~KI1?E z9(dfc=(FJy0*g){@_63S*3=9j1)vo`*_@>*0Nnt(I?i71^*=tcI?&P9lmO86bnT{= zO*>yiT|*=ESkQH0n==@^eg*w~KValm{{;Z4jzwzYqeQM_T&E$A$_r?#uYtknB9t(pNNrj<%-M$Y6gY{6M4t$ z(EXDk`@_;uO4(dY8fNzwR|#F$xwsI^*?q;AVku?9^Z1P@#tm_QaRRiFb>g~nLqxqx$bhA}0cOW*T&Mp4wqH=g%=`N?piysAFedU|4f zIM>?$N|Y-AfZHRtCiD6J_QboZq?FzH2uLZrqYzlocz*6o`>C~c4aXn;K0J8+^uhN(oj0C` r;YapBcF)lqr#~7M|H*j1=mh=+SUN~Huv8Y*00000NkvXXu0mjf859-D literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec37fd55bc97dbac2bf21e599468ee8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8pIh$D;n7J8P zI>Ge14w>EaktaqCUE zeMXd{ME$g&z>Gq{!c_^51snY4TFqGcLLjQ(k}BKWT(|8URw)zHiUpPV%6ybN9$az| zmu;Sc#D(ln%u|sTI=_3w%fVq$30uq+-Wr*9>1G+|L*tQ*8A<3KdPL!+jr;j zyPNI^?l>Rxp=xiU$?=&!&#b?m?K{Re;o6oTci2uHuq-+4#ku0izm_8tZol1k;`!%% z;ZByeIC;BvdFM4@+U;$ZUw-yu+3!qAh)ffylanGm54`^_&&$TFd03vI{mjOFEP7!Ret4N3Q(;gIHk&>5PTAf# z`$@Zlx$<9B{;iv@E}bmI!Pd;WvsnEJhi9t_pG)!aN5MP9I+z*{1f0t*D=(kEZn;BW zW0OIF)!eMLVXs5qw3#=0ElpbFuQ=1EF6>F0dC#v)rBQ3WZ)*P#zx1}uo~w58#TBW~ zm|9}2?A|LZnV0Xp;9|y<#ESkeSF=p5B@aH>B;V`idFW;rL(t*Ly_XGz&V9~Ze;~oY zW^vp8sRBP#OLW9ecjxvzwkl2A{Bxzjyt8TXGgyv2E)0BeJ7-&a#FKxv%aW=iUaN&X&+75LUZLyb_4t6%LZ9WqX;HC>cO0K}C{;QZ+BU?z zo8YnfVQ6Hp-%}TLq0TeU1BxQohOK`pAo@7g;nhLsSNjh>Ewbc0{v+8!W}aS_!@_^F zuXpbFEIa-5SB|B3rnah0K53WakhOMJfuedt|G$R0g-e4nH{(tuF)I_U^4vQ~# zT))8{lzqKLB<}NU&Xrj;(pOuw6XK`DdOc;ieq@bwi1Z%blhz6SRpKvJlru7Z{Jhz< les}r7ySG2opO9x{WB7J{-|3FTiSIzgyr-+5%Q~loCIA;2bXNcX diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png index 685a5cb2a93933036bec2353f4e1291358ec3ca1..844169a963567982f39336dcff5b0c56568f58ce 100644 GIT binary patch literal 2289 zcmV000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200>D* zL_t(&f$f-oY*W`2$G`XevSWTZ2@nE>7|2Mpl*FtpZCR)t!P+rRg9%EvbX9^!VVX7p z8WNeRG%x%ZNE0IJD%Nf*37ytzV?a=+vB5S%L)Ne%;;n3jk_smXl0hJWB+q_7&;E!V zY{!lrvcW$b>B;Zi=X<}Od+zbQ=a>-@9;R^*Rs9hF03p7CF&6V&T~R6nsM~SyOkbq! zwO5w71wrrva075jk_1&%14QH}qNbhiw)m3?#>X5R(GUetv+g;!D2i9+K?ndG$EtK)pGHIw1OcXLLf3U< zW=_F3U;N4$Q534#+%-*c-D&|qzxb<_j~6YFkDq9EpZ9+Pj^iMT;zR(y-?ef1=XG80 z6Gic!R=oJm4a;1rs%_IW4IIY}yBq*|d+%WH8x1W&L3zCRu!)5)A7lA1En4wqPu&a4 zzX(wjVObUwMaktjRuwIt5P-<~nZx0LBuQa!aNv0!cDo&-C_+`WZLe1@btMCc7@POv zmPI9nTjtMw42&_@Y&HPcTwPJ>jQ-w;C8+wrdIcDY1tNlwkr5#q`m`*Vx{mD)&8Zk5 z6qMIpKlA2_e_#CUdBzwF!?0y#Im-d;PYNIwzPu{s$YZeF-02%1FIsTra(f4KU5DLf zTOSSZf8UDP{I!7z4*MlwXgNcwS`hvIft&@|S}D z=Xt2A3XZYewcqxRITl`fWr>^P_-z>(83+c0C|EETIn%T1QUWm7>Za0Xzu=FY_o5`( z1%Yp_S@&Gp5IZ+4^V;pUW=+$eC<-P_aNya+#V0X;Z6HP~Sw29Y{l@#}Qy-l=`}dDw znkI%45n*6(P}$4#eBJhj<~}5_og0=p4a3;Xaa;{!463Svh_L4CFDUNf!lJYR0DwA< z$c;z-P;>751vnfIsHzH46rt8<0uIoeZ z!#kWPiqJF-q9~$dVF5f#pSqiwow+F@4vaA?j`2j`up6eiufKoLd%o>o=(yU2uI`)A zG#!>@Vd8`gOr4sAg3q~7STGOH?92uLwam3T5Hp#vWW@4sDQAflKn+79gg-Z>&7f6H-_eV#z$JG-f`r<+n) zUr#qRzO$QTpT{5eR&u>$0J6`sDsa&sGw4{YyR)6%u6?yX8X_$K+2?T{daL$Eit(=y z(NQ9*316p(s5kygA!Q&2A}xS@Ti5PMHeruiTb7l*k4_FBB6TNnvT_z?DM$NgxDP2_rnj~4aIw5 z1OO2=js_66v;Y7g6de3xq*F*4pr8EkTi+cO;D2pIDcL!TBllWJNnM^R{e1(G``Po0#$BFIoSaz_ zc^tH53JjqmS*En@-zz%+D)7sMhArEd51k^zJvWB@hM5UnQt1K+I@ra1a;Un$g|aj_%HO z0Kkkn`EV61f~(LyJnMMz@OZIr(m4x=Xj6P7rDK+5-XWsOQT5UR2zPYTP}-HQ)l-6F zJMADG1;hoQ0{7~I$p8O=@YM+57-KAuq<^g5XtRD0_RveSM*#l?BwzixKjlZG00000 LNkvXXu0mjfx#&Pd literal 2110 zcmaJ?dpMN&9)IPULP##F%)TzQVlKvI3?q{qH!AU7rX(x^@3SCarV%3VJMx2>8?fK(4@AJIx@A7;;pYQGSJa5i{eLgzc zX4(J%==k|k7>X68e6=(bUvYBsykap$yhD*dI0i{%i6DT?fukXmADzgcs0+aUzv6FdhR}Q$x1LZCyDg^it!a_;;@d7bXN&-LV5*2&pH3md|fFL{) z_(xKq0S8cCun0mqp|SRCtTPtnj6>t_jxH`Pb|?od4vWD$U~mrhI2R(`fr!PTK0cr# znurraWKgIdV<}D~Fb+Y4L<}Y|F%g}JN5i6649?ZnRjJ|NV6Q;fi<1NhOKL9=TdpZk zATe9S6(U?%fKn>5qG1U_0u`D5Q37B1Nmd~K*d|58FjAHfgF|DLC9MGi0{%ag&;NuL zBMj)zeE+AgI4DU7VHl7YmWbGj!NpiALkWpqB8Y{+q97QKU+dz5I2eJ&aj+2O73hQt z;R-l#qWA+kAb{v65F;!B8}g%&Km{Mo<#LE#1S)}oCpf!0VZCuUZydqZ#g*bpcEIDj z_B!Kn&TCu>%$D#W0kX#B{K<7$m#Z`aU#N&ofkfOR5Qi#)`KS*C6S?c>;<&EfM=odm zT%6YBVid_>lwv!TOA^$jt_3;ju**OX8P$^oD_)9J9RL$2fBKz4t>mXtnfX zCTH=~3$vOfy9VqesDhx15g3?a?>skiv{n@Obd%}_~SD+n8j;di)UX{ zyg94a#&OuVC=xEJEWZMT=B-Z`|0SDUc=9}D`q7j0`BuG(h9=vs+B?zpOQylLMs*Dh zCl3^5Kkk0?I47EzSw7F#tZat939bp!m=L{f50T|wl77?3>q(J4d{~xNI5f7fAgPpq zr=q5%?z&n6^Hpvu2=v{N8`{H`>!Poe4E>-oYNNvKMT$mH*_##Mj9aZ=UKT zLg5+xv2n-FyF)slq2;#r4Jm({>3MND&-CBnLP-hlGa}8#P`vw;QPyWYWsg1dBjh#4 z$9GUy!7>SOyCP4XL-4da{LC(E?}$~IcjSH9*w~onMzvp_C9Smlj*bio(-r1>Bs~|z z{9}18EAn!vU2AV|uSxzL0}MUmg5+w%{+9IJ8R#x_yJ1A!c#-Prja|03bAdyk@qkRm z!=L=zz}nBM%7m)XG5&VtX14$sxP3dvB)GotqI2f*5$_Wv;gON>SiSn|yJrkW2F*%U zULwS8i`SX7#=H*oR7@-V(6@9Z(_E%i+1cq%!&?_rS683tpzq_Rh(tf09N53@MqfaT zS`^lVTGi%#Z_;w-XrgxN5HT#!+WPX;)YNz`K$A2q)(p`#s-{jxjmuwVel1QjGgcGQ z&J6!?5gMk=dO$`%^6zxPwADFms=XO z=x)-=kJU^~Yjb`6c4E2IFwGPA-t!dJ*0+RVOegC#c&qgtc25VV2~AV&!U#`~oy~^w z^0G3|2Ryj%UBVF`66>ZxBy;;e?>G|(KdB9Qye%B~%e9=Hj8@9z`C32Tm#7WXqIS;* zs}#52_3HM}dcP}K86HuMDsEWVt|QAmDwoSyF)@=C-a$-8!p|`b-=mI}kFGuy+Sx7` z`B+c5&3@^U+UCl+!5A%F7GE>ntnpVp0*Pc_&7=N!`n19KwY3|XM>cDxSbssv$z>% diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..daa338cd9bad28014559c72dab05555471ed402b GIT binary patch literal 732 zcmV<20wev2P)hPu2Ds07A#D z+(`)m10Mn0JJUZ@+pnq%MBp|%ES8NwDOLk#-~e!sr^msc6xo3pa5tZ@SZX^c-ho6o z06e&ZB7qF}i)0IA!gl~p>L5#?0N!D-JQN8?!jlC`;HvFkz>@@Oz-J58g3l7D2|p`P z8~&=mCE!tkOTnW827U+NPfd7GfZKJ0>63S=?e7451Mpk}9uxr30C=|7DAo1@fG#3Y z1bh} z^05>ix)tAeWB=B=!&DC&0NNI&WPE`=rmvk=Z9huGLQ(H8r|$x9UZ75YfIRIFC>8Aw zfaLK{3Qkh7L*3U0(z`UC0k;6t*GAaUDm zv{_eH15)rT0ZDkWKndKe&lf0#7YRtfvjwE!Spt&qWC3Y-l0Xf3s(>bWAi0-<&lceH zYekZc8Lx~?5j;iUE6Ibmu!%^_hNlP&B*(zwRS7&rz!u*o@PK_TJVn6G##wBSAqzfB zfMgdq=g~R;Y@Ro3;YFgD1q%&8O?(WPGBdSVDd`TL85dhqT2qH4N*IktZ1@II2I(YR4)WAlv zvU%qR&X@!VPJr&J6|ez*ghT^dppdL=FCxGNZ-6^P@E)%~&i!NSBU#Tt9T^*vt~(P|%gu7`!?=FJha~9{6Sqo?DucISV8!Tj0q^e|G$^U+W6=&|TFs{tr0D zn`GtcogeTY{2@7k0{HHEzmIV?MZg+=cl?8)4fjZ138$>U6Oen}H~&I_Zwqq#0!Ns# z1)=mZrC*QeGz8FHb<620w~?$ojJO|=hS2?H{W|fyC9-)1SKyz?OFd_PpxdkuIiRjt*AT2)sj{}ur*_}&=2$KKgpL_iZ6yhk%zfT|V~ zgZC(W{*%uKEY0W=-Rf*QTz?%{1n|Gl2dst2T7r*J2mKobq%Fk*5r>%ImKC`8@Lh^BEZML#?@q@t?dBCZ7*{$}PBp`GD#z=jH<W1u002ovPDHLkV1mUGDkT5_ literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png new file mode 100644 index 0000000000000000000000000000000000000000..340d7371f204e07c5e1e7202160cbd20eb2bbaff GIT binary patch literal 999 zcmV8xO?{jC#X3A z<^rQ6j=F<){f31acLnk3NI;JEztL3;=ED0r;h&G?5}pfEjSuu_%CNV5XvU@m_!&_+lvS zGi=KfkeD6`29P2<1@1bOm((tAl*iOtGP3^n3d9XW5P%ffNGo=&I0vp(l;$ofDY6sl zZJM|sY_F!dOJ2EO@>1E?rnsVF@H=Em>=u+$6d29P2f16LmXhZ?R|RFqxl`C@$SI(F}sZF#_Sdu2ZG0hGq|spmg$1$YVp_`N9r9sNul zc?iJ5xIUC33yOXonNo*hm+sDNcu$?-z{+T$V$>6jtT;Xojsw@m^#PD;g`vh{+U~A! z2ULe;Mro_5gc;{{Dc-445mWDr2m>KcG}_e*h6_{j6sbsb!(>6A>w;UrG^4d;l$b zJpj3-bf`RPZ+QXy6_Lnh`vZDgg0?_JMjb1@7m?UUB_byx@?g!W8czgmfr!jJ#!C@d z`^NWx{BX_f1rU+3$9N;N5C9D^wdaNaEPDV%M8*Rk?u>br?S;-$unBQ^G%@Xce1AZx zl6`-mqd(vTu=XteK(Kv(U<>_$I&ymZ1HMokTkpY}`vbBb*2h7CNb00xMzG*db3@0Z zZCjRW_BsG;FARdv^DATii@o|z0FV1BJ?71bQpb8%Hcj;Nu!6);xS9TdQi}$_Hqe`l zMC8J;q7Zozt2P|81=hrgv|r3VxfMs+9=rt(1!F?`19cX3&2QW5TJ<($=U+y9fPeFJ V^_8`m{=5JH002ovPDHLkV1m
    -
    - +
      @@ -66,7 +61,17 @@
    - +
    +
    + +
    +
      diff --git a/resources/library/interactivities/Ordre images.wgt/js/script.js b/resources/library/interactivities/Ordre images.wgt/js/script.js index f0a4ca0c..c19678e4 100644 --- a/resources/library/interactivities/Ordre images.wgt/js/script.js +++ b/resources/library/interactivities/Ordre images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "Place the pictures in ascending order.", add: "Add new block", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -22,9 +23,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -47,11 +50,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -72,7 +77,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -83,7 +88,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -130,7 +135,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -214,7 +219,7 @@ function exportData(){ } $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.right = $(this).find(".imgs_cont>input").val(); cont_obj.imgs = []; @@ -231,7 +236,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -254,12 +259,12 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } var tmp_array = []; var container = $("
    "); @@ -451,10 +456,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -468,10 +473,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -485,10 +490,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html index 6151ae43..b8c4d872 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html @@ -25,12 +25,7 @@
    -
    - +
      @@ -40,7 +35,17 @@
    - +
    +
    + +
    +
      diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js index ca851845..153d5c08 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js @@ -1,6 +1,6 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Placez les images dans l'ordre croissant.", add: "Nouveau bloc", @@ -12,28 +12,29 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content: "

    Ordonner des images

    "+ -"

    Classer des images dans l’ordre demandé.

    "+ + "

    Classer des images dans l’ordre demandé.

    "+ -"

    La consigne indique dans quel ordre les images doivent être classées. Le classement des images s’effectue par un glisser-déposer. Une fois que toutes les images sont correctement classées, la zone se colore en vert.

    "+ + "

    La consigne indique dans quel ordre les images doivent être classées. Le classement des images s’effectue par un glisser-déposer. Une fois que toutes les images sont correctement classées, la zone se colore en vert.

    "+ -"

    Le bouton “Recharger” réinitialise les exercices.

    "+ + "

    Le bouton “Recharger” réinitialise les exercices.

    "+ -"

    Le bouton “Modifier” vous permet :

    "+ -"
    • 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é.
    "+ -"

    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 consigne ici …”,
      • "+ -"
    • insérez des images dans les zones de dépôt par glisser-déposer des images à partir de votre bibliothèque,
      • "+ -"
    • modifiez éventuellement l’ordre des images par un glisser-déposer de l’image concernée pour la mettre au bon endroit dans la suite.
    "+ + "

    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 consigne ici …”,
      • "+ + "
    • insérez des images dans les zones de dépôt par glisser-déposer des images à partir de votre bibliothèque,
      • "+ + "
    • modifiez éventuellement l’ordre des images par un glisser-déposer de l’image concernée pour la mettre au bon endroit dans la suite.
    "+ -"

    Pour ajouter une zone image, cliquez sur le gros “+” en bas.

    "+ -"

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

    "+ -"

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

    "+ + "

    Pour ajouter une zone image, cliquez sur le gros “+” en bas.

    "+ + "

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

    "+ + "

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

    "+ -"

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

    "+ + "

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

    "+ -"

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

    " + "

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

    ", + theme: "Thème" }; //main function @@ -45,9 +46,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -70,11 +73,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -95,7 +100,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -105,7 +110,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -151,7 +156,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -235,7 +240,7 @@ function exportData(){ } $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.right = $(this).find(".imgs_cont>input").val(); cont_obj.imgs = []; @@ -252,7 +257,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -270,11 +275,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); }else{ if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } var tmp_array = []; var container = $("
    "); @@ -465,10 +470,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -482,10 +487,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -499,10 +504,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html b/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html index 6151ae43..b8c4d872 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Ordre images.wgt/locales/ru/index.html @@ -25,12 +25,7 @@
    -
    - +
      @@ -40,7 +35,17 @@
    - +
    +
    + +
    +
      diff --git a/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js index 4f709a3c..0bce5739 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js @@ -1,6 +1,6 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", short_desc: "Расположите картинки в порядке возрастания цифр.", add: "Новый блок", @@ -11,7 +11,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; //main function @@ -23,9 +24,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -48,11 +51,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -73,7 +78,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -83,7 +88,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -129,7 +134,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -213,7 +218,7 @@ function exportData(){ } $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.right = $(this).find(".imgs_cont>input").val(); cont_obj.imgs = []; @@ -230,7 +235,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -248,11 +253,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); }else{ if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } var tmp_array = []; var container = $("
    "); @@ -443,10 +448,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -460,10 +465,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -477,10 +482,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } @@ -518,7 +523,6 @@ function onDropTarget(obj, event) { tmp_img.attr("height",h); tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0"); } - exportData(); }, 6) } else { From b49a01d981f02c4bedcc1cbca5e9cfbe7f695973 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Fri, 28 Sep 2012 16:40:04 +0300 Subject: [PATCH 15/20] Fixed export images to CFF. Added UUIDs for each imported item. Supported groups. --- plugins/cffadaptor/src/UBCFFAdaptor.cpp | 8 ++- src/adaptors/UBCFFSubsetAdaptor.cpp | 68 ++++++++++++++++++++----- src/adaptors/UBCFFSubsetAdaptor.h | 1 + src/adaptors/UBSvgSubsetAdaptor.cpp | 2 +- 4 files changed, 64 insertions(+), 15 deletions(-) diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index 106d2457..f5c84068 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -1277,7 +1277,13 @@ bool UBCFFAdaptor::UBToCFFConverter::setCFFAttribute(const QString &attributeNam if (attributeName.contains(aUBZUuid)) { - QString id = "{" +ubzElement.attribute(aUBZParent)+"}" + "{"+ubzElement.attribute(aUBZUuid)+"}"; + QString parentId = ubzElement.attribute(aUBZParent); + QString id; + if (!parentId.isEmpty()) + id = "{" + parentId + "}" + "{" + ubzElement.attribute(aUBZUuid)+"}"; + else + id = "{" + ubzElement.attribute(aUBZUuid)+"}"; + svgElement.setAttribute(aID, id); } else diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index e0584b4d..d06c95a7 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -249,7 +249,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &elem painter.end(); UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); - svgItem->setUuid(QUuid::createUuid()); + + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + svgItem->setUuid(QUuid(uuid)); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -300,7 +304,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgEllipse(const QDomElement &e painter.end(); UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); - svgItem->setUuid(QUuid::createUuid()); + + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + svgItem->setUuid(QUuid(uuid)); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -395,6 +403,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e mCurrentScene->addItem(graphicsPolygon); graphicsPolygon->setUuid(itemUuid); + mRefToUuidMap.insert(element.attribute(aId), itemUuid); } else // single CFF @@ -415,7 +424,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); QTransform transform; QString textTransform = element.attribute(aTransform); - svgItem->setUuid(QUuid::createUuid()); + + QUuid uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + svgItem->setUuid(uuid); + svgItem->resetTransform(); if (!textTransform.isNull()) { transform = transformFromString(textTransform, svgItem); @@ -508,6 +521,9 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement & } mCurrentScene->addItem(graphicsPolygon); + graphicsPolygon->setUuid(itemUuid); + mRefToUuidMap.insert(element.attribute(aId), itemUuid); + } else // simple CFF { @@ -525,7 +541,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement & //add resulting svg file to scene UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); - svgItem->setUuid(QUuid::createUuid()); + + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + svgItem->setUuid(QUuid(uuid)); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -678,6 +698,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgText(const QDomElement &elem //add resulting svg file to scene UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName())); + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + svgItem->setUuid(QUuid(uuid)); + svgItem->resetTransform(); repositionSvgItem(svgItem, width, height, x + transform.m31(), y + transform.m32(), transform); hashSceneItem(element, svgItem); @@ -791,6 +815,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgTextarea(const QDomElement & UBGraphicsTextItem *svgItem = mCurrentScene->addTextHtml(doc.toHtml()); svgItem->resize(width, height); + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + svgItem->setUuid(QUuid(uuid)); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -840,6 +868,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &ele } UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix, NULL); + + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + pixItem->setUuid(QUuid(uuid)); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -887,6 +920,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele UBGraphicsWidgetItem *flashItem = mCurrentScene->addW3CWidget(QUrl::fromLocalFile(flashUrl)); flashItem->setSourceUrl(urlPath); + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); + flashItem->setUuid(QUuid(uuid)); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -924,14 +961,15 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &ele concreteUrl = QUrl::fromLocalFile(audioPath); } - QUuid uuid = QUuid::createUuid(); + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); QString destFile; bool b = UBPersistenceManager::persistenceManager()->addFileToDocument( mCurrentScene->document(), concreteUrl.toLocalFile(), UBPersistenceManager::audioDirectory, - uuid, + QUuid(uuid), destFile); if (!b) { @@ -940,6 +978,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &ele concreteUrl = QUrl::fromLocalFile(destFile); UBGraphicsMediaItem *audioItem = mCurrentScene->addAudio(concreteUrl, false); + QTransform transform; QString textTransform = parentOfAudio.attribute(aTransform); @@ -977,15 +1016,15 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele concreteUrl = QUrl::fromLocalFile(videoPath); } - QUuid uuid = QUuid::createUuid(); - + QString uuid = QUuid::createUuid().toString(); + mRefToUuidMap.insert(element.attribute(aId), uuid); QString destFile; bool b = UBPersistenceManager::persistenceManager()->addFileToDocument( mCurrentScene->document(), concreteUrl.toLocalFile(), UBPersistenceManager::videoDirectory, - uuid, + QUuid(uuid), destFile); if (!b) { @@ -994,6 +1033,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele concreteUrl = QUrl::fromLocalFile(destFile); UBGraphicsMediaItem *videoItem = mCurrentScene->addVideo(concreteUrl, false); + QTransform transform; QString textTransform = element.attribute(aTransform); @@ -1129,13 +1169,15 @@ UBGraphicsGroupContainerItem *UBCFFSubsetAdaptor::UBCFFSubsetReader::parseIwbGro group->addToGroup(parseIwbGroup(currentStrokeElement)); else { - QString uuid = currentStrokeElement.attribute(aRef); + + QString ref = currentStrokeElement.attribute(aRef); + QString uuid = mRefToUuidMap[ref]; if (!uuid.isEmpty()) { - if (uuid.size() > QUuid().toString().length()) // create stroke group + if (ref.size() > QUuid().toString().length()) // create stroke group { - currentStrokeIdentifier = uuid.left(QUuid().toString().length()-1); - UBGraphicsPolygonItem *strokeByUuid = qgraphicsitem_cast(mCurrentScene->itemForUuid(QUuid(uuid.right(QUuid().toString().length())))); + currentStrokeIdentifier = ref.left(QUuid().toString().length()-1); + UBGraphicsPolygonItem *strokeByUuid = qgraphicsitem_cast(mCurrentScene->itemForUuid(QUuid(ref.right(QUuid().toString().length())))); if (strokeByUuid) strokesGroupsContainer.insert(currentStrokeIdentifier, strokeByUuid); diff --git a/src/adaptors/UBCFFSubsetAdaptor.h b/src/adaptors/UBCFFSubsetAdaptor.h index ca389a49..3a6f89a6 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.h +++ b/src/adaptors/UBCFFSubsetAdaptor.h @@ -74,6 +74,7 @@ private: QDomDocument mDOMdoc; QDomNode mCurrentDOMElement; QHash persistedItems; + QMap mRefToUuidMap; QDir mTmpFlashDir; void addItemToGSection(QGraphicsItem *item); diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 8f0efe67..17e25564 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1015,7 +1015,7 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId); UBGraphicsGroupContainerItem *curGroup = readGroup(); if (curGroup) - group->addToGroup(curGroup); + groupContainer.append(curGroup); } else if (mXmlReader.name() == tElement) { From ec97931e2e1a94f9bc9cb7289099532ddfa45fdc Mon Sep 17 00:00:00 2001 From: maximXbs Date: Fri, 28 Sep 2012 17:09:46 +0200 Subject: [PATCH 16/20] updated 'Ordre lettres' app --- .../Ordre lettres.wgt/css/basic.css | 141 +++++++++--------- .../Ordre lettres.wgt/img/green_point.png | Bin 721 -> 0 bytes .../Ordre lettres.wgt/img/parameters-bg.png | Bin 0 -> 4256 bytes .../Ordre lettres.wgt/img/red_point.png | Bin 740 -> 0 bytes .../Ordre lettres.wgt/img/slate-display.png | Bin 532 -> 0 bytes .../Ordre lettres.wgt/img/slate-edit.png | Bin 1907 -> 0 bytes .../img/slate-help-white.png | Bin 553 -> 0 bytes .../Ordre lettres.wgt/img/slate-help.png | Bin 1795 -> 0 bytes .../img/slate-toolbar-help.png | Bin 0 -> 1697 bytes .../img/slate-toolbar-reload-white.png | Bin 1619 -> 0 bytes .../img/slate-toolbar-reload.png | Bin 2110 -> 2289 bytes .../Ordre lettres.wgt/img/toolbar-edit.png | Bin 0 -> 732 bytes .../Ordre lettres.wgt/img/toolbar-help.png | Bin 0 -> 707 bytes .../Ordre lettres.wgt/img/toolbar-reload.png | Bin 0 -> 999 bytes .../Ordre lettres.wgt/index.html | 17 ++- .../Ordre lettres.wgt/js/script.js | 45 +++--- .../Ordre lettres.wgt/locales/fr/index.html | 17 ++- .../Ordre lettres.wgt/locales/fr/js/script.js | 89 ++++++----- .../Ordre lettres.wgt/locales/ru/index.html | 17 ++- .../Ordre lettres.wgt/locales/ru/js/script.js | 66 ++++---- 20 files changed, 223 insertions(+), 169 deletions(-) delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/green_point.png create mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/red_point.png delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png create mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png create mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png create mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png create mode 100644 resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 4573addc..bd270ede 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.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; @@ -306,57 +298,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{ @@ -391,51 +366,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; @@ -444,5 +418,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/green_point.png b/resources/library/interactivities/Ordre lettres.wgt/img/green_point.png deleted file mode 100644 index a2a4468089bac7dc1e200c8f60836c9b45f16e2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 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 WxhI7T;&QP70000J?Gxv$9bOTect!?{?08< zN?hvX;OPJWfD=ESC!j{q^3JfMzUrKu2h`v}#)`=0xQx_@RTvO0#nUj5uMn@p1ejQ= z+t7`L1Aq-E7m7#`x(t!v3WnH%VQ3Wu#Rh=z#acovS&xxm8n#ZZjG+B-^f(QaOCxA2 zIVg-0F<81hK1YQu&q)+Ya@I?@QrhB3FkFjJ0t$>2gIYzVQjKUMXwP&JYHrzvXy7vl zxjusS+>{7S0%LF$267lMT>=NgU@()xWCw+Wgam>tmKbdn?x2-0XY3=NxstJXnGE|+W3V6o^Fg09vnNwJo$RL`GO;9+Ws zN=}e+TnSnf#c6mJ89}3*K2JeGyp&a{UzCX|7^D>w5R(C0Qkn#!=>J0%ikE0LDZpO& z{ZC=FP)A^p08`^xDhYLPviX)!1QMgd#3Zf~;&|p{6_e6&5?80=1Q@fN1Fn=SrMO1@ z42_})U#TX=N(sj2MbIcdLoSyhF}x5ShqHvm<-oB_W-OB%7Z(y63bWavalu?(EO(O2 z!zEb?Oi501rLVZ`DY=$LP!LpP9;T9KW70Skt^l7UjL4_<0#B*;f-9Zc3v)^?M45ps z$NH~hp4_5($1;7{wAA8d+ha>aN`4^P+{?-|ntN-*HQx)6TATclZsO zo&Fx|-2@w`qA@lHZwR=N+Zm@kM()CieUF6j;@u z)mi($s_Ysvx4W0z_|a%I-kmsd`n$gx%6iMvq#cE>+C1~I!bkC=j@Ke9y34+lpX6OO zXN{YVLI+|JqM4(EH*dZK0ZN_9zS>AbgtOE=W%4d;Ch`fL$EeKN)-=9-`HC9acSx8 zbHfe+YYP2)*757zy}9~}F3sClx|W|lGxp6A7yCw}U0j#zcW6gI!{`sg-Mpq@0`?9r zI{8uSv0oOt48Bp`a`51plR{yL5B}6?A zn6+53i74n3D8uy*faXX_P-Ns!MPbcr9*&;Smml8kTUhv^*(-3Tmz%ysXfnT}n zS3@r1|K+6%kiUS72|H8u1LTW{Lf1JdS`d>v4N6Qnu+_cDrU-h519XxnWlyUk}jQt8p z=&zWj`@f?)hRmBjc+fG@{DtW) zE9k9Mk*#ASIIF&>sA%r)F@HOhXn#Zx41Cbi($dc(E7i(b0o5j9XGHaD@B#zpioNaL z-V0;wDznGF{;}Hn`rbKhq5CUj2b?!9-j) z(t)e-1*S()rv8gt&fa~}v$N#)Aa@-KUrlR>ygu#lc*cbdc?pQK8DAy7RoHC(ciOmn ZDi8|3Y4kkxbj0!-_pb~$&L3vDaAXI=gPRvNf*c8S$Ood*7f2B<470o|&+qb$b4UIY z13>CP>OuPOnGLstkOR8%{g1qObmu=Q0HhwIk75S^eUb3s#)bdn0FXYAeu^Bhd-aTS z|0w`a{dn!bn+;`^bqp!VV#MfYB#=_6QA{$9mV`ss0iQp-IZBD)pWhRqpFlQo_)i&d zptvOb{rlHea%_g`qr4~v(gJ_~{<%zwYKh_U?Zrw@-n>WPS6;vE1r zEP==XNFXwOfiY3-0T}r6=l54;W)?17>VZN3jfI7ko0J9#3n|%Z%fg=f0wNOHxa2>) zd2yfQyh>~ofWWf{H{at6dyqT{S)6cfhz|IL#UD~4PjM7%n%~7BDX)rC{`te(3^a`b zU{mWgfu`7NQlo$*2LQ!35XgcXNOb^7*$@Qgcjh%IY8cj{i{HO-zB#dcQXRSjs2T-O r^#wS5UqE6-M>qsV8zl4q009O7eJ4TJ=dcL@00000NkvXXu0mjfuXXIg diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png deleted file mode 100644 index 069052d0061dacbeaa3bd022259a5db0e37a9f16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1795 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 literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec37fd55bc97dbac2bf21e599468ee8d36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8pIh$D;n7J8P zI>Ge14w>EaktaqCUE zeMXd{ME$g&z>Gq{!c_^51snY4TFqGcLLjQ(k}BKWT(|8URw)zHiUpPV%6ybN9$az| zmu;Sc#D(ln%u|sTI=_3w%fVq$30uq+-Wr*9>1G+|L*tQ*8A<3KdPL!+jr;j zyPNI^?l>Rxp=xiU$?=&!&#b?m?K{Re;o6oTci2uHuq-+4#ku0izm_8tZol1k;`!%% z;ZByeIC;BvdFM4@+U;$ZUw-yu+3!qAh)ffylanGm54`^_&&$TFd03vI{mjOFEP7!Ret4N3Q(;gIHk&>5PTAf# z`$@Zlx$<9B{;iv@E}bmI!Pd;WvsnEJhi9t_pG)!aN5MP9I+z*{1f0t*D=(kEZn;BW zW0OIF)!eMLVXs5qw3#=0ElpbFuQ=1EF6>F0dC#v)rBQ3WZ)*P#zx1}uo~w58#TBW~ zm|9}2?A|LZnV0Xp;9|y<#ESkeSF=p5B@aH>B;V`idFW;rL(t*Ly_XGz&V9~Ze;~oY zW^vp8sRBP#OLW9ecjxvzwkl2A{Bxzjyt8TXGgyv2E)0BeJ7-&a#FKxv%aW=iUaN&X&+75LUZLyb_4t6%LZ9WqX;HC>cO0K}C{;QZ+BU?z zo8YnfVQ6Hp-%}TLq0TeU1BxQohOK`pAo@7g;nhLsSNjh>Ewbc0{v+8!W}aS_!@_^F zuXpbFEIa-5SB|B3rnah0K53WakhOMJfuedt|G$R0g-e4nH{(tuF)I_U^4vQ~# zT))8{lzqKLB<}NU&Xrj;(pOuw6XK`DdOc;ieq@bwi1Z%blhz6SRpKvJlru7Z{Jhz< les}r7ySG2opO9x{WB7J{-|3FTiSIzgyr-+5%Q~loCIA;2bXNcX diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png index 685a5cb2a93933036bec2353f4e1291358ec3ca1..844169a963567982f39336dcff5b0c56568f58ce 100644 GIT binary patch literal 2289 zcmV000W>0fLJSS^xk59CSrkbW?9;ba!ELWdK2BZ(?O2Mrm?o zcW-iQb09-gHF34$HUIzs7IZ~ebVG7wVRUJ4ZXi@?ZDjy5HZL$UFEKLOh$^H200>D* zL_t(&f$f-oY*W`2$G`XevSWTZ2@nE>7|2Mpl*FtpZCR)t!P+rRg9%EvbX9^!VVX7p z8WNeRG%x%ZNE0IJD%Nf*37ytzV?a=+vB5S%L)Ne%;;n3jk_smXl0hJWB+q_7&;E!V zY{!lrvcW$b>B;Zi=X<}Od+zbQ=a>-@9;R^*Rs9hF03p7CF&6V&T~R6nsM~SyOkbq! zwO5w71wrrva075jk_1&%14QH}qNbhiw)m3?#>X5R(GUetv+g;!D2i9+K?ndG$EtK)pGHIw1OcXLLf3U< zW=_F3U;N4$Q534#+%-*c-D&|qzxb<_j~6YFkDq9EpZ9+Pj^iMT;zR(y-?ef1=XG80 z6Gic!R=oJm4a;1rs%_IW4IIY}yBq*|d+%WH8x1W&L3zCRu!)5)A7lA1En4wqPu&a4 zzX(wjVObUwMaktjRuwIt5P-<~nZx0LBuQa!aNv0!cDo&-C_+`WZLe1@btMCc7@POv zmPI9nTjtMw42&_@Y&HPcTwPJ>jQ-w;C8+wrdIcDY1tNlwkr5#q`m`*Vx{mD)&8Zk5 z6qMIpKlA2_e_#CUdBzwF!?0y#Im-d;PYNIwzPu{s$YZeF-02%1FIsTra(f4KU5DLf zTOSSZf8UDP{I!7z4*MlwXgNcwS`hvIft&@|S}D z=Xt2A3XZYewcqxRITl`fWr>^P_-z>(83+c0C|EETIn%T1QUWm7>Za0Xzu=FY_o5`( z1%Yp_S@&Gp5IZ+4^V;pUW=+$eC<-P_aNya+#V0X;Z6HP~Sw29Y{l@#}Qy-l=`}dDw znkI%45n*6(P}$4#eBJhj<~}5_og0=p4a3;Xaa;{!463Svh_L4CFDUNf!lJYR0DwA< z$c;z-P;>751vnfIsHzH46rt8<0uIoeZ z!#kWPiqJF-q9~$dVF5f#pSqiwow+F@4vaA?j`2j`up6eiufKoLd%o>o=(yU2uI`)A zG#!>@Vd8`gOr4sAg3q~7STGOH?92uLwam3T5Hp#vWW@4sDQAflKn+79gg-Z>&7f6H-_eV#z$JG-f`r<+n) zUr#qRzO$QTpT{5eR&u>$0J6`sDsa&sGw4{YyR)6%u6?yX8X_$K+2?T{daL$Eit(=y z(NQ9*316p(s5kygA!Q&2A}xS@Ti5PMHeruiTb7l*k4_FBB6TNnvT_z?DM$NgxDP2_rnj~4aIw5 z1OO2=js_66v;Y7g6de3xq*F*4pr8EkTi+cO;D2pIDcL!TBllWJNnM^R{e1(G``Po0#$BFIoSaz_ zc^tH53JjqmS*En@-zz%+D)7sMhArEd51k^zJvWB@hM5UnQt1K+I@ra1a;Un$g|aj_%HO z0Kkkn`EV61f~(LyJnMMz@OZIr(m4x=Xj6P7rDK+5-XWsOQT5UR2zPYTP}-HQ)l-6F zJMADG1;hoQ0{7~I$p8O=@YM+57-KAuq<^g5XtRD0_RveSM*#l?BwzixKjlZG00000 LNkvXXu0mjfx#&Pd literal 2110 zcmaJ?dpMN&9)IPULP##F%)TzQVlKvI3?q{qH!AU7rX(x^@3SCarV%3VJMx2>8?fK(4@AJIx@A7;;pYQGSJa5i{eLgzc zX4(J%==k|k7>X68e6=(bUvYBsykap$yhD*dI0i{%i6DT?fukXmADzgcs0+aUzv6FdhR}Q$x1LZCyDg^it!a_;;@d7bXN&-LV5*2&pH3md|fFL{) z_(xKq0S8cCun0mqp|SRCtTPtnj6>t_jxH`Pb|?od4vWD$U~mrhI2R(`fr!PTK0cr# znurraWKgIdV<}D~Fb+Y4L<}Y|F%g}JN5i6649?ZnRjJ|NV6Q;fi<1NhOKL9=TdpZk zATe9S6(U?%fKn>5qG1U_0u`D5Q37B1Nmd~K*d|58FjAHfgF|DLC9MGi0{%ag&;NuL zBMj)zeE+AgI4DU7VHl7YmWbGj!NpiALkWpqB8Y{+q97QKU+dz5I2eJ&aj+2O73hQt z;R-l#qWA+kAb{v65F;!B8}g%&Km{Mo<#LE#1S)}oCpf!0VZCuUZydqZ#g*bpcEIDj z_B!Kn&TCu>%$D#W0kX#B{K<7$m#Z`aU#N&ofkfOR5Qi#)`KS*C6S?c>;<&EfM=odm zT%6YBVid_>lwv!TOA^$jt_3;ju**OX8P$^oD_)9J9RL$2fBKz4t>mXtnfX zCTH=~3$vOfy9VqesDhx15g3?a?>skiv{n@Obd%}_~SD+n8j;di)UX{ zyg94a#&OuVC=xEJEWZMT=B-Z`|0SDUc=9}D`q7j0`BuG(h9=vs+B?zpOQylLMs*Dh zCl3^5Kkk0?I47EzSw7F#tZat939bp!m=L{f50T|wl77?3>q(J4d{~xNI5f7fAgPpq zr=q5%?z&n6^Hpvu2=v{N8`{H`>!Poe4E>-oYNNvKMT$mH*_##Mj9aZ=UKT zLg5+xv2n-FyF)slq2;#r4Jm({>3MND&-CBnLP-hlGa}8#P`vw;QPyWYWsg1dBjh#4 z$9GUy!7>SOyCP4XL-4da{LC(E?}$~IcjSH9*w~onMzvp_C9Smlj*bio(-r1>Bs~|z z{9}18EAn!vU2AV|uSxzL0}MUmg5+w%{+9IJ8R#x_yJ1A!c#-Prja|03bAdyk@qkRm z!=L=zz}nBM%7m)XG5&VtX14$sxP3dvB)GotqI2f*5$_Wv;gON>SiSn|yJrkW2F*%U zULwS8i`SX7#=H*oR7@-V(6@9Z(_E%i+1cq%!&?_rS683tpzq_Rh(tf09N53@MqfaT zS`^lVTGi%#Z_;w-XrgxN5HT#!+WPX;)YNz`K$A2q)(p`#s-{jxjmuwVel1QjGgcGQ z&J6!?5gMk=dO$`%^6zxPwADFms=XO z=x)-=kJU^~Yjb`6c4E2IFwGPA-t!dJ*0+RVOegC#c&qgtc25VV2~AV&!U#`~oy~^w z^0G3|2Ryj%UBVF`66>ZxBy;;e?>G|(KdB9Qye%B~%e9=Hj8@9z`C32Tm#7WXqIS;* zs}#52_3HM}dcP}K86HuMDsEWVt|QAmDwoSyF)@=C-a$-8!p|`b-=mI}kFGuy+Sx7` z`B+c5&3@^U+UCl+!5A%F7GE>ntnpVp0*Pc_&7=N!`n19KwY3|XM>cDxSbssv$z>% diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png new file mode 100644 index 0000000000000000000000000000000000000000..daa338cd9bad28014559c72dab05555471ed402b GIT binary patch literal 732 zcmV<20wev2P)hPu2Ds07A#D z+(`)m10Mn0JJUZ@+pnq%MBp|%ES8NwDOLk#-~e!sr^msc6xo3pa5tZ@SZX^c-ho6o z06e&ZB7qF}i)0IA!gl~p>L5#?0N!D-JQN8?!jlC`;HvFkz>@@Oz-J58g3l7D2|p`P z8~&=mCE!tkOTnW827U+NPfd7GfZKJ0>63S=?e7451Mpk}9uxr30C=|7DAo1@fG#3Y z1bh} z^05>ix)tAeWB=B=!&DC&0NNI&WPE`=rmvk=Z9huGLQ(H8r|$x9UZ75YfIRIFC>8Aw zfaLK{3Qkh7L*3U0(z`UC0k;6t*GAaUDm zv{_eH15)rT0ZDkWKndKe&lf0#7YRtfvjwE!Spt&qWC3Y-l0Xf3s(>bWAi0-<&lceH zYekZc8Lx~?5j;iUE6Ibmu!%^_hNlP&B*(zwRS7&rz!u*o@PK_TJVn6G##wBSAqzfB zfMgdq=g~R;Y@Ro3;YFgD1q%&8O?(WPGBdSVDd`TL85dhqT2qH4N*IktZ1@II2I(YR4)WAlv zvU%qR&X@!VPJr&J6|ez*ghT^dppdL=FCxGNZ-6^P@E)%~&i!NSBU#Tt9T^*vt~(P|%gu7`!?=FJha~9{6Sqo?DucISV8!Tj0q^e|G$^U+W6=&|TFs{tr0D zn`GtcogeTY{2@7k0{HHEzmIV?MZg+=cl?8)4fjZ138$>U6Oen}H~&I_Zwqq#0!Ns# z1)=mZrC*QeGz8FHb<620w~?$ojJO|=hS2?H{W|fyC9-)1SKyz?OFd_PpxdkuIiRjt*AT2)sj{}ur*_}&=2$KKgpL_iZ6yhk%zfT|V~ zgZC(W{*%uKEY0W=-Rf*QTz?%{1n|Gl2dst2T7r*J2mKobq%Fk*5r>%ImKC`8@Lh^BEZML#?@q@t?dBCZ7*{$}PBp`GD#z=jH<W1u002ovPDHLkV1mUGDkT5_ literal 0 HcmV?d00001 diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png new file mode 100644 index 0000000000000000000000000000000000000000..340d7371f204e07c5e1e7202160cbd20eb2bbaff GIT binary patch literal 999 zcmV8xO?{jC#X3A z<^rQ6j=F<){f31acLnk3NI;JEztL3;=ED0r;h&G?5}pfEjSuu_%CNV5XvU@m_!&_+lvS zGi=KfkeD6`29P2<1@1bOm((tAl*iOtGP3^n3d9XW5P%ffNGo=&I0vp(l;$ofDY6sl zZJM|sY_F!dOJ2EO@>1E?rnsVF@H=Em>=u+$6d29P2f16LmXhZ?R|RFqxl`C@$SI(F}sZF#_Sdu2ZG0hGq|spmg$1$YVp_`N9r9sNul zc?iJ5xIUC33yOXonNo*hm+sDNcu$?-z{+T$V$>6jtT;Xojsw@m^#PD;g`vh{+U~A! z2ULe;Mro_5gc;{{Dc-445mWDr2m>KcG}_e*h6_{j6sbsb!(>6A>w;UrG^4d;l$b zJpj3-bf`RPZ+QXy6_Lnh`vZDgg0?_JMjb1@7m?UUB_byx@?g!W8czgmfr!jJ#!C@d z`^NWx{BX_f1rU+3$9N;N5C9D^wdaNaEPDV%M8*Rk?u>br?S;-$unBQ^G%@Xce1AZx zl6`-mqd(vTu=XteK(Kv(U<>_$I&ymZ1HMokTkpY}`vbBb*2h7CNb00xMzG*db3@0Z zZCjRW_BsG;FARdv^DATii@o|z0FV1BJ?71bQpb8%Hcj;Nu!6);xS9TdQi}$_Hqe`l zMC8J;q7Zozt2P|81=hrgv|r3VxfMs+9=rt(1!F?`19cX3&2QW5TJ<($=U+y9fPeFJ V^_8`m{=5JH002ovPDHLkV1m
    -   @@ -66,7 +61,17 @@
    - +
    +
    + +
    +
      diff --git a/resources/library/interactivities/Ordre lettres.wgt/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/js/script.js index d3ca2c70..a9c844d8 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "Listen to the sound and make the correct word.", add: "Add new block", @@ -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("associer_sound","")){ @@ -36,7 +39,7 @@ function start(){ showExample(); if(sankore.preference("ord_let_style","")){ changeStyle(sankore.preference("ord_let_style","")); - $(".style_select").val(sankore.preference("ord_let_style","")); + $("#style_select").val(sankore.preference("ord_let_style","")); } else changeStyle("3") } @@ -46,18 +49,20 @@ function start(){ if (window.widget) { window.widget.onleave = function(){ exportData(); - sankore.setPreference("ord_let_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("ord_let_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); @@ -124,7 +129,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); $("
    ").appendTo(container); @@ -446,10 +451,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"); @@ -463,10 +468,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"); @@ -480,10 +485,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html index 035d2684..cb3d1b52 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html @@ -26,11 +26,6 @@
    -   @@ -40,7 +35,17 @@
    - +
    +
    + +
    +
      diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js index 2e85339f..f37ff6a2 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Ecoutez le son et replacer les lettres dans l'ordre.", add: "Nouveau bloc", @@ -12,26 +12,27 @@ var sankoreLang = { none: "Aucun", help: "Aide", help_content: "

    Ordre des lettres

    "+ -"

    Ordonner des lettres pour reconstituer un mot.

    "+ + "

    Ordonner des lettres pour reconstituer un mot.

    "+ -"

    L’intégration d’un fichier son (facultatif) permet d’écouter le mot à reconstituer. Lorsque les lettres sont dans le bon ordre, l’interactivité se colore en vert.

    "+ + "

    L’intégration d’un fichier son (facultatif) permet d’écouter le mot à reconstituer. Lorsque les lettres sont dans le bon ordre, l’interactivité se colore en vert.

    "+ -"

    L’activité s’effectue par un glisser-déposer des étiquettes pour remettre les lettres en ordre. NB : vous pouvez également utiliser cette activité avec des chiffres.

    "+ + "

    L’activité s’effectue par un glisser-déposer des étiquettes pour remettre les lettres en ordre. NB : vous pouvez également utiliser cette activité avec des chiffres.

    "+ -"

    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 déterminer le mot à reconstituer.
    "+ + "

    Le bouton “Modifier” vous permet :

    "+ + "
    • de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),
      • "+ + "
    • de déterminer le mot à reconstituer.
    "+ -"

    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 ...”,
      • "+ -"
    • insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque (facultatif),
      • "+ -"
    • écrivez le mot souhaité à la place de “exemple”.
    "+ + "

    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 ...”,
      • "+ + "
    • insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque (facultatif),
      • "+ + "
    • écrivez le mot souhaité à la place de “exemple”.
    "+ -"

    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 @@ -43,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_sound","")){ @@ -56,7 +59,7 @@ function start(){ showExample(); if(sankore.preference("ord_let_style","")){ changeStyle(sankore.preference("ord_let_style","")); - $(".style_select").val(sankore.preference("ord_let_style","")); + $("#style_select").val(sankore.preference("ord_let_style","")); } else changeStyle("3") } @@ -66,18 +69,20 @@ function start(){ if (window.widget) { window.widget.onleave = function(){ exportData(); - sankore.setPreference("ord_let_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("ord_let_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"); @@ -98,7 +103,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -109,7 +114,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); @@ -133,7 +138,11 @@ function start(){ tmp_array = shuffle(tmp_array); for(var i = 0; i").appendTo(container); @@ -300,7 +309,7 @@ function importData(data){ var audio_block = $("
    ").appendTo(text); $("
    ").appendTo(audio_block); $("
    ").appendTo(audio_block); - var source = $("").attr("src", "../../" + data[i].audio); + var source = $("").attr("src", data[i].audio); var audio = $("
    ").appendTo(audio_block); $("
    ").appendTo(audio_block); - var source = $("").attr("src", "objects/beep.mp3"); + var source = $("").attr("src", "objects/exemple.mp3"); var audio = $("
    -   @@ -40,7 +35,17 @@
    - +
    +
    + +
    +
      diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js index 3377a85c..05853cd2 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", short_desc: "Прослушайте звук и составьте корректное слово.", add: "Новый блок", @@ -11,10 +11,10 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; - //main function function start(){ @@ -24,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_sound","")){ @@ -37,7 +39,7 @@ function start(){ showExample(); if(sankore.preference("ord_let_style","")){ changeStyle(sankore.preference("ord_let_style","")); - $(".style_select").val(sankore.preference("ord_let_style","")); + $("#style_select").val(sankore.preference("ord_let_style","")); } else changeStyle("3") } @@ -47,18 +49,20 @@ function start(){ if (window.widget) { window.widget.onleave = function(){ exportData(); - sankore.setPreference("ord_let_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("ord_let_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"); @@ -79,7 +83,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -90,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); @@ -114,7 +118,11 @@ function start(){ tmp_array = shuffle(tmp_array); for(var i = 0; i").appendTo(container); @@ -281,7 +289,7 @@ function importData(data){ var audio_block = $("
    ").appendTo(text); $("
    ").appendTo(audio_block); $("
    ").appendTo(audio_block); - var source = $("").attr("src", "../../" + data[i].audio); + var source = $("").attr("src", data[i].audio); var audio = $("
  • "+(i+1)+"
    • ").appendTo($pagination); + $("
  • "+(i+1)+"
    • ").appendTo($pagination); $operations = $("
      "); $operationContainer.append($operations);