diff --git a/JournalDesModifications.pdf b/JournalDesModifications.pdf index a9e38bd6..088a09cd 100644 Binary files a/JournalDesModifications.pdf and b/JournalDesModifications.pdf differ diff --git a/ReleaseNotes.pdf b/ReleaseNotes.pdf index 3edddab7..22443f42 100644 Binary files a/ReleaseNotes.pdf and b/ReleaseNotes.pdf differ diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index f6aab45e..5f1a5b9e 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -11,7 +11,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 2 VERSION_MIN = 00 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 07 +VERSION_PATCH = 08 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index 5630c01d..f5c84068 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -550,8 +550,8 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parsePage(const QString &pageFileNam pageFile.close(); return QDomElement(); } - } else if (tagname == tUBZGroup) { - group = parseGroupPageSection(nextTopElement); + } else if (tagname == tUBZGroups) { + group = parseGroupsPageSection(nextTopElement); if (group.isNull()) { qDebug() << "Page doesn't contains any groups."; pageFile.close(); @@ -634,6 +634,7 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parseSvgPageSection(const QDomElemen else if (tagName == tUBZLine) parseUBZLine(nextElement, svgElements); else if (tagName == tUBZPolygon) parseUBZPolygon(nextElement, svgElements); else if (tagName == tUBZPolyline) parseUBZPolyline(nextElement, svgElements); + else if (tagName == tUBZGroups) parseGroupsPageSection(nextElement); nextElement = nextElement.nextSiblingElement(); } @@ -694,12 +695,34 @@ bool UBCFFAdaptor::UBToCFFConverter::writeExtendedIwbSection() // extended element options // editable, background, locked are supported for now -QDomElement UBCFFAdaptor::UBToCFFConverter::parseGroupPageSection(const QDomElement &element) +QDomElement UBCFFAdaptor::UBToCFFConverter::parseGroupsPageSection(const QDomElement &groupRoot) { // First sankore side implementation needed. TODO in Sankore 1.5 - Q_UNUSED(element) + if (!groupRoot.hasChildNodes()) { + qDebug() << "Group root is empty"; + return QDomElement(); + } + + QDomElement groupElement = groupRoot.firstChildElement(); + + while (!groupElement.isNull()) { + QDomElement extendedElement = mDataModel->createElementNS(iwbNS, groupElement.tagName()); + QDomElement groupChildElement = groupElement.firstChildElement(); + while (!groupChildElement.isNull()) { + QDomElement extSubElement = mDataModel->createElementNS(iwbNS, groupChildElement.tagName()); + extSubElement.setAttribute(aRef, groupChildElement.attribute(aID, QUuid().toString())); + extendedElement.appendChild(extSubElement); + + groupChildElement = groupChildElement.nextSiblingElement(); + } + + mExtendedElements.append(extendedElement); + + groupElement = groupElement.nextSiblingElement(); + } + qDebug() << "parsing ubz group section"; - return QDomElement(); + return groupRoot; } QString UBCFFAdaptor::UBToCFFConverter::getDstContentFolderName(const QString &elementType) @@ -1250,6 +1273,19 @@ bool UBCFFAdaptor::UBToCFFConverter::setCFFAttribute(const QString &attributeNam { setGeometryFromUBZ(ubzElement, svgElement); } + else + if (attributeName.contains(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 if (attributeName.contains(aUBZHref)||attributeName.contains(aSrc)) { @@ -1799,7 +1835,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/UBCFFAdaptor.h b/plugins/cffadaptor/src/UBCFFAdaptor.h index d9891460..f38d51e0 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.h +++ b/plugins/cffadaptor/src/UBCFFAdaptor.h @@ -63,7 +63,7 @@ private: QDomElement parseSvgPageSection(const QDomElement &element); void writeQDomElementToXML(const QDomNode &node); bool writeExtendedIwbSection(); - QDomElement parseGroupPageSection(const QDomElement &element); + QDomElement parseGroupsPageSection(const QDomElement &groupRoot); bool createBackground(const QDomElement &element, QMultiMap &dstSvgList); QString createBackgroundImage(const QDomElement &element, QSize size); diff --git a/plugins/cffadaptor/src/UBCFFConstants.h b/plugins/cffadaptor/src/UBCFFConstants.h index adeeb507..69de92dd 100644 --- a/plugins/cffadaptor/src/UBCFFConstants.h +++ b/plugins/cffadaptor/src/UBCFFConstants.h @@ -28,6 +28,7 @@ const QString tIWBPageSet = "pageset"; const QString tId = "id"; const QString tElement = "element"; const QString tUBZGroup = "group"; +const QString tUBZGroups = "groups"; const QString tUBZG = "g"; const QString tUBZPolygon = "polygon"; const QString tUBZPolyline = "polyline"; @@ -67,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 @@ -334,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(" \ @@ -376,4 +380,4 @@ struct UBItemLayerType }; }; -#endif // UBCFFCONSTANTS_H \ No newline at end of file +#endif // UBCFFCONSTANTS_H 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 diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/sankore_ar.ts index d0563711..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 @@ -1511,6 +1511,21 @@ سلة المهملات + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + إلغاء + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2096,6 +2111,10 @@ Do you want to ignore these errors for this host? Cache تخزين مؤقت + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_bg.ts b/resources/i18n/sankore_bg.ts index e7b021aa..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 @@ -1503,6 +1503,21 @@ Кошче + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Отмени + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2094,6 +2109,10 @@ Do you want to ignore these errors for this host? Cache Кеш + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_ca.ts b/resources/i18n/sankore_ca.ts index e6365c40..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 @@ -1504,6 +1504,21 @@ Paperera + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Cancel·la + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2090,6 +2105,10 @@ Voleu ignorar aquests errors per a aquest amfitrió? Cache Memòria cau + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_cs.ts b/resources/i18n/sankore_cs.ts index c445e919..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 @@ -1506,6 +1506,21 @@ Koš + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Zrušit + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2097,6 +2112,10 @@ Chcete ignorovat tyto chyby na tomto serveru? Magnifier Lupa + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/sankore_da.ts index ba78f4f9..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 @@ -1502,6 +1502,21 @@ Papirkurv + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Annuller + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host? Cache Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/sankore_de.ts index 2b504d9c..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 @@ -1502,6 +1502,21 @@ Papierkorb + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Abbrechen + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2101,6 +2116,10 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren? Cache Zwischenspeicher + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_el.ts b/resources/i18n/sankore_el.ts index ff22d029..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 @@ -1502,6 +1502,21 @@ Κάδος ανακύκλωσης + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Άκυρο + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host? Cache Προβολέας + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/sankore_en.ts index 2fa83d94..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 @@ -1500,6 +1500,21 @@ + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host? Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/sankore_en_UK.ts index b201acef..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 @@ -1500,6 +1500,21 @@ + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host? Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/sankore_es.ts index 6170c441..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 @@ -1502,6 +1502,21 @@ Papelera + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Cancelar + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host? Cache Caché + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 7889d130..6b2894cf 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -39,7 +39,7 @@ Stop - Stop + Arrêter Open @@ -73,11 +73,11 @@ Stylus - Stylet + Stylets Backgrounds - Fond + Fonds Undo @@ -373,15 +373,15 @@ Tutorial - Tutoriel + Tutoriels Show Desktop - Bureau + Afficher le bureau Ctrl+Shift+H - Ctrl+Shift+H + Ctrl+Maj+H Rename Content @@ -393,11 +393,11 @@ Use Document Wide Size (16/9) - Utiliser un format de document 16/9 + Utiliser un format large (16/9) Use Document Regular Size (4/3) - Utiliser un format de document 4/3 + Utiliser un format normal (4/3) Use Custom Document Size @@ -461,11 +461,11 @@ Highlight - Surligner + Surligner Ctrl+M - + Ctrl+M Select And Modify Objects @@ -481,11 +481,11 @@ Laser Pointer - Pointer avec le laser + Utiliser le "pointeur laser" Virtual Laser Pointer - Pointer avec le laser + Utiliser le "pointeur laser" Ctrl+G @@ -497,7 +497,7 @@ Ctrl+J - + Ctrl+J Write Text @@ -553,11 +553,11 @@ Open the tutorial - Ouvrir le tutoriel + Ouvrir les tutoriels Check Update - Contrôler les mises à jour + Contrôler la mise à jour Ctrl+H @@ -645,11 +645,11 @@ Wide Size (16/9) - Format 16/9 + Format large (16/9) Regular Size (4/3) - Format 4/3 + Format normal (4/3) Custom Size @@ -781,7 +781,7 @@ Show Open-Sankoré Widgets Editor - Ouvrir l'éditeur Sankoré + Ouvrir l'éditeur d'appliquettes Open-Sankoré Hide Open-Sankoré @@ -801,23 +801,24 @@ Group items - Grouper + Grouper les objets Play - Jouer + j'hésite avec Lancer (dépend du contexte d'usage) + Jouer Interact with items - Interagir avec des objets + Interagir avec des objets Erase Background - Effacer le fond + Effacer le fond Remove the backgound - Supprimer le fond + Supprimer le fond Group @@ -859,26 +860,26 @@ Save username and password for future use - Enregistrer le nom d'utilisateur et le mot de passe pour une utilisation future + Enregistrer le nom d'utilisateur et le mot de passe pour la prochaine.utilisation QObject Element ID = - ID de l'élément = + ID de l'élément = Content is not supported in destination format. - Le contenu n'est pas supporté dans le format destinataire. + Contenu non supporté dans le format souhaité. Remove Page - Supprimer la page + Supprimer la page Are you sure you want to remove 1 page from the selected document '%0'? - Voulez-vous vraiment effacer 1 page de ce document '%0'? + Voulez-vous vraiment effacer 1 page de ce document '%0'? @@ -900,7 +901,7 @@ New update available, would you go to the web page ? - Nouvelle mise à jour disponible, voulez-vous aller à la page Web ? + Nouvelle mise à jour disponible : voulez-vous accéder à la page de téléchargement ? No update available @@ -943,15 +944,15 @@ Delete page %1 from document - + Supprimer la page %1 du document Page %1 deleted - Page %1 effacée + Page %1 supprimée Add file operation failed: file copying error - Echec d'ajout de document : erreur de copie + Echec d'ajout de document : erreur de copie Group @@ -970,7 +971,7 @@ CapturedImage - Image capturée + Image capturée @@ -998,10 +999,6 @@ UBDesktopPalette - - Show Uniboard - Afficher Open-Sankoré - Capture Part of the Screen Capturer une partie de l'écran @@ -1022,6 +1019,10 @@ Show Desktop on Secondary Screen Afficher le bureau sur l'écran secondaire + + Show Open-Sankore + Afficher Open-Sankoré + UBDocumentController @@ -1139,7 +1140,7 @@ The document '%1' has been generated with a newer version of Sankore (%2). By opening it, you may lose some information. Do you want to proceed? - Le document '%1' a été créé avec une version plus récente de Sankoré (%2). En l'ouvrant, vous risquez de perdre certains éléments. Désirez-vous continuer ? + Le document '%1' a été créé avec une version plus récente d'Open-Sankoré (%2). En l'ouvrant, vous risquez de perdre certains éléments. Désirez-vous continuer ? Are you sure you want to remove %n page(s) from the selected document '%1'? @@ -1150,15 +1151,15 @@ Title page - Page de titre + Page de titre Folder does not contain any image files - Le dossier ne contient pas d'image + Le dossier ne contient pas d'image Untitled Documents - Documents sans titre + Documents sans titre @@ -1185,23 +1186,24 @@ File %1 saved - Fichier %1 sauvé + Fichier %1 enregistré Inserting page %1 of %2 - Ajout de la page %1 de %2 + Ajout de la page %1 sur %2 Import successful. - Importation terminée. + Importation réussie. Import of file %1 successful. - Importation du document %1 terminée. + Importation du document %1 réussie. Importing file %1 - Importation du document %1 en cours + j'ai raccourci la phrase pour eviter les soucis de place ! + Importation de %1 en cours @@ -1212,18 +1214,18 @@ Title page - Page 0 + Page de titre UBDocumentPublisher Export failed. - Echec de l'exportation. + Echec de l'export. Export canceled ... - Exportation annulée ... + Export annulée ... Converting page %1/%2 ... @@ -1231,11 +1233,11 @@ Credentials has to not been filled out yet. - Les informations n'ont pas encore été fournies. + Les nom d'utilisateur et mot de passe n'ont pas été encore renseignés. Uploading Sankore File on Web. - Fichier Open-Sankoré en cours de transfert vers Planète Sankoré. + Fichier Open-Sankoré en cours de transfert vers Planète-Sankoré. Document uploaded correctly on the web. @@ -1243,7 +1245,7 @@ Failed to upload document on the web. - Echec du transfert du document sur le Web. + Echec du transfert du document vers Planète-Sankoré. @@ -1258,7 +1260,7 @@ %1 pages copied - + %1 page copiée %1 pages copiées @@ -1279,37 +1281,37 @@ UBExportAdaptor Warnings during export was appeared - Avertissements lors de l'exportation + Avertissements lors de l'exportation UBExportCFF Export to IWB - Exporter au format CFF (*.iwb) + Exporter au format CFF (*.iwb) Export as IWB File - Exporter au format CFF (*.iwb) + Exporter au format CFF (*.iwb) Exporting document... - Exportation du document... + Exportation du document... Export successful. - Export réussi. + Export réussi. Export failed. - Echec de l'exportation. + Echec de l'export. UBExportDocument Export as UBZ File - Exporter au format UBZ (*.ubz) + Exporter au format UBZ (*.ubz) Export successful. @@ -1336,7 +1338,7 @@ UBExportFullPDF Export as PDF File - Exporter au format PDF (*.pdf) + Exporter au format PDF (*.pdf) Exporting document... @@ -1348,14 +1350,14 @@ Export successful. - Exportation terminée. + Export terminé. UBExportPDF Export as PDF File - Exporter au format PDF (*.pdf) + Exporter au format PDF (*.pdf) Exporting page %1 of %2 @@ -1363,7 +1365,7 @@ Export successful. - Exportation terminée. + Export terminé. Exporting document... @@ -1371,7 +1373,7 @@ Export to PDF - Exporter au format PDF (*.pdf) + Exporter au format PDF (*.pdf) @@ -1390,11 +1392,11 @@ Export successful. - Exportation réussie. + Export réussi. Export failed. - Echec de l'exportation. + Echec de l'export. Export to Web Browser @@ -1405,119 +1407,137 @@ UBFeatureProperties Add to page - Ajout à la page + j'ai choisi de rendre le bouton plus compact (mais info moins complète) + Ajout page Set as background - Ajout en fond + j'ai choisi de rendre le bouton plus compact (mais info moins complète) + Ajout en fond Add to library - Ajout à la bibliothèque + j'ai choisi de rendre le bouton plus compact (mais info moins complète) + Ajout bibliothèque Object informations - Informations + Informations UBFeaturesActionBar Add to favorites - Ajouter aux favoris + Ajouter aux favoris Share - Partager + Partager Search - Rechercher + Rechercher Delete - Supprimer + Supprimer Back to folder - Retour au répertoire + Retour au répertoire Remove from favorites - Supprimer des favoris + Supprimer des favoris Create new folder - Créer un nouveau dossier + Créer nouveau dossier Rescan file system - Rescanner le système de fichiers + Parcourir le système de fichiers UBFeaturesController ImportedImage - Image importée + Image importée Audios - Sons + Sons Movies - Vidéos + Vidéos Pictures - Images + Images Animations - Animations + Animations Interactivities - Interactivités + Interactivités Applications - Applications + Applications Shapes - Formes + Formes Favorites - Favoris + Favoris Web search - Recherche Web + Recherche Web Trash - Corbeille + Corbeille + + + + UBFeaturesNewFolderDialog + + Accept + Accepter + + + Cancel + Annuler + + + Enter a new folder name + Saisir le nom du nouveau dossier UBFeaturesProgressInfo Loading - Chargement en cours + Chargement en cours UBGraphicsGroupContainerItemDelegate Locked - Verrouillé + Verrouillé Visible on Extended Screen - Visible sur l'écran de projection + Visible sur l'écran étendu @@ -1528,7 +1548,7 @@ Visible on Extended Screen - Visible sur l'écran de projection + Visible sur l'écran étendu Go to Content Source @@ -1539,7 +1559,7 @@ UBGraphicsTextItem <Type Text Here> - <Ecrire votre texte ici> + <Saisir votre texte ici> @@ -1557,18 +1577,18 @@ UBGraphicsW3CWidgetItem Web - Web + Web UBGraphicsWidgetItem Cannot load content - Impossible de charger le contenu + Impossible de charger le contenu Loading ... - Chargement en cours ... + Chargement en cours ... @@ -1594,15 +1614,15 @@ Import of file %1 failed. - Echec de l'importation du fichier %1. + Echec de l'import du fichier %1. Import successful. - Importation terminée. + Import terminée. Import failed. - Echec de l'importation. + Echec de l'import. @@ -1613,11 +1633,11 @@ Import successful. - Importation terminée. + Import terminé. Import of file %1 failed. - Échec de l'importation du fichier %1. + Échec de l'import du fichier %1. Open-Sankore (*.ubz) @@ -1635,11 +1655,11 @@ UBImportPDF Portable Document Format (*.pdf) - Format de document portable (*.pdf) + Format PDF (*.pdf) PDF import failed. - Échec de l'importation du fichier PDF. + Échec de l'import du fichier PDF. Importing page %1 of %2 @@ -1690,14 +1710,14 @@ UBMessagesDialog Close - Fermer + Fermer UBNetworkAccessManager <qt>Enter username and password for "%1" at %2</qt> - <qt>Saisir le nom de l'utilisateur et le mot de passe pour "%1" à %2</qt> + <qt>Renseigner le nom de l'utilisateur et le mot de passe pour "%1" à %2</qt> Failed to log to Proxy @@ -1711,7 +1731,7 @@ %2 Do you want to ignore these errors for this host? - Erreur SSL: + Erreur SSL (Secure Socket Layer) sur un serveur sécurisé: %1 @@ -1736,7 +1756,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Document Repository Loss - Accès perdu au répertoire des documents + Accès perdu vers le répertoire des documents Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well. @@ -1774,7 +1794,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? No Podcast encoder available ... - Aucun encodeur pour le podcast disponible... + Aucun encodeur disponible.pour le podcast... Part %1 @@ -1826,7 +1846,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Sankore Cast - Open-Sankoré Cast + Podcast Open-Sankoré @@ -1844,7 +1864,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBProxyLoginDlg Proxy Login - Identification Proxy + Identification sur le Proxy Username: @@ -1859,7 +1879,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBPublicationDlg Publish document on the web - Publier un fichier Open-Sankoré sur Planète Sankoré + Publier un fichier Open-Sankoré sur Planète-Sankoré Title: @@ -1885,33 +1905,33 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBTGActionWidget Teacher - Professeur + Enseignant Student - Elève + Elève/Etudiant Type task here ... - Saisir une action ici ... + Proposer une action ici ... UBTGMediaWidget drop media here ... - Glisser une ressource ici ... + Glisser un média ici ... Type title here... - Saisir le titre ici ... + Renseigner le titre ici ... UBTGUrlWidget Insert link title here... - Saisir le titre du lien ici ... + Renseigner le titre du lien ici ... @@ -1925,131 +1945,132 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBTeacherGuideEditionWidget Type title here ... - Saisir le titre de l'activité ici ... + Renseigner le titre de l'activité... Type comment here ... - Saisir le commentaire ici ... + Renseigner le commentaire ici ... Add an action - Ajouter une action + Ajouter une action Add a media - Ajouter un média + Ajouter un média Add a link - Ajouter un lien + Ajouter un lien.web Page: %0 - Page: %0 + Page: %0 UBTeacherGuidePageZeroWidget Type session title here ... - Saisir le titre de la séance ... + Renseigner le titre de la séance ... Author(s) - Auteur(s) : + Auteur(s) : Type authors here ... - Saisir les auteurs ici ... + Ajouter les auteurs ici ... Objective(s) - Objectif(s) : + Objectif(s) de la séance : Type objectives here... - Saisir les objectifs ici ... + Ajouter les objectifs ici ... Resource indexing - Indexation de la ressource + Métadonnées de la ressource Keywords: - Mot(s) clé(s) : + Mot(s) clé(s) : Type keywords here ... - Saisir le(s) mot(s) clé(s) ici ... + Ajouter le(s) mot(s) clé(s) ici ... Level: - Niveau scolaire : + Niveau(x) scolaire(s) : Subjects: - Discipline : + Discipline(s) : Type: - Type : + Type(s) : Licence - Licence + Licence Attribution CC BY - Licence Planète Sankoré (CC Paternité 3.0) + Licence recommandée (CC Paternité 3.0) Attribution-NoDerivs CC BY-ND - CC Paternité, Pas de modification + CC Paternité, Pas de modification Attribution-ShareAlike CC BY-SA - CC Paternité, Partage à l'identique + CC Paternité, Partage à l'identique Attribution-NonCommercial CC BY-NC - CC Paternité, Pas d'utilisation Commerciale + CC Paternité, Pas d'utilisation commerciale Attribution-NonCommercial-NoDerivs CC BY-NC-ND - CC Paternité, Pas d'utilisation Commerciale, Pas de modification + CC Paternité, Pas d'utilisation commerciale, Pas de modification Attribution-NonCommercial-ShareAlike CC BY-NC-SA - CC Paternité, Pas d'utilisation Commerciale, Partage à l'identique + CC Paternité, Pas d'utilisation commerciale, Partage à l'identique Public domain - Domaine public + Domaine public Copyright - Droit d'auteur + attention le copyright n'est pas une protection ou une licence puisque ca existe même pour les licences libres les plus ouvertes. C'est simplement la mention détenteur des droits de reproduction (celui qui fixe la licence) . Le terme est donc impropre même en anglais. + Protection par le droit d'auteur Created the: - Créé le : + Créé le : Updated the: - Modifié le : + Modifié le : Title page - Page de titre + Page de titre UBTeacherGuidePresentationWidget Page: %0 - Page: %0 + Page: %0 @@ -2093,6 +2114,10 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Cache Spot + + Aristo + + UBTrapFlashController @@ -2113,7 +2138,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? files require an update. - fichiers nécessitent une mise à jour. + fichiers nécessitant une mise à jour. Backup path: @@ -2169,7 +2194,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. UBWebPublisher Publish Document on Sankore Web - Publier un fichier Open-Sankoré sur Planète Sankoré + Publier un fichier Open-Sankoré sur Planète-Sankoré @@ -2195,11 +2220,11 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Open-Sankore - + Open-Sankoré OpenSankore - + Open-Sankoré @@ -2276,11 +2301,11 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. UniboardSankoreTransition Import old Uniboard/Sankore documents - Importer les anciens documents Uniboard/Sankoré + Importer des documents depuis le format Uniboard ou Sankoré There are no documents that should be imported - Aucun document trouvé à importer + Aucun document au format Uniboard n'a été trouvé @@ -2322,7 +2347,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. - %4 %5 remaining - - %4 %5 restant(s) + - %4 %5 restante(s) %1 of %2 (%3/sec) %4 @@ -2331,7 +2356,8 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. ? unknown file size - ? + si je me fie aux commentaires des développeurs... + Taille de fichier inconnue %1 of %2 - Stopped @@ -2381,7 +2407,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. %1 items - %1 éléments + %1 élément(s) @@ -2399,19 +2425,19 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Clone Tab - Dupliquer l'onglet + Dupliquer onglet &Close Tab - &Fermer l'onglet + &Fermer onglet Close &Other Tabs - Fermer les &autres onglets + Fermer &autres onglets Reload Tab - Recharger l'onglet + Recharger &onglet Reload All Tabs @@ -2437,7 +2463,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. No Recent Searches - Aucun historique des recherches + Aucune recherche récente Recent Searches @@ -2486,7 +2512,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Title - Titre + Titre du podcast Description @@ -2506,7 +2532,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. YouTube Username - Utilisateur YouTube + Nom d'utilisateur YouTube YouTube Password @@ -2753,7 +2779,7 @@ p, li { white-space: pre-wrap; } Swap control display and view display - Inverser les écrans + Inverser la disposition des écrans Mode @@ -2773,7 +2799,7 @@ p, li { white-space: pre-wrap; } Proxy User: - Utilisateur Proxy : + Nom d'utilisateur : Pass: @@ -2781,11 +2807,11 @@ p, li { white-space: pre-wrap; } Planète Sankoré ID - Identifiant Planète Sankoré + Identifiant Planète-Sankoré User: - Utilisateur : + Nom d'utilisateur : Pass: @@ -3230,11 +3256,12 @@ DAMAGES. END OF TERMS AND CONDITIONS + non traduisible en l'état (sauf disponibilité d'une version non officielle introuvable sur le web) Credits - + Crédits <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3245,7 +3272,14 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">The licences are in English to respect the official and legal approved translation.</span></p></td></tr></table></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Les licences proposées ci-dessous sont rédigées en langue anglaise afin de respecter le cadre légal et officiel des traductions aprouvées par les auteurs de ces textes. licences.</span></p></td></tr></table></body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3256,6 +3290,7 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-family:'Ubuntu'; font-size:12pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"> </span></p></td></tr></table></body></html> + ATTENTION : Je ne vois pas à quelle partie ce texte fait référence : si ce sont les crédits des tierces parties alors il en manque et elle ne sont pas à jour par rapport aux librairies utilisées effectivement dans le code source (voir les mentions légales sur Github dans les tierces parties). Ce problème a déja été mentionné dans des messages précédents. @@ -3268,7 +3303,16 @@ p, li { white-space: pre-wrap; } <td style="border: none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">&quot;</span></p></td></tr></table></body></html> - + ATTENTION AU NUMERO DE VERSION MENTIONNÉ DANS LA VERSION ANGLAISE ! (RESTE EN 1.4) + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Open-Sankoré version 2.0 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">&quot;</span></p></td></tr></table></body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3320,7 +3364,56 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p></body></html> - + attention ce texte est en français par défaut ce qui signifie qu'il devrait être traduit en anglais pour les utilisateurs non francophones ! + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Crédits police scolaire Open-Sankoré : </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police Andika Basic dispose d'une licence Open Font License </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Sil international</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Court </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Ligne Court</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier lignes pointillés</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier pointillés</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP pointillés</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p></body></html> diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index 7889d130..6b2894cf 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -39,7 +39,7 @@ Stop - Stop + Arrêter Open @@ -73,11 +73,11 @@ Stylus - Stylet + Stylets Backgrounds - Fond + Fonds Undo @@ -373,15 +373,15 @@ Tutorial - Tutoriel + Tutoriels Show Desktop - Bureau + Afficher le bureau Ctrl+Shift+H - Ctrl+Shift+H + Ctrl+Maj+H Rename Content @@ -393,11 +393,11 @@ Use Document Wide Size (16/9) - Utiliser un format de document 16/9 + Utiliser un format large (16/9) Use Document Regular Size (4/3) - Utiliser un format de document 4/3 + Utiliser un format normal (4/3) Use Custom Document Size @@ -461,11 +461,11 @@ Highlight - Surligner + Surligner Ctrl+M - + Ctrl+M Select And Modify Objects @@ -481,11 +481,11 @@ Laser Pointer - Pointer avec le laser + Utiliser le "pointeur laser" Virtual Laser Pointer - Pointer avec le laser + Utiliser le "pointeur laser" Ctrl+G @@ -497,7 +497,7 @@ Ctrl+J - + Ctrl+J Write Text @@ -553,11 +553,11 @@ Open the tutorial - Ouvrir le tutoriel + Ouvrir les tutoriels Check Update - Contrôler les mises à jour + Contrôler la mise à jour Ctrl+H @@ -645,11 +645,11 @@ Wide Size (16/9) - Format 16/9 + Format large (16/9) Regular Size (4/3) - Format 4/3 + Format normal (4/3) Custom Size @@ -781,7 +781,7 @@ Show Open-Sankoré Widgets Editor - Ouvrir l'éditeur Sankoré + Ouvrir l'éditeur d'appliquettes Open-Sankoré Hide Open-Sankoré @@ -801,23 +801,24 @@ Group items - Grouper + Grouper les objets Play - Jouer + j'hésite avec Lancer (dépend du contexte d'usage) + Jouer Interact with items - Interagir avec des objets + Interagir avec des objets Erase Background - Effacer le fond + Effacer le fond Remove the backgound - Supprimer le fond + Supprimer le fond Group @@ -859,26 +860,26 @@ Save username and password for future use - Enregistrer le nom d'utilisateur et le mot de passe pour une utilisation future + Enregistrer le nom d'utilisateur et le mot de passe pour la prochaine.utilisation QObject Element ID = - ID de l'élément = + ID de l'élément = Content is not supported in destination format. - Le contenu n'est pas supporté dans le format destinataire. + Contenu non supporté dans le format souhaité. Remove Page - Supprimer la page + Supprimer la page Are you sure you want to remove 1 page from the selected document '%0'? - Voulez-vous vraiment effacer 1 page de ce document '%0'? + Voulez-vous vraiment effacer 1 page de ce document '%0'? @@ -900,7 +901,7 @@ New update available, would you go to the web page ? - Nouvelle mise à jour disponible, voulez-vous aller à la page Web ? + Nouvelle mise à jour disponible : voulez-vous accéder à la page de téléchargement ? No update available @@ -943,15 +944,15 @@ Delete page %1 from document - + Supprimer la page %1 du document Page %1 deleted - Page %1 effacée + Page %1 supprimée Add file operation failed: file copying error - Echec d'ajout de document : erreur de copie + Echec d'ajout de document : erreur de copie Group @@ -970,7 +971,7 @@ CapturedImage - Image capturée + Image capturée @@ -998,10 +999,6 @@ UBDesktopPalette - - Show Uniboard - Afficher Open-Sankoré - Capture Part of the Screen Capturer une partie de l'écran @@ -1022,6 +1019,10 @@ Show Desktop on Secondary Screen Afficher le bureau sur l'écran secondaire + + Show Open-Sankore + Afficher Open-Sankoré + UBDocumentController @@ -1139,7 +1140,7 @@ The document '%1' has been generated with a newer version of Sankore (%2). By opening it, you may lose some information. Do you want to proceed? - Le document '%1' a été créé avec une version plus récente de Sankoré (%2). En l'ouvrant, vous risquez de perdre certains éléments. Désirez-vous continuer ? + Le document '%1' a été créé avec une version plus récente d'Open-Sankoré (%2). En l'ouvrant, vous risquez de perdre certains éléments. Désirez-vous continuer ? Are you sure you want to remove %n page(s) from the selected document '%1'? @@ -1150,15 +1151,15 @@ Title page - Page de titre + Page de titre Folder does not contain any image files - Le dossier ne contient pas d'image + Le dossier ne contient pas d'image Untitled Documents - Documents sans titre + Documents sans titre @@ -1185,23 +1186,24 @@ File %1 saved - Fichier %1 sauvé + Fichier %1 enregistré Inserting page %1 of %2 - Ajout de la page %1 de %2 + Ajout de la page %1 sur %2 Import successful. - Importation terminée. + Importation réussie. Import of file %1 successful. - Importation du document %1 terminée. + Importation du document %1 réussie. Importing file %1 - Importation du document %1 en cours + j'ai raccourci la phrase pour eviter les soucis de place ! + Importation de %1 en cours @@ -1212,18 +1214,18 @@ Title page - Page 0 + Page de titre UBDocumentPublisher Export failed. - Echec de l'exportation. + Echec de l'export. Export canceled ... - Exportation annulée ... + Export annulée ... Converting page %1/%2 ... @@ -1231,11 +1233,11 @@ Credentials has to not been filled out yet. - Les informations n'ont pas encore été fournies. + Les nom d'utilisateur et mot de passe n'ont pas été encore renseignés. Uploading Sankore File on Web. - Fichier Open-Sankoré en cours de transfert vers Planète Sankoré. + Fichier Open-Sankoré en cours de transfert vers Planète-Sankoré. Document uploaded correctly on the web. @@ -1243,7 +1245,7 @@ Failed to upload document on the web. - Echec du transfert du document sur le Web. + Echec du transfert du document vers Planète-Sankoré. @@ -1258,7 +1260,7 @@ %1 pages copied - + %1 page copiée %1 pages copiées @@ -1279,37 +1281,37 @@ UBExportAdaptor Warnings during export was appeared - Avertissements lors de l'exportation + Avertissements lors de l'exportation UBExportCFF Export to IWB - Exporter au format CFF (*.iwb) + Exporter au format CFF (*.iwb) Export as IWB File - Exporter au format CFF (*.iwb) + Exporter au format CFF (*.iwb) Exporting document... - Exportation du document... + Exportation du document... Export successful. - Export réussi. + Export réussi. Export failed. - Echec de l'exportation. + Echec de l'export. UBExportDocument Export as UBZ File - Exporter au format UBZ (*.ubz) + Exporter au format UBZ (*.ubz) Export successful. @@ -1336,7 +1338,7 @@ UBExportFullPDF Export as PDF File - Exporter au format PDF (*.pdf) + Exporter au format PDF (*.pdf) Exporting document... @@ -1348,14 +1350,14 @@ Export successful. - Exportation terminée. + Export terminé. UBExportPDF Export as PDF File - Exporter au format PDF (*.pdf) + Exporter au format PDF (*.pdf) Exporting page %1 of %2 @@ -1363,7 +1365,7 @@ Export successful. - Exportation terminée. + Export terminé. Exporting document... @@ -1371,7 +1373,7 @@ Export to PDF - Exporter au format PDF (*.pdf) + Exporter au format PDF (*.pdf) @@ -1390,11 +1392,11 @@ Export successful. - Exportation réussie. + Export réussi. Export failed. - Echec de l'exportation. + Echec de l'export. Export to Web Browser @@ -1405,119 +1407,137 @@ UBFeatureProperties Add to page - Ajout à la page + j'ai choisi de rendre le bouton plus compact (mais info moins complète) + Ajout page Set as background - Ajout en fond + j'ai choisi de rendre le bouton plus compact (mais info moins complète) + Ajout en fond Add to library - Ajout à la bibliothèque + j'ai choisi de rendre le bouton plus compact (mais info moins complète) + Ajout bibliothèque Object informations - Informations + Informations UBFeaturesActionBar Add to favorites - Ajouter aux favoris + Ajouter aux favoris Share - Partager + Partager Search - Rechercher + Rechercher Delete - Supprimer + Supprimer Back to folder - Retour au répertoire + Retour au répertoire Remove from favorites - Supprimer des favoris + Supprimer des favoris Create new folder - Créer un nouveau dossier + Créer nouveau dossier Rescan file system - Rescanner le système de fichiers + Parcourir le système de fichiers UBFeaturesController ImportedImage - Image importée + Image importée Audios - Sons + Sons Movies - Vidéos + Vidéos Pictures - Images + Images Animations - Animations + Animations Interactivities - Interactivités + Interactivités Applications - Applications + Applications Shapes - Formes + Formes Favorites - Favoris + Favoris Web search - Recherche Web + Recherche Web Trash - Corbeille + Corbeille + + + + UBFeaturesNewFolderDialog + + Accept + Accepter + + + Cancel + Annuler + + + Enter a new folder name + Saisir le nom du nouveau dossier UBFeaturesProgressInfo Loading - Chargement en cours + Chargement en cours UBGraphicsGroupContainerItemDelegate Locked - Verrouillé + Verrouillé Visible on Extended Screen - Visible sur l'écran de projection + Visible sur l'écran étendu @@ -1528,7 +1548,7 @@ Visible on Extended Screen - Visible sur l'écran de projection + Visible sur l'écran étendu Go to Content Source @@ -1539,7 +1559,7 @@ UBGraphicsTextItem <Type Text Here> - <Ecrire votre texte ici> + <Saisir votre texte ici> @@ -1557,18 +1577,18 @@ UBGraphicsW3CWidgetItem Web - Web + Web UBGraphicsWidgetItem Cannot load content - Impossible de charger le contenu + Impossible de charger le contenu Loading ... - Chargement en cours ... + Chargement en cours ... @@ -1594,15 +1614,15 @@ Import of file %1 failed. - Echec de l'importation du fichier %1. + Echec de l'import du fichier %1. Import successful. - Importation terminée. + Import terminée. Import failed. - Echec de l'importation. + Echec de l'import. @@ -1613,11 +1633,11 @@ Import successful. - Importation terminée. + Import terminé. Import of file %1 failed. - Échec de l'importation du fichier %1. + Échec de l'import du fichier %1. Open-Sankore (*.ubz) @@ -1635,11 +1655,11 @@ UBImportPDF Portable Document Format (*.pdf) - Format de document portable (*.pdf) + Format PDF (*.pdf) PDF import failed. - Échec de l'importation du fichier PDF. + Échec de l'import du fichier PDF. Importing page %1 of %2 @@ -1690,14 +1710,14 @@ UBMessagesDialog Close - Fermer + Fermer UBNetworkAccessManager <qt>Enter username and password for "%1" at %2</qt> - <qt>Saisir le nom de l'utilisateur et le mot de passe pour "%1" à %2</qt> + <qt>Renseigner le nom de l'utilisateur et le mot de passe pour "%1" à %2</qt> Failed to log to Proxy @@ -1711,7 +1731,7 @@ %2 Do you want to ignore these errors for this host? - Erreur SSL: + Erreur SSL (Secure Socket Layer) sur un serveur sécurisé: %1 @@ -1736,7 +1756,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Document Repository Loss - Accès perdu au répertoire des documents + Accès perdu vers le répertoire des documents Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well. @@ -1774,7 +1794,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? No Podcast encoder available ... - Aucun encodeur pour le podcast disponible... + Aucun encodeur disponible.pour le podcast... Part %1 @@ -1826,7 +1846,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Sankore Cast - Open-Sankoré Cast + Podcast Open-Sankoré @@ -1844,7 +1864,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBProxyLoginDlg Proxy Login - Identification Proxy + Identification sur le Proxy Username: @@ -1859,7 +1879,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBPublicationDlg Publish document on the web - Publier un fichier Open-Sankoré sur Planète Sankoré + Publier un fichier Open-Sankoré sur Planète-Sankoré Title: @@ -1885,33 +1905,33 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBTGActionWidget Teacher - Professeur + Enseignant Student - Elève + Elève/Etudiant Type task here ... - Saisir une action ici ... + Proposer une action ici ... UBTGMediaWidget drop media here ... - Glisser une ressource ici ... + Glisser un média ici ... Type title here... - Saisir le titre ici ... + Renseigner le titre ici ... UBTGUrlWidget Insert link title here... - Saisir le titre du lien ici ... + Renseigner le titre du lien ici ... @@ -1925,131 +1945,132 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBTeacherGuideEditionWidget Type title here ... - Saisir le titre de l'activité ici ... + Renseigner le titre de l'activité... Type comment here ... - Saisir le commentaire ici ... + Renseigner le commentaire ici ... Add an action - Ajouter une action + Ajouter une action Add a media - Ajouter un média + Ajouter un média Add a link - Ajouter un lien + Ajouter un lien.web Page: %0 - Page: %0 + Page: %0 UBTeacherGuidePageZeroWidget Type session title here ... - Saisir le titre de la séance ... + Renseigner le titre de la séance ... Author(s) - Auteur(s) : + Auteur(s) : Type authors here ... - Saisir les auteurs ici ... + Ajouter les auteurs ici ... Objective(s) - Objectif(s) : + Objectif(s) de la séance : Type objectives here... - Saisir les objectifs ici ... + Ajouter les objectifs ici ... Resource indexing - Indexation de la ressource + Métadonnées de la ressource Keywords: - Mot(s) clé(s) : + Mot(s) clé(s) : Type keywords here ... - Saisir le(s) mot(s) clé(s) ici ... + Ajouter le(s) mot(s) clé(s) ici ... Level: - Niveau scolaire : + Niveau(x) scolaire(s) : Subjects: - Discipline : + Discipline(s) : Type: - Type : + Type(s) : Licence - Licence + Licence Attribution CC BY - Licence Planète Sankoré (CC Paternité 3.0) + Licence recommandée (CC Paternité 3.0) Attribution-NoDerivs CC BY-ND - CC Paternité, Pas de modification + CC Paternité, Pas de modification Attribution-ShareAlike CC BY-SA - CC Paternité, Partage à l'identique + CC Paternité, Partage à l'identique Attribution-NonCommercial CC BY-NC - CC Paternité, Pas d'utilisation Commerciale + CC Paternité, Pas d'utilisation commerciale Attribution-NonCommercial-NoDerivs CC BY-NC-ND - CC Paternité, Pas d'utilisation Commerciale, Pas de modification + CC Paternité, Pas d'utilisation commerciale, Pas de modification Attribution-NonCommercial-ShareAlike CC BY-NC-SA - CC Paternité, Pas d'utilisation Commerciale, Partage à l'identique + CC Paternité, Pas d'utilisation commerciale, Partage à l'identique Public domain - Domaine public + Domaine public Copyright - Droit d'auteur + attention le copyright n'est pas une protection ou une licence puisque ca existe même pour les licences libres les plus ouvertes. C'est simplement la mention détenteur des droits de reproduction (celui qui fixe la licence) . Le terme est donc impropre même en anglais. + Protection par le droit d'auteur Created the: - Créé le : + Créé le : Updated the: - Modifié le : + Modifié le : Title page - Page de titre + Page de titre UBTeacherGuidePresentationWidget Page: %0 - Page: %0 + Page: %0 @@ -2093,6 +2114,10 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Cache Spot + + Aristo + + UBTrapFlashController @@ -2113,7 +2138,7 @@ Voulez-vous ignorer les erreurs pour ce serveur ? files require an update. - fichiers nécessitent une mise à jour. + fichiers nécessitant une mise à jour. Backup path: @@ -2169,7 +2194,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. UBWebPublisher Publish Document on Sankore Web - Publier un fichier Open-Sankoré sur Planète Sankoré + Publier un fichier Open-Sankoré sur Planète-Sankoré @@ -2195,11 +2220,11 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Open-Sankore - + Open-Sankoré OpenSankore - + Open-Sankoré @@ -2276,11 +2301,11 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. UniboardSankoreTransition Import old Uniboard/Sankore documents - Importer les anciens documents Uniboard/Sankoré + Importer des documents depuis le format Uniboard ou Sankoré There are no documents that should be imported - Aucun document trouvé à importer + Aucun document au format Uniboard n'a été trouvé @@ -2322,7 +2347,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. - %4 %5 remaining - - %4 %5 restant(s) + - %4 %5 restante(s) %1 of %2 (%3/sec) %4 @@ -2331,7 +2356,8 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. ? unknown file size - ? + si je me fie aux commentaires des développeurs... + Taille de fichier inconnue %1 of %2 - Stopped @@ -2381,7 +2407,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. %1 items - %1 éléments + %1 élément(s) @@ -2399,19 +2425,19 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Clone Tab - Dupliquer l'onglet + Dupliquer onglet &Close Tab - &Fermer l'onglet + &Fermer onglet Close &Other Tabs - Fermer les &autres onglets + Fermer &autres onglets Reload Tab - Recharger l'onglet + Recharger &onglet Reload All Tabs @@ -2437,7 +2463,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. No Recent Searches - Aucun historique des recherches + Aucune recherche récente Recent Searches @@ -2486,7 +2512,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Title - Titre + Titre du podcast Description @@ -2506,7 +2532,7 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. YouTube Username - Utilisateur YouTube + Nom d'utilisateur YouTube YouTube Password @@ -2753,7 +2779,7 @@ p, li { white-space: pre-wrap; } Swap control display and view display - Inverser les écrans + Inverser la disposition des écrans Mode @@ -2773,7 +2799,7 @@ p, li { white-space: pre-wrap; } Proxy User: - Utilisateur Proxy : + Nom d'utilisateur : Pass: @@ -2781,11 +2807,11 @@ p, li { white-space: pre-wrap; } Planète Sankoré ID - Identifiant Planète Sankoré + Identifiant Planète-Sankoré User: - Utilisateur : + Nom d'utilisateur : Pass: @@ -3230,11 +3256,12 @@ DAMAGES. END OF TERMS AND CONDITIONS + non traduisible en l'état (sauf disponibilité d'une version non officielle introuvable sur le web) Credits - + Crédits <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3245,7 +3272,14 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">The licences are in English to respect the official and legal approved translation.</span></p></td></tr></table></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Les licences proposées ci-dessous sont rédigées en langue anglaise afin de respecter le cadre légal et officiel des traductions aprouvées par les auteurs de ces textes. licences.</span></p></td></tr></table></body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3256,6 +3290,7 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-family:'Ubuntu'; font-size:12pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-family:'Ubuntu'; font-size:9pt;"> </span></p></td></tr></table></body></html> + ATTENTION : Je ne vois pas à quelle partie ce texte fait référence : si ce sont les crédits des tierces parties alors il en manque et elle ne sont pas à jour par rapport aux librairies utilisées effectivement dans le code source (voir les mentions légales sur Github dans les tierces parties). Ce problème a déja été mentionné dans des messages précédents. @@ -3268,7 +3303,16 @@ p, li { white-space: pre-wrap; } <td style="border: none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Open-Sankoré version 1.4 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">&quot;</span></p></td></tr></table></body></html> - + ATTENTION AU NUMERO DE VERSION MENTIONNÉ DANS LA VERSION ANGLAISE ! (RESTE EN 1.4) + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Open-Sankoré version 2.0 , Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la Lesser GNU general Public Licence (GNU LGPL) telle que publiée par la Free Software Foundation en version 2 ou une version plus récente.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence Lesser GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">.<br /><br />Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.<br /><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">&quot;</span></p></td></tr></table></body></html> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -3320,7 +3364,56 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p></body></html> - + attention ce texte est en français par défaut ce qui signifie qu'il devrait être traduit en anglais pour les utilisateurs non francophones ! + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Crédits police scolaire Open-Sankoré : </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police Andika Basic dispose d'une licence Open Font License </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Sil international</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Court </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Ligne Court</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier lignes pointillés</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier pointillés</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP pointillés</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p></body></html> diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/sankore_it.ts index 17e06832..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 @@ -1504,6 +1504,21 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Cestino + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Annulla + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2098,6 +2113,10 @@ risorsa multimediale ... Cache Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/sankore_iw.ts index 6bc9e519..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 @@ -1499,6 +1499,21 @@ Trash + סל + + + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + בטל + + + Enter a new folder name @@ -2088,6 +2103,10 @@ Do you want to ignore these errors for this host? Cache מטמון + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/sankore_ja.ts index b7fa009a..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 @@ -1500,6 +1500,21 @@ ゴミ箱 + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + キャンセル + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2092,6 +2107,10 @@ Do you want to ignore these errors for this host? Cache キャッシュ + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/sankore_ko.ts index c6f407b6..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 @@ -1500,6 +1500,21 @@ 휴지통 + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + 취소 + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host? Cache 캐시 + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_mg.ts b/resources/i18n/sankore_mg.ts index 8a5989b6..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 @@ -1502,6 +1502,21 @@ Daba + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Ajanony + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2093,6 +2108,10 @@ Tena tsy te hiraharaha an'ireo tsy mety ho an'ilay milina ve ianao?Cache Tahiry + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/sankore_nb.ts index 9704ec84..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 @@ -1505,6 +1505,21 @@ Søppel + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Avbryt + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host? Cache Skjul + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/sankore_nl.ts index b86a92a2..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 @@ -1502,6 +1502,21 @@ Prullenbak + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Annuleren + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host? Cache Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/sankore_pl.ts index c1e1789d..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 @@ -1509,6 +1509,21 @@ Kosz + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Anuluj + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2100,6 +2115,10 @@ Czy chcesz ignorować te błędy dla tego hosta? Cache Pamięć podręczna + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/sankore_pt.ts index 0e289b26..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 @@ -1505,6 +1505,21 @@ Lixo + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Cancelar + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2092,6 +2107,10 @@ Quer ignorar estes erros, deste servidor? Cache Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_rm.ts b/resources/i18n/sankore_rm.ts index da91b02b..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 @@ -1500,6 +1500,21 @@ + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host? Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/sankore_ro.ts index 76116524..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 @@ -1502,6 +1502,21 @@ Coş de gunoi + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Anulare + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2093,6 +2108,10 @@ Doriţi să ignoraţi aceste erori pentru acest host? Cache Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/sankore_ru.ts index ce0e1eb2..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 @@ -1502,6 +1502,21 @@ Корзина + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Отмена + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host? Cache Кэш + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_sk.ts b/resources/i18n/sankore_sk.ts index 09da571c..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 @@ -1506,6 +1506,21 @@ Kôš + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Zrušiť + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2097,6 +2112,10 @@ Chcete ignorovať tieto chyby na tomto serveri? Magnifier Lupa + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/sankore_sv.ts index 915b07bc..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 @@ -1502,6 +1502,21 @@ Papperskorg + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + Avsluta + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2093,6 +2108,10 @@ Vill du ignorera felen för den här värden? Cache Cache + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_tr.ts b/resources/i18n/sankore_tr.ts index 4d14209b..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 @@ -1501,6 +1501,21 @@ Çöp + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + İptal + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2091,6 +2106,10 @@ Bu host için yukarıdaki hatalar yok sayılsın mı? Cache Gizli Yer + + Aristo + + UBTrapFlashController diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/sankore_zh.ts index 1c00fe69..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 @@ -1500,6 +1500,21 @@ 回收站 + + UBFeaturesNewFolderDialog + + Accept + + + + Cancel + 取消 + + + Enter a new folder name + + + UBFeaturesProgressInfo @@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host? Cache 高级缓存 + + Aristo + + UBTrapFlashController diff --git a/resources/images/toolPalette/aristoTool.png b/resources/images/toolPalette/aristoTool.png new file mode 100644 index 00000000..225c0b1e Binary files /dev/null and b/resources/images/toolPalette/aristoTool.png differ diff --git a/resources/images/toque.png b/resources/images/toque.png deleted file mode 100644 index a976e147..00000000 Binary files a/resources/images/toque.png and /dev/null differ diff --git a/resources/images/toque.svg b/resources/images/toque.svg new file mode 100644 index 00000000..146cddc5 --- /dev/null +++ b/resources/images/toque.svg @@ -0,0 +1,131 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/library/applications/OpenStreetMap.wgt/index.html b/resources/library/applications/OpenStreetMap.wgt/index.html index 5b7da167..750e1a6e 100755 --- a/resources/library/applications/OpenStreetMap.wgt/index.html +++ b/resources/library/applications/OpenStreetMap.wgt/index.html @@ -68,7 +68,7 @@ * along with this program. If not, see . */ - /* API identifier */ + /* Geonames API identifier */ var geonamesUser = "yimgo"; /* map variable will be used to manipulate the map. This will be initialized like an OpenLayers.Map object. */ @@ -149,6 +149,17 @@ }); } + function importData(data) + { + map.setCenter(new OpenLayers.LonLat(data["center"]["lon"], data["center"]["lat"]), data["zoom"]); + } + + function exportData() + { + if (window.sankore) + sankore.setPreference("osm", JSON.stringify({center: map.getCenter(), zoom: map.getZoom()})); + } + window.onload = function() { map = new OpenLayers.Map({ div: "map" @@ -198,7 +209,21 @@ map.setBaseLayer(newLayer); return false; - }); + }); + + /* importing state from Sankoré preferences */ + if (window.sankore) { + if (sankore.preference("osm","")) { + importData(JSON.parse(sankore.preference("osm",""))); + } + } + + /* exporting state when receiving a leave event */ + if (window.widget) { + window.widget.onleave = function() { + exportData(); + } + } }; --> diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index 51369796..cad8daa5 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass images.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -32,14 +32,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -288,58 +280,42 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; -} .btl_pad{ background-image: url(../img/pad-top-left.png) !important; @@ -373,43 +349,44 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } +/*new update 26 09 2012*/ + .pad_color{ - color: white !important; + color: #FC9 !important; + text-shadow: none !important; } .pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; + background: url(../img/toolbar-reload.png) left top no-repeat !important; } .pad_edit{ - background-image: url(../img/slate-display.png) !important; + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -419,4 +396,35 @@ body{ .open{ +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Ass images.wgt/img/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Ass images.wgt/img/parameters-bg.png diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-display.png b/resources/library/interactivities/Ass images.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-edit.png b/resources/library/interactivities/Ass images.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png b/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-help.png b/resources/library/interactivities/Ass images.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Ass images.wgt/img/toolbar-help.png diff --git a/resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Balance.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Ass images.wgt/index.html b/resources/library/interactivities/Ass images.wgt/index.html index dd36faee..cf873ad1 100644 --- a/resources/library/interactivities/Ass images.wgt/index.html +++ b/resources/library/interactivities/Ass images.wgt/index.html @@ -55,11 +55,6 @@
-   @@ -69,7 +64,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/js/script.js b/resources/library/interactivities/Ass images.wgt/js/script.js index f819ddd5..c2322d84 100644 --- a/resources/library/interactivities/Ass images.wgt/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "Select the number \"three\".", add: "Add new block", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -22,9 +23,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("associer","")){ @@ -46,11 +49,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -71,7 +76,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -82,7 +87,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display", "none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -186,8 +191,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); - + $("#parameters").css("display", "block"); $(".cont").each(function(){ var container = $(this); container.find(".imgs_answers").find(".img_block").each(function(){ @@ -196,8 +200,6 @@ function start(){ container.find(".imgs_answers").remove(); $("
").appendTo(container); container.find(".text_cont").attr("contenteditable","true"); - //container.find(".imgs_cont").sortable("destroy"); - //container.find(".imgs_cont").css("background-color", "white"); var add_img = $("
"); container.find(".img_block").each(function(){ @@ -279,7 +281,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "edit"; cont_obj.imgs = []; @@ -296,7 +298,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.mode = "display"; cont_obj.imgs = []; @@ -325,7 +327,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -340,11 +342,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -623,7 +625,6 @@ function showExample(){ } } }); -//container.appendTo("body") } //changing the style @@ -641,10 +642,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -658,10 +659,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -675,10 +676,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/index.html b/resources/library/interactivities/Ass images.wgt/locales/fr/index.html index 1fb435c9..d4c628de 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/index.html @@ -26,11 +26,6 @@
-   @@ -40,7 +35,17 @@
- +
+
+ +
+
  diff --git a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js index 0f7ebd13..967256d0 100644 --- a/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Sélectionner le numéro «trois».", add: "Nouveau bloc", @@ -11,28 +11,28 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content:"

Associer des images

"+ -"

Faire correspondre une image à la consigne indiquée.

"+ + "

Faire correspondre une image à la consigne indiquée.

"+ -"

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

"+ + "

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

"+ -"

Le bouton “Recharger” réinitialise les exercices.

"+ + "

Le bouton “Recharger” réinitialise les exercices.

"+ -"

Le bouton “Modifier” vous permet :

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

Le bouton “Modifier” vous permet :

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

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

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

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

"+ -"

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

"+ + "

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

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

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

"+ + "

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

"+ -"

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

"+ - -"

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

" + "

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

"+ + "

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

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

Associer aux sons

"+ -"

Faire correspondre une image à un son.

"+ + "

Faire correspondre une image à un son.

"+ -"

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

"+ + "

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

"+ -"

Le bouton “Recharger” réinitialise les exercices.

"+ + "

Le bouton “Recharger” réinitialise les exercices.

"+ -"

Le bouton “Modifier” vous permet :

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

Le bouton “Modifier” vous permet :

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

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

"+ "
  • insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+ "
  • insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,
    • "+ @@ -29,10 +30,21 @@ var sankoreLang = { "
  • définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.
"+ "

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

"+ "

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

"+ +======= + "

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

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

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

"+ + "

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

"+ +>>>>>>> 986e8e8f3435c5208d294c97db33e0cf54790514 -"

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

"+ + "

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

"+ -"

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

" + "

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

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

      Catégoriser des images

      "+ -"

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

      "+ + "

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

      "+ -"

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

      "+ -"

      Le bouton “Recharger” réinitialise les exercices.

      "+ + "

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

      "+ + "

      Le bouton “Recharger” réinitialise les exercices.

      "+ -"

      Le bouton “Modifier” vous permet :

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

      Le bouton “Modifier” vous permet :

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

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

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

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

      "+ -"

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

      "+ + "

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

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

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

      "+ + "

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

      "+ -"

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

      "+ + "

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

      "+ -"

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

      " + "

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

      ", + theme: "Thème" }; //main function @@ -42,9 +43,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_images","")){ @@ -66,11 +69,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -91,7 +96,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -100,7 +105,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); sankore.enableDropOnWidget(false); $(".add_block").remove(); $(".cont").each(function(){ @@ -130,7 +135,7 @@ function start(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -170,7 +175,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); sankore.enableDropOnWidget(true); $(".cont").each(function(){ var container = $(this); @@ -251,7 +256,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "edit"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -275,7 +280,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "display"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -309,7 +314,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -324,11 +329,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -358,7 +363,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -430,7 +435,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -475,6 +480,7 @@ function importData(data){ } }); container.appendTo("#data"); + checkCorrectness(all_imgs); } } } @@ -537,7 +543,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -548,7 +554,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -578,9 +584,9 @@ function addCategory(obj){ $("").appendTo(imgs_container); $("").appendTo(imgs_container); imgs_container.attr("ondragenter", "return false;") - .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); + .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;") + .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;") + .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);"); } //add new container @@ -599,9 +605,9 @@ function addContainer(){ $("").appendTo(imgs_container); $("").appendTo(imgs_container); imgs_container.attr("ondragenter", "return false;") - .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); + .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;") + .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;") + .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);"); container.insertBefore($(".add_block")); } @@ -655,10 +661,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -672,10 +678,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -689,10 +695,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } @@ -704,8 +710,7 @@ function returnId(){ } //a func for checking when smth will drop -function checkOnDrop(dest, source){ - dest.append(source); +function checkOnDrop(dest){ var tmp_count = dest.find("input[name='count']").val(); var tmp_mask = dest.find("input[name='mask']").val(); if(dest.find(".img_block").size() == tmp_count){ @@ -715,47 +720,35 @@ function checkOnDrop(dest, source){ tmp_right = false; }); if(tmp_right) - dest.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); + dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont"); else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } //checking source on correctness function checkCorrectness(source){ if(!source.hasClass("all_imgs")){ - var tmp_count = source.find("input[name='count']").val(); - var tmp_mask = source.find("input[name='mask']").val(); - if(source.find(".img_block").size() == tmp_count){ - var tmp_right = true; - source.find(".img_block").each(function(){ - if($(this).find("input").val() != tmp_mask) - tmp_right = false; - }); - - if(tmp_right) - source.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); - } else if(source.find(".img_block").size() == 0) - source.addClass("def_cont") - .removeClass("green_cont") - .removeClass("red_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + if(source.parent().find(".all_imgs").find(".img_block").size() == 0){ + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } + } else { + if(source.find(".img_block").size() > 0){ + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } } } diff --git a/resources/library/interactivities/Cat images.wgt/locales/ru/index.html b/resources/library/interactivities/Cat images.wgt/locales/ru/index.html index 10f242f8..66f8ca12 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/ru/index.html +++ b/resources/library/interactivities/Cat images.wgt/locales/ru/index.html @@ -26,11 +26,6 @@
      -   @@ -40,7 +35,17 @@
      - +
      +
      + +
      +
        diff --git a/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js index 367e5630..06844011 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Показать", + display: "Закрыть", edit: "Изменить", first_desc: "Нечетные числа", second_desc: "Четные числа", @@ -11,7 +11,8 @@ var sankoreLang = { pad: "Планшет", none: "Нет", help: "Помощь", - help_content: "Пример текста помощи ..." + help_content: "Пример текста помощи ...", + theme: "Тема" }; //main function @@ -23,9 +24,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("categoriser_images","")){ @@ -47,11 +50,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -72,7 +77,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -81,7 +86,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); sankore.enableDropOnWidget(false); $(".add_block").remove(); $(".cont").each(function(){ @@ -111,7 +116,7 @@ function start(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -151,7 +156,7 @@ function start(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); sankore.enableDropOnWidget(true); $(".cont").each(function(){ var container = $(this); @@ -232,7 +237,7 @@ function exportData(){ if($("#wgt_edit").hasClass("selected")){ $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "edit"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -244,8 +249,7 @@ function exportData(){ $(this).find(".img_block").each(function(){ var img_obj = new Object(); img_obj.value = $(this).find("input").val(); - img_obj.link = $(this).find("img").attr("src").replace("../../",""); - ; + img_obj.link = $(this).find("img").attr("src").replace("../../",""); img_obj.ht = $(this).find("img").height(); img_obj.wd = $(this).find("img").width(); img_cont.imgs.push(img_obj); @@ -257,7 +261,7 @@ function exportData(){ } else { $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.mode = "display"; cont_obj.conts = []; $(this).find(".imgs_cont").each(function(){ @@ -269,8 +273,7 @@ function exportData(){ $(this).find(".img_block").each(function(){ var img_obj = new Object(); img_obj.value = $(this).find("input").val(); - img_obj.link = $(this).find("img").attr("src").replace("../../",""); - ; + img_obj.link = $(this).find("img").attr("src").replace("../../",""); img_obj.ht = $(this).find("img").height(); img_obj.wd = $(this).find("img").width(); img_cont.imgs.push(img_obj); @@ -281,8 +284,7 @@ function exportData(){ $(this).find(".all_imgs .img_block").each(function(){ var img = new Object(); img.value = $(this).find("input").val(); - img.link = $(this).find("img").attr("src").replace("../../",""); - ; + img.link = $(this).find("img").attr("src").replace("../../",""); img.ht = $(this).find("img").height(); img.wd = $(this).find("img").width(); cont_obj.all_imgs.push(img); @@ -293,7 +295,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -308,11 +310,11 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } if(data[i].mode == "edit"){ var tmp_array = []; @@ -342,7 +344,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -414,7 +416,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -459,6 +461,7 @@ function importData(data){ } }); container.appendTo("#data"); + checkCorrectness(all_imgs); } } } @@ -521,7 +524,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -532,7 +535,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -562,9 +565,9 @@ function addCategory(obj){ $("").appendTo(imgs_container); $("").appendTo(imgs_container); imgs_container.attr("ondragenter", "return false;") - .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); + .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;") + .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;") + .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);"); } //add new container @@ -583,9 +586,9 @@ function addContainer(){ $("").appendTo(imgs_container); $("").appendTo(imgs_container); imgs_container.attr("ondragenter", "return false;") - .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") - .attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); + .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;") + .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;") + .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);"); container.insertBefore($(".add_block")); } @@ -639,10 +642,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -656,10 +659,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -673,10 +676,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } @@ -688,8 +691,7 @@ function returnId(){ } //a func for checking when smth will drop -function checkOnDrop(dest, source){ - dest.append(source); +function checkOnDrop(dest){ var tmp_count = dest.find("input[name='count']").val(); var tmp_mask = dest.find("input[name='mask']").val(); if(dest.find(".img_block").size() == tmp_count){ @@ -699,47 +701,35 @@ function checkOnDrop(dest, source){ tmp_right = false; }); if(tmp_right) - dest.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); + dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont"); else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } //checking source on correctness function checkCorrectness(source){ if(!source.hasClass("all_imgs")){ - var tmp_count = source.find("input[name='count']").val(); - var tmp_mask = source.find("input[name='mask']").val(); - if(source.find(".img_block").size() == tmp_count){ - var tmp_right = true; - source.find(".img_block").each(function(){ - if($(this).find("input").val() != tmp_mask) - tmp_right = false; - }); - - if(tmp_right) - source.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); - } else if(source.find(".img_block").size() == 0) - source.addClass("def_cont") - .removeClass("green_cont") - .removeClass("red_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + if(source.parent().find(".all_imgs").find(".img_block").size() == 0){ + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } + } else { + if(source.find(".img_block").size() > 0){ + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } } } diff --git a/resources/library/interactivities/Cat text.wgt/css/basic.css b/resources/library/interactivities/Cat text.wgt/css/basic.css index e73ae42c..849093d5 100644 --- a/resources/library/interactivities/Cat text.wgt/css/basic.css +++ b/resources/library/interactivities/Cat text.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -28,14 +28,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -286,57 +278,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; -} - -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -371,51 +346,50 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../img/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_reload{ + background: url(../img/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -424,5 +398,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Cat text.wgt/img/ar_down.png b/resources/library/interactivities/Cat text.wgt/img/ar_down.png deleted file mode 100644 index a20fab4f..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/ar_down.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/ar_down_white.png b/resources/library/interactivities/Cat text.wgt/img/ar_down_white.png deleted file mode 100644 index 4a1d133b..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/green_point.png b/resources/library/interactivities/Cat text.wgt/img/green_point.png deleted file mode 100644 index a2a44680..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/green_point.png and /dev/null differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png b/resources/library/interactivities/Cat text.wgt/img/parameters-bg.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/parameters-bg.png rename to resources/library/interactivities/Cat text.wgt/img/parameters-bg.png diff --git a/resources/library/interactivities/Cat text.wgt/img/red_point.png b/resources/library/interactivities/Cat text.wgt/img/red_point.png deleted file mode 100644 index f6daa19a..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/red_point.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-display.png b/resources/library/interactivities/Cat text.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-edit.png b/resources/library/interactivities/Cat text.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-help-white.png b/resources/library/interactivities/Cat text.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-help.png b/resources/library/interactivities/Cat text.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/slate-toolbar-help.png rename to resources/library/interactivities/Cat text.wgt/img/slate-toolbar-help.png diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Cat text.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-edit.png rename to resources/library/interactivities/Cat text.wgt/img/toolbar-edit.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-help.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-help.png rename to resources/library/interactivities/Cat text.wgt/img/toolbar-help.png diff --git a/resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png b/resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png similarity index 100% rename from resources/library/interactivities/Morpion.wgt/css/images/toolbar-reload.png rename to resources/library/interactivities/Cat text.wgt/img/toolbar-reload.png diff --git a/resources/library/interactivities/Cat text.wgt/index.html b/resources/library/interactivities/Cat text.wgt/index.html index 688bb52f..9dddb48e 100644 --- a/resources/library/interactivities/Cat text.wgt/index.html +++ b/resources/library/interactivities/Cat text.wgt/index.html @@ -16,6 +16,7 @@ lang = sankore.locale().substr(0,2); } else lang = "en"; + lang = "fr"; if(lang == "en"){ if(window.sankore) sankore.enableDropOnWidget(false); @@ -51,12 +52,7 @@
      -
      - +
        @@ -66,7 +62,17 @@
      - +
      +
      + +
      +
        diff --git a/resources/library/interactivities/Cat text.wgt/js/script.js b/resources/library/interactivities/Cat text.wgt/js/script.js index 12653ac4..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); @@ -120,7 +125,7 @@ function start(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -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 = []; @@ -339,7 +344,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -410,12 +415,11 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } - }); - checkCorrectness(imgs_container); + }); } all_imgs = $("
      ").appendTo(container); @@ -452,7 +456,8 @@ function importData(data){ } } } - }); + }); + checkCorrectness(all_imgs); } } } @@ -516,7 +521,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -527,7 +532,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -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,17 +681,16 @@ 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; } } //a func for checking when smth will drop -function checkOnDrop(dest, source){ - dest.append(source); +function checkOnDrop(dest){ var tmp_count = dest.find("input[name='count']").val(); var tmp_mask = dest.find("input[name='mask']").val(); if(dest.find(".img_block").size() == tmp_count){ @@ -696,46 +700,34 @@ function checkOnDrop(dest, source){ tmp_right = false; }); if(tmp_right) - dest.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); + dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont"); else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } //checking source on correctness function checkCorrectness(source){ if(!source.hasClass("all_imgs")){ - var tmp_count = source.find("input[name='count']").val(); - var tmp_mask = source.find("input[name='mask']").val(); - if(source.find(".img_block").size() == tmp_count){ - var tmp_right = true; - source.find(".img_block").each(function(){ - if($(this).find("input").val() != tmp_mask) - tmp_right = false; - }); - - if(tmp_right) - source.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); - } else if(source.find(".img_block").size() == 0) - source.addClass("def_cont") - .removeClass("green_cont") - .removeClass("red_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + if(source.parent().find(".all_imgs").find(".img_block").size() == 0){ + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } + } else { + if(source.find(".img_block").size() > 0){ + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } } } 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 f8526612..3e1395ec 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 @@ -18,15 +18,15 @@ 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 …”,
        • "+ @@ -36,9 +36,11 @@ var sankoreLang = { "

        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.

        "+ -"

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

        " + "

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

        "+ + + "

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

        ", + theme: "Thème" }; //main function @@ -50,9 +52,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 +78,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 +105,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -108,7 +114,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); @@ -141,7 +147,7 @@ function start(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -181,7 +187,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 +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(".img_block").size(); img_cont.text = $(this).find(".cat_desc").val(); @@ -287,7 +293,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 +319,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 +334,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 = []; @@ -360,7 +366,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -431,7 +437,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -473,7 +479,8 @@ function importData(data){ } } } - }); + }); + checkCorrectness(all_imgs); } } } @@ -537,7 +544,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -548,7 +555,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -663,10 +670,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"); @@ -680,10 +687,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"); @@ -697,17 +704,16 @@ 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; } } //a func for checking when smth will drop -function checkOnDrop(dest, source){ - dest.append(source); +function checkOnDrop(dest){ var tmp_count = dest.find("input[name='count']").val(); var tmp_mask = dest.find("input[name='mask']").val(); if(dest.find(".img_block").size() == tmp_count){ @@ -717,46 +723,34 @@ function checkOnDrop(dest, source){ tmp_right = false; }); if(tmp_right) - dest.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); + dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont"); else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } //checking source on correctness function checkCorrectness(source){ if(!source.hasClass("all_imgs")){ - var tmp_count = source.find("input[name='count']").val(); - var tmp_mask = source.find("input[name='mask']").val(); - if(source.find(".img_block").size() == tmp_count){ - var tmp_right = true; - source.find(".img_block").each(function(){ - if($(this).find("input").val() != tmp_mask) - tmp_right = false; - }); - - if(tmp_right) - source.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); - } else if(source.find(".img_block").size() == 0) - source.addClass("def_cont") - .removeClass("green_cont") - .removeClass("red_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + if(source.parent().find(".all_imgs").find(".img_block").size() == 0){ + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } + } else { + if(source.find(".img_block").size() > 0){ + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } } } 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 dade5268..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); @@ -120,7 +125,7 @@ function start(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -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 = []; @@ -339,7 +344,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -410,7 +415,7 @@ function importData(data){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -452,7 +457,8 @@ function importData(data){ } } } - }); + }); + checkCorrectness(all_imgs); } } } @@ -516,7 +522,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -527,7 +533,7 @@ function showExample(){ drop: function(event, ui) { if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ var tmp_ui = $(ui.draggable).parent(); - checkOnDrop($(this), $(ui.draggable)); + $(this).append($(ui.draggable)); checkCorrectness(tmp_ui); } } @@ -642,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"); @@ -659,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"); @@ -676,17 +682,16 @@ 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; } } //a func for checking when smth will drop -function checkOnDrop(dest, source){ - dest.append(source); +function checkOnDrop(dest){ var tmp_count = dest.find("input[name='count']").val(); var tmp_mask = dest.find("input[name='mask']").val(); if(dest.find(".img_block").size() == tmp_count){ @@ -696,46 +701,34 @@ function checkOnDrop(dest, source){ tmp_right = false; }); if(tmp_right) - dest.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); + dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont"); else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } else - dest.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont"); } //checking source on correctness function checkCorrectness(source){ if(!source.hasClass("all_imgs")){ - var tmp_count = source.find("input[name='count']").val(); - var tmp_mask = source.find("input[name='mask']").val(); - if(source.find(".img_block").size() == tmp_count){ - var tmp_right = true; - source.find(".img_block").each(function(){ - if($(this).find("input").val() != tmp_mask) - tmp_right = false; - }); - - if(tmp_right) - source.removeClass("def_cont") - .removeClass("red_cont") - .addClass("green_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); - } else if(source.find(".img_block").size() == 0) - source.addClass("def_cont") - .removeClass("green_cont") - .removeClass("red_cont"); - else - source.removeClass("def_cont") - .removeClass("green_cont") - .addClass("red_cont"); + if(source.parent().find(".all_imgs").find(".img_block").size() == 0){ + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } + } else { + if(source.find(".img_block").size() > 0){ + source.parent().find(".imgs_cont").each(function(){ + $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont"); + }) + } else { + source.parent().find(".imgs_cont").each(function(){ + checkOnDrop($(this)) + }) + } } } \ No newline at end of file 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 a20fab4f..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/ar_down.png and /dev/null differ 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 4a1d133b..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/parameters-bg.png b/resources/library/interactivities/Choisir.wgt/images/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/parameters-bg.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-display.png b/resources/library/interactivities/Choisir.wgt/images/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-edit.png b/resources/library/interactivities/Choisir.wgt/images/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-help-white.png b/resources/library/interactivities/Choisir.wgt/images/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-help-white.png and /dev/null differ 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 069052d0..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png differ 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 78d146ec..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png and /dev/null differ 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 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png and b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png differ 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 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/toolbar-help.png b/resources/library/interactivities/Choisir.wgt/images/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/toolbar-help.png differ 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 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png differ diff --git a/resources/library/interactivities/Choisir.wgt/index.html b/resources/library/interactivities/Choisir.wgt/index.html index 5d5bc7cd..9c9a371e 100644 --- a/resources/library/interactivities/Choisir.wgt/index.html +++ b/resources/library/interactivities/Choisir.wgt/index.html @@ -54,12 +54,7 @@ and open the template in the editor.
        -
        - +
          @@ -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 ad481ba2..36b0c319 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; } } 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 a20fab4f..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/ar_down.png and /dev/null differ 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 4a1d133b..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Etudier.wgt/img/green_point.png b/resources/library/interactivities/Etudier.wgt/img/green_point.png deleted file mode 100644 index a2a44680..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/green_point.png and /dev/null differ diff --git a/resources/library/interactivities/Etudier.wgt/img/parameters-bg.png b/resources/library/interactivities/Etudier.wgt/img/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Etudier.wgt/img/parameters-bg.png differ diff --git a/resources/library/interactivities/Etudier.wgt/img/red_point.png b/resources/library/interactivities/Etudier.wgt/img/red_point.png deleted file mode 100644 index f6daa19a..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/red_point.png and /dev/null differ diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-display.png b/resources/library/interactivities/Etudier.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-edit.png b/resources/library/interactivities/Etudier.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-help-white.png b/resources/library/interactivities/Etudier.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-help-white.png and /dev/null differ 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 069052d0..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-help.png differ 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 78d146ec..00000000 Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload-white.png and /dev/null differ 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 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Etudier.wgt/img/slate-toolbar-reload.png differ 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 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Etudier.wgt/img/toolbar-edit.png differ diff --git a/resources/library/interactivities/Etudier.wgt/img/toolbar-help.png b/resources/library/interactivities/Etudier.wgt/img/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Etudier.wgt/img/toolbar-help.png differ 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 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Etudier.wgt/img/toolbar-reload.png differ diff --git a/resources/library/interactivities/Etudier.wgt/index.html b/resources/library/interactivities/Etudier.wgt/index.html index c21be121..3029c850 100644 --- a/resources/library/interactivities/Etudier.wgt/index.html +++ b/resources/library/interactivities/Etudier.wgt/index.html @@ -52,11 +52,6 @@
        -   @@ -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 07a889a4..3d9d5b47 100644 --- a/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js @@ -10,13 +10,14 @@ 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),
          • "+ @@ -25,10 +26,12 @@ var sankoreLang = { "
        • 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.

        "+ -"

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

        " + "

        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é.

        ", + theme: "Thème" }; @@ -51,9 +54,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 +69,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 +81,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 +89,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 +120,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 +173,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 +590,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 +606,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 +622,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 diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css index 48ab3bb5..930b66f4 100644 --- a/resources/library/interactivities/Ordre images.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css @@ -3,7 +3,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -28,14 +28,6 @@ body{ margin: 5px 10px; } -.green_point{ - background-image: url(../img/green_point.png); -} - -.red_point{ - background-image: url(../img/red_point.png); -} - #display_text, #edit_text{ height: 19px; padding: 3px 0 0 0; @@ -245,57 +237,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - /*font-family: "Lobster13Regular";*/ + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../img/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../img/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; -} - -.style_select{ - width: 120px; - /*font-family: "Lobster13Regular";*/ - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../img/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; + padding-left: 35px; + background: url(../img/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -330,51 +305,50 @@ body{ background-image: url(../img/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../img/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../img/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../img/ar_down_white.png) !important; +.pad_reload{ + background: url(../img/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../img/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../img/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../img/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../img/slate-help-white.png) !important; +.help_pad{ + background: url(../img/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../img/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../img/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -383,5 +357,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../img/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../img/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Ordre images.wgt/img/ar_down.png b/resources/library/interactivities/Ordre images.wgt/img/ar_down.png deleted file mode 100644 index a20fab4f..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/ar_down.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png b/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png deleted file mode 100644 index 4a1d133b..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/green_point.png b/resources/library/interactivities/Ordre images.wgt/img/green_point.png deleted file mode 100644 index a2a44680..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/green_point.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png b/resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/parameters-bg.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/red_point.png b/resources/library/interactivities/Ordre images.wgt/img/red_point.png deleted file mode 100644 index f6daa19a..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/red_point.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-display.png b/resources/library/interactivities/Ordre images.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-edit.png b/resources/library/interactivities/Ordre images.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png b/resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-help.png b/resources/library/interactivities/Ordre images.wgt/img/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ordre images.wgt/img/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/toolbar-edit.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/toolbar-help.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png b/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Ordre images.wgt/img/toolbar-reload.png differ diff --git a/resources/library/interactivities/Ordre images.wgt/index.html b/resources/library/interactivities/Ordre images.wgt/index.html index 53ab2c3d..5ef629a0 100644 --- a/resources/library/interactivities/Ordre images.wgt/index.html +++ b/resources/library/interactivities/Ordre images.wgt/index.html @@ -51,12 +51,7 @@
        -
        - +
          @@ -66,7 +61,17 @@
        - +
        +
        + +
        +
          diff --git a/resources/library/interactivities/Ordre images.wgt/js/script.js b/resources/library/interactivities/Ordre images.wgt/js/script.js index f0a4ca0c..c19678e4 100644 --- a/resources/library/interactivities/Ordre images.wgt/js/script.js +++ b/resources/library/interactivities/Ordre images.wgt/js/script.js @@ -1,5 +1,5 @@ var sankoreLang = { - display: "Display", + display: "Close", edit: "Edit", short_desc: "Place the pictures in ascending order.", add: "Add new block", @@ -10,7 +10,8 @@ var sankoreLang = { pad: "Pad", none: "None", help: "Help", - help_content: "This is an example of help content ..." + help_content: "This is an example of help content ...", + theme: "Theme" }; //main function @@ -22,9 +23,11 @@ function start(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) if(window.sankore){ if(sankore.preference("odr_des_imgs","")){ @@ -47,11 +50,13 @@ function start(){ $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -72,7 +77,7 @@ function start(){ exportData(); }); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -83,7 +88,7 @@ function start(){ sankore.enableDropOnWidget(false); $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(".add_block").remove(); $(".cont").each(function(){ var container = $(this); @@ -130,7 +135,7 @@ function start(){ sankore.enableDropOnWidget(true); $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(".cont").each(function(){ var container = $(this); @@ -214,7 +219,7 @@ function exportData(){ } $(".cont").each(function(){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.text = $(this).find(".text_cont").text(); cont_obj.right = $(this).find(".imgs_cont>input").val(); cont_obj.imgs = []; @@ -231,7 +236,7 @@ function exportData(){ if($(".cont").size() == 0){ var cont_obj = new Object(); - cont_obj.style = $(".style_select").find("option:selected").val(); + cont_obj.style = $("#style_select").find("option:selected").val(); cont_obj.tmp = "clear"; array_to_export.push(cont_obj); } @@ -254,12 +259,12 @@ function importData(data){ for(var i in data){ if(data[i].tmp){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } else { if(i == 0){ changeStyle(data[i].style); - $(".style_select").val(data[i].style); + $("#style_select").val(data[i].style); } var tmp_array = []; var container = $("
        "); @@ -451,10 +456,10 @@ function changeStyle(val){ $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); - $("#wgt_display").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_name").removeClass("pad_color"); - $(".style_select").removeClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").addClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").addClass("radius_ft"); break; case "2": $(".b_top_left").addClass("btl_pad").removeClass("without_back"); @@ -468,10 +473,10 @@ function changeStyle(val){ $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("pad_select").removeClass("none_select").val(val); - $("body, html").removeClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").removeClass("without_radius").removeClass("radius_ft"); break; case "3": $(".b_top_left").addClass("without_back").removeClass("btl_pad"); @@ -485,10 +490,10 @@ function changeStyle(val){ $("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit"); - $("#wgt_display").addClass("pad_color").addClass("pad_edit"); $("#wgt_name").addClass("pad_color"); - $(".style_select").addClass("none_select").val(val); - $("body, html").addClass("without_radius"); + $("#wgt_display").removeClass("display_wood"); + $("#style_select").val(val); + $("body, html").addClass("without_radius").removeClass("radius_ft"); break; } } diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html index 6151ae43..b8c4d872 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html +++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/index.html @@ -25,12 +25,7 @@
        -
        - +
          @@ -40,7 +35,17 @@
        - +
        +
        + +
        +
          diff --git a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js index ca851845..153d5c08 100644 --- a/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js @@ -1,6 +1,6 @@ var sankoreLang = { - display: "Afficher", + display: "Fermer", edit: "Modifier", short_desc: "Placez les images dans l'ordre croissant.", add: "Nouveau bloc", @@ -12,28 +12,29 @@ var sankoreLang = { none: "aucun", help: "Aide", help_content: "

        Ordonner des images

        "+ -"

        Classer des images dans l’ordre demandé.

        "+ + "

        Classer des images dans l’ordre demandé.

        "+ -"

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

        "+ + "

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

        "+ -"

        Le bouton “Recharger” réinitialise les exercices.

        "+ + "

        Le bouton “Recharger” réinitialise les exercices.

        "+ -"

        Le bouton “Modifier” vous permet :

        "+ -"
        • 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 { 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 a2a44680..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/green_point.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png b/resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/parameters-bg.png differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/red_point.png b/resources/library/interactivities/Ordre lettres.wgt/img/red_point.png deleted file mode 100644 index f6daa19a..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/red_point.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help-white.png and /dev/null differ 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 069052d0..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-help.png differ 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 78d146ec..00000000 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload-white.png and /dev/null differ 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 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png and b/resources/library/interactivities/Ordre lettres.wgt/img/slate-toolbar-reload.png differ 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 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-edit.png differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-help.png differ 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 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Ordre lettres.wgt/img/toolbar-reload.png differ diff --git a/resources/library/interactivities/Ordre lettres.wgt/index.html b/resources/library/interactivities/Ordre lettres.wgt/index.html index 1ccdeec9..a5328ff0 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/index.html @@ -52,11 +52,6 @@
        -   @@ -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 = $("