Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r10633 -r10641
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 10633)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 10641)
@@ -1,6 +1,12 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" tab_preset="" module="" icon="">
-	<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
-	<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" system="1"/>
+<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" system_permission="1" title_preset="" tab_preset="" module="" icon="">
+	<inp2:m_if check="m_Param" name="perm_section" inverse="1">
+		<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
+	</inp2:m_if>
+	<inp2:m_if check="m_Param" name="permission_type">
+		<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" system="$system_permission"/>
+	<inp2:m_else/>
+		<inp2:m_RequireLogin permissions="{$perm_section}" system="$system_permission"/>
+	</inp2:m_if>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -777,4 +783,49 @@
 		</td>
 		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
 	</tr>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_picker" is_last="" has_empty="0" empty_value="" style="width: 225px;" size="15">
+	<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" is_last="$is_last"/>
+		<td>
+			<table cellpadding="0" cellspacing="0">
+				<tr>
+					<td><strong><inp2:m_Phrase label="la_SelectedItems" /></strong></td>
+					<td>&nbsp;</td>
+					<td><strong><inp2:m_Phrase label="la_AvailableItems" /></strong></td>
+				</tr>
+				<tr>
+					<td>
+						<inp2:m_DefineElement name="picker_option_block">
+							<option value="<inp2:Field name="$key_field" />"><inp2:Field name="$value_field" /></option>
+						</inp2:m_DefineElement>
+
+						<select multiple id="<inp2:$prefix_InputName name="$field" />_selected" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
+							<inp2:$optprefix.selected_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" per_page="-1" link_to_prefix="$prefix" />
+						</select>
+					</td>
+					<td align="center">
+						<img src="img/icons/icon_left.gif" id="<inp2:$prefix_InputName name="$field" />_move_left_button"/><br />
+						<img src="img/icons/icon_right.gif" id="<inp2:$prefix_InputName name="$field" />_move_right_button"/>
+					</td>
+					<td>
+						<select multiple id="<inp2:$prefix_InputName name="$field" />_available" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
+							<inp2:$optprefix.available_PrintList render_as="picker_option_block" key_field="$option_key_field" value_field="$option_value_field" per_page="-1" link_to_prefix="$prefix" />
+						</select>
+					</td>
+				</tr>
+			</table>
+
+			<input type="hidden" name="<inp2:$prefix_InputName name="$field" />" id="<inp2:$prefix_InputName name="$field" />" value="<inp2:$prefix_Field field="$field" db="db"/>">
+			<input type="hidden" name="unselected_<inp2:$prefix_InputName name="$field" />" id="<inp2:$prefix_InputName name="$field" />_available_field" value="">
+
+			<script type="text/javascript">
+				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:$prefix_InputName name="$field" />');
+				<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_SelectItemToMove" escape="1"/>');
+			</script>
+
+		</td>
+		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>