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)