Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r10372 -r10537
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10372)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 10537)
@@ -202,10 +202,18 @@
 		<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error</inp2:m_if>">
 			<inp2:{$PrefixSpecial}_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
 		</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="error"> *</span></inp2:m_if>:<br />
+
 		<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
-			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
+			<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
+				<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
+			<inp2:m_else/>
+				<inp2:Field name="FieldName" result_to_var="custom_field"/>
+				<a href="javascript:OpenEditor('&section=in-link:editlink_general', 'kernel_form', '<inp2:{$SourcePrefix}_InputName field="cust_{$custom_field}"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" border="0"></a>
+			</inp2:m_if>
 		<inp2:m_else/>
-			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
+			<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
+				<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
+			</inp2:m_if>
 		</inp2:m_if>
 	</td>
 </inp2:m_DefineElement>
@@ -438,7 +446,7 @@
 			Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="selected_class"/>', ':original', edit, a_toolbar);
 			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
 	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
-	  			
+
 	  		<inp2:m_if check="{$PrefixSpecial}_UseAutoRefresh">
 	  			function refresh_grid() {
 	  				// window.location.reload();
Index: branches/RC/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r8929 -r10537
--- branches/RC/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 10537)
@@ -31,7 +31,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
-	<textarea name="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
+	<textarea name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_radio_item">
@@ -47,7 +47,7 @@
 		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
-	
+
 	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
 	<script type="text/javascript">
 		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
@@ -60,7 +60,7 @@
 		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
-	
+
 	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
 	<script type="text/javascript">
 		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
Index: branches/RC/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r8929 -r10537
--- branches/RC/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 10537)
@@ -31,7 +31,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
-	<textarea name="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
+	<textarea name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" <inp2:m_param name="field_params" />><inp2:Field field="$field" /></textarea>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_radio_item">
@@ -47,7 +47,7 @@
 		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
-	
+
 	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
 	<script type="text/javascript">
 		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
@@ -60,7 +60,7 @@
 		<script type="text/javascript" src="js/calendar.js"></script>
 		<inp2:m_set calendar_included="1"/>
 	</inp2:m_if>
-	
+
 	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
 	<script type="text/javascript">
 		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");