Index: branches/5.2.x/units/products/products_config.php
===================================================================
diff -u -N -r14655 -r14682
--- branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14655)
+++ branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14682)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 14655 2011-10-11 15:44:35Z alex $
+* @version	$Id: products_config.php 14682 2011-10-19 10:55:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -574,7 +574,7 @@
 						'CategoryId'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
 						'ExportFormat'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
 						'ExportFilename'		=>	Array ('type' => 'string', 'default' => ''),
-						'FieldsSeparatedBy'		=>	Array ('type' => 'string', 'default' => ', '),
+						'FieldsSeparatedBy'		=>	Array ('type' => 'string', 'default' => ','),
 						'FieldsEnclosedBy'		=>	Array ('type' => 'string', 'default' => '"'),
 						'LineEndings'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
 						'LineEndingsInside'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2),
Index: branches/5.2.x/units/orders/orders_config.php
===================================================================
diff -u -N -r14641 -r14682
--- branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14641)
+++ branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14682)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 14641 2011-10-05 15:31:23Z alex $
+* @version	$Id: orders_config.php 14682 2011-10-19 10:55:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -496,7 +496,7 @@
 						// export related fields: begin
 						'ExportFormat'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
 						'ExportFilename'		=>	Array ('type' => 'string', 'default' => ''),
-						'FieldsSeparatedBy'		=>	Array ('type' => 'string', 'default' => ', '),
+						'FieldsSeparatedBy'		=>	Array ('type' => 'string', 'default' => ','),
 						'FieldsEnclosedBy'		=>	Array ('type' => 'string', 'default' => '"'),
 						'LineEndings'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
 						'LineEndingsInside'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2),
Index: branches/5.2.x/admin_templates/import.tpl
===================================================================
diff -u -N -r14258 -r14682
--- branches/5.2.x/admin_templates/import.tpl	(.../import.tpl)	(revision 14258)
+++ branches/5.2.x/admin_templates/import.tpl	(.../import.tpl)	(revision 14682)
@@ -11,17 +11,19 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						location.href = '<inp2:m_Link t="tools/import2"/>';
+					}
+				) );
+
 				a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
 
 						document.getElementById('export_columns').value = select_to_string('<inp2:p.import_InputName field="ExportColumns"/>');
 						submit_event('p.import','OnExportBegin');
 
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('p.import','OnGoBack');
-						}
-				 ) );
 
 				a_toolbar.Render();
 
@@ -88,134 +90,132 @@
 <inp2:p.import_SaveWarning name="grid_save_warning"/>
 <inp2:p.import_ErrorWarning name="form_error_warning"/>
 
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-			<inp2:m_RenderElement design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename">
-				<td class="control-cell">
-					<table border="0">
-						<tr>
-							<td>
-								<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_1"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
-							</td>
-							<td>
-								<label for="<inp2:p.import_InputName field="ImportSource"/>_1">upload</label>
-							</td>
-							<td>
-								<input type="file" name="<inp2:p.import_InputName field="ImportFilename"/>" id="<inp2:p.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_1');">
-							</td>
-						</tr>
+<table class="edit-form bordered">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+		<inp2:m_RenderElement design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename">
+			<td class="control-cell">
+				<table border="0">
+					<tr>
+						<td>
+							<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_1"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
+						</td>
+						<td>
+							<label for="<inp2:p.import_InputName field="ImportSource"/>_1">upload</label>
+						</td>
+						<td>
+							<input type="file" name="<inp2:p.import_InputName field="ImportFilename"/>" id="<inp2:p.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_1');">
+						</td>
+					</tr>
 
-						<tr>
-							<td>
-								<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_2"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
-							</td>
-							<td>
-								<label for="<inp2:p.import_InputName field="ImportSource"/>_2">select</label>
-							</td>
-							<td>
-								<select name="<inp2:p.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_2');">
-									<inp2:p.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
-								</select>
-							</td>
-						</tr>
+					<tr>
+						<td>
+							<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_2"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
+						</td>
+						<td>
+							<label for="<inp2:p.import_InputName field="ImportSource"/>_2">select</label>
+						</td>
+						<td>
+							<select name="<inp2:p.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_2');">
+								<inp2:p.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
+							</select>
+						</td>
+					</tr>
 
-					</table>
-				</td>
-			</inp2:m_RenderElement>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
-
-			<inp2:m_RenderElement design="form_row" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns">
-				<td class="control-cell">
-					<table cellpadding="0" cellspacing="0" border="0">
-						<tr>
-							<td>
-								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button">
-								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
-								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
-							</td>
-							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
-							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
-						</tr>
-						<tr>
-							<td>
-								<select multiple id="<inp2:p.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
-									<inp2:p.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
-								</select>
-								<input type="hidden" id="export_columns" name="<inp2:p.import_InputName field="ExportColumns"/>" value="<inp2:p.import_Field field="ExportColumns"/>" />
-							</td>
-							<td align="center">
-								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:p.import_InputName field="AvailableColumns"/>', '<inp2:p.import_InputName field="ExportColumns"/>')" class="button"><br>
-								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
-								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:p.import_InputName field="ExportColumns"/>', '<inp2:p.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:p.import_InputName field="AvailableColumns"/>');" class="button">
-							</td>
-							<td>
-								<select multiple id="<inp2:p.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
-									<inp2:p.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</inp2:m_RenderElement>
-
-	<!-- CATEGORY SELECTOR: BEGIN -->
-		<inp2:m_DefineElement name="root_cat_caption">
-			<inp2:m_Phrase name="la_rootcategory_name"/>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="category_caption">
-			<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
-		</inp2:m_DefineElement>
-
-		<inp2:m_RenderElement design="form_row" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory">
-			<td class="control-cell">
-				<b><inp2:p.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
-				<input type="hidden" name="<inp2:p.import_InputName field='CategoryId'/>" value="<inp2:p.import_Field field='CategoryId' db='db'/>" />
-				<a href="javascript:openSelector('p.import', '<inp2:adm_SelectorLink prefix="p.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
+				</table>
 			</td>
 		</inp2:m_RenderElement>
 
-	<!-- CATEGORY SELECTOR: END -->
-		<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
+		<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
 
-		<inp2:m_RenderElement design="form_row" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
+		<inp2:m_RenderElement design="form_row" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns">
 			<td class="control-cell">
-				<table cellspacing="0" cellpadding="0">
+				<table cellpadding="0" cellspacing="0" border="0">
 					<tr>
-						<td valign="top">
-							<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
-						</td>
 						<td>
-							<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: PRODUCTID</label>
+							<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button">
+							<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
+							<img src="img/spacer.gif" width="1" height="5" alt=""><br />
 						</td>
+						<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
+						<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
 					</tr>
-
 					<tr>
-						<td valign="top">
-							<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
+						<td>
+							<select multiple id="<inp2:p.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
+								<inp2:p.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
+							</select>
+							<input type="hidden" id="export_columns" name="<inp2:p.import_InputName field="ExportColumns"/>" value="<inp2:p.import_Field field="ExportColumns"/>" />
 						</td>
+						<td align="center">
+							<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:p.import_InputName field="AvailableColumns"/>', '<inp2:p.import_InputName field="ExportColumns"/>')" class="button"><br>
+							<img src="img/spacer.gif" width="1" height="4" alt=""><br>
+							<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:p.import_InputName field="ExportColumns"/>', '<inp2:p.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:p.import_InputName field="AvailableColumns"/>');" class="button">
+						</td>
 						<td>
-							<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
-							<inp2:p.import_PredefinedOptions prefix="p.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
-
-							<inp2:m_RenderElement prefix="p.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
+							<select multiple id="<inp2:p.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
+								<inp2:p.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
+							</select>
 						</td>
 					</tr>
 				</table>
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
+<!-- CATEGORY SELECTOR: BEGIN -->
+	<inp2:m_DefineElement name="root_cat_caption">
+		<inp2:m_Phrase name="la_rootcategory_name"/>
+	</inp2:m_DefineElement>
 
+	<inp2:m_DefineElement name="category_caption">
+		<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
+	</inp2:m_DefineElement>
+
+	<inp2:m_RenderElement design="form_row" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory">
+		<td class="control-cell">
+			<b><inp2:p.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
+			<input type="hidden" name="<inp2:p.import_InputName field='CategoryId'/>" value="<inp2:p.import_Field field='CategoryId' db='db'/>" />
+			<a href="javascript:openSelector('p.import', '<inp2:adm_SelectorLink prefix="p.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
+		</td>
+	</inp2:m_RenderElement>
+
+<!-- CATEGORY SELECTOR: END -->
+	<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
+
+	<inp2:m_RenderElement design="form_row" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
+		<td class="control-cell">
+			<table cellspacing="0" cellpadding="0">
+				<tr>
+					<td valign="top">
+						<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
+					</td>
+					<td>
+						<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: PRODUCTID</label>
+					</td>
+				</tr>
+
+				<tr>
+					<td valign="top">
+						<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
+					</td>
+					<td>
+						<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
+						<inp2:p.import_PredefinedOptions prefix="p.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
+
+						<inp2:m_RenderElement prefix="p.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</inp2:m_RenderElement>
+
+	<inp2:m_RenderElement name="inp_edit_filler"/>
+</table>
+
 <script language="javascript" type="text/javascript">
 	reflectFormFields();
 </script>