Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_tag_processor.php
===================================================================
diff -u -r1422 -r1484
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 1422)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 1484)
@@ -7,17 +7,9 @@
 		{
 			$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
 			$style_data = $object->GetDBField( $params['field'] );
-
-			$ret = '';
 			
-			if($style_data)
-			{
-				$separator = getArrayValue($params,'inline') ? ' ' : '<br>';
-				foreach($style_data as $property_name => $property_value)
-				{
-					$ret .= $property_name.': '.$property_value.';'.$separator;	
-				}
-			}
+			$ret = $object->CompileStyleBody( getArrayValue($params,'inline') ? STYLE_INLINE : STYLE_PREVIEW );
+			
 			return $ret;
 		}
 		
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r1422 -r1484
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 1422)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 1484)
@@ -99,6 +99,12 @@
 			</td>
 			<td class="error">&nbsp;</td>
 		</tr>
+			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td colspan="3">
+				<input type="button" class="button" onclick="submit_event('selectors','OnResetToBase');" value="<inp2:m_phrase name="la_reset_to_base"/>">
+			</td>
+		</tr>
 		
 </table>
 <input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/colorselector.js
===================================================================
diff -u -r1410 -r1484
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/colorselector.js	(.../colorselector.js)	(revision 1410)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/colorselector.js	(.../colorselector.js)	(revision 1484)
@@ -2,22 +2,17 @@
 
 	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($field)
+	function kColorSelector()
 	{
-		this.Field = $field;
-		
 		var $selector = document.getElementById('colorSelector_div');
+		
 		this.updateColor = updateColor;
 		this.colorMouseOver = colorMouseOver;
 		this.colorMouseOut = colorMouseOut;
 		this.colorClick = colorClick;
 		
 		if( !isset($selector) )
 		{
-			var $s_table = document.createElement('TABLE');
-			$s_table.id = 'colorSelector';
-			$selector.appendChild($s_table);
-			
 			var $selector = document.createElement('DIV');
 			$selector.id = 'colorSelector_div';
 			$selector.className = 'table_color1';
@@ -29,12 +24,18 @@
 			$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');
 			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++)
 				{
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r1423 -r1484
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 1423)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 1484)
@@ -43,6 +43,8 @@
 				
 				function openColorSelector($e, $field)
 				{
+					alert('onpen colorselector called');
+					
 					var $div = document.getElementById('colorSelector_div');
 					
 					var posx = 0;
@@ -71,9 +73,6 @@
 </table>
 
 <inp2:m_block name="inp_edit_color"/>
-	<script language="javascript">
-		$cs = new kColorSelector('<inp2:$prefix_InputName field="$field" subfield="$subfield"/>');
-	</script>
 	<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>
@@ -85,21 +84,36 @@
 					size="<inp2:m_param name="size"/>"
 					maxlength="<inp2:m_param name="maxlength"/>"
 					class="<inp2:m_param name="class"/>"
-					onkeypress="$cs.updateColor(event,'color_<inp2:$prefix_InputName field="$field" subfield="$subfield"/>')"
+					onkeyup="updateColor(event,'<inp2:$prefix_InputName field="$field" subfield="$subfield"/>')"
 					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"/>');
+			</script>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
 <inp2:m_blockend/>
 
+<inp2:m_block name="inp_edit_options_style"/>
+	<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"/>">
+				<inp2:$prefix_PredefinedOptions field="$value_field" block="inp_option_item" selected="selected"/>
+			</select>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+	</tr>
+<inp2:m_blockend/>
 
 
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 	<inp2:m_ParseBlock name="subsection" title="!la_FontAttributes!"/>
 		<inp2:m_ParseBlock name="inp_edit_color" prefix="selectors" field="SelectorData" subfield="color" title="!la_fld_FontColor!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-size" title="!la_fld_FontSize!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorData" subfield="font-style" title="!la_fld_FontStyle!"/>
+		<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!"/>
@@ -115,17 +129,18 @@
 
 <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_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/units/selectors/selectors_config.php
===================================================================
diff -u -r1469 -r1484
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 1469)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 1484)
@@ -97,8 +97,12 @@
 										'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'),
 								),
 
-					'VirtualFields'	=> 	Array( ),
+					'VirtualFields'	=> 	Array(
+												'FontStyle' => Array('type'=>'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array('inherit'=>'inherit','normal'=>'normal','italic'=>'italic','oblique'=>'oblique') ),
 											
+										
+										),
+											
 					'Grids'	=> Array(
 								'Default' => Array(
 													'Icons' => Array('default'=>'icon16_selector.gif'),
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_item.php
===================================================================
diff -u -r1469 -r1484
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_item.php	(.../selectors_item.php)	(revision 1469)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_item.php	(.../selectors_item.php)	(revision 1484)
@@ -1,28 +1,37 @@
 <?php
 
+	define('STYLE_INLINE',	' ');
+	define('STYLE_FILE',	"\n");
+	define('STYLE_PREVIEW', '<br>');
+	
 	class SelectorsItem extends kDBItem 
 	{
 		/**
 		 * Returns compiled selector for inserting into css file
 		 *
 		 * @return string
 		 */
-		function CompileStyle()
+		function CompileStyle($separator = STYLE_FILE)
 		{
-			$selector_data = $this->GetDBField('SelectorData');
+			$ret = $this->GetDBField('SelectorName')." {\n";
+			$ret .= $this->CompileStyleBody($separator);
+			$ret .= $separator."}\n";
+			return $ret;
+		}
+		
+		function CompileStyleBody($separator)
+		{
 			$ret = '';
+			$selector_data = $this->GetDBField('SelectorData');
+			if(!$selector_data) return $ret;
 			
-			$ret .= $this->GetDBField('SelectorName')." {\n";
 			foreach($selector_data as $property_name => $property_value)
 			{
 				if ($property_value == '') continue;
-				$ret .= "\t$property_name: $property_value;\n";
+				$ret .= "\t$property_name: $property_value;".$separator;
 			}
-			$ret .= $this->GetDBField('AdvancedCSS')."\n";
-			$ret .= "}\n";
 			
-			
-			
+			$ret .= $this->GetDBField('AdvancedCSS');
 			return $ret;
 		}
 	}