Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop

Conflicts:
	resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
	resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
	resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
	resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
preferencesAboutTextFull
bmagnin 12 years ago
commit 9c5cbb58b2
  1. BIN
      JournalDesModifications.pdf
  2. BIN
      ReleaseNotes.pdf
  3. 2
      Sankore_3.1.pro
  4. 51
      plugins/cffadaptor/src/UBCFFAdaptor.cpp
  5. 2
      plugins/cffadaptor/src/UBCFFAdaptor.h
  6. 8
      plugins/cffadaptor/src/UBCFFConstants.h
  7. 4
      release.win7.vc9.bat
  8. 27
      resources/i18n/sankore_ar.ts
  9. 27
      resources/i18n/sankore_bg.ts
  10. 27
      resources/i18n/sankore_ca.ts
  11. 27
      resources/i18n/sankore_cs.ts
  12. 27
      resources/i18n/sankore_da.ts
  13. 27
      resources/i18n/sankore_de.ts
  14. 27
      resources/i18n/sankore_el.ts
  15. 27
      resources/i18n/sankore_en.ts
  16. 27
      resources/i18n/sankore_en_UK.ts
  17. 27
      resources/i18n/sankore_es.ts
  18. 437
      resources/i18n/sankore_fr.ts
  19. 437
      resources/i18n/sankore_fr_CH.ts
  20. 27
      resources/i18n/sankore_it.ts
  21. 27
      resources/i18n/sankore_iw.ts
  22. 27
      resources/i18n/sankore_ja.ts
  23. 27
      resources/i18n/sankore_ko.ts
  24. 27
      resources/i18n/sankore_mg.ts
  25. 27
      resources/i18n/sankore_nb.ts
  26. 27
      resources/i18n/sankore_nl.ts
  27. 27
      resources/i18n/sankore_pl.ts
  28. 27
      resources/i18n/sankore_pt.ts
  29. 27
      resources/i18n/sankore_rm.ts
  30. 27
      resources/i18n/sankore_ro.ts
  31. 27
      resources/i18n/sankore_ru.ts
  32. 27
      resources/i18n/sankore_sk.ts
  33. 27
      resources/i18n/sankore_sv.ts
  34. 27
      resources/i18n/sankore_tr.ts
  35. 27
      resources/i18n/sankore_zh.ts
  36. BIN
      resources/images/toolPalette/aristoTool.png
  37. BIN
      resources/images/toque.png
  38. 131
      resources/images/toque.svg
  39. 27
      resources/library/applications/OpenStreetMap.wgt/index.html
  40. 124
      resources/library/interactivities/Ass images.wgt/css/basic.css
  41. 0
      resources/library/interactivities/Ass images.wgt/img/parameters-bg.png
  42. BIN
      resources/library/interactivities/Ass images.wgt/img/slate-display.png
  43. BIN
      resources/library/interactivities/Ass images.wgt/img/slate-edit.png
  44. BIN
      resources/library/interactivities/Ass images.wgt/img/slate-help-white.png
  45. BIN
      resources/library/interactivities/Ass images.wgt/img/slate-help.png
  46. 0
      resources/library/interactivities/Ass images.wgt/img/slate-toolbar-help.png
  47. BIN
      resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload-white.png
  48. BIN
      resources/library/interactivities/Ass images.wgt/img/slate-toolbar-reload.png
  49. 0
      resources/library/interactivities/Ass images.wgt/img/toolbar-edit.png
  50. 0
      resources/library/interactivities/Ass images.wgt/img/toolbar-help.png
  51. 0
      resources/library/interactivities/Ass images.wgt/img/toolbar-reload.png
  52. 17
      resources/library/interactivities/Ass images.wgt/index.html
  53. 53
      resources/library/interactivities/Ass images.wgt/js/script.js
  54. 17
      resources/library/interactivities/Ass images.wgt/locales/fr/index.html
  55. 55
      resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
  56. 17
      resources/library/interactivities/Ass images.wgt/locales/ru/index.html
  57. 52
      resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js
  58. 121
      resources/library/interactivities/Ass sons.wgt/css/basic.css
  59. 0
      resources/library/interactivities/Ass sons.wgt/img/parameters-bg.png
  60. BIN
      resources/library/interactivities/Ass sons.wgt/img/slate-display.png
  61. BIN
      resources/library/interactivities/Ass sons.wgt/img/slate-edit.png
  62. BIN
      resources/library/interactivities/Ass sons.wgt/img/slate-help-white.png
  63. BIN
      resources/library/interactivities/Ass sons.wgt/img/slate-help.png
  64. 0
      resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-help.png
  65. BIN
      resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload-white.png
  66. BIN
      resources/library/interactivities/Ass sons.wgt/img/slate-toolbar-reload.png
  67. 0
      resources/library/interactivities/Ass sons.wgt/img/toolbar-edit.png
  68. 0
      resources/library/interactivities/Ass sons.wgt/img/toolbar-help.png
  69. 0
      resources/library/interactivities/Ass sons.wgt/img/toolbar-reload.png
  70. 17
      resources/library/interactivities/Ass sons.wgt/index.html
  71. 43
      resources/library/interactivities/Ass sons.wgt/js/script.js
  72. 17
      resources/library/interactivities/Ass sons.wgt/locales/fr/index.html
  73. 54
      resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
  74. 17
      resources/library/interactivities/Ass sons.wgt/locales/ru/index.html
  75. 43
      resources/library/interactivities/Ass sons.wgt/locales/ru/js/script.js
  76. 2
      resources/library/interactivities/Calcul.wgt/css/main.css
  77. 2
      resources/library/interactivities/Calcul.wgt/js/main.js
  78. 137
      resources/library/interactivities/Cat images.wgt/css/basic.css
  79. BIN
      resources/library/interactivities/Cat images.wgt/img/ar_down.png
  80. BIN
      resources/library/interactivities/Cat images.wgt/img/ar_down_white.png
  81. 0
      resources/library/interactivities/Cat images.wgt/img/parameters-bg.png
  82. BIN
      resources/library/interactivities/Cat images.wgt/img/slate-display.png
  83. BIN
      resources/library/interactivities/Cat images.wgt/img/slate-edit.png
  84. BIN
      resources/library/interactivities/Cat images.wgt/img/slate-help-white.png
  85. BIN
      resources/library/interactivities/Cat images.wgt/img/slate-help.png
  86. 0
      resources/library/interactivities/Cat images.wgt/img/slate-toolbar-help.png
  87. BIN
      resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload-white.png
  88. BIN
      resources/library/interactivities/Cat images.wgt/img/slate-toolbar-reload.png
  89. 0
      resources/library/interactivities/Cat images.wgt/img/toolbar-edit.png
  90. 0
      resources/library/interactivities/Cat images.wgt/img/toolbar-help.png
  91. 0
      resources/library/interactivities/Cat images.wgt/img/toolbar-reload.png
  92. 17
      resources/library/interactivities/Cat images.wgt/index.html
  93. 126
      resources/library/interactivities/Cat images.wgt/js/script.js
  94. 17
      resources/library/interactivities/Cat images.wgt/locales/fr/index.html
  95. 131
      resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js
  96. 17
      resources/library/interactivities/Cat images.wgt/locales/ru/index.html
  97. 134
      resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js
  98. 137
      resources/library/interactivities/Cat text.wgt/css/basic.css
  99. BIN
      resources/library/interactivities/Cat text.wgt/img/ar_down.png
  100. BIN
      resources/library/interactivities/Cat text.wgt/img/ar_down_white.png
  101. Some files were not shown because too many files have changed in this diff Show More

Binary file not shown.

Binary file not shown.

@ -11,7 +11,7 @@ CONFIG += debug_and_release \
VERSION_MAJ = 2 VERSION_MAJ = 2
VERSION_MIN = 00 VERSION_MIN = 00
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error 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 = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "") VERSION = $$replace(VERSION, "\\.r", "")

@ -550,8 +550,8 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parsePage(const QString &pageFileNam
pageFile.close(); pageFile.close();
return QDomElement(); return QDomElement();
} }
} else if (tagname == tUBZGroup) { } else if (tagname == tUBZGroups) {
group = parseGroupPageSection(nextTopElement); group = parseGroupsPageSection(nextTopElement);
if (group.isNull()) { if (group.isNull()) {
qDebug() << "Page doesn't contains any groups."; qDebug() << "Page doesn't contains any groups.";
pageFile.close(); pageFile.close();
@ -634,6 +634,7 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parseSvgPageSection(const QDomElemen
else if (tagName == tUBZLine) parseUBZLine(nextElement, svgElements); else if (tagName == tUBZLine) parseUBZLine(nextElement, svgElements);
else if (tagName == tUBZPolygon) parseUBZPolygon(nextElement, svgElements); else if (tagName == tUBZPolygon) parseUBZPolygon(nextElement, svgElements);
else if (tagName == tUBZPolyline) parseUBZPolyline(nextElement, svgElements); else if (tagName == tUBZPolyline) parseUBZPolyline(nextElement, svgElements);
else if (tagName == tUBZGroups) parseGroupsPageSection(nextElement);
nextElement = nextElement.nextSiblingElement(); nextElement = nextElement.nextSiblingElement();
} }
@ -694,14 +695,36 @@ bool UBCFFAdaptor::UBToCFFConverter::writeExtendedIwbSection()
// extended element options // extended element options
// editable, background, locked are supported for now // 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 // First sankore side implementation needed. TODO in Sankore 1.5
Q_UNUSED(element) if (!groupRoot.hasChildNodes()) {
qDebug() << "parsing ubz group section"; qDebug() << "Group root is empty";
return QDomElement(); 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 groupRoot;
}
QString UBCFFAdaptor::UBToCFFConverter::getDstContentFolderName(const QString &elementType) QString UBCFFAdaptor::UBToCFFConverter::getDstContentFolderName(const QString &elementType)
{ {
QString sRet; QString sRet;
@ -1250,6 +1273,19 @@ bool UBCFFAdaptor::UBToCFFConverter::setCFFAttribute(const QString &attributeNam
{ {
setGeometryFromUBZ(ubzElement, svgElement); 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 else
if (attributeName.contains(aUBZHref)||attributeName.contains(aSrc)) if (attributeName.contains(aUBZHref)||attributeName.contains(aSrc))
{ {
@ -1799,7 +1835,10 @@ bool UBCFFAdaptor::UBToCFFConverter::parseUBZPolygon(const QDomElement &element,
if (0 < iwbElementPart.attributes().count()) 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); svgElementPart.setAttribute(aID, id);
iwbElementPart.setAttribute(aRef, id); iwbElementPart.setAttribute(aRef, id);

@ -63,7 +63,7 @@ private:
QDomElement parseSvgPageSection(const QDomElement &element); QDomElement parseSvgPageSection(const QDomElement &element);
void writeQDomElementToXML(const QDomNode &node); void writeQDomElementToXML(const QDomNode &node);
bool writeExtendedIwbSection(); bool writeExtendedIwbSection();
QDomElement parseGroupPageSection(const QDomElement &element); QDomElement parseGroupsPageSection(const QDomElement &groupRoot);
bool createBackground(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList); bool createBackground(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
QString createBackgroundImage(const QDomElement &element, QSize size); QString createBackgroundImage(const QDomElement &element, QSize size);

@ -28,6 +28,7 @@ const QString tIWBPageSet = "pageset";
const QString tId = "id"; const QString tId = "id";
const QString tElement = "element"; const QString tElement = "element";
const QString tUBZGroup = "group"; const QString tUBZGroup = "group";
const QString tUBZGroups = "groups";
const QString tUBZG = "g"; const QString tUBZG = "g";
const QString tUBZPolygon = "polygon"; const QString tUBZPolygon = "polygon";
const QString tUBZPolyline = "polyline"; const QString tUBZPolyline = "polyline";
@ -67,6 +68,7 @@ const QString aBackground = "background";
const QString aCrossedBackground = "crossed-background"; const QString aCrossedBackground = "crossed-background";
const QString aUBZType = "type"; const QString aUBZType = "type";
const QString aUBZUuid = "uuid"; const QString aUBZUuid = "uuid";
const QString aUBZParent = "parent";
const QString aFill = "fill"; // IWB attribute contans color to fill 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 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(" \ const QString ubzElementAttributesToConvert(" \
xlink:href, \ xlink:href, \
src, \ src, \
transform \ transform, \
"); uuid \
"
);
// additional attributes. Have references in SVG section. // additional attributes. Have references in SVG section.
const QString svgElementAttributes(" \ const QString svgElementAttributes(" \

@ -63,6 +63,9 @@ REM echo %LAST_TAG_VERSION%
nmake release-install nmake release-install
IF NOT EXIST build\win32\release\product\Open-Sankore.exe GOTO EXIT_WITH_ERROR 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 set CUSTOMIZATIONS=build\win32\release\product\customizations
mkdir %CUSTOMIZATIONS% mkdir %CUSTOMIZATIONS%
xcopy /s resources\customizations %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%" call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
set INSTALL_DIRECTORY=install\win32\ set INSTALL_DIRECTORY=install\win32\
xcopy *.pdf %INSTALL_DIRECTORY% xcopy *.pdf %INSTALL_DIRECTORY%
cd %INSTALL_DIRECTORY% cd %INSTALL_DIRECTORY%
call %SEVEN_ZIP_EXE% a Open-Sankor‚_Windows_%VERSION%.zip *.exe *.pdf call %SEVEN_ZIP_EXE% a Open-Sankor‚_Windows_%VERSION%.zip *.exe *.pdf

@ -999,10 +999,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>اظهار Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>التقاط جزء من الشاشة</translation> <translation>التقاط جزء من الشاشة</translation>
@ -1023,6 +1019,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>اظهار سطح المكتب على الشاشة الثانوية</translation> <translation>اظهار سطح المكتب على الشاشة الثانوية</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1511,6 +1511,21 @@
<translation type="unfinished">سلة المهملات</translation> <translation type="unfinished">سلة المهملات</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">إلغاء </translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2096,6 +2111,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>تخزين مؤقت</translation> <translation>تخزين مؤقت</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Покажи Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Снимай част от екрана</translation> <translation>Снимай част от екрана</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Покажи работния плот на втория екран</translation> <translation>Покажи работния плот на втория екран</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1503,6 +1503,21 @@
<translation type="unfinished">Кошче</translation> <translation type="unfinished">Кошче</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Отмени</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2094,6 +2109,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Кеш</translation> <translation>Кеш</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Mostra l&apos;Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Captura part de la pantalla</translation> <translation>Captura part de la pantalla</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Mostra l&apos;escriptori a la pantalla secundària</translation> <translation>Mostra l&apos;escriptori a la pantalla secundària</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1504,6 +1504,21 @@
<translation type="unfinished">Paperera</translation> <translation type="unfinished">Paperera</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancel·la</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2090,6 +2105,10 @@ Voleu ignorar aquests errors per a aquest amfitrió?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Memòria cau</translation> <translation>Memòria cau</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -1016,14 +1016,14 @@
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Zachytit část obrazovky</translation> <translation>Zachytit část obrazovky</translation>
</message> </message>
<message>
<source>Show Uniboard</source>
<translation>Zobrazit Uniboard</translation>
</message>
<message> <message>
<source>Show Board on Secondary Screen</source> <source>Show Board on Secondary Screen</source>
<translation>Zobrazit tabuli na druhé obrazovce</translation> <translation>Zobrazit tabuli na druhé obrazovce</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1506,6 +1506,21 @@
<translation type="unfinished">Koš</translation> <translation type="unfinished">Koš</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Zrušit</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2097,6 +2112,10 @@ Chcete ignorovat tyto chyby na tomto serveru?</translation>
<source>Magnifier</source> <source>Magnifier</source>
<translation>Lupa</translation> <translation>Lupa</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Vis Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Klip del af skærmen</translation> <translation>Klip del af skærmen</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Vis skrivebord sekundær skærm</translation> <translation>Vis skrivebord sekundær skærm</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Papirkurv</translation> <translation type="unfinished">Papirkurv</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annuller</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Uniboard anzeigen</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Teil des Bildschirms erfassen</translation> <translation>Teil des Bildschirms erfassen</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Desktop auf zweitem Bildschirm anzeigen</translation> <translation>Desktop auf zweitem Bildschirm anzeigen</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Papierkorb</translation> <translation type="unfinished">Papierkorb</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Abbrechen</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2101,6 +2116,10 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Zwischenspeicher</translation> <translation>Zwischenspeicher</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Εμφάνιση του Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Λήψη στιγμιότυπου μέρους της οθόνης</translation> <translation>Λήψη στιγμιότυπου μέρους της οθόνης</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Εμφάνιση της Επιφάνειας Εργασίας στη δευτερεύουσα οθόνη</translation> <translation>Εμφάνιση της Επιφάνειας Εργασίας στη δευτερεύουσα οθόνη</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Κάδος ανακύκλωσης</translation> <translation type="unfinished">Κάδος ανακύκλωσης</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Άκυρο</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Προβολέας</translation> <translation>Προβολέας</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Mostrar Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Capturar parte de la pantalla</translation> <translation>Capturar parte de la pantalla</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Mostrar escritorio en la pantalla secundaria</translation> <translation>Mostrar escritorio en la pantalla secundaria</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Papelera</translation> <translation type="unfinished">Papelera</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Caché</translation> <translation>Caché</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Mostra Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Cattura parte della schermata</translation> <translation>Cattura parte della schermata</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Mostra il desktop sullo schermo secondario</translation> <translation>Mostra il desktop sullo schermo secondario</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1504,6 +1504,21 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento &apos;%1&apos; selezion
<translation type="unfinished">Cestino</translation> <translation type="unfinished">Cestino</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annulla</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2098,6 +2113,10 @@ risorsa multimediale ...</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>הצג Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>לכד חלק מהמסך</translation> <translation>לכד חלק מהמסך</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>הצג את שולחן העבודה על מסך משני</translation> <translation>הצג את שולחן העבודה על מסך משני</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1499,6 +1499,21 @@
</message> </message>
<message> <message>
<source>Trash</source> <source>Trash</source>
<translation type="unfinished">סל</translation>
</message>
</context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">בטל</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -2088,6 +2103,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>מטמון</translation> <translation>מטמון</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Uniboard表示 </translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation> </translation> <translation> </translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2092,6 +2107,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation> </translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation> </translation> <translation> </translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Asehoy ny Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Maka ampahan&apos;ny efijery</translation> <translation>Maka ampahan&apos;ny efijery</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Aseho ny sehatr&apos;asa amin&apos;ny efijery faharoa</translation> <translation>Aseho ny sehatr&apos;asa amin&apos;ny efijery faharoa</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Daba</translation> <translation type="unfinished">Daba</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Ajanony</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Tena tsy te hiraharaha an&apos;ireo tsy mety ho an&apos;ilay milina ve ianao?</t
<source>Cache</source> <source>Cache</source>
<translation>Tahiry</translation> <translation>Tahiry</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -1000,10 +1000,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Vis Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Ta bilde av en del av skjermen</translation> <translation>Ta bilde av en del av skjermen</translation>
@ -1024,6 +1020,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Vis skrivebord annen skjerm</translation> <translation>Vis skrivebord annen skjerm</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1505,6 +1505,21 @@
<translation type="unfinished">Søppel</translation> <translation type="unfinished">Søppel</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Avbryt</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Skjul</translation> <translation>Skjul</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Uniboard weergeven</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Afdruk deel van scherm</translation> <translation>Afdruk deel van scherm</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Desktop op bijscherm weergeven</translation> <translation>Desktop op bijscherm weergeven</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Prullenbak</translation> <translation type="unfinished">Prullenbak</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Annuleren</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2087,6 +2102,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -1002,10 +1002,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Pokaż Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Przechwyć część ekranu</translation> <translation>Przechwyć część ekranu</translation>
@ -1026,6 +1022,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Pokaż pulpit na ekranie podrzędnym</translation> <translation>Pokaż pulpit na ekranie podrzędnym</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1509,6 +1509,21 @@
<translation type="unfinished">Kosz</translation> <translation type="unfinished">Kosz</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Anuluj</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2100,6 +2115,10 @@ Czy chcesz ignorować te błędy dla tego hosta?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Pamięć podręczna</translation> <translation>Pamięć podręczna</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -1000,10 +1000,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Mostrar Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Capturar Parte do Ecrã</translation> <translation>Capturar Parte do Ecrã</translation>
@ -1024,6 +1020,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Mostrar Ambiente de Trabalho num Ecrã Secundário</translation> <translation>Mostrar Ambiente de Trabalho num Ecrã Secundário</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1505,6 +1505,21 @@
<translation type="unfinished">Lixo</translation> <translation type="unfinished">Lixo</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2092,6 +2107,10 @@ Quer ignorar estes erros, deste servidor?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2085,6 +2100,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Afişare Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Capturare parte de ecran</translation> <translation>Capturare parte de ecran</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Afişare desktop pe ecran secundar</translation> <translation>Afişare desktop pe ecran secundar</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Coş de gunoi</translation> <translation type="unfinished">Coş de gunoi</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Anulare</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Doriţi să ignoraţi aceste erori pentru acest host?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Показать Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Сделать снимок части экрана</translation> <translation>Сделать снимок части экрана</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Показать раб. стол на втором экране</translation> <translation>Показать раб. стол на втором экране</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Корзина</translation> <translation type="unfinished">Корзина</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Отмена</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation>Кэш</translation> <translation>Кэш</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -1016,14 +1016,14 @@
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Označiť časť obrazovky</translation> <translation>Označiť časť obrazovky</translation>
</message> </message>
<message>
<source>Show Uniboard</source>
<translation>Zobraziť Uniboard</translation>
</message>
<message> <message>
<source>Show Board on Secondary Screen</source> <source>Show Board on Secondary Screen</source>
<translation>Zobraziť tabuľu na druhej obrazovke</translation> <translation>Zobraziť tabuľu na druhej obrazovke</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1506,6 +1506,21 @@
<translation type="unfinished">Kôš</translation> <translation type="unfinished">Kôš</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Zrušiť</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2097,6 +2112,10 @@ Chcete ignorovať tieto chyby na tomto serveri?</translation>
<source>Magnifier</source> <source>Magnifier</source>
<translation>Lupa</translation> <translation>Lupa</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Visa Uniboard</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Fånga en del av skärmen</translation> <translation>Fånga en del av skärmen</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Visa skrivbordet den sekundära skärmen</translation> <translation>Visa skrivbordet den sekundära skärmen</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1502,6 +1502,21 @@
<translation type="unfinished">Papperskorg</translation> <translation type="unfinished">Papperskorg</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Avsluta</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2093,6 +2108,10 @@ Vill du ignorera felen för den här värden?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Cache</translation> <translation>Cache</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation>Uniboard&apos;u Göster</translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation>Ekranın Bir Bölümünü Yakala</translation> <translation>Ekranın Bir Bölümünü Yakala</translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation>Masaüstünü İkincil Ekranda Göster</translation> <translation>Masaüstünü İkincil Ekranda Göster</translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1501,6 +1501,21 @@
<translation type="unfinished">Çöp</translation> <translation type="unfinished">Çöp</translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">İptal</translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Bu host için yukarıdaki hatalar yok sayılsın mı?</translation>
<source>Cache</source> <source>Cache</source>
<translation>Gizli Yer</translation> <translation>Gizli Yer</translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

@ -998,10 +998,6 @@
</context> </context>
<context> <context>
<name>UBDesktopPalette</name> <name>UBDesktopPalette</name>
<message>
<source>Show Uniboard</source>
<translation></translation>
</message>
<message> <message>
<source>Capture Part of the Screen</source> <source>Capture Part of the Screen</source>
<translation></translation> <translation></translation>
@ -1022,6 +1018,10 @@
<source>Show Desktop on Secondary Screen</source> <source>Show Desktop on Secondary Screen</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Show Open-Sankore</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBDocumentController</name> <name>UBDocumentController</name>
@ -1500,6 +1500,21 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>UBFeaturesNewFolderDialog</name>
<message>
<source>Accept</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a new folder name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>UBFeaturesProgressInfo</name> <name>UBFeaturesProgressInfo</name>
<message> <message>
@ -2091,6 +2106,10 @@ Do you want to ignore these errors for this host?</source>
<source>Cache</source> <source>Cache</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<source>Aristo</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UBTrapFlashController</name> <name>UBTrapFlashController</name>

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

@ -0,0 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="107px" height="107px" viewBox="-17.174 -24.39 107 107"
overflow="visible" enable-background="new -17.174 -24.39 107 107" xml:space="preserve">
<defs>
</defs>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.2129" y1="39.3477" x2="59.75" y2="39.3477">
<stop offset="0" style="stop-color:#898989"/>
<stop offset="0.0798" style="stop-color:#58585A"/>
<stop offset="0.4447" style="stop-color:#474749"/>
<stop offset="0.7853" style="stop-color:#3D3D3F"/>
<stop offset="0.8232" style="stop-color:#464648"/>
<stop offset="0.8857" style="stop-color:#5F5F61"/>
<stop offset="0.9646" style="stop-color:#87888A"/>
<stop offset="1" style="stop-color:#9B9C9E"/>
</linearGradient>
<path fill="url(#SVGID_1_)" d="M59.45,37.001l-1.48-9.818l-44.251,1.82l-1.206,7.998c-0.195,0.645-0.3,1.307-0.3,1.981
c0,6.921,10.642,12.53,23.769,12.53s23.769-5.609,23.769-12.53C59.75,38.308,59.646,37.646,59.45,37.001z"/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.1631" y1="38.3486" x2="58.7988" y2="38.3486">
<stop offset="0" style="stop-color:#898989"/>
<stop offset="0.0859" style="stop-color:#676769"/>
<stop offset="0.268" style="stop-color:#616163"/>
<stop offset="0.4049" style="stop-color:#58585A"/>
<stop offset="0.908" style="stop-color:#676769"/>
<stop offset="0.9389" style="stop-color:#6D6D6F"/>
<stop offset="0.9815" style="stop-color:#7F7F80"/>
<stop offset="1" style="stop-color:#898989"/>
</linearGradient>
<path fill="url(#SVGID_2_)" d="M58.512,36.071l-1.422-9.523l-42.48,1.766l-1.158,7.758c-0.188,0.625-0.288,1.268-0.288,1.922
c0,6.713,10.217,12.155,22.818,12.155s22.817-5.442,22.817-12.155C58.799,37.339,58.699,36.696,58.512,36.071z"/>
</g>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.3369" y1="31.8486" x2="58.6104" y2="31.8486">
<stop offset="0" style="stop-color:#898989"/>
<stop offset="0.0859" style="stop-color:#3D3D3F"/>
<stop offset="0.39" style="stop-color:#434345"/>
<stop offset="0.8089" style="stop-color:#555557"/>
<stop offset="0.865" style="stop-color:#58585A"/>
<stop offset="1" style="stop-color:#58585A"/>
</linearGradient>
<path fill="url(#SVGID_3_)" d="M13.337,31.536c2,0.104,6.124,4.434,12.807,6.387c6.149,1.796,12.109,2.05,17.251,0
c8.431-3.361,13.344-8.442,15.216-6.49l-1-7.102H14.455L13.337,31.536z"/>
<polygon fill="#4C4C4C" points="36.026,31.402 35.981,31.382 35.981,36.613 36.034,36.638 72.053,19.763 72.053,17.504
67.232,17.504 "/>
<polygon fill="#58585A" points="35.981,31.382 4.822,17.504 0,17.504 0,19.763 35.981,36.613 "/>
<g>
<polygon fill="#B0B2B3" points="36.034,0.628 0,17.504 36.034,34.38 72.053,17.504 "/>
<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="0" y1="17.5039" x2="72.0527" y2="17.5039">
<stop offset="0" style="stop-color:#676769"/>
<stop offset="0.3361" style="stop-color:#6D6D6F"/>
<stop offset="0.799" style="stop-color:#7F7F80"/>
<stop offset="1" style="stop-color:#898989"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="36.034,0.628 0,17.504 36.034,34.38 72.053,17.504 "/>
</g>
<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="0" y1="25.5254" x2="72.0527" y2="25.5254">
<stop offset="0" style="stop-color:#58585A"/>
<stop offset="0.2484" style="stop-color:#5B5B5D"/>
<stop offset="0.4496" style="stop-color:#656567"/>
<stop offset="0.6342" style="stop-color:#767678"/>
<stop offset="0.8089" style="stop-color:#8D8E90"/>
<stop offset="0.9752" style="stop-color:#ABADAE"/>
<stop offset="1" style="stop-color:#B0B2B3"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="71.615,16.671 72.053,17.504 36.034,34.38 0,17.504 0.438,16.671 "/>
<g>
<polygon fill="#B0B2B3" points="36.034,0 0.438,16.671 36.034,33.341 71.615,16.671 "/>
<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="0.4375" y1="16.6704" x2="71.6152" y2="16.6704">
<stop offset="0" style="stop-color:#3D3D3F"/>
<stop offset="0.1996" style="stop-color:#434345"/>
<stop offset="0.4751" style="stop-color:#555556"/>
<stop offset="0.7934" style="stop-color:#727273"/>
<stop offset="1" style="stop-color:#898989"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="36.034,0 0.438,16.671 36.034,33.341 71.615,16.671 "/>
</g>
<polyline fill="none" stroke="#F4CC4D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
37.981,15.245 17.606,24.812 17.606,40.544 "/>
<g>
<path fill="#C2981E" d="M20.072,38.685H15.14l-2.854,15.502c0,0.743,2.381,2.803,5.32,2.803c2.938,0,5.32-2.06,5.32-2.803
L20.072,38.685z"/>
<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="16.2759" y1="47.8516" x2="20.8228" y2="47.5343">
<stop offset="0.5031" style="stop-color:#F4CC4D"/>
<stop offset="0.6585" style="stop-color:#EEC649"/>
<stop offset="0.8725" style="stop-color:#DCB43E"/>
<stop offset="1" style="stop-color:#CEA636"/>
</linearGradient>
<path fill="url(#SVGID_7_)" d="M20.072,38.685H15.14l-2.854,15.502c0,0.743,2.381,2.803,5.32,2.803c2.938,0,5.32-2.06,5.32-2.803
L20.072,38.685z"/>
</g>
<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="18.2104" y1="44.4365" x2="20.937" y2="51.7485">
<stop offset="0" style="stop-color:#EAC049"/>
<stop offset="0.3765" style="stop-color:#E4BA45"/>
<stop offset="0.8952" style="stop-color:#D2AA39"/>
<stop offset="0.9877" style="stop-color:#CEA636"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="20.535,56.606 18.673,41.413 19.269,41.341 21.131,56.533 "/>
<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="19.7891" y1="45.0312" x2="22.4774" y2="51.315">
<stop offset="0" style="stop-color:#CEA636"/>
<stop offset="0.416" style="stop-color:#CBA230"/>
<stop offset="0.9877" style="stop-color:#C2981E"/>
</linearGradient>
<polygon fill="url(#SVGID_9_)" points="22.019,55.55 19.634,40.843 20.226,40.747 22.61,55.454 "/>
<path fill="#B79537" d="M20.384,40.379c-0.584,0.987-1.588,1.745-2.814,1.745c-1.229,0-2.188-0.593-2.771-1.58l0.172-1.494
l5.169-0.275L20.384,40.379z"/>
<radialGradient id="SVGID_10_" cx="16.71" cy="36.7051" r="5.0908" gradientUnits="userSpaceOnUse">
<stop offset="0.5031" style="stop-color:#F4CC4D"/>
<stop offset="0.6585" style="stop-color:#EEC649"/>
<stop offset="0.8725" style="stop-color:#DCB43E"/>
<stop offset="1" style="stop-color:#CEA636"/>
</radialGradient>
<circle fill="url(#SVGID_10_)" cx="17.606" cy="38.685" r="2.923"/>
<g>
<path fill="#B79537" d="M17.606,56.989c-2.939,0-5.32-2.06-5.32-2.803v0.799c0,0.742,2.381,2.803,5.32,2.803
c2.938,0,5.32-2.061,5.32-2.803v-0.799C22.927,54.93,20.545,56.989,17.606,56.989z"/>
<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="13.0371" y1="56.083" x2="22.2794" y2="55.6343">
<stop offset="0" style="stop-color:#F4CC4D"/>
<stop offset="0.2114" style="stop-color:#EEC647"/>
<stop offset="0.5031" style="stop-color:#DDB437"/>
<stop offset="0.8282" style="stop-color:#C2981E"/>
<stop offset="0.9877" style="stop-color:#D3A522"/>
</linearGradient>
<path fill="url(#SVGID_11_)" d="M17.606,56.989c-2.939,0-5.32-2.06-5.32-2.803v0.799c0,0.742,2.381,2.803,5.32,2.803
c2.938,0,5.32-2.061,5.32-2.803v-0.799C22.927,54.93,20.545,56.989,17.606,56.989z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.7 KiB

@ -68,7 +68,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* API identifier */ /* Geonames API identifier */
var geonamesUser = "yimgo"; var geonamesUser = "yimgo";
/* map variable will be used to manipulate the map. This will be initialized like an OpenLayers.Map object. */ /* 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() { window.onload = function() {
map = new OpenLayers.Map({ map = new OpenLayers.Map({
div: "map" div: "map"
@ -199,6 +210,20 @@
return false; 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();
}
}
}; };
--> -->
</script> </script>

@ -3,7 +3,7 @@ html, body{
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-radius: 50px; border-radius: 35px;
overflow: hidden; overflow: hidden;
} }
@ -32,14 +32,6 @@ body{
margin: 5px 10px; 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{ #display_text, #edit_text{
height: 19px; height: 19px;
padding: 3px 0 0 0; padding: 3px 0 0 0;
@ -288,58 +280,42 @@ body{
margin: 10px 10px 0 10px; margin: 10px 10px 0 10px;
padding: 0; padding: 0;
float: left; float: left;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer; cursor: pointer;
height: 44px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
float: right; float: right;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; line-height: 32px;
} }
#wgt_display{ #wgt_display{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/toolbar-edit.png) left -32px no-repeat;
background-repeat: no-repeat; color: white;
background-position: top 0;
display: none; display: none;
} }
#wgt_edit{ #wgt_edit{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/slate-toolbar-edit.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload{ #wgt_reload{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-toolbar-reload.png); background: url(../img/slate-toolbar-reload.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; 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{ .btl_pad{
background-image: url(../img/pad-top-left.png) !important; background-image: url(../img/pad-top-left.png) !important;
@ -373,43 +349,44 @@ body{
background-image: url(../img/pad-bottom-right.png) !important; background-image: url(../img/pad-bottom-right.png) !important;
} }
/*new update 26 09 2012*/
.pad_color{ .pad_color{
color: white !important; color: #FC9 !important;
text-shadow: none !important;
} }
.pad_reload{ .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{ .pad_edit{
background-image: url(../img/slate-display.png) !important; background: url(../img/toolbar-edit.png) left top no-repeat !important;
} }
.pad_select{ .pad_help{
background-color: black !important; background: url(../img/toolbar-help.png) left top no-repeat !important;
color: white !important;
background-image: url(../img/ar_down_white.png) !important;
} }
.none_select{ .help_wood{
background-color: #333 !important; background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important; color: white !important;
background-image: url(../img/ar_down_white.png) !important; text-shadow: #7F613F 0 -1px 0 !important;
} }
.pad_help{ .help_pad{
background-image: url(../img/slate-help-white.png) !important; background: url(../img/toolbar-help.png) left -32px no-repeat !important;
color: white !important;
} }
#wgt_help{ #wgt_help{
padding-left: 32px; padding-left: 35px;
background-image: url(../img/slate-help.png); background: url(../img/slate-toolbar-help.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#help{ #help{
width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
display: none; display: none;
@ -420,3 +397,34 @@ body{
.open{ .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;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

@ -55,11 +55,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -69,7 +64,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Display", display: "Close",
edit: "Edit", edit: "Edit",
short_desc: "Select the number \"three\".", short_desc: "Select the number \"three\".",
add: "Add new block", add: "Add new block",
@ -10,7 +10,8 @@ var sankoreLang = {
pad: "Pad", pad: "Pad",
none: "None", none: "None",
help: "Help", help: "Help",
help_content: "This is an example of help content ..." help_content: "This is an example of help content ...",
theme: "Theme"
}; };
//main function //main function
@ -22,9 +23,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("associer","")){ if(sankore.preference("associer","")){
@ -46,11 +49,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -71,7 +76,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -82,7 +87,7 @@ function start(){
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display", "none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -186,8 +191,7 @@ function start(){
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display", "block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
container.find(".imgs_answers").find(".img_block").each(function(){ container.find(".imgs_answers").find(".img_block").each(function(){
@ -196,8 +200,6 @@ function start(){
container.find(".imgs_answers").remove(); container.find(".imgs_answers").remove();
$("<div class='close_cont'>").appendTo(container); $("<div class='close_cont'>").appendTo(container);
container.find(".text_cont").attr("contenteditable","true"); container.find(".text_cont").attr("contenteditable","true");
//container.find(".imgs_cont").sortable("destroy");
//container.find(".imgs_cont").css("background-color", "white");
var add_img = $("<div class='add_img'>"); var add_img = $("<div class='add_img'>");
container.find(".img_block").each(function(){ container.find(".img_block").each(function(){
@ -279,7 +281,7 @@ function exportData(){
if($("#wgt_edit").hasClass("selected")){ if($("#wgt_edit").hasClass("selected")){
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.text = $(this).find(".text_cont").text();
cont_obj.mode = "edit"; cont_obj.mode = "edit";
cont_obj.imgs = []; cont_obj.imgs = [];
@ -296,7 +298,7 @@ function exportData(){
} else { } else {
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.text = $(this).find(".text_cont").text();
cont_obj.mode = "display"; cont_obj.mode = "display";
cont_obj.imgs = []; cont_obj.imgs = [];
@ -325,7 +327,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); 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"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -340,11 +342,11 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} else { } else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -623,7 +625,6 @@ function showExample(){
} }
} }
}); });
//container.appendTo("body")
} }
//changing the style //changing the style
@ -641,10 +642,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -26,11 +26,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Afficher", display: "Fermer",
edit: "Modifier", edit: "Modifier",
short_desc: "Sélectionner le numéro «trois».", short_desc: "Sélectionner le numéro «trois».",
add: "Nouveau bloc", add: "Nouveau bloc",
@ -23,7 +23,7 @@ var sankoreLang = {
"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis</p>"+ "<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis</p>"+
"<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir la consigne ici ...”, </li>"+ "<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir la consigne ici ...”, </li>"+
"<li>ajoutez des zones image(s) en cliquant sur le gros signe + en dessous, </li>"+ "<li>ajoutez des zones image en cliquant sur le gros signe + en dessous, </li>"+
"<li>insérez des images dans ces zones par glisser-déposer des images à partir de votre bibliothèque, </li>"+ "<li>insérez des images dans ces zones par glisser-déposer des images à partir de votre bibliothèque, </li>"+
"<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+ "<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
"<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+ "<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+
@ -31,8 +31,8 @@ var sankoreLang = {
"<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+ "<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>" "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
theme: "Thème"
}; };
//main function //main function
@ -44,9 +44,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("associer","")){ if(sankore.preference("associer","")){
@ -68,11 +70,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -93,7 +97,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -103,7 +107,7 @@ function start(){
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display", "none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -206,7 +210,7 @@ function start(){
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display", "block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -216,8 +220,6 @@ function start(){
container.find(".imgs_answers").remove(); container.find(".imgs_answers").remove();
$("<div class='close_cont'>").appendTo(container); $("<div class='close_cont'>").appendTo(container);
container.find(".text_cont").attr("contenteditable","true"); container.find(".text_cont").attr("contenteditable","true");
//container.find(".imgs_cont").sortable("destroy");
//container.find(".imgs_cont").css("background-color", "white");
var add_img = $("<div class='add_img'>"); var add_img = $("<div class='add_img'>");
container.find(".img_block").each(function(){ container.find(".img_block").each(function(){
@ -299,7 +301,7 @@ function exportData(){
if($("#wgt_edit").hasClass("selected")){ if($("#wgt_edit").hasClass("selected")){
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.text = $(this).find(".text_cont").text();
cont_obj.mode = "edit"; cont_obj.mode = "edit";
cont_obj.imgs = []; cont_obj.imgs = [];
@ -316,7 +318,7 @@ function exportData(){
} else { } else {
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.text = $(this).find(".text_cont").text();
cont_obj.mode = "display"; cont_obj.mode = "display";
cont_obj.imgs = []; cont_obj.imgs = [];
@ -345,7 +347,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); 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"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -360,11 +362,11 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} else { } else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -638,7 +640,6 @@ function showExample(){
} }
} }
}); });
//container.appendTo("body")
} }
//changing the style //changing the style
@ -656,10 +657,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -26,11 +26,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Показать", display: "Закрыть",
edit: "Изменить", edit: "Изменить",
short_desc: "Выберите число \"три\".", short_desc: "Выберите число \"три\".",
add: "Новый блок", add: "Новый блок",
@ -10,7 +10,8 @@ var sankoreLang = {
pad: "Планшет", pad: "Планшет",
none: "Нет", none: "Нет",
help: "Помощь", help: "Помощь",
help_content: "Пример текста помощи ..." help_content: "Пример текста помощи ...",
theme: "Тема"
}; };
@ -23,9 +24,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("associer","")){ if(sankore.preference("associer","")){
@ -47,11 +50,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -72,7 +77,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -82,7 +87,7 @@ function start(){
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display", "none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -185,7 +190,7 @@ function start(){
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display", "block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -195,8 +200,6 @@ function start(){
container.find(".imgs_answers").remove(); container.find(".imgs_answers").remove();
$("<div class='close_cont'>").appendTo(container); $("<div class='close_cont'>").appendTo(container);
container.find(".text_cont").attr("contenteditable","true"); container.find(".text_cont").attr("contenteditable","true");
//container.find(".imgs_cont").sortable("destroy");
//container.find(".imgs_cont").css("background-color", "white");
var add_img = $("<div class='add_img'>"); var add_img = $("<div class='add_img'>");
container.find(".img_block").each(function(){ container.find(".img_block").each(function(){
@ -278,7 +281,7 @@ function exportData(){
if($("#wgt_edit").hasClass("selected")){ if($("#wgt_edit").hasClass("selected")){
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.text = $(this).find(".text_cont").text();
cont_obj.mode = "edit"; cont_obj.mode = "edit";
cont_obj.imgs = []; cont_obj.imgs = [];
@ -295,7 +298,7 @@ function exportData(){
} else { } else {
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.text = $(this).find(".text_cont").text();
cont_obj.mode = "display"; cont_obj.mode = "display";
cont_obj.imgs = []; cont_obj.imgs = [];
@ -324,7 +327,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); 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"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -339,11 +342,11 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} else { } else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -617,7 +620,6 @@ function showExample(){
} }
} }
}); });
//container.appendTo("body")
} }
//changing the style //changing the style
@ -635,10 +637,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -3,7 +3,7 @@ html, body{
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-radius: 50px; border-radius: 35px;
overflow: hidden; overflow: hidden;
} }
@ -28,14 +28,6 @@ body{
margin: 5px 10px; 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{ #display_text, #edit_text{
height: 19px; height: 19px;
padding: 3px 0 0 0; padding: 3px 0 0 0;
@ -323,41 +315,40 @@ body{
margin: 10px 10px 0 10px; margin: 10px 10px 0 10px;
padding: 0; padding: 0;
float: left; float: left;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer; cursor: pointer;
height: 44px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
float: right; float: right;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; line-height: 32px;
} }
#wgt_display{ #wgt_display{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/toolbar-edit.png) left -32px no-repeat;
background-repeat: no-repeat; color: white;
background-position: top 0;
display: none; display: none;
} }
#wgt_edit{ #wgt_edit{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/slate-toolbar-edit.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload{ #wgt_reload{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-toolbar-reload.png); background: url(../img/slate-toolbar-reload.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
.style_select{ .style_select{
@ -408,51 +399,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important; background-image: url(../img/pad-bottom-right.png) !important;
} }
.pad_color{ .without_radius{
color: white !important; border-radius: 0 !important;
} }
.pad_reload{ .without_back{
background-image: url(../img/slate-toolbar-reload-white.png) !important; background: none !important;
} }
.pad_edit{ .pad_color{
background-image: url(../img/slate-display.png) !important; color: #FC9 !important;
text-shadow: none !important;
} }
.pad_select{ .pad_reload{
background-color: black !important; background: url(../img/toolbar-reload.png) left top no-repeat !important;
color: white !important;
background-image: url(../img/ar_down_white.png) !important;
} }
.without_radius{ .pad_edit{
border-radius: 0 !important; background: url(../img/toolbar-edit.png) left top no-repeat !important;
} }
.without_back{ .pad_help{
background: none !important; background: url(../img/toolbar-help.png) left top no-repeat !important;
} }
.none_select{ .help_wood{
background-color: #333 !important; background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important; color: white !important;
background-image: url(../img/ar_down_white.png) !important; text-shadow: #7F613F 0 -1px 0 !important;
} }
.pad_help{ .help_pad{
background-image: url(../img/slate-help-white.png) !important; background: url(../img/toolbar-help.png) left -32px no-repeat !important;
color: white !important;
} }
#wgt_help{ #wgt_help{
padding-left: 32px; padding-left: 35px;
background-image: url(../img/slate-help.png); background: url(../img/slate-toolbar-help.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#help{ #help{
width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
display: none; display: none;
@ -463,3 +453,34 @@ body{
.open{ .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;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

@ -52,11 +52,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -66,7 +61,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Display", display: "Close",
edit: "Edit", edit: "Edit",
short_desc: "How many signals do you hear?", short_desc: "How many signals do you hear?",
add: "Add new block", add: "Add new block",
@ -10,7 +10,8 @@ var sankoreLang = {
pad: "Pad", pad: "Pad",
none: "None", none: "None",
help: "Help", help: "Help",
help_content: "This is an example of help content ..." help_content: "This is an example of help content ...",
theme: "Theme"
}; };
//main function //main function
@ -22,9 +23,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("associer_sound","")){ if(sankore.preference("associer_sound","")){
@ -35,7 +38,7 @@ function start(){
showExample(); showExample();
if(sankore.preference("as_snd_style","")){ if(sankore.preference("as_snd_style","")){
changeStyle(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 } else
changeStyle("3") changeStyle("3")
} }
@ -46,18 +49,20 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
exportData(); 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(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -78,7 +83,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -89,7 +94,7 @@ function start(){
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display", "none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -195,7 +200,7 @@ function start(){
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display", "block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -777,10 +782,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -26,11 +26,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Afficher", display: "Fermer",
edit: "Modifier", edit: "Modifier",
short_desc: "Combien de signaux entendez-vous?", short_desc: "Combien de signaux entendez-vous?",
add: "Nouveau bloc", add: "Nouveau bloc",
@ -21,6 +21,7 @@ var sankoreLang = {
"<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+ "<ul><li>de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun),</li>"+
"<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité.</li></ul>"+ "<li>de modifier un exercice ou d’en créer de nouveaux dans la même activité.</li></ul>"+
<<<<<<< HEAD
"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+ "<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+
"<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+ "<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+
"<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+ "<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+
@ -29,10 +30,21 @@ var sankoreLang = {
"<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+ "<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
"<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+ "<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+
"<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+ "<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+
=======
"<p>En mode édition, pour créer un nouvel exercice, cliquez sur “Nouveau bloc” en bas, puis </p>"+
"<ul><li>insérez une consigne en cliquant sur le champ de texte “Saisir votre description ici ...”,"+
"<li>insérez un son dans la zone à gauche de la consigne par glisser-déposer d’un son à partir de votre bibliothèque,</li>"+
"<li>ajoutez des zones image en cliquant sur le gros signe + en dessous,</li>"+
"<li>insérez des images par glisser-déposer des images à partir de votre bibliothèque,</li>"+
"<li>définissez l’image correcte de l’interactivité en cliquant sur le bouton valider “v” situé en bas à droite de l’image concernée.</li></ul>"+
"<p>Pour supprimer une zone image, cliquez sur la croix située dans le coin supérieur droit de l’image.</p>"+
"<p>Pour remplacer un son, glissez-déposez simplement un nouveau son.</p>"+
>>>>>>> 986e8e8f3435c5208d294c97db33e0cf54790514
"<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+ "<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>" "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
theme: "Thème"
}; };
@ -45,9 +57,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("associer_sound","")){ if(sankore.preference("associer_sound","")){
@ -58,7 +72,7 @@ function start(){
showExample(); showExample();
if(sankore.preference("as_snd_style","")){ if(sankore.preference("as_snd_style","")){
changeStyle(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 } else
changeStyle("3") changeStyle("3")
} }
@ -69,18 +83,20 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
exportData(); 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(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -101,7 +117,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -112,7 +128,7 @@ function start(){
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display", "none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -218,7 +234,7 @@ function start(){
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -785,10 +801,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -26,11 +26,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Показать", display: "Закрыть",
edit: "Изменить", edit: "Изменить",
short_desc: "Сколько сигналов вы слышите?", short_desc: "Сколько сигналов вы слышите?",
add: "Новый блок", add: "Новый блок",
@ -10,7 +10,8 @@ var sankoreLang = {
pad: "Планшет", pad: "Планшет",
none: "Нет", none: "Нет",
help: "Помощь", help: "Помощь",
help_content: "Пример текста помощи ..." help_content: "Пример текста помощи ...",
theme: "Тема"
}; };
//main function //main function
@ -22,9 +23,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("associer_sound","")){ if(sankore.preference("associer_sound","")){
@ -35,7 +38,7 @@ function start(){
showExample(); showExample();
if(sankore.preference("as_snd_style","")){ if(sankore.preference("as_snd_style","")){
changeStyle(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 } else
changeStyle("3") changeStyle("3")
} }
@ -46,18 +49,20 @@ function start(){
if (window.widget) { if (window.widget) {
window.widget.onleave = function(){ window.widget.onleave = function(){
exportData(); 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(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -78,7 +83,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -89,7 +94,7 @@ function start(){
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display", "none");
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -195,7 +200,7 @@ function start(){
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -762,10 +767,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }

@ -25,7 +25,7 @@ ul {
background-color: red; background-color: red;
} }
.pagination li a { .pagination li span {
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;

@ -27,7 +27,7 @@ function reloadApp(app) {
$pagination = $("<ul class='pagination'></ul>"); $pagination = $("<ul class='pagination'></ul>");
$operationContainer.append($pagination); $operationContainer.append($pagination);
for (var i = 0; i < operations; i++) for (var i = 0; i < operations; i++)
$("<li><a href='#'>"+(i+1)+"</a></li>").appendTo($pagination); $("<li><span>"+(i+1)+"</span></li>").appendTo($pagination);
$operations = $("<ul class='operations'></ul>"); $operations = $("<ul class='operations'></ul>");
$operationContainer.append($operations); $operationContainer.append($operations);

@ -3,7 +3,7 @@ html, body{
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-radius: 50px; border-radius: 35px;
overflow: hidden; overflow: hidden;
} }
@ -28,14 +28,6 @@ body{
margin: 5px 10px; 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{ #display_text, #edit_text{
height: 19px; height: 19px;
padding: 3px 0 0 0; padding: 3px 0 0 0;
@ -264,57 +256,40 @@ body{
margin: 10px 10px 0 10px; margin: 10px 10px 0 10px;
padding: 0; padding: 0;
float: left; float: left;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer; cursor: pointer;
height: 44px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
float: right; float: right;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; line-height: 32px;
} }
#wgt_display{ #wgt_display{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/toolbar-edit.png) left -32px no-repeat;
background-repeat: no-repeat; color: white;
background-position: top 0;
display: none; display: none;
} }
#wgt_edit{ #wgt_edit{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/slate-toolbar-edit.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload{ #wgt_reload{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-toolbar-reload.png); background: url(../img/slate-toolbar-reload.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; 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{ .btl_pad{
@ -349,51 +324,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important; background-image: url(../img/pad-bottom-right.png) !important;
} }
.pad_color{ .without_radius{
color: white !important; border-radius: 0 !important;
} }
.pad_reload{ .without_back{
background-image: url(../img/slate-toolbar-reload-white.png) !important; background: none !important;
} }
.pad_edit{ .pad_color{
background-image: url(../img/slate-display.png) !important; color: #FC9 !important;
text-shadow: none !important;
} }
.pad_select{ .pad_reload{
background-color: black !important; background: url(../img/toolbar-reload.png) left top no-repeat !important;
color: white !important;
background-image: url(../img/ar_down_white.png) !important;
} }
.without_radius{ .pad_edit{
border-radius: 0 !important; background: url(../img/toolbar-edit.png) left top no-repeat !important;
} }
.without_back{ .pad_help{
background: none !important; background: url(../img/toolbar-help.png) left top no-repeat !important;
} }
.none_select{ .help_wood{
background-color: #333 !important; background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important; color: white !important;
background-image: url(../img/ar_down_white.png) !important; text-shadow: #7F613F 0 -1px 0 !important;
} }
.pad_help{ .help_pad{
background-image: url(../img/slate-help-white.png) !important; background: url(../img/toolbar-help.png) left -32px no-repeat !important;
color: white !important;
} }
#wgt_help{ #wgt_help{
padding-left: 32px; padding-left: 35px;
background-image: url(../img/slate-help.png); background: url(../img/slate-toolbar-help.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#help{ #help{
width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
display: none; display: none;
@ -404,3 +378,34 @@ body{
.open{ .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;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

@ -52,11 +52,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -66,7 +61,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Display", display: "Close",
edit: "Edit", edit: "Edit",
first_desc: "Odd numbers", first_desc: "Odd numbers",
second_desc: "Even numbers", second_desc: "Even numbers",
@ -11,7 +11,8 @@ var sankoreLang = {
pad: "Pad", pad: "Pad",
none: "None", none: "None",
help: "Help", help: "Help",
help_content: "This is an example of help content ..." help_content: "This is an example of help content ...",
theme: "Theme"
}; };
//main function //main function
@ -23,9 +24,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("categoriser_images","")){ if(sankore.preference("categoriser_images","")){
@ -47,11 +50,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -72,7 +77,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -81,7 +86,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
if(window.sankore) if(window.sankore)
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(".add_block").remove(); $(".add_block").remove();
@ -112,7 +117,7 @@ function start(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -152,7 +157,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
if(window.sankore) if(window.sankore)
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(".cont").each(function(){ $(".cont").each(function(){
@ -234,7 +239,7 @@ function exportData(){
if($("#wgt_edit").hasClass("selected")){ if($("#wgt_edit").hasClass("selected")){
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.mode = "edit";
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
@ -258,7 +263,7 @@ function exportData(){
} else { } else {
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.mode = "display";
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
@ -292,7 +297,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); 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"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -307,11 +312,11 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} else { } else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -341,7 +346,7 @@ function importData(data){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -413,12 +418,11 @@ function importData(data){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
}); });
checkCorrectness(imgs_container);
} }
all_imgs = $("<div class='all_imgs'>").appendTo(container); all_imgs = $("<div class='all_imgs'>").appendTo(container);
@ -458,6 +462,7 @@ function importData(data){
} }
}); });
container.appendTo("#data"); container.appendTo("#data");
checkCorrectness(all_imgs);
} }
} }
} }
@ -520,7 +525,7 @@ function showExample(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -531,7 +536,7 @@ function showExample(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -561,9 +566,9 @@ function addCategory(obj){
$("<button class='del_category'></button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);");
} }
//add new container //add new container
@ -625,10 +630,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }
@ -686,8 +691,7 @@ function returnId(){
} }
//a func for checking when smth will drop //a func for checking when smth will drop
function checkOnDrop(dest, source){ function checkOnDrop(dest){
dest.append(source);
var tmp_count = dest.find("input[name='count']").val(); var tmp_count = dest.find("input[name='count']").val();
var tmp_mask = dest.find("input[name='mask']").val(); var tmp_mask = dest.find("input[name='mask']").val();
if(dest.find(".img_block").size() == tmp_count){ if(dest.find(".img_block").size() == tmp_count){
@ -697,47 +701,35 @@ function checkOnDrop(dest, source){
tmp_right = false; tmp_right = false;
}); });
if(tmp_right) if(tmp_right)
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont");
.removeClass("red_cont")
.addClass("green_cont");
else else
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont");
.removeClass("green_cont")
.addClass("red_cont");
} else } else
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont");
.removeClass("green_cont")
.addClass("red_cont");
} }
//checking source on correctness //checking source on correctness
function checkCorrectness(source){ function checkCorrectness(source){
if(!source.hasClass("all_imgs")){ if(!source.hasClass("all_imgs")){
var tmp_count = source.find("input[name='count']").val(); if(source.parent().find(".all_imgs").find(".img_block").size() == 0){
var tmp_mask = source.find("input[name='mask']").val(); source.parent().find(".imgs_cont").each(function(){
if(source.find(".img_block").size() == tmp_count){ checkOnDrop($(this))
var tmp_right = true; })
source.find(".img_block").each(function(){ } else {
if($(this).find("input").val() != tmp_mask) source.parent().find(".imgs_cont").each(function(){
tmp_right = false; $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont");
}); })
}
if(tmp_right) } else {
source.removeClass("def_cont") if(source.find(".img_block").size() > 0){
.removeClass("red_cont") source.parent().find(".imgs_cont").each(function(){
.addClass("green_cont"); $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont");
else })
source.removeClass("def_cont") } else {
.removeClass("green_cont") source.parent().find(".imgs_cont").each(function(){
.addClass("red_cont"); checkOnDrop($(this))
} 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");
} }
} }

@ -26,11 +26,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Afficher", display: "Fermer",
edit: "Modifier", edit: "Modifier",
first_desc: "Les nombres impairs", first_desc: "Les nombres impairs",
second_desc: "Les nombres pairs", second_desc: "Les nombres pairs",
@ -30,7 +30,8 @@ var sankoreLang = {
"<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+ "<p>Pour supprimer un exercice, cliquez sur la croix à gauche du numéro de l’exercice.</p>"+
"<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>" "<p>Le bouton “Afficher” vous permet d’utiliser l’activité.</p>",
theme: "Thème"
}; };
//main function //main function
@ -42,9 +43,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("categoriser_images","")){ if(sankore.preference("categoriser_images","")){
@ -66,11 +69,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -91,7 +96,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -100,7 +105,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
@ -130,7 +135,7 @@ function start(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -170,7 +175,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -251,7 +256,7 @@ function exportData(){
if($("#wgt_edit").hasClass("selected")){ if($("#wgt_edit").hasClass("selected")){
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.mode = "edit";
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
@ -275,7 +280,7 @@ function exportData(){
} else { } else {
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.mode = "display";
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
@ -309,7 +314,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); 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"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -324,11 +329,11 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} else { } else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -358,7 +363,7 @@ function importData(data){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -430,7 +435,7 @@ function importData(data){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -475,6 +480,7 @@ function importData(data){
} }
}); });
container.appendTo("#data"); container.appendTo("#data");
checkCorrectness(all_imgs);
} }
} }
} }
@ -537,7 +543,7 @@ function showExample(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -548,7 +554,7 @@ function showExample(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -578,9 +584,9 @@ function addCategory(obj){
$("<button class='del_category'></button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);");
} }
//add new container //add new container
@ -599,9 +605,9 @@ function addContainer(){
$("<button class='del_category'></button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);");
container.insertBefore($(".add_block")); container.insertBefore($(".add_block"));
} }
@ -655,10 +661,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }
@ -704,8 +710,7 @@ function returnId(){
} }
//a func for checking when smth will drop //a func for checking when smth will drop
function checkOnDrop(dest, source){ function checkOnDrop(dest){
dest.append(source);
var tmp_count = dest.find("input[name='count']").val(); var tmp_count = dest.find("input[name='count']").val();
var tmp_mask = dest.find("input[name='mask']").val(); var tmp_mask = dest.find("input[name='mask']").val();
if(dest.find(".img_block").size() == tmp_count){ if(dest.find(".img_block").size() == tmp_count){
@ -715,47 +720,35 @@ function checkOnDrop(dest, source){
tmp_right = false; tmp_right = false;
}); });
if(tmp_right) if(tmp_right)
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont");
.removeClass("red_cont")
.addClass("green_cont");
else else
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont");
.removeClass("green_cont")
.addClass("red_cont");
} else } else
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont");
.removeClass("green_cont")
.addClass("red_cont");
} }
//checking source on correctness //checking source on correctness
function checkCorrectness(source){ function checkCorrectness(source){
if(!source.hasClass("all_imgs")){ if(!source.hasClass("all_imgs")){
var tmp_count = source.find("input[name='count']").val(); if(source.parent().find(".all_imgs").find(".img_block").size() == 0){
var tmp_mask = source.find("input[name='mask']").val(); source.parent().find(".imgs_cont").each(function(){
if(source.find(".img_block").size() == tmp_count){ checkOnDrop($(this))
var tmp_right = true; })
source.find(".img_block").each(function(){ } else {
if($(this).find("input").val() != tmp_mask) source.parent().find(".imgs_cont").each(function(){
tmp_right = false; $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont");
}); })
}
if(tmp_right) } else {
source.removeClass("def_cont") if(source.find(".img_block").size() > 0){
.removeClass("red_cont") source.parent().find(".imgs_cont").each(function(){
.addClass("green_cont"); $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont");
else })
source.removeClass("def_cont") } else {
.removeClass("green_cont") source.parent().find(".imgs_cont").each(function(){
.addClass("red_cont"); checkOnDrop($(this))
} 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");
} }
} }

@ -26,11 +26,6 @@
<div id="wgt_reload"></div> <div id="wgt_reload"></div>
<div id="wgt_display" class="selected"></div> <div id="wgt_display" class="selected"></div>
<div id="wgt_edit"></div> <div id="wgt_edit"></div>
<select class="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</td> </td>
<td class="b_top_right">&nbsp;</td> <td class="b_top_right">&nbsp;</td>
</tr> </tr>
@ -40,7 +35,17 @@
<td> <td>
<div id="help"></div> <div id="help"></div>
<div id="data"> <div id="data">
<div id="parameters">
<div class="inline">
<label>
<select id="style_select">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
</select>
</label>
</div>
</div>
</div> </div>
</td> </td>
<td class="b_center_right">&nbsp;</td> <td class="b_center_right">&nbsp;</td>

@ -1,5 +1,5 @@
var sankoreLang = { var sankoreLang = {
display: "Показать", display: "Закрыть",
edit: "Изменить", edit: "Изменить",
first_desc: "Нечетные числа", first_desc: "Нечетные числа",
second_desc: "Четные числа", second_desc: "Четные числа",
@ -11,7 +11,8 @@ var sankoreLang = {
pad: "Планшет", pad: "Планшет",
none: "Нет", none: "Нет",
help: "Помощь", help: "Помощь",
help_content: "Пример текста помощи ..." help_content: "Пример текста помощи ...",
theme: "Тема"
}; };
//main function //main function
@ -23,9 +24,11 @@ function start(){
$("#wgt_reload").text(sankoreLang.reload); $("#wgt_reload").text(sankoreLang.reload);
$("#wgt_help").text(sankoreLang.help); $("#wgt_help").text(sankoreLang.help);
$("#help").html(sankoreLang.help_content); $("#help").html(sankoreLang.help_content);
$(".style_select option[value='1']").text(sankoreLang.slate); $("#style_select option[value='1']").text(sankoreLang.slate);
$(".style_select option[value='2']").text(sankoreLang.pad); $("#style_select option[value='2']").text(sankoreLang.pad);
$(".style_select option[value='3']").text(sankoreLang.none); $("#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(window.sankore){
if(sankore.preference("categoriser_images","")){ if(sankore.preference("categoriser_images","")){
@ -47,11 +50,13 @@ function start(){
$("#wgt_help").click(function(){ $("#wgt_help").click(function(){
var tmp = $(this); var tmp = $(this);
if($(this).hasClass("open")){ if($(this).hasClass("open")){
$(this).removeClass("help_pad").removeClass("help_wood")
$("#help").slideUp("100", function(){ $("#help").slideUp("100", function(){
tmp.removeClass("open"); tmp.removeClass("open");
$("#data").show(); $("#data").show();
}); });
} else { } else {
($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
$("#data").hide(); $("#data").hide();
$("#help").slideDown("100", function(){ $("#help").slideDown("100", function(){
tmp.addClass("open"); tmp.addClass("open");
@ -72,7 +77,7 @@ function start(){
exportData(); exportData();
}); });
$(".style_select").change(function (event){ $("#style_select").change(function (event){
changeStyle($(this).find("option:selected").val()); changeStyle($(this).find("option:selected").val());
}) })
@ -81,7 +86,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_edit").removeClass("selected"); $("#wgt_edit").removeClass("selected");
$(".style_select").css("display","none"); $("#parameters").css("display","none");
sankore.enableDropOnWidget(false); sankore.enableDropOnWidget(false);
$(".add_block").remove(); $(".add_block").remove();
$(".cont").each(function(){ $(".cont").each(function(){
@ -111,7 +116,7 @@ function start(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -151,7 +156,7 @@ function start(){
if(!$(this).hasClass("selected")){ if(!$(this).hasClass("selected")){
$(this).addClass("selected"); $(this).addClass("selected");
$("#wgt_display").removeClass("selected"); $("#wgt_display").removeClass("selected");
$(".style_select").css("display","block"); $("#parameters").css("display","block");
sankore.enableDropOnWidget(true); sankore.enableDropOnWidget(true);
$(".cont").each(function(){ $(".cont").each(function(){
var container = $(this); var container = $(this);
@ -232,7 +237,7 @@ function exportData(){
if($("#wgt_edit").hasClass("selected")){ if($("#wgt_edit").hasClass("selected")){
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.mode = "edit";
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
@ -245,7 +250,6 @@ function exportData(){
var img_obj = new Object(); var img_obj = new Object();
img_obj.value = $(this).find("input").val(); 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.ht = $(this).find("img").height();
img_obj.wd = $(this).find("img").width(); img_obj.wd = $(this).find("img").width();
img_cont.imgs.push(img_obj); img_cont.imgs.push(img_obj);
@ -257,7 +261,7 @@ function exportData(){
} else { } else {
$(".cont").each(function(){ $(".cont").each(function(){
var cont_obj = new Object(); 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.mode = "display";
cont_obj.conts = []; cont_obj.conts = [];
$(this).find(".imgs_cont").each(function(){ $(this).find(".imgs_cont").each(function(){
@ -270,7 +274,6 @@ function exportData(){
var img_obj = new Object(); var img_obj = new Object();
img_obj.value = $(this).find("input").val(); 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.ht = $(this).find("img").height();
img_obj.wd = $(this).find("img").width(); img_obj.wd = $(this).find("img").width();
img_cont.imgs.push(img_obj); img_cont.imgs.push(img_obj);
@ -282,7 +285,6 @@ function exportData(){
var img = new Object(); var img = new Object();
img.value = $(this).find("input").val(); 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.ht = $(this).find("img").height();
img.wd = $(this).find("img").width(); img.wd = $(this).find("img").width();
cont_obj.all_imgs.push(img); cont_obj.all_imgs.push(img);
@ -293,7 +295,7 @@ function exportData(){
if($(".cont").size() == 0){ if($(".cont").size() == 0){
var cont_obj = new Object(); 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"; cont_obj.tmp = "clear";
array_to_export.push(cont_obj); array_to_export.push(cont_obj);
} }
@ -308,11 +310,11 @@ function importData(data){
for(var i in data){ for(var i in data){
if(data[i].tmp){ if(data[i].tmp){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} else { } else {
if(i == 0){ if(i == 0){
changeStyle(data[i].style); changeStyle(data[i].style);
$(".style_select").val(data[i].style); $("#style_select").val(data[i].style);
} }
if(data[i].mode == "edit"){ if(data[i].mode == "edit"){
var tmp_array = []; var tmp_array = [];
@ -342,7 +344,7 @@ function importData(data){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -414,7 +416,7 @@ function importData(data){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -459,6 +461,7 @@ function importData(data){
} }
}); });
container.appendTo("#data"); container.appendTo("#data");
checkCorrectness(all_imgs);
} }
} }
} }
@ -521,7 +524,7 @@ function showExample(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -532,7 +535,7 @@ function showExample(){
drop: function(event, ui) { drop: function(event, ui) {
if($(ui.draggable).parent().parent().html() == $(this).parent().html()){ if($(ui.draggable).parent().parent().html() == $(this).parent().html()){
var tmp_ui = $(ui.draggable).parent(); var tmp_ui = $(ui.draggable).parent();
checkOnDrop($(this), $(ui.draggable)); $(this).append($(ui.draggable));
checkCorrectness(tmp_ui); checkCorrectness(tmp_ui);
} }
} }
@ -562,9 +565,9 @@ function addCategory(obj){
$("<button class='del_category'></button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);");
} }
//add new container //add new container
@ -583,9 +586,9 @@ function addContainer(){
$("<button class='del_category'></button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
.attr("ondrop", "$(this).css(\"background-color\",\"\"); return onDropTarget(this,event);"); .attr("ondrop", "$(this).css(\"background-color\",\"#e6f6ff\"); return onDropTarget(this,event);");
container.insertBefore($(".add_block")); container.insertBefore($(".add_block"));
} }
@ -639,10 +642,10 @@ function changeStyle(val){
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload"); $("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help"); $("#wgt_help").removeClass("pad_color").removeClass("pad_help");
$("#wgt_edit").removeClass("pad_color").removeClass("pad_edit"); $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color"); $("#wgt_name").removeClass("pad_color");
$(".style_select").removeClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").addClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").addClass("radius_ft");
break; break;
case "2": case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back"); $(".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_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_help").addClass("pad_color").addClass("pad_help"); $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("pad_select").removeClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").removeClass("without_radius"); $("#style_select").val(val);
$("body, html").removeClass("without_radius").removeClass("radius_ft");
break; break;
case "3": case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad"); $(".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_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload"); $("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit"); $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_display").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color"); $("#wgt_name").addClass("pad_color");
$(".style_select").addClass("none_select").val(val); $("#wgt_display").removeClass("display_wood");
$("body, html").addClass("without_radius"); $("#style_select").val(val);
$("body, html").addClass("without_radius").removeClass("radius_ft");
break; break;
} }
} }
@ -688,8 +691,7 @@ function returnId(){
} }
//a func for checking when smth will drop //a func for checking when smth will drop
function checkOnDrop(dest, source){ function checkOnDrop(dest){
dest.append(source);
var tmp_count = dest.find("input[name='count']").val(); var tmp_count = dest.find("input[name='count']").val();
var tmp_mask = dest.find("input[name='mask']").val(); var tmp_mask = dest.find("input[name='mask']").val();
if(dest.find(".img_block").size() == tmp_count){ if(dest.find(".img_block").size() == tmp_count){
@ -699,47 +701,35 @@ function checkOnDrop(dest, source){
tmp_right = false; tmp_right = false;
}); });
if(tmp_right) if(tmp_right)
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("red_cont").addClass("green_cont");
.removeClass("red_cont")
.addClass("green_cont");
else else
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont");
.removeClass("green_cont")
.addClass("red_cont");
} else } else
dest.removeClass("def_cont") dest.removeClass("def_cont").removeClass("green_cont").addClass("red_cont");
.removeClass("green_cont")
.addClass("red_cont");
} }
//checking source on correctness //checking source on correctness
function checkCorrectness(source){ function checkCorrectness(source){
if(!source.hasClass("all_imgs")){ if(!source.hasClass("all_imgs")){
var tmp_count = source.find("input[name='count']").val(); if(source.parent().find(".all_imgs").find(".img_block").size() == 0){
var tmp_mask = source.find("input[name='mask']").val(); source.parent().find(".imgs_cont").each(function(){
if(source.find(".img_block").size() == tmp_count){ checkOnDrop($(this))
var tmp_right = true; })
source.find(".img_block").each(function(){ } else {
if($(this).find("input").val() != tmp_mask) source.parent().find(".imgs_cont").each(function(){
tmp_right = false; $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont");
}); })
}
if(tmp_right) } else {
source.removeClass("def_cont") if(source.find(".img_block").size() > 0){
.removeClass("red_cont") source.parent().find(".imgs_cont").each(function(){
.addClass("green_cont"); $(this).addClass("def_cont").removeClass("green_cont").removeClass("red_cont");
else })
source.removeClass("def_cont") } else {
.removeClass("green_cont") source.parent().find(".imgs_cont").each(function(){
.addClass("red_cont"); checkOnDrop($(this))
} 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");
} }
} }

@ -3,7 +3,7 @@ html, body{
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-radius: 50px; border-radius: 35px;
overflow: hidden; overflow: hidden;
} }
@ -28,14 +28,6 @@ body{
margin: 5px 10px; 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{ #display_text, #edit_text{
height: 19px; height: 19px;
padding: 3px 0 0 0; padding: 3px 0 0 0;
@ -286,57 +278,40 @@ body{
margin: 10px 10px 0 10px; margin: 10px 10px 0 10px;
padding: 0; padding: 0;
float: left; float: left;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; color: #7F613F;
text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{
cursor: pointer; cursor: pointer;
height: 44px;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
float: right; float: right;
/*font-family: "Lobster13Regular";*/ font-family: Arial,Helvetica,sans-serif;
font-size: 24px; font-size: 24px;
color: #8c5730; line-height: 32px;
} }
#wgt_display{ #wgt_display{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/toolbar-edit.png) left -32px no-repeat;
background-repeat: no-repeat; color: white;
background-position: top 0;
display: none; display: none;
} }
#wgt_edit{ #wgt_edit{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-edit.png); background: url(../img/slate-toolbar-edit.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#wgt_reload{ #wgt_reload{
padding-left: 40px; padding-left: 35px;
background-image: url(../img/slate-toolbar-reload.png); background: url(../img/slate-toolbar-reload.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; 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{ .btl_pad{
@ -371,51 +346,50 @@ body{
background-image: url(../img/pad-bottom-right.png) !important; background-image: url(../img/pad-bottom-right.png) !important;
} }
.pad_color{ .without_radius{
color: white !important; border-radius: 0 !important;
} }
.pad_reload{ .without_back{
background-image: url(../img/slate-toolbar-reload-white.png) !important; background: none !important;
} }
.pad_edit{ .pad_color{
background-image: url(../img/slate-display.png) !important; color: #FC9 !important;
text-shadow: none !important;
} }
.pad_select{ .pad_reload{
background-color: black !important; background: url(../img/toolbar-reload.png) left top no-repeat !important;
color: white !important;
background-image: url(../img/ar_down_white.png) !important;
} }
.without_radius{ .pad_edit{
border-radius: 0 !important; background: url(../img/toolbar-edit.png) left top no-repeat !important;
} }
.without_back{ .pad_help{
background: none !important; background: url(../img/toolbar-help.png) left top no-repeat !important;
} }
.none_select{ .help_wood{
background-color: #333 !important; background: url(../img/slate-toolbar-help.png) left -32px no-repeat !important;
color: white !important; color: white !important;
background-image: url(../img/ar_down_white.png) !important; text-shadow: #7F613F 0 -1px 0 !important;
} }
.pad_help{ .help_pad{
background-image: url(../img/slate-help-white.png) !important; background: url(../img/toolbar-help.png) left -32px no-repeat !important;
color: white !important;
} }
#wgt_help{ #wgt_help{
padding-left: 32px; padding-left: 35px;
background-image: url(../img/slate-help.png); background: url(../img/slate-toolbar-help.png) left top no-repeat;
background-repeat: no-repeat; color: #7F613F;
background-position: top 0; text-shadow: #FFDCA9 0 1px 0;
} }
#help{ #help{
width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
display: none; display: none;
@ -426,3 +400,34 @@ body{
.open{ .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;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save