Index: branches/5.1.x/core/units/sections/sections_config.php
===================================================================
diff -u -r13086 -r14110
--- branches/5.1.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 13086)
+++ branches/5.1.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 14110)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: sections_config.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: sections_config.php 14110 2011-01-05 10:46:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -219,8 +219,7 @@
 				'parent'		=>	'in-portal:tools',
 				'icon'			=>	'import_data',
 				'label'			=>	'la_tab_ImportData',
-				'url'			=>	Array ('t' => 'tools/import1'),
-				'onclick'		=>	'direct_edit(\'adm\', this.href);',
+				'url'			=>	Array ('t' => 'tools/import1'),				
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	3,
 				'type'			=>	stTREE,
Index: branches/5.1.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -r13956 -r14110
--- branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 13956)
+++ branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 14110)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 13956 2010-09-22 10:16:03Z alex $
+* @version	$Id: admin_events_handler.php 14110 2011-01-05 10:46:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1213,16 +1213,17 @@
 	{
 		parent::OnAfterConfigRead($event);
 
-		if (!$this->Application->ConfigValue('AdvancedUserManagement')) {
-			$section_ajustments = $this->Application->getUnitOption($event->Prefix, 'SectionAdjustments');
-			if (!$section_ajustments) {
-				$section_ajustments = Array ();
-			}
+		$section_ajustments = $this->Application->getUnitOption($event->Prefix, 'SectionAdjustments', Array());
 
+		if ( !$this->Application->ConfigValue('AdvancedUserManagement') ) {
 			$section_ajustments['in-portal:user_groups'] = 'remove';
+		}
 
-			$this->Application->setUnitOption($event->Prefix, 'SectionAdjustments', $section_ajustments);
+		if ( $this->Application->ConfigValue('UsePopups') ) { // 1 - pop-up, 2 - modal
+			$section_ajustments['in-portal:main_import'] = Array('onclick' => 'direct_edit(\'adm\', this.href);');
 		}
+
+		$this->Application->setUnitOption($event->Prefix, 'SectionAdjustments', $section_ajustments);
 	}
 
 	/**
Index: branches/5.1.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -r13470 -r14110
--- branches/5.1.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 13470)
+++ branches/5.1.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 14110)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 13470 2010-04-28 15:21:51Z alex $
+* @version	$Id: configuration_event_handler.php 14110 2011-01-05 10:46:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -161,7 +161,7 @@
 			$variable_value = $object->GetDBField('VariableValue');
 			$watch_variables = Array (
 				'Require_AdminSSL', 'AdminSSL_URL', 'AdvancedUserManagement',
-				'Site_Name', 'AdminConsoleInterface'
+				'Site_Name', 'AdminConsoleInterface', 'UsePopups'
 			);
 
 			if (in_array($variable_name, $watch_variables)) {
@@ -250,7 +250,7 @@
 				// reset cache
 				$changed = $this->Application->GetVar($event->getPrefixSpecial() . '_changed', Array ());
 				$require_refresh = Array (
-					'AdvancedUserManagement', 'Site_Name', 'AdminConsoleInterface'
+					'AdvancedUserManagement', 'Site_Name', 'AdminConsoleInterface', 'UsePopups'
 				);
 
 				$refresh_sections = array_intersect($require_refresh, $changed);