Index: branches/RC/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -N -r10539 -r10583
--- branches/RC/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 10539)
+++ branches/RC/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 10583)
@@ -29,8 +29,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td style="width: <inp2:m_if check="m_ParamEquals" name="width" value="default">140<inp2:m_else/><inp2:m_Param name="width"/></inp2:m_if>px">
-			&nbsp;
+		<td style="width: <inp2:m_if check="m_ParamEquals" name="width" value="default">140<inp2:m_else/><inp2:m_Param name="width"/></inp2:m_if>px">&nbsp;
 		</td>
 		<td>
 			<br />
@@ -99,6 +98,21 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_box_ml">
+	<inp2:Field name="LanguageId" result_to_var="language_id"/>
+	<inp2:m_if check="SelectedLanguage">
+		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" style="{$style}" />
+	<inp2:m_else/>
+		<inp2:Field name="PackName" result_to_var="language_name"/>
+		<inp2:m_RenderElement name="inp_edit_box" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" style="{$style}" />
+		<inp2:m_if check="IsPrimaryLanguageInList">
+			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
+				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
+			</inp2:m_if>
+		</inp2:m_if>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_password" style="" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
@@ -260,6 +274,21 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_textarea_ml">
+	<inp2:Field name="LanguageId" result_to_var="language_id"/>
+	<inp2:m_if check="SelectedLanguage">
+		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
+	<inp2:m_else/>
+		<inp2:Field name="PackName" result_to_var="language_name"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" field="l{$language_id}_{$field}" title="{$title}_{$language_name}" prefix="{$prefix}" is_last="{$is_last}" style="{$style}" cols="{$cols}" rows="{$rows}"/>
+		<inp2:m_if check="IsPrimaryLanguageInList">
+			<inp2:m_if check="{$prefix}_IsRequired" field="$field">
+				<input type="hidden" name="<inp2:{$prefix}_FieldModifier name="l{$language_id}_{$field}" type="required"/>" value="1"/>
+			</inp2:m_if>
+		</inp2:m_if>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_option_item">
 	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
@@ -385,4 +414,26 @@
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="primary_category">
+	<inp2:m_param name="separator"/> <inp2:m_param name="title"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="primary_root_category">
+	<inp2:m_RootCategoryName/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_pr_category_label" is_last="0" editing="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td valign="top" class="field-value">
+		<inp2:m_if check="m_Param" name="editing">
+			<inp2:{$prefix}_CategoryName />
+		<inp2:m_else />
+			<inp2:c_CategoryPath separator="&gt;" render_as="primary_category" root_cat_render_as="primary_root_category" titles="$titles" />
+		</inp2:m_if>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
\ No newline at end of file