diff --git a/www/extras/colorpicker/colorpicker.css b/www/extras/colorpicker/colorpicker.css index 1ff8b40ff..0b7654a82 100644 --- a/www/extras/colorpicker/colorpicker.css +++ b/www/extras/colorpicker/colorpicker.css @@ -1,4 +1,10 @@ - #ddPicker { position: absolute; background-color: #eeeeee; top: 200px; left: 20px; width: 360px; height: 240px; z-index: 1000; } +.colorPickerFormSwatch { + width: 18px; + height: 18px; + border: 1px solid black; + float: left; +} + #ddPicker { position: absolute; background-color: #eeeeee; top: 200px; left: 20px; width: 380px; height: 260px; z-index: 1000; } #ddPicker input { font-size: .85em } #pickerHandle { background-color: #bbbbbb; height: 10px; cursor: move; } #hueThumb { cursor:default; width:18px; height:18px; z-index: 9; position:absolute; } diff --git a/www/extras/colorpicker/colorpicker.js b/www/extras/colorpicker/colorpicker.js index 8495eaba4..a2071fe95 100644 --- a/www/extras/colorpicker/colorpicker.js +++ b/www/extras/colorpicker/colorpicker.js @@ -1,4 +1,4 @@ -webguiColorPicker = function() { +WebguiColorPicker = function() { var Slider=YAHOO.widget.Slider; var Color=YAHOO.util.Color; var Dom=YAHOO.util.Dom; @@ -67,7 +67,7 @@ webguiColorPicker = function() { setColor: function () { var color = "#"+document.getElementById("hexval").value; currentColorField.value = color; - Dom.get(currentColorField.id + "_swatch").style.backgroundColor = color; + currentColorField.onchange(); ddPicker = Dom.get("ddPicker"); ddPicker.innerHTML = ""; ddPicker.style.display = "none"; @@ -81,7 +81,7 @@ webguiColorPicker = function() { ddPicker.style.top = YAHOO.util.Dom.getY(currentColorField) + "px"; ddPicker.style.left = YAHOO.util.Dom.getX(currentColorField) + "px"; ddPicker.style.display = "block"; - ddPicker.innerHTML = '



