diff --git a/resources/library/interactivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css index b40b8bb7..ad7c7371 100644 --- a/resources/library/interactivities/Choisir.wgt/css/basic.css +++ b/resources/library/interactivities/Choisir.wgt/css/basic.css @@ -16,7 +16,7 @@ html, body{ height: 100%; margin: 0; padding: 0; - border-radius: 50px; + border-radius: 35px; overflow: hidden; } @@ -471,57 +471,40 @@ body{ margin: 10px 10px 0 10px; padding: 0; float: left; - font-family: "Lobster13Regular"; + font-family: Arial,Helvetica,sans-serif; font-size: 24px; - color: #8c5730; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload, #wgt_edit, #wgt_display, #wgt_help{ cursor: pointer; - height: 44px; margin: 10px 10px 0 0; float: right; - font-family: "Lobster13Regular"; - font-size: 24px; - color: #8c5730; + font-family: Arial,Helvetica,sans-serif; + font-size: 24px; + line-height: 32px; } #wgt_display{ - padding-left: 40px; - background-image: url(../images/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../images/toolbar-edit.png) left -32px no-repeat; + color: white; display: none; } #wgt_edit{ - padding-left: 40px; - background-image: url(../images/slate-edit.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../images/slate-toolbar-edit.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #wgt_reload{ - padding-left: 40px; - background-image: url(../images/slate-toolbar-reload.png); - background-repeat: no-repeat; - background-position: top 0; -} - -.style_select{ - width: 120px; - font-family: "Lobster13Regular"; - font-size: 24px; - float: right; - margin: 10px 20px 0 0; - border-radius: 10px; - background-image: url(../images/ar_down.png); - background-color: #d4aa79; - color: #8c5730; - background-position: 105px 11px; - background-repeat: no-repeat; - -webkit-appearance: menulist-text; - display: none; + padding-left: 35px; + background: url(../images/slate-toolbar-reload.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } .btl_pad{ @@ -556,51 +539,50 @@ body{ background-image: url(../images/pad-bottom-right.png) !important; } -.pad_color{ - color: white !important; +.without_radius{ + border-radius: 0 !important; } -.pad_reload{ - background-image: url(../images/slate-toolbar-reload-white.png) !important; +.without_back{ + background: none !important; } -.pad_edit{ - background-image: url(../images/slate-display.png) !important; +.pad_color{ + color: #FC9 !important; + text-shadow: none !important; } -.pad_select{ - background-color: black !important; - color: white !important; - background-image: url(../images/ar_down_white.png) !important; +.pad_reload{ + background: url(../images/toolbar-reload.png) left top no-repeat !important; } -.without_radius{ - border-radius: 0 !important; +.pad_edit{ + background: url(../images/toolbar-edit.png) left top no-repeat !important; } -.without_back{ - background: none !important; +.pad_help{ + background: url(../images/toolbar-help.png) left top no-repeat !important; } -.none_select{ - background-color: #333 !important; +.help_wood{ + background: url(../images/slate-toolbar-help.png) left -32px no-repeat !important; color: white !important; - background-image: url(../images/ar_down_white.png) !important; + text-shadow: #7F613F 0 -1px 0 !important; } -.pad_help{ - background-image: url(../images/slate-help-white.png) !important; +.help_pad{ + background: url(../images/toolbar-help.png) left -32px no-repeat !important; + color: white !important; } #wgt_help{ - padding-left: 32px; - background-image: url(../images/slate-help.png); - background-repeat: no-repeat; - background-position: top 0; + padding-left: 35px; + background: url(../images/slate-toolbar-help.png) left top no-repeat; + color: #7F613F; + text-shadow: #FFDCA9 0 1px 0; } #help{ - width: 100%; height: 100%; overflow: auto; display: none; @@ -609,5 +591,36 @@ body{ } .open{ - + +} + +#parameters{ + display: none; + padding: 10px 20px; + background: url("../images/parameters-bg.png"); + border-radius: 4px 4px 0 0; +} + +.inline{ + display: inline-block; + font-family: "helvetica neue"; + font-size: 14px; + color: #666; +} + +#parameters label { + font-style: italic; +} + +#style_select{ + margin-left: 10px; +} + +.display_wood{ + background: url(../images/slate-toolbar-edit.png) left -32px no-repeat !important; + text-shadow: #7F613F 0 -1px 0; +} + +.radius_ft{ + border-radius: 45px !important; } \ No newline at end of file diff --git a/resources/library/interactivities/Choisir.wgt/images/ar_down.png b/resources/library/interactivities/Choisir.wgt/images/ar_down.png deleted file mode 100644 index a20fab4f..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/ar_down.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/ar_down_white.png b/resources/library/interactivities/Choisir.wgt/images/ar_down_white.png deleted file mode 100644 index 4a1d133b..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/ar_down_white.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/parameters-bg.png b/resources/library/interactivities/Choisir.wgt/images/parameters-bg.png new file mode 100644 index 00000000..36f648e1 Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/parameters-bg.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-display.png b/resources/library/interactivities/Choisir.wgt/images/slate-display.png deleted file mode 100644 index 96166143..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-display.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-edit.png b/resources/library/interactivities/Choisir.wgt/images/slate-edit.png deleted file mode 100644 index 17f5fc5c..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-edit.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-help-white.png b/resources/library/interactivities/Choisir.wgt/images/slate-help-white.png deleted file mode 100644 index 7b5ebfd8..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-help-white.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-help.png b/resources/library/interactivities/Choisir.wgt/images/slate-help.png deleted file mode 100644 index 069052d0..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-help.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png new file mode 100644 index 00000000..fb7cdeba Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-help.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png deleted file mode 100644 index 78d146ec..00000000 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload-white.png and /dev/null differ diff --git a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png index 685a5cb2..844169a9 100644 Binary files a/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png and b/resources/library/interactivities/Choisir.wgt/images/slate-toolbar-reload.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png b/resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png new file mode 100644 index 00000000..daa338cd Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/toolbar-edit.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/toolbar-help.png b/resources/library/interactivities/Choisir.wgt/images/toolbar-help.png new file mode 100644 index 00000000..6c4454c0 Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/toolbar-help.png differ diff --git a/resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png b/resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png new file mode 100644 index 00000000..340d7371 Binary files /dev/null and b/resources/library/interactivities/Choisir.wgt/images/toolbar-reload.png differ diff --git a/resources/library/interactivities/Choisir.wgt/index.html b/resources/library/interactivities/Choisir.wgt/index.html index 5d5bc7cd..9c9a371e 100644 --- a/resources/library/interactivities/Choisir.wgt/index.html +++ b/resources/library/interactivities/Choisir.wgt/index.html @@ -54,12 +54,7 @@ and open the template in the editor.
- - +Pour supprimer un exercice, cliquez sur la croix à droite du numéro de ”Options”.
"+ -"Le bouton “Afficher” vous permet d’utiliser l’activité.
" +"Le bouton “Afficher” vous permet d’utiliser l’activité.
", +theme: "Thème" }; var questionArray; @@ -85,10 +86,11 @@ function init(){ $("#wgt_reload").text(sankoreLang.reload); $("#wgt_help").text(sankoreLang.help); $("#help").html(sankoreLang.help_content); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); - $(".style_select option[value='3']").text(sankoreLang.none); - + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='3']").text(sankoreLang.none); + var tmpl = $("div.inline label").html(); + $("div.inline label").html(sankoreLang.theme + tmpl) //popup message var popupText = $("").appendTo("#data"); @@ -127,14 +129,14 @@ function init(){ if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } if(window.sankore) if(sankore.preference("choisir_style","")){ changeStyle(sankore.preference("choisir_style","")); - $(".style_select").val(sankore.preference("choisir_style","")); + $("#style_select").val(sankore.preference("choisir_style","")); } else changeStyle("3") @@ -143,21 +145,21 @@ function init(){ if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_edit").removeClass("selected"); - $(".style_select").css("display","none"); + $("#parameters").css("display","none"); $(this).css("display", "none"); $("#wgt_edit").css("display", "block"); displayData(true); mode = true; if(window.sankore){ sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); - sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); + sankore.setPreference("choisir_style", $("#style_select").find("option:selected").val()); } } } else { if(!$(this).hasClass("selected")){ $(this).addClass("selected"); $("#wgt_display").removeClass("selected"); - $(".style_select").css("display","block"); + $("#parameters").css("display","block"); $(this).css("display", "none"); $("#wgt_display").css("display", "block"); editData(); @@ -165,15 +167,17 @@ function init(){ } } }); - + $("#wgt_help").click(function(){ var tmp = $(this); if($(this).hasClass("open")){ + $(this).removeClass("help_pad").removeClass("help_wood") $("#help").slideUp("100", function(){ tmp.removeClass("open"); $("#data").show(); }); - } else { + } else { + ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad"); $("#data").hide(); $("#help").slideDown("100", function(){ tmp.addClass("open"); @@ -192,10 +196,10 @@ function init(){ } }); - $(".style_select option[value='1']").text(sankoreLang.slate); - $(".style_select option[value='2']").text(sankoreLang.pad); + $("#style_select option[value='1']").text(sankoreLang.slate); + $("#style_select option[value='2']").text(sankoreLang.pad); - $(".style_select").change(function (event){ + $("#style_select").change(function (event){ changeStyle($(this).find("option:selected").val()); }) @@ -477,71 +481,71 @@ function init(){ // show questions and answers in display mode function addToPage(array){ - var counter = 1; - for(var i in array){ + var counter = 1; + for(var i in array){ - var qstDiv = $("