Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r11482 -r11538
--- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11538)
@@ -72,45 +72,48 @@
 </table>
 
 <inp2:selectors_SaveWarning name="grid_save_warning"/>
+<inp2:selectors_ErrorWarning name="form_error_warning"/>
+
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-		<inp2:m_RenderElement name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
-		<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
+			<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
 
-		<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
 
-		<inp2:m_RenderElement name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
-		<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-			<inp2:m_inc param="tab_index" by="1"/>
-			<td class="text" valign="top">
-				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
-				<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
-			</td>
-			<td>
-				<table width="100%">
-					<tr>
-						<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
-						<td>
-							<inp2:selectors_PrintStyle field="SelectorData"/>
-						</td>
-						<td><inp2:m_phrase name="la_StylePreview"/>:</td>
-						<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
-							<inp2:m_phrase name="la_SampleText"/>
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td class="error">&nbsp;</td>
-		</tr>
-
-</table>
+			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="label-cell">
+					<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
+					<a href="javascript:editStyle();"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<table width="100%">
+						<tr>
+							<td><inp2:m_phrase name="la_StyleDefinition"/>:</td>
+							<td>
+								<inp2:selectors_PrintStyle field="SelectorData"/>
+							</td>
+							<td><inp2:m_phrase name="la_StylePreview"/>:</td>
+							<td style="<inp2:selectors_PrintStyle field="SelectorData" inline="inline"/>">
+								<inp2:m_phrase name="la_SampleText"/>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
 </div>
+
 <input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file