Index: branches/RC/core/units/structure/structure_config.php
===================================================================
diff -u -N -r11610 -r11635
--- branches/RC/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 11610)
+++ branches/RC/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 11635)
@@ -88,6 +88,7 @@
 		'Fields' 			=> 	Array (
             'CategoryId'				=>	Array('type' => 'int', 'not_null' => 1,'default' => 0),
             'Type'						=>	Array('type' => 'int','not_null' => 1,'default' => 0),
+		    'SymLinkCategoryId'			=>	Array ('type' => 'int', 'default' => NULL),
             'ParentId'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'not_null' => 1,'default' => 0, 'required'=>1),
             'Name'						=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'not_null' => 1, 'required' => 1, 'default' => ''),
             'Filename'					=>	Array('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1),
@@ -103,6 +104,8 @@
             'CreatedById'				=>	Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'options' => Array(-1 => 'root', -2 => 'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'not_null' => 1,'default' => 0),
             'ResourceId'				=>	Array('type' => 'int', 'default' => null),
             'ParentPath'				=>	Array('type' => 'string', 'default' => null),
+		    'TreeLeft'					=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+			'TreeRight'					=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
             'NamedParentPath'			=>	Array('type' => 'string', 'default' => null),
             'MetaDescription'			=>	Array('type' => 'string', 'default' => null),
             'HotItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
@@ -114,11 +117,29 @@
 
 
             // fields from Pages
-            'Template'			=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter',
-																'options_sql'	=>	'	SELECT CONCAT(tf.Description, " (", TRIM(TRAILING ".tpl" FROM FileName), ")") AS Title,
+		    'Template'			=>	Array (
+		    	'type' => 'string',
+		    	'formatter' => 'kOptionsFormatter', 'options_sql' => '	SELECT	CONCAT(tf.Description, " (", TRIM(TRAILING ".des" FROM TRIM(TRAILING ".tpl" FROM FileName) ), ")") AS Title,
 																					 	CONCAT(FilePath, "/", TRIM(TRAILING ".tpl" FROM FileName)) AS Value
-																						FROM '.TABLE_PREFIX.'ThemeFiles AS tf LEFT JOIN '.TABLE_PREFIX.'Theme AS t ON t.ThemeId = tf.ThemeId WHERE t.Enabled = 1 AND FilePath = "/designs"',
-																'option_key_field' => 'Value', 'option_title_field' => 'Title', 'default' => null/*, 'required' => 1*/),
+																		FROM ' . TABLE_PREFIX . 'ThemeFiles AS tf
+																		LEFT JOIN ' . TABLE_PREFIX . 'Theme AS t ON t.ThemeId = tf.ThemeId
+																		WHERE (t.Enabled = 1) AND (tf.FileName NOT LIKE "%%.elm.tpl") AND (tf.FileName NOT LIKE "%%.des.tpl") AND (tf.FilePath = "/designs")',
+				'option_key_field' => 'Value', 'option_title_field' => 'Title',
+				/*'required' => 1,*/ 'default' => null
+			),
+
+			'UseExternalUrl'	=>	Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
+			'ExternalUrl'		=>	Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+			'UseMenuIconUrl'	=>	Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
+			'MenuIconUrl'		=>	Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 			'Title'				=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'default' => '', 'not_null'=>1),
 			'MenuTitle'			=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'format'=>'no_default', 'not_null' => 1, 'default' => ''),
 			'MetaTitle'			=>	Array('type' => 'string', 'default' => null),