diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css index cc411a94a..419f6ff03 100644 --- a/modules/widget/tpl/css/widget.css +++ b/modules/widget/tpl/css/widget.css @@ -26,7 +26,7 @@ .widgetButtons .widgetBoxCopy{background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000} .widgetButtons .widgetBoxSize{background:transparent url("../images/widget_size.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000} .widgetButtons .widgetBoxRemove{background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000} -#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:2000;position:absolute} +#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:1999;position:absolute} #pageSizeLayer table{border:0;width:100%;table-layout:fixed} #pageSizeLayer table th{padding:4px 0 4px 0;background-color:#DEDEDE;text-align:center;color:#888} #pageSizeLayer table th.line {border-top:1px dotted #eee} diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js index f9c1d1b0c..944d5b92f 100644 --- a/modules/widget/tpl/js/widget.js +++ b/modules/widget/tpl/js/widget.js @@ -682,7 +682,14 @@ function doShowWidgetSizeSetup(px, py, obj) { jQuery.each(opts, function(key, val){ var el = form[0].elements[key]; - if (el) el.value = val; + if (el) + { + el.value = val; + if(el.className.match(/\bcolor-indicator\b/)) + { + el.style.background = el.value = '#'+el.value; + } + } if (el.tagName.toLowerCase() == "select") { if(el.selectedIndex == -1) { diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html index 59b2d6565..208f8098f 100644 --- a/modules/widget/tpl/widget_layer.html +++ b/modules/widget/tpl/widget_layer.html @@ -47,7 +47,7 @@ - # + @@ -57,7 +57,7 @@ - # + px @@ -65,7 +65,7 @@ - # + @@ -75,12 +75,12 @@ - # + {$lang->cmd_widget_background_color} - + {$lang->cmd_widget_background_image_url} @@ -108,3 +108,5 @@ + +