diff --git a/JournalDesModifications.pdf b/JournalDesModifications.pdf index ca52c5d6..cb4a07e9 100644 Binary files a/JournalDesModifications.pdf and b/JournalDesModifications.pdf differ diff --git a/ReleaseNotes.pdf b/ReleaseNotes.pdf index 4d86e6e7..26bc0207 100644 Binary files a/ReleaseNotes.pdf and b/ReleaseNotes.pdf differ diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index 4e600cb0..b9a7fbf9 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -38,7 +38,7 @@ REM is correct. This is important because installer REM pick up dll from this directory IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR -REM rmdir /S /Q %BUILD_DIR% +rmdir /S /Q %BUILD_DIR% set EDITION=MNEMIS_EDITION diff --git a/resources/etc/freezedWidgetWrapper.html b/resources/etc/freezedWidgetWrapper.html index 56f2f42a..00aaeb1b 100644 --- a/resources/etc/freezedWidgetWrapper.html +++ b/resources/etc/freezedWidgetWrapper.html @@ -9,9 +9,19 @@ width: 100%; } - div{ + #freezed{ text-align: center; - border: 5px #ccc outset; + border: 5px solid #ccc; + border-radius: 80px; + box-shadow: inset 0 0 30px rgba(66,66,66,0.5); + } + + .loading{ + color: #999; + font-weight: bold; + font-size: large; + margin-top: 5px; + margin-left: 5px; } -
Widget freezed.
+
Loading ...
\ No newline at end of file diff --git a/resources/etc/img/loading.gif b/resources/etc/img/loading.gif new file mode 100644 index 00000000..feb4229e Binary files /dev/null and b/resources/etc/img/loading.gif differ diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index 033ef2d2..51369796 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass images.wgt/css/basic.css @@ -64,7 +64,7 @@ body{ .sub_cont{ width: 100%; padding: 0; - margin: 20px 0 0 0; + margin: 20px 0 5px 0; min-height: 60px; } @@ -84,7 +84,7 @@ body{ } .imgs_answers_gray{ - + } .imgs_answers_green{ @@ -114,11 +114,12 @@ body{ min-height: 40px; max-height: 60px; float: right; - overflow: auto; + overflow-x: hidden; background-color: #ccc; border-top-left-radius: 10px; border-bottom-left-radius: 10px; - padding-left: 10px; + padding-left: 10px; + word-break: break-all; } .close_cont{ @@ -207,7 +208,7 @@ body{ } .dropBack{ - + } /* new design */ @@ -417,5 +418,5 @@ body{ } .open{ - + } \ No newline at end of file diff --git a/resources/library/interactivities/Ass sons.wgt/css/basic.css b/resources/library/interactivities/Ass sons.wgt/css/basic.css index b684a1d8..9045c831 100644 --- a/resources/library/interactivities/Ass sons.wgt/css/basic.css +++ b/resources/library/interactivities/Ass sons.wgt/css/basic.css @@ -218,6 +218,7 @@ body{ overflow-x: hidden; float: right; margin-left: 20px; + word-break: break-all; } .play, .stop{ diff --git a/resources/library/interactivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css index a391cfa7..0472e8ce 100644 --- a/resources/library/interactivities/Choisir.wgt/css/basic.css +++ b/resources/library/interactivities/Choisir.wgt/css/basic.css @@ -149,12 +149,10 @@ body{ font-family: Verdana,Arial,Helvetica,sans-serif; font-size: small; border: 3px solid #ccc; - -webkit-border-radius: 5px; border-radius: 5px; - -moz-box-shadow: #dadada -1px 0 4px; - -webkit-box-shadow: #dadada -1px 0 4px; box-shadow: #dadada -1px 0 4px; color: white; + word-break: break-all; } .qstContentDisplay{ @@ -169,6 +167,7 @@ body{ border: 1px solid #DFDFDE; border-top-left-radius: 10px; border-bottom-left-radius: 10px; + word-break: break-all; } .ansDiv{ @@ -222,12 +221,10 @@ body{ overflow-x: hidden; float: left; border: 3px solid #ccc; - -webkit-border-radius: 5px; border-radius: 5px; - -moz-box-shadow: #dadada -1px 0 4px; - -webkit-box-shadow: #dadada -1px 0 4px; box-shadow: #dadada -1px 0 4px; color: white; + word-break: break-all; } .ansContentDisplay{ @@ -244,6 +241,7 @@ body{ border-top-left-radius: 10px; border-bottom-left-radius: 10px; color: white; + word-break: break-all; } .ansDelete{ diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css index cc891579..48ab3bb5 100644 --- a/resources/library/interactivities/Ordre images.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css @@ -60,7 +60,7 @@ body{ .sub_cont{ width: 100%; padding: 0; - margin: 20px 0 0 0; + margin: 20px 0 5px 0; min-height: 60px; } @@ -93,6 +93,7 @@ body{ border-top-left-radius: 10px; border-bottom-left-radius: 10px; padding-left: 10px; + word-break: break-all; } .close_cont{ diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 6830edb2..26583dd9 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -172,6 +172,7 @@ body{ overflow-x: hidden; float: right; margin-left: 20px; + word-break: break-all; } .play, .stop{ @@ -205,16 +206,15 @@ body{ .audio_answer{ min-height: 50px; + min-width: 200px; + max-width: 700px; margin: 5px 10px; padding: 0 10px; background-color: white; - display: inline-block; - position: relative; border: 1px solid #ccc; - -moz-box-shadow: #ccc -1px 0 4px; - -webkit-box-shadow: #ccc -1px 0 4px; box-shadow: #ccc -1px 0 4px; font-size: 230%; + word-wrap: break-word; } /*new design*/ diff --git a/resources/library/interactivities/Ordre lettres.wgt/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/js/script.js index 66e9855f..b018fe93 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/js/script.js @@ -337,7 +337,7 @@ function showExample(){ var audio_block = $("
").appendTo(text); $("
").appendTo(audio_block); $("
").appendTo(audio_block); - var source = $("").attr("src", "objects/beep.wav"); + var source = $("").attr("src", "objects/beep.mp3"); var audio = $("