From c60b3feb08084fe65c8612c6025a1b3e19b0904f Mon Sep 17 00:00:00 2001 From: maximXbs Date: Tue, 11 Sep 2012 17:03:16 +0200 Subject: [PATCH] Sankore-946 issue --- .../Ordre lettres.wgt/css/basic.css | 34 +- .../Ordre lettres.wgt/index.html | 4 +- .../Ordre lettres.wgt/js/jquery-1.6.2.min.js | 18 - .../Ordre lettres.wgt/js/jquery-1.8.0.min.js | 2 + .../js/jquery-ui-1.8.23.custom.min.js | 125 +++ .../js/jquery-ui-1.8.9.custom.min.js | 781 ------------------ .../Ordre lettres.wgt/js/script.js | 87 +- .../Ordre lettres.wgt/locales/fr/index.html | 4 +- .../Ordre lettres.wgt/locales/fr/js/script.js | 91 +- .../Ordre lettres.wgt/locales/ru/index.html | 8 +- .../Ordre lettres.wgt/locales/ru/js/script.js | 89 +- 11 files changed, 268 insertions(+), 975 deletions(-) delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/js/jquery-1.6.2.min.js create mode 100644 resources/library/interactivities/Ordre lettres.wgt/js/jquery-1.8.0.min.js create mode 100644 resources/library/interactivities/Ordre lettres.wgt/js/jquery-ui-1.8.23.custom.min.js delete mode 100644 resources/library/interactivities/Ordre lettres.wgt/js/jquery-ui-1.8.9.custom.min.js diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 26583dd9..4573addc 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -64,12 +64,6 @@ body{ min-height: 60px; } -.imgs_cont{ - width: 100%; - min-height: 62px; - margin: 0; -} - .imgs_answers_gray{ } @@ -115,19 +109,41 @@ body{ left: 5px; } -.img_block{ - width: 50px; +#sortable{ +/* width: 100%; + min-height: 62px; + margin: 0;*/ + list-style-type: none; + margin: 10px 0 10px 20px; + padding: 0; +} + +#sortable li{ +/* width: 50px; height: 50px; margin: 5px 10px; cursor: pointer; + float: left; display: inline-block; position: relative; background-color: white; 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%;*/ + margin: 5px 10px; + display: inline-table; + width: 50px; + height: 50px; + background-color: white; font-size: 230%; + -webkit-box-shadow: #ccc -1px 0 4px; + box-shadow: #ccc -1px 0 4px; + text-align: center; +} + +.highlight { + background-color: #999 !important; } .add_block{ diff --git a/resources/library/interactivities/Ordre lettres.wgt/index.html b/resources/library/interactivities/Ordre lettres.wgt/index.html index 1aec98d8..1ccdeec9 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/index.html +++ b/resources/library/interactivities/Ordre lettres.wgt/index.html @@ -6,8 +6,8 @@ - - + + - + + - + + - + diff --git a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js index e9fb0b36..3377a85c 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js @@ -68,8 +68,8 @@ function start(){ $("#wgt_reload").click(function(){ if($("#wgt_display").hasClass("selected")){ - $("#wgt_edit").trigger("click"); - $("#wgt_display").trigger("click"); + setTimeout('$("#wgt_display").trigger("click")', 10) + $("#wgt_edit").trigger("click"); } else { $("#wgt_display").trigger("click"); } @@ -95,7 +95,7 @@ function start(){ $(".cont").each(function(){ var container = $(this); var tmp_array = []; - var imgs_container = container.find(".imgs_cont"); + var ans_container = container.find(".audio_answer"); container.find(".text_cont .audio_desc").removeAttr("contenteditable"); container.find(".audio_block").removeAttr("ondragenter") @@ -103,19 +103,18 @@ function start(){ .removeAttr("ondragover") .removeAttr("ondrop") container.find(".close_cont").remove(); - var answer = imgs_container.find(".audio_answer").text(); - imgs_container.find(".audio_answer").remove(); - imgs_container.find("input").val(answer); + var answer = ans_container.text(); + ans_container.prev().val(answer) + ans_container.remove(); + var ul_cont = $("