Index: branches/RC/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N -r11650 -r11698
--- branches/RC/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 11650)
+++ branches/RC/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 11698)
@@ -60,13 +60,15 @@
 </table>
 
 <inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
-	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
-		<td class="control-cell">
-			<input style="<inp2:m_Param name="style"/>" type="text"
-				name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>][Value]" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>]" value="<inp2:m_Param name="Value"/>">
-		</td>
-	</tr>
+	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
+			<td class="control-cell">
+				<input style="<inp2:m_Param name='style'/>" type="text"
+					name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>][Value]" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>]" value="<inp2:m_Param name='Value'/>">
+			</td>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
@@ -90,186 +92,184 @@
 			.skin-table td {width: 90px};
 		</style>
 
-			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Font Color (HeadColor)</td>
-							<td>Background (HeadBgColor)</td>
-							<td>Bar Text Color (HeadBarColor)</td>
-							<td>Bar Background (HeadBarBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Font Color (HeadColor)</td>
+						<td>Background (HeadBgColor)</td>
+						<td>Bar Text Color (HeadBarColor)</td>
+						<td>Bar Background (HeadBarBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
-			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Section Title Color (SectionColor)</td>
-							<td>Section Background (SectionBgColor)</td>
-							<td>Titlebar Font Color (TitleBarColor)</td>
-							<td>Titlebar Background (TitleBarBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
-									value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Section Title Color (SectionColor)</td>
+						<td>Section Background (SectionBgColor)</td>
+						<td>Titlebar Font Color (TitleBarColor)</td>
+						<td>Titlebar Background (TitleBarBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
+								value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
-			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Toolbar Backgroun (ToolbarBgColor)</td>
-							<td>Filter Row Background (FiltersBgColor)</td>
-							<td>Column Titles Color (ColumnTitlesColor)</td>
-							<td>Column Titles Background (ColumnTitlesBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
-									value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Toolbar Backgroun (ToolbarBgColor)</td>
+						<td>Filter Row Background (FiltersBgColor)</td>
+						<td>Column Titles Color (ColumnTitlesColor)</td>
+						<td>Column Titles Background (ColumnTitlesBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
+								value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
-		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Grid Odd Row Color (OddColor)</td>
-							<td>Grid Odd Row Background Color (OddBgColor)</td>
-							<td>Grid Even Row Color (EvenColor)</td>
-							<td>Grid Even Row Background Color (EvenBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
-									value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
-									value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Grid Odd Row Color (OddColor)</td>
+						<td>Grid Odd Row Background Color (OddBgColor)</td>
+						<td>Grid Even Row Color (EvenColor)</td>
+						<td>Grid Even Row Background Color (EvenBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
+								value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
+								value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
 
-		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
-				<td class="control-cell">
-					<table class="skin-table">
-						<tr>
-							<td>Tree Color (TreeColor)</td>
-							<td>Tree Background Color (TreeBgColor)</td>
-							<td>Tree Highlighted Color (TreeHighColor)</td>
-							<td>Tree Highlighted Background Color (TreeHighBgColor)</td>
-						</tr>
-						<tr>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
-							</td>
-							<td>
-								<input style="width: 80px" type="text"
-									name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
-									value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
+			<td class="control-cell">
+				<table class="skin-table">
+					<tr>
+						<td>Tree Color (TreeColor)</td>
+						<td>Tree Background Color (TreeBgColor)</td>
+						<td>Tree Highlighted Color (TreeHighColor)</td>
+						<td>Tree Highlighted Background Color (TreeHighBgColor)</td>
+					</tr>
+					<tr>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
 
 	<!--	<inp2:m_RenderElement name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->