diff --git a/Sankore.iss b/Sankore.iss
deleted file mode 100644
index 939a468a..00000000
--- a/Sankore.iss
+++ /dev/null
@@ -1,134 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B}
-AppName=Sankore
-AppVerName=Sankore
-AppPublisher=Sankore
-
-AppPublisherURL=http://dev.open-sankore.org
-AppSupportURL=http://dev.open-sankore.org
-AppUpdatesURL=http://dev.open-sankore.org
-
-DefaultDirName={pf}\Sankore
-DefaultGroupName=Sankore
-
-OutputDir=.\install\win32\
-OutputBaseFilename=Sankore
-SetupIconFile=.\resources\win\uniboard.ico
-Compression=lzma
-SolidCompression=yes
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
-Name: "gr"; MessagesFile: "compiler:Languages\German.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "sp"; MessagesFile: "compiler:Languages\Spanish.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[InstallDelete]
-
-Type: files ; Name: "{app}\Sankore.pdb"
-Type: filesandordirs ; Name: "{app}\library"
-Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT"
-Type: filesandordirs ; Name: "{app}\plugins"
-Type: filesandordirs ; Name: "{app}\i18n"
-Type: files ; Name: "{app}\*.dll"
-
-[Files]
-Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}"
-Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-;OpenSSL
-Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
-Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion
-
-;Qt base dll
-Source: "..\Qt-sankore3.1\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion
-
-;Qt plugins
-Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblewidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\bearer\qgenericbearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\bearer\qnativewifibearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qcncodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qjpcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qkrcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\codecs\qtwcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\graphicssystems\qglgraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\graphicssystems\qtracegraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\iconengines\qsvgicon4.dll"; DestDir: "{app}\iconengines"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qgif4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qico4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qmng4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "..\Qt-sankore3.1\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\Sankore"; Filename: "{app}\Sankore.exe"
-Name: "{group}\{cm:UninstallProgram,Sankore}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\Sankore"; Filename: "{app}\Sankore.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Sankore"; Filename: "{app}\Sankore.exe"; Tasks: quicklaunchicon
-;Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app}
-
-[Registry]
-Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "SankoreFile"; ValueType: string; ValueName: ""; ValueData: "Sankore document"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Sankore.exe,1"
-Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Sankore.exe"" ""%1"""
-
-Root: HKLM; Subkey: "SOFTWARE\Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-
-Root: HKLM; Subkey: "SOFTWARE\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: dword; ValueName: "Policy"; ValueData: "3"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppName"; ValueData: "Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppPath"; ValueData: "{app}"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-
-Root: HKLM64; Subkey: "SOFTWARE\Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
-
-Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: dword; ValueName: "Policy"; ValueData: "3"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppName"; ValueData: "Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppPath"; ValueData: "{app}"; Flags: uninsdeletevalue; Check: isProcessorX64
-
-[Run]
-Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}"
-Filename: "{app}\Sankore.exe"; Description: "{cm:LaunchProgram,Sankore}"; Flags: nowait postinstall
-
-[UninstallDelete]
-; cleanup and delete whole installation directory
-Name: {app}; Type: filesandordirs
-
-[Code]
-function isProcessorX64: Boolean;
-begin
- Result := (ProcessorArchitecture = paX64);
-end;
-
-function isProcessorNotX64: Boolean;
-begin
- Result := not isProcessorX64;
-end;
-
diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 3005b8b1..a8467a52 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -13,7 +13,7 @@ linux-g++-64 {
VERSION_MAJ = 1
VERSION_MIN = 40
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 01
+VERSION_PATCH = 02
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "")
diff --git a/release.win7.vc9.64.bat b/release.win7.vc9.64.bat
new file mode 100644
index 00000000..ace21254
--- /dev/null
+++ b/release.win7.vc9.64.bat
@@ -0,0 +1,71 @@
+REM --------------------------------------------------------------------
+REM This program is free software: you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation, either version 3 of the License, or
+REM (at your option) any later version.
+REM
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+REM GNU General Public License for more details.
+REM
+REM You should have received a copy of the GNU General Public License
+REM along with this program. If not, see .
+REM ---------------------------------------------------------------------
+
+set QT_DIR=..\Qt-sankore3.1
+set QT_BIN=%QT_DIR%\bin
+
+set PROGRAMS_FILE_PATH=C:\Program Files (x86)
+
+set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin
+set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 9.0\VC\bin
+set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin
+set INNO_EXE=%PROGRAMS_FILE_PATH%\Inno Setup 5\iscc.exe
+set BUILD_DIR=build\win32\release
+set LRELEASE=%QT_DIR%\bin\lrelease
+
+set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%GIT_BIN%
+
+call "%VS_BIN%\vcvars32.bat"
+
+echo %PATH%
+
+REM this checks if the custom qt directory path
+REM is correct. This is important because installer
+REM pick up dll from this directory
+IF NOT EXIST "..\Qt-sankore3.1\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
+
+REM rmdir /S /Q %BUILD_DIR%
+
+set EDITION=MNEMIS_EDITION
+
+"%QT_BIN%\qmake.exe" "DEFINES+=%EDITION%"
+
+%LRELEASE% Sankore_3.1.pro
+
+set /p VERSION= < build\win32\release\version
+git rev-list --tags --max-count=1 > tmp
+set /p LAST_TAG= < tmp
+erase tmp
+git describe %LAST_TAG% > tmp
+set /p LAST_TAG_VERSION=< tmp
+erase tmp
+
+echo %VERSION%
+echo %LAST_TAG_VERSION%
+
+REM if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
+
+nmake release-install
+
+del ".\build\win32\release\product\Sankore.pdb"
+
+set INSTALLER_NAME=Open-Sankore
+
+set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
+
+call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
+
+:EXIT_WITH_ERROR
+ echo ERROR
diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat
index f5ce23ec..b67d2a0b 100644
--- a/release.win7.vc9.bat
+++ b/release.win7.vc9.bat
@@ -65,7 +65,7 @@ set INSTALLER_NAME=Open-Sankore
set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
-call "%INNO_EXE%" "Sankore.iss" /F"%INSTALLER_NAME%"
+call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
:EXIT_WITH_ERROR
echo ERROR
diff --git a/resources/library/interactive/Anyembed.wgt/css/ubwidget.css b/resources/library/interactive/Anyembed.wgt/css/ubwidget.css
index f75bea11..afa58bd8 100644
--- a/resources/library/interactive/Anyembed.wgt/css/ubwidget.css
+++ b/resources/library/interactive/Anyembed.wgt/css/ubwidget.css
@@ -19,3 +19,6 @@ body{
}
+.bordered{
+ border: 1px solid red;
+}
\ No newline at end of file
diff --git a/resources/library/interactive/Anyembed.wgt/js/languages.js b/resources/library/interactive/Anyembed.wgt/js/languages.js
index 9cf170b7..8e8508e3 100644
--- a/resources/library/interactive/Anyembed.wgt/js/languages.js
+++ b/resources/library/interactive/Anyembed.wgt/js/languages.js
@@ -8,5 +8,4 @@ var sankoreLang = {
"fr":{
"embed": "Intégrer"
}
-};
-
+};
\ No newline at end of file
diff --git a/resources/library/interactive/Anyembed.wgt/js/ubw-main.js b/resources/library/interactive/Anyembed.wgt/js/ubw-main.js
index 283c4622..4af601fa 100644
--- a/resources/library/interactive/Anyembed.wgt/js/ubw-main.js
+++ b/resources/library/interactive/Anyembed.wgt/js/ubw-main.js
@@ -74,25 +74,35 @@ function init(){
$("#ubwidget").append(searchWrap);
submit.click(function(){
- $("#ubwidget").append(loadWindow)
embed = inputBox.val();
- searchWrap.hide();
+ if(embed){
+ $("#ubwidget").append(loadWindow);
+ searchWrap.hide();
- if(/