diff --git a/resources/library/interactivities/Contraste.wgt/css/basic.css b/resources/library/interactivities/Contraste.wgt/css/basic.css
index 64323d60..90530c69 100644
--- a/resources/library/interactivities/Contraste.wgt/css/basic.css
+++ b/resources/library/interactivities/Contraste.wgt/css/basic.css
@@ -3,7 +3,7 @@ html, body{
height: 100%;
margin: 0;
padding: 0;
- border-radius: 50px;
+ border-radius: 35px;
overflow: hidden;
}
@@ -41,8 +41,6 @@ body{
height: 100%;
float: left;
background-color: black;
- -webkit-border-top-left-radius: 7px;
- -webkit-border-bottom-left-radius: 7px;
border-top-left-radius: 7px;
border-bottom-left-radius: 7px;
}
@@ -52,8 +50,6 @@ body{
height: 100%;
float: right;
background-color: yellow;
- -webkit-border-top-right-radius: 7px;
- -webkit-border-bottom-right-radius: 7px;
border-top-right-radius: 7px;
border-bottom-right-radius: 7px;
}
@@ -269,65 +265,55 @@ 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_add, #wgt_help{
+#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;
+ padding-left: 35px;
+ background: url(../images/slate-toolbar-reload.png) left top no-repeat;
+ color: #7F613F;
+ text-shadow: #FFDCA9 0 1px 0;
}
#wgt_add{
- padding-left: 40px;
- background-image: url(../images/plus.png);
- background-repeat: no-repeat;
- background-position: top 0;
- display: none;
+ margin-left: 10px;
+ padding-right: 10px;
+ border: 1px solid #666;
+ border-radius: 15px;
+ padding-left: 30px;
+ background: url(../images/plus.png) -2px -2px no-repeat;
+ display: inline-block;
}
-.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;
+#wgt_add:hover{
+ border-color: black;
+ cursor: pointer;
}
.btl_pad{
@@ -362,55 +348,50 @@ body{
background-image: url(../images/pad-bottom-right.png) !important;
}
-.pad_color{
- color: white !important;
-}
-
-.pad_reload{
- background-image: url(../images/slate-toolbar-reload-white.png) !important;
+.without_radius{
+ border-radius: 0 !important;
}
-.pad_edit{
- background-image: url(../images/slate-display.png) !important;
+.without_back{
+ background: none !important;
}
-.pad_add{
- background-image: url(../images/plus-white.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;
@@ -419,5 +400,37 @@ body{
}
.open{
-
+
+}
+
+#parameters{
+ display: none;
+ margin: 40px 0 0 0;
+ 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/Contraste.wgt/images/ar_down.png b/resources/library/interactivities/Contraste.wgt/images/ar_down.png
deleted file mode 100644
index a20fab4f..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/ar_down.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/ar_down_white.png b/resources/library/interactivities/Contraste.wgt/images/ar_down_white.png
deleted file mode 100644
index 4a1d133b..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/ar_down_white.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/parameters-bg.png b/resources/library/interactivities/Contraste.wgt/images/parameters-bg.png
new file mode 100644
index 00000000..36f648e1
Binary files /dev/null and b/resources/library/interactivities/Contraste.wgt/images/parameters-bg.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/plus-white.png b/resources/library/interactivities/Contraste.wgt/images/plus-white.png
deleted file mode 100644
index 650983ca..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/plus-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/plus.png b/resources/library/interactivities/Contraste.wgt/images/plus.png
index b8d6f764..4ed06b7c 100644
Binary files a/resources/library/interactivities/Contraste.wgt/images/plus.png and b/resources/library/interactivities/Contraste.wgt/images/plus.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-display.png b/resources/library/interactivities/Contraste.wgt/images/slate-display.png
deleted file mode 100644
index 96166143..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/slate-display.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-edit.png b/resources/library/interactivities/Contraste.wgt/images/slate-edit.png
deleted file mode 100644
index 17f5fc5c..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/slate-edit.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-help-white.png b/resources/library/interactivities/Contraste.wgt/images/slate-help-white.png
deleted file mode 100644
index 7b5ebfd8..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/slate-help-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-help.png b/resources/library/interactivities/Contraste.wgt/images/slate-help.png
deleted file mode 100644
index 069052d0..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/slate-help.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-help.png b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-help.png
new file mode 100644
index 00000000..fb7cdeba
Binary files /dev/null and b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-help.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload-white.png b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload-white.png
deleted file mode 100644
index 78d146ec..00000000
Binary files a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload-white.png and /dev/null differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload.png b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload.png
index 685a5cb2..844169a9 100644
Binary files a/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload.png and b/resources/library/interactivities/Contraste.wgt/images/slate-toolbar-reload.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/toolbar-edit.png b/resources/library/interactivities/Contraste.wgt/images/toolbar-edit.png
new file mode 100644
index 00000000..daa338cd
Binary files /dev/null and b/resources/library/interactivities/Contraste.wgt/images/toolbar-edit.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/toolbar-help.png b/resources/library/interactivities/Contraste.wgt/images/toolbar-help.png
new file mode 100644
index 00000000..6c4454c0
Binary files /dev/null and b/resources/library/interactivities/Contraste.wgt/images/toolbar-help.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/images/toolbar-reload.png b/resources/library/interactivities/Contraste.wgt/images/toolbar-reload.png
new file mode 100644
index 00000000..340d7371
Binary files /dev/null and b/resources/library/interactivities/Contraste.wgt/images/toolbar-reload.png differ
diff --git a/resources/library/interactivities/Contraste.wgt/index.html b/resources/library/interactivities/Contraste.wgt/index.html
index 0072e219..8f20fea1 100644
--- a/resources/library/interactivities/Contraste.wgt/index.html
+++ b/resources/library/interactivities/Contraste.wgt/index.html
@@ -5,7 +5,7 @@
-
+
@@ -51,27 +51,33 @@
-
-
-
-
-
-
-
+
+
-
+
-
+
diff --git a/resources/library/interactivities/Contraste.wgt/locales/fr/index.html b/resources/library/interactivities/Contraste.wgt/locales/fr/index.html
index f2cecf06..5c74529e 100644
--- a/resources/library/interactivities/Contraste.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/Contraste.wgt/locales/fr/index.html
@@ -9,7 +9,7 @@ and open the template in the editor.
-
+
@@ -31,27 +31,33 @@ and open the template in the editor.
-
-
-
-
-
-
-
+
+
-
+
-
+
diff --git a/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
index 634dde99..aa40e63e 100644
--- a/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
@@ -14,7 +14,7 @@
*/
var sankoreLang = {
- display: "Afficher",
+ display: "Fermer",
edit: "Modifier",
add: "Ajouter",
enter_data: "Saisir la donnée:",
@@ -28,24 +28,25 @@ var sankoreLang = {
none: "aucun",
help: "Aide",
help_content: "
Contraste "+
-"
Jeu de couleurs. "+
+ "
Jeu de couleurs. "+
-"Cette activité permet de masquer et d’afficher du texte en jouant sur la couleur de fond (jaune ou noir). Le but est de pouvoir faire apparaître des données en passant d’une couleur à l’autre.
"+
+ "Cette activité permet de masquer et d’afficher du texte en jouant sur la couleur de fond (jaune ou noir). Le but est de pouvoir faire apparaître des données en passant d’une couleur à l’autre.
"+
-"Le bouton “Recharger” réinitialise les exercices.
"+
+ "Le bouton “Recharger” réinitialise les exercices.
"+
-"Le bouton “Modifier” vous permet :
"+
-"de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
-"de modifier un exercice ou d’en créer de nouveaux dans la même activité. "+
+ "Le bouton “Modifier” vous permet :
"+
+ "de choisir le thème de l’interactivité : tablette, ardoise ou aucun (par défaut aucun), "+
+ "de modifier un exercice ou d’en créer de nouveaux dans la même activité. "+
-"En mode édition, pour créer un nouvel exercice, cliquez sur “+ Ajouter” en haut, puis
"+
-"saisissez la donnée par exemple “3x15”, "+
-"saisissez le résultat, par exemple “15” et cliquez sur “OK”. "+
-"Pour modifier les données ou les résultats, cliquez directement sur l’exercice.
"+
-"Pour supprimer un exercice, cliquez sur la croix en haut à droite de l’exercice.
"+
+ "En mode édition, pour créer un nouvel exercice, cliquez sur “+ Ajouter” en haut, puis
"+
+ "saisissez la donnée par exemple “3x15”, "+
+ "saisissez le résultat, par exemple “15” et cliquez sur “OK”. "+
+ "Pour modifier les données ou les résultats, cliquez directement sur l’exercice.
"+
+ "Pour supprimer un exercice, cliquez sur la croix en haut à droite de l’exercice.
"+
-"Le bouton “Afficher” vous permet d’utiliser l’activité.
"
+ "Le bouton “Afficher” vous permet d’utiliser l’activité.
",
+ theme: "Thème"
};
function init(){
@@ -61,6 +62,8 @@ function init(){
var flagForSelect = false;
var dragElement = null; //the element that must be dragging
var lang = ""; //locale language
+ var resizeFlag = true;
+
var coords = {
left:0,
top:0
@@ -82,9 +85,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)
if(window.sankore){
if(sankore.preference("blackYellowData","")){
@@ -109,7 +114,7 @@ function init(){
if(window.sankore){
if(sankore.preference("by_style","")){
changeStyle(sankore.preference("by_style",""));
- $(".style_select").val(sankore.preference("by_style",""));
+ $("#style_select").val(sankore.preference("by_style",""));
} else
changeStyle("3")
} else
@@ -120,9 +125,15 @@ function init(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
+ var tmpwh = $(window).height();
+ var tmpww = $(window).width();
+ resizeFlag = true;
+ window.resizeTo(tmpww, tmpwh - 44)
+ $("#data").css("padding-bottom","");
+ $("#leftDiv").css("border-top-left-radius","7px");
+ $("#rightDiv").css("border-top-right-radius","7px");
$(this).css("display", "none");
- $("#wgt_add").css("display", "none");
$("#wgt_edit").css("display", "block");
mode = false;
$(".leftDiv, .rightDiv").animate({
@@ -135,7 +146,7 @@ function init(){
tmpReadyTask.width($(domElem).width())
.height($(domElem).height())
.css("position","absolute")
- .css("top",$(domElem).position().top)
+ .css("top",$(domElem).position().top - 40)
.css("left",$(domElem).position().left)
.find(".taskContainer").removeAttr("contenteditable");
@@ -146,15 +157,22 @@ function init(){
opacityChanged = false;
}
});
+
$(document).disableTextSelect();
}
} else {
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
+ tmpwh = $(window).height();
+ tmpww = $(window).width();
+ resizeFlag = true;
+ window.resizeTo(tmpww, tmpwh + 44)
+ $("#data").css("padding-bottom","42px");
+ $("#leftDiv").css("border-top-left-radius","0px");
+ $("#rightDiv").css("border-top-right-radius","0px");
$(this).css("display", "none");
- $("#wgt_add").css("display", "block");
$("#wgt_display").css("display", "block");
mode = true;
$(document).enableTextSelect();
@@ -189,12 +207,15 @@ 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();
+ ($("#wgt_edit").hasClass("selected"))?$("#parameters").show():'';
});
} else {
- $("#data").hide();
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
+ $("#data, #parameters").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
});
@@ -218,10 +239,10 @@ function init(){
$(document).disableTextSelect();
});
- $(".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());
})
@@ -372,12 +393,12 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px");
else
- curr.css("top", "60px").css("left", prevLeft + 255 + "px");
+ curr.css("top", "100px").css("left", prevLeft + 255 + "px");
} else {
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else
- curr.css("top", "60px").css("left", prevLeft + 255 + "px");
+ curr.css("top", "100px").css("left", prevLeft + 255 + "px");
}
prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left;
@@ -390,28 +411,31 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){
- if($("#wgt_edit").hasClass("selected")){
- if($(".editContainer").size() > 1){
- var prev = $(".editContainer:first"),
- prevBottom = prev.position().top + prev.height(),
- prevLeft = prev.position().left;
- recursionCall(prevBottom, prevLeft, prev.next());
+ if(!resizeFlag){
+ if($("#wgt_edit").hasClass("selected")){
+ if($(".editContainer").size() > 1){
+ var prev = $(".editContainer:first"),
+ prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
+ } else {
+ var tmp_array = [];
+ $(".readyTask").each(function(){
+ tmp_array.push($(this));
+ });
+ orderItems(tmp_array);
}
- } else {
- var tmp_array = [];
- $(".readyTask").each(function(){
- tmp_array.push($(this));
- });
- orderItems(tmp_array);
- }
- popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
- popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
+ popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
+ popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
+ } else
+ resizeFlag = false;
});
if (window.widget) {
window.widget.onleave = function(){
exportToSankore();
- sankore.setPreference("by_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("by_style", $("#style_select").find("option:selected").val());
}
}
@@ -434,7 +458,7 @@ function init(){
objToExport.data2 = $(domElem).find(".readyTask").find(":last-child").text();
objToExport.width = $(domElem).width();
objToExport.height = $(domElem).height();
- objToExport.top = $(domElem).position().top;
+ objToExport.top = $(domElem).position().top - 40;
objToExport.left = $(domElem).position().left;
arrayToExport.push(objToExport);
});
@@ -493,14 +517,14 @@ function reloadItems(){
//order items
function orderItems(items){
- var bottom = 45,
+ var bottom = ($("#wgt_edit").hasClass("selected"))?85:45,
lastItemLeft = 54;
for (var i in items){
if((bottom + items[i].height()) < ($(window).height() - 54)){
items[i].css("top", bottom + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data");
bottom += items[i].height() + 15;
} else {
- bottom = 60;
+ bottom = 100;
lastItemLeft += 255;
items[i].css("top", bottom + "px").css("left", lastItemLeft + "px").appendTo("#data");
bottom += items[i].height();
@@ -525,7 +549,7 @@ function shuffle( arr )
//adding a new task to the page
function addTask(expression, result){
var lastItem = $(".editContainer:last"),
- lastItemPos = lastItem.length ? lastItem.position().top : 45,
+ lastItemPos = lastItem.length ? lastItem.position().top : 85,
lastItemHeight = lastItem.length ? lastItem.height() : 0,
lastItemLeft = lastItem.length ? lastItem.position().left : 54;
var bottom = lastItemPos + lastItemHeight + 85;
@@ -537,7 +561,7 @@ function addTask(expression, result){
if(bottom < ($(window).height() - 54)){
editContent.css("top", lastItemPos + lastItemHeight + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data");
} else {
- lastItemPos = 45;
+ lastItemPos = 85;
editContent.css("top", lastItemPos + 15 + "px").css("left", lastItemLeft + 255 + "px").appendTo("#data");
}
main.appendTo(editContent);
@@ -556,13 +580,12 @@ function changeStyle(val){
$(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back");
$(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back");
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
- $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_add").removeClass("pad_color").removeClass("pad_add");
+ $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -574,13 +597,12 @@ function changeStyle(val){
$(".b_bottom_left").addClass("bbl_pad").removeClass("without_back");
$(".b_bottom_center").addClass("bbc_pad").removeClass("without_back");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
- $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
- $("#wgt_add").addClass("pad_color").addClass("pad_add");
+ $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -591,14 +613,13 @@ function changeStyle(val){
$(".b_bottom_right").addClass("without_back").removeClass("bbr_pad");
$(".b_bottom_left").addClass("without_back").removeClass("bbl_pad");
$(".b_bottom_center").addClass("without_back").removeClass("bbc_pad");
+ $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_help").addClass("pad_color").addClass("pad_help");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
- $("#wgt_add").addClass("pad_color").addClass("pad_add");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
if($("#wgt_edit").hasClass("selected"))
diff --git a/resources/library/interactivities/Contraste.wgt/locales/ru/index.html b/resources/library/interactivities/Contraste.wgt/locales/ru/index.html
index f2cecf06..f72a635b 100644
--- a/resources/library/interactivities/Contraste.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/Contraste.wgt/locales/ru/index.html
@@ -31,12 +31,6 @@ and open the template in the editor.
-
-
-
-
-
-
@@ -45,6 +39,18 @@ and open the template in the editor.
+
diff --git a/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
index fc0eb152..15d2aff3 100644
--- a/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
@@ -14,7 +14,7 @@
*/
var sankoreLang = {
- display: "Показать",
+ display: "Закрыть",
edit: "Изменить",
add: "Добавить",
enter_data: "Введите вопрос:",
@@ -27,7 +27,8 @@ var sankoreLang = {
pad: "планшет",
none: "нет",
help: "Помощь",
- help_content: "Пример текста помощи ..."
+ help_content: "Пример текста помощи ...",
+ theme: "Тема"
};
function init(){
@@ -43,6 +44,8 @@ function init(){
var flagForSelect = false;
var dragElement = null; //the element that must be dragging
var lang = ""; //locale language
+ var resizeFlag = true;
+
var coords = {
left:0,
top:0
@@ -64,9 +67,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)
if(window.sankore){
if(sankore.preference("blackYellowData","")){
@@ -91,7 +96,7 @@ function init(){
if(window.sankore){
if(sankore.preference("by_style","")){
changeStyle(sankore.preference("by_style",""));
- $(".style_select").val(sankore.preference("by_style",""));
+ $("#style_select").val(sankore.preference("by_style",""));
} else
changeStyle("3")
} else
@@ -102,9 +107,15 @@ function init(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
+ var tmpwh = $(window).height();
+ var tmpww = $(window).width();
+ resizeFlag = true;
+ window.resizeTo(tmpww, tmpwh - 44)
+ $("#data").css("padding-bottom","");
+ $("#leftDiv").css("border-top-left-radius","7px");
+ $("#rightDiv").css("border-top-right-radius","7px");
$(this).css("display", "none");
- $("#wgt_add").css("display", "none");
$("#wgt_edit").css("display", "block");
mode = false;
$(".leftDiv, .rightDiv").animate({
@@ -117,7 +128,7 @@ function init(){
tmpReadyTask.width($(domElem).width())
.height($(domElem).height())
.css("position","absolute")
- .css("top",$(domElem).position().top)
+ .css("top",$(domElem).position().top - 40)
.css("left",$(domElem).position().left)
.find(".taskContainer").removeAttr("contenteditable");
@@ -128,15 +139,22 @@ function init(){
opacityChanged = false;
}
});
+
$(document).disableTextSelect();
}
} else {
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
+ tmpwh = $(window).height();
+ tmpww = $(window).width();
+ resizeFlag = true;
+ window.resizeTo(tmpww, tmpwh + 44)
+ $("#data").css("padding-bottom","42px");
+ $("#leftDiv").css("border-top-left-radius","0px");
+ $("#rightDiv").css("border-top-right-radius","0px");
$(this).css("display", "none");
- $("#wgt_add").css("display", "block");
$("#wgt_display").css("display", "block");
mode = true;
$(document).enableTextSelect();
@@ -171,12 +189,15 @@ 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();
+ ($("#wgt_edit").hasClass("selected"))?$("#parameters").show():'';
});
} else {
- $("#data").hide();
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
+ $("#data, #parameters").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
});
@@ -200,10 +221,10 @@ function init(){
$(document).disableTextSelect();
});
- $(".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());
})
@@ -354,12 +375,12 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px");
else
- curr.css("top", "60px").css("left", prevLeft + 255 + "px");
+ curr.css("top", "100px").css("left", prevLeft + 255 + "px");
} else {
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else
- curr.css("top", "60px").css("left", prevLeft + 255 + "px");
+ curr.css("top", "100px").css("left", prevLeft + 255 + "px");
}
prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left;
@@ -372,28 +393,31 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){
- if($("#wgt_edit").hasClass("selected")){
- if($(".editContainer").size() > 1){
- var prev = $(".editContainer:first"),
- prevBottom = prev.position().top + prev.height(),
- prevLeft = prev.position().left;
- recursionCall(prevBottom, prevLeft, prev.next());
+ if(!resizeFlag){
+ if($("#wgt_edit").hasClass("selected")){
+ if($(".editContainer").size() > 1){
+ var prev = $(".editContainer:first"),
+ prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
+ } else {
+ var tmp_array = [];
+ $(".readyTask").each(function(){
+ tmp_array.push($(this));
+ });
+ orderItems(tmp_array);
}
- } else {
- var tmp_array = [];
- $(".readyTask").each(function(){
- tmp_array.push($(this));
- });
- orderItems(tmp_array);
- }
- popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
- popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
+ popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
+ popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
+ } else
+ resizeFlag = false;
});
if (window.widget) {
window.widget.onleave = function(){
exportToSankore();
- sankore.setPreference("by_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("by_style", $("#style_select").find("option:selected").val());
}
}
@@ -416,7 +440,7 @@ function init(){
objToExport.data2 = $(domElem).find(".readyTask").find(":last-child").text();
objToExport.width = $(domElem).width();
objToExport.height = $(domElem).height();
- objToExport.top = $(domElem).position().top;
+ objToExport.top = $(domElem).position().top - 40;
objToExport.left = $(domElem).position().left;
arrayToExport.push(objToExport);
});
@@ -475,14 +499,14 @@ function reloadItems(){
//order items
function orderItems(items){
- var bottom = 45,
+ var bottom = ($("#wgt_edit").hasClass("selected"))?85:45,
lastItemLeft = 54;
for (var i in items){
if((bottom + items[i].height()) < ($(window).height() - 54)){
items[i].css("top", bottom + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data");
bottom += items[i].height() + 15;
} else {
- bottom = 60;
+ bottom = 100;
lastItemLeft += 255;
items[i].css("top", bottom + "px").css("left", lastItemLeft + "px").appendTo("#data");
bottom += items[i].height();
@@ -507,7 +531,7 @@ function shuffle( arr )
//adding a new task to the page
function addTask(expression, result){
var lastItem = $(".editContainer:last"),
- lastItemPos = lastItem.length ? lastItem.position().top : 45,
+ lastItemPos = lastItem.length ? lastItem.position().top : 85,
lastItemHeight = lastItem.length ? lastItem.height() : 0,
lastItemLeft = lastItem.length ? lastItem.position().left : 54;
var bottom = lastItemPos + lastItemHeight + 85;
@@ -519,7 +543,7 @@ function addTask(expression, result){
if(bottom < ($(window).height() - 54)){
editContent.css("top", lastItemPos + lastItemHeight + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data");
} else {
- lastItemPos = 45;
+ lastItemPos = 85;
editContent.css("top", lastItemPos + 15 + "px").css("left", lastItemLeft + 255 + "px").appendTo("#data");
}
main.appendTo(editContent);
@@ -538,13 +562,12 @@ function changeStyle(val){
$(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back");
$(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back");
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
- $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_add").removeClass("pad_color").removeClass("pad_add");
+ $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -556,13 +579,12 @@ function changeStyle(val){
$(".b_bottom_left").addClass("bbl_pad").removeClass("without_back");
$(".b_bottom_center").addClass("bbc_pad").removeClass("without_back");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
- $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
- $("#wgt_add").addClass("pad_color").addClass("pad_add");
+ $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -573,14 +595,13 @@ function changeStyle(val){
$(".b_bottom_right").addClass("without_back").removeClass("bbr_pad");
$(".b_bottom_left").addClass("without_back").removeClass("bbl_pad");
$(".b_bottom_center").addClass("without_back").removeClass("bbc_pad");
+ $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_help").addClass("pad_color").addClass("pad_help");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
- $("#wgt_add").addClass("pad_color").addClass("pad_add");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
if($("#wgt_edit").hasClass("selected"))
diff --git a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
index 26746d70..593bde46 100644
--- a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
@@ -14,7 +14,7 @@
*/
var sankoreLang = {
- display: "Display",
+ display: "Close",
edit: "Edit",
add: "Add",
enter_data: "Enter data:",
@@ -27,7 +27,8 @@ var sankoreLang = {
pad: "pad",
none: "none",
help: "Help",
- help_content: "This is an example of help content ..."
+ help_content: "This is an example of help content ...",
+ theme: "Theme"
};
function init(){
@@ -43,6 +44,8 @@ function init(){
var flagForSelect = false;
var dragElement = null; //the element that must be dragging
var lang = ""; //locale language
+ var resizeFlag = true;
+
var coords = {
left:0,
top:0
@@ -64,9 +67,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)
if(window.sankore){
if(sankore.preference("blackYellowData","")){
@@ -91,7 +96,7 @@ function init(){
if(window.sankore){
if(sankore.preference("by_style","")){
changeStyle(sankore.preference("by_style",""));
- $(".style_select").val(sankore.preference("by_style",""));
+ $("#style_select").val(sankore.preference("by_style",""));
} else
changeStyle("3")
} else
@@ -102,9 +107,15 @@ function init(){
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_edit").removeClass("selected");
- $(".style_select").css("display","none");
+ $("#parameters").css("display","none");
+ var tmpwh = $(window).height();
+ var tmpww = $(window).width();
+ resizeFlag = true;
+ window.resizeTo(tmpww, tmpwh - 44)
+ $("#data").css("padding-bottom","");
+ $("#leftDiv").css("border-top-left-radius","7px");
+ $("#rightDiv").css("border-top-right-radius","7px");
$(this).css("display", "none");
- $("#wgt_add").css("display", "none");
$("#wgt_edit").css("display", "block");
mode = false;
$(".leftDiv, .rightDiv").animate({
@@ -117,7 +128,7 @@ function init(){
tmpReadyTask.width($(domElem).width())
.height($(domElem).height())
.css("position","absolute")
- .css("top",$(domElem).position().top)
+ .css("top",$(domElem).position().top - 40)
.css("left",$(domElem).position().left)
.find(".taskContainer").removeAttr("contenteditable");
@@ -128,15 +139,22 @@ function init(){
opacityChanged = false;
}
});
+
$(document).disableTextSelect();
}
} else {
if(!$(this).hasClass("selected")){
$(this).addClass("selected");
$("#wgt_display").removeClass("selected");
- $(".style_select").css("display","block");
+ $("#parameters").css("display","block");
+ tmpwh = $(window).height();
+ tmpww = $(window).width();
+ resizeFlag = true;
+ window.resizeTo(tmpww, tmpwh + 44)
+ $("#data").css("padding-bottom","42px");
+ $("#leftDiv").css("border-top-left-radius","0px");
+ $("#rightDiv").css("border-top-right-radius","0px");
$(this).css("display", "none");
- $("#wgt_add").css("display", "block");
$("#wgt_display").css("display", "block");
mode = true;
$(document).enableTextSelect();
@@ -171,12 +189,15 @@ 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();
+ ($("#wgt_edit").hasClass("selected"))?$("#parameters").show():'';
});
} else {
- $("#data").hide();
+ ($("#style_select").val() == 1)?$(this).removeClass("help_pad").addClass("help_wood"):$(this).removeClass("help_wood").addClass("help_pad");
+ $("#data, #parameters").hide();
$("#help").slideDown("100", function(){
tmp.addClass("open");
});
@@ -200,10 +221,10 @@ function init(){
$(document).disableTextSelect();
});
- $(".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());
})
@@ -354,12 +375,12 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px");
else
- curr.css("top", "60px").css("left", prevLeft + 255 + "px");
+ curr.css("top", "100px").css("left", prevLeft + 255 + "px");
} else {
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else
- curr.css("top", "60px").css("left", prevLeft + 255 + "px");
+ curr.css("top", "100px").css("left", prevLeft + 255 + "px");
}
prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left;
@@ -372,28 +393,31 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){
- if($("#wgt_edit").hasClass("selected")){
- if($(".editContainer").size() > 1){
- var prev = $(".editContainer:first"),
- prevBottom = prev.position().top + prev.height(),
- prevLeft = prev.position().left;
- recursionCall(prevBottom, prevLeft, prev.next());
+ if(!resizeFlag){
+ if($("#wgt_edit").hasClass("selected")){
+ if($(".editContainer").size() > 1){
+ var prev = $(".editContainer:first"),
+ prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
+ } else {
+ var tmp_array = [];
+ $(".readyTask").each(function(){
+ tmp_array.push($(this));
+ });
+ orderItems(tmp_array);
}
- } else {
- var tmp_array = [];
- $(".readyTask").each(function(){
- tmp_array.push($(this));
- });
- orderItems(tmp_array);
- }
- popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
- popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
+ popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
+ popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
+ } else
+ resizeFlag = false;
});
if (window.widget) {
window.widget.onleave = function(){
exportToSankore();
- sankore.setPreference("by_style", $(".style_select").find("option:selected").val());
+ sankore.setPreference("by_style", $("#style_select").find("option:selected").val());
}
}
@@ -416,7 +440,7 @@ function init(){
objToExport.data2 = $(domElem).find(".readyTask").find(":last-child").text();
objToExport.width = $(domElem).width();
objToExport.height = $(domElem).height();
- objToExport.top = $(domElem).position().top;
+ objToExport.top = $(domElem).position().top - 40;
objToExport.left = $(domElem).position().left;
arrayToExport.push(objToExport);
});
@@ -475,14 +499,14 @@ function reloadItems(){
//order items
function orderItems(items){
- var bottom = 45,
+ var bottom = ($("#wgt_edit").hasClass("selected"))?85:45,
lastItemLeft = 54;
for (var i in items){
if((bottom + items[i].height()) < ($(window).height() - 54)){
items[i].css("top", bottom + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data");
bottom += items[i].height() + 15;
} else {
- bottom = 60;
+ bottom = 100;
lastItemLeft += 255;
items[i].css("top", bottom + "px").css("left", lastItemLeft + "px").appendTo("#data");
bottom += items[i].height();
@@ -507,7 +531,7 @@ function shuffle( arr )
//adding a new task to the page
function addTask(expression, result){
var lastItem = $(".editContainer:last"),
- lastItemPos = lastItem.length ? lastItem.position().top : 45,
+ lastItemPos = lastItem.length ? lastItem.position().top : 85,
lastItemHeight = lastItem.length ? lastItem.height() : 0,
lastItemLeft = lastItem.length ? lastItem.position().left : 54;
var bottom = lastItemPos + lastItemHeight + 85;
@@ -519,7 +543,7 @@ function addTask(expression, result){
if(bottom < ($(window).height() - 54)){
editContent.css("top", lastItemPos + lastItemHeight + 15 + "px").css("left", lastItemLeft + "px").appendTo("#data");
} else {
- lastItemPos = 45;
+ lastItemPos = 85;
editContent.css("top", lastItemPos + 15 + "px").css("left", lastItemLeft + 255 + "px").appendTo("#data");
}
main.appendTo(editContent);
@@ -538,13 +562,12 @@ function changeStyle(val){
$(".b_bottom_left").removeClass("bbl_pad").removeClass("without_back");
$(".b_bottom_center").removeClass("bbc_pad").removeClass("without_back");
$("#wgt_reload").removeClass("pad_color").removeClass("pad_reload");
- $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_help").removeClass("pad_color").removeClass("pad_help");
- $("#wgt_display").removeClass("pad_color").removeClass("pad_edit");
- $("#wgt_add").removeClass("pad_color").removeClass("pad_add");
+ $("#wgt_edit").removeClass("pad_color").removeClass("pad_edit");
$("#wgt_name").removeClass("pad_color");
- $(".style_select").removeClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").addClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").addClass("radius_ft");
break;
case "2":
$(".b_top_left").addClass("btl_pad").removeClass("without_back");
@@ -556,13 +579,12 @@ function changeStyle(val){
$(".b_bottom_left").addClass("bbl_pad").removeClass("without_back");
$(".b_bottom_center").addClass("bbc_pad").removeClass("without_back");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
- $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_help").addClass("pad_color").addClass("pad_help");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
- $("#wgt_add").addClass("pad_color").addClass("pad_add");
+ $("#wgt_edit").addClass("pad_color").addClass("pad_edit");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("pad_select").removeClass("none_select").val(val);
- $("body, html").removeClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").removeClass("without_radius").removeClass("radius_ft");
break;
case "3":
$(".b_top_left").addClass("without_back").removeClass("btl_pad");
@@ -573,14 +595,13 @@ function changeStyle(val){
$(".b_bottom_right").addClass("without_back").removeClass("bbr_pad");
$(".b_bottom_left").addClass("without_back").removeClass("bbl_pad");
$(".b_bottom_center").addClass("without_back").removeClass("bbc_pad");
+ $("#wgt_help").addClass("pad_color").addClass("pad_help");
$("#wgt_reload").addClass("pad_color").addClass("pad_reload");
$("#wgt_edit").addClass("pad_color").addClass("pad_edit");
- $("#wgt_help").addClass("pad_color").addClass("pad_help");
- $("#wgt_display").addClass("pad_color").addClass("pad_edit");
- $("#wgt_add").addClass("pad_color").addClass("pad_add");
$("#wgt_name").addClass("pad_color");
- $(".style_select").addClass("none_select").val(val);
- $("body, html").addClass("without_radius");
+ $("#wgt_display").removeClass("display_wood");
+ $("#style_select").val(val);
+ $("body, html").addClass("without_radius").removeClass("radius_ft");
break;
}
if($("#wgt_edit").hasClass("selected"))