Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/colorselector.js
===================================================================
diff -u -r1484 -r1485
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/colorselector.js	(.../colorselector.js)	(revision 1484)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/colorselector.js	(.../colorselector.js)	(revision 1485)
@@ -2,15 +2,10 @@
 
 	var aColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF';
 	
-	function kColorSelector()
+	function InitColorSelector()
 	{
 		var $selector = document.getElementById('colorSelector_div');
 		
-		this.updateColor = updateColor;
-		this.colorMouseOver = colorMouseOver;
-		this.colorMouseOut = colorMouseOut;
-		this.colorClick = colorClick;
-		
 		if( !isset($selector) )
 		{
 			var $selector = document.createElement('DIV');
@@ -22,20 +17,18 @@
 			$selector.style.display = 'none';
 			$selector.style.position = 'absolute';
 			$selector.style.borderStyle = 'solid';
-			document.appendChild($selector);
 			
-			alert('1');
 			var $s_table = document.createElement('TABLE');
 			$s_table.id = 'colorSelector';
 			$selector.appendChild($s_table);
-			alert('2');
+			document.body.appendChild($selector);
+
 			var oTable = document.getElementById('colorSelector');
 			var iCounter = 0;
 			aColors = aColors.split(',');
-			alert('3');
+
 			while(iCounter < aColors.length)
 			{
-				alert('aa');
 				var oRow = oTable.insertRow(-1);
 				for(var i = 0; i < 8 && iCounter < aColors.length; i++, iCounter++)
 				{
@@ -51,10 +44,9 @@
 		}
 	}
 	
-	function updateColor($event,$color_preview)
+	function updateColor($event,$color_id)
 	{
-		alert('e: '+$event+'; cp: '+$color_preview);
-		document.getElementById('color_'+$color_preview).style.backgroundColor = document.getElementById($color_preview).value;
+		document.getElementById('color_'+$color_id).style.backgroundColor = document.getElementById($color_id).value;
 	}
 	
 	function colorMouseOver($e)
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r1484 -r1485
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 1484)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 1485)
@@ -6,9 +6,6 @@
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="style_edit" module="in-commerce" icon="icon46_style"/>
 <script src="incs/colorselector.js" type="text/javascript" language="javascript"></script>
 <style type="text/css">
-
-	
-	
 	.ColorBox
 	{
 		font-size: 1px;
@@ -17,9 +14,6 @@
 		position: static;
 		height: 10px;
 	}
-	
-	
-
 </style>
 
 <!-- ToolBar --->
@@ -43,28 +37,32 @@
 				
 				function openColorSelector($e, $field)
 				{
-					alert('onpen colorselector called');
-					
 					var $div = document.getElementById('colorSelector_div');
-					
-					var posx = 0;
-					var posy = 0;
-					if (!$e) var $e = window.event;
-					if ($e.pageX || $e.pageY)
+					if($div)
 					{
-						posx = $e.pageX;
-						posy = $e.pageY;
+						alert('div - ok');
+						var posx = 0;
+						var posy = 0;
+						if (!$e) var $e = window.event;
+						if ($e.pageX || $e.pageY)
+						{
+							posx = $e.pageX;
+							posy = $e.pageY;
+						}
+						else if ($e.clientX || $e.clientY)
+						{
+							posx = $e.clientX + document.body.scrollLeft;
+							posy = $e.clientY + document.body.scrollTop;
+						}
+
+						$div.style.left = posx;
+						$div.style.top = posy;
+						$div.style.display = 'block';
 					}
-					else if ($e.clientX || $e.clientY)
+					else
 					{
-						posx = $e.clientX + document.body.scrollLeft;
-						posy = $e.clientY + document.body.scrollTop;
+						alert('div not defined');	
 					}
-					
-					$div.style.left = posx;
-					$div.style.top = posy;
-					$div.style.display = 'block';
-					
 				}
 			</script>
 		</td>
@@ -88,7 +86,7 @@
 					onblur="<inp2:m_Param name="onblur"/>">
 			<div id="color_<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" style="display: inline; border: 1px solid #000000;" onclick="openColorSelector(event,'<inp2:$prefix_InputName field="$field" subfield="$subfield"/>');">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
 			<script language="javascript">
-				updateColor(event,'<inp2:$prefix_InputName field="$field" subfield="$subfield"/>');
+				updateColor(null,'<inp2:$prefix_InputName field="$field" subfield="$subfield"/>');
 			</script>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
@@ -99,7 +97,7 @@
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
-			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
+			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
 				<inp2:$prefix_PredefinedOptions field="$value_field" block="inp_option_item" selected="selected"/>
 			</select>
 		</td>
@@ -116,7 +114,7 @@
 		<inp2:m_ParseBlock name="inp_edit_options_style" prefix="selectors" field="SelectorData" subfield="font-style" value_field="FontStyle" title="!la_fld_FontStyle!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-weight" title="!la_fld_FontWeight!"/>
 	<inp2:m_ParseBlock name="subsection" title="!la_BackgroundAndBorders!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="background-color" title="!la_fld_BackgroundColor!"/>
+		<inp2:m_ParseBlock name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="background-color" title="!la_fld_BackgroundColor!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="border" title="!la_fld_Border!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="padding" title="!la_fld_Padding!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="margin" title="!la_fld_Margins!"/>
@@ -128,63 +126,7 @@
 
 
 <script language="javascript" type="text/javascript">
-	
-	$cs = new kColorSelector();
-
-	var $input_name = '<inp2:selectors_InputName field="SelectorData" subfield="color"/>';
-
-	var oTable = document.getElementById('colorSelector');
-	var iCounter = 0;
-	var aColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF';
-	aColors = aColors.split(',');
-	
-	function updateColor($event,$color_id)
-	{
-		document.getElementById('color_'+$color_id).style.backgroundColor = document.getElementById($color_id).value;
-	}
-	
-	function colorMouseOver($e)
-	{
-		if(!$e) $e = window.event;
-		//print_pre(this);
-		this.parentNode.style.backgroundColor = '#C8D3E2';
-		this.parentNode.style.borderColor = '#7196CC';
-		
-	}
-	
-	function colorMouseOut($e)
-	{
-		if(!$e) $e = window.event;
-		this.parentNode.style.backgroundColor = '#F6F6F6';
-		this.parentNode.style.borderColor = '#F6F6F6';
-	}
-	
-	function colorClick($e)
-	{
-		if(!$e) $e = window.event;
-		var $color = aColors[ this.getAttribute('ColorIndex') ];
-		
-		document.getElementById('color_'+$input_name).style.backgroundColor = $color;
-		document.getElementById($input_name).value = '#' + $color;
-		document.getElementById('colorSelector_div').style.display = 'none';
-		
-		colorMouseOut($e);
-	}
-	
-	while(iCounter < aColors.length)
-	{
-		var oRow=oTable.insertRow(-1);
-		for(var i=0; i<8 && iCounter < aColors.length; i++,iCounter++)
-		{
-			var $cell = document.createElement('TD');
-			$cell.innerHTML = '<div class="ColorBox" style="background-color: #'+aColors[iCounter]+'"></div>';
-			$cell.onmouseover = colorMouseOver;
-			$cell.onmouseout = colorMouseOut;
-			$cell.onclick = colorClick;
-			$cell.setAttribute('ColorIndex', iCounter);
-			var oDiv=oRow.insertCell(-1).appendChild($cell);
-		};
-	}
+	InitColorSelector();
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -r1423 -r1485
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 1423)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 1485)
@@ -181,12 +181,10 @@
 				
 				foreach($selector_data as $prop_name => $prop_value)
 				{
-					if( $base_selector_data[$prop_name] == $prop_value ) {
+					if( !$prop_value || getArrayValue($base_selector_data,$prop_name) == $prop_value )
+					{
 						unset($selector_data[$prop_name]);
 					}
-					if( $prop_value == '') {
-						unset($selector_data[$prop_name]);
-					}
 				}
 				$object->SetDBField('SelectorData', $selector_data);
 				return $selector_data;
@@ -217,6 +215,21 @@
 			}
 			return $selector_data;
 		}
+		
+		/**
+		 * Reset Style definition to base style -> no customizations
+		 *
+		 * @param kEvent $event
+		 */
+		function OnResetToBase(&$event)
+		{
+			$object =& $event->getObject();
+			$object->SetFieldsFromHash( $this->getSubmittedFields($event) );
+			$object->SetDBField( 'SelectorData', Array() );
+			$object->Update();
+			
+			$event->redirect_params['pass'] = 'all,'.$event->getPrefixSpecial();
+		}
 	}
 
 ?>
\ No newline at end of file