Index: branches/5.1.x/core/units/structure/structure_config.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 12657)
+++ branches/5.1.x/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: structure_config.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: structure_config.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
@@ -108,7 +108,7 @@
             'Filename'					=>	Array('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1),
 			'AutomaticFilename'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 1),
             'Description'				=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => null),
-            'CreatedOn'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'required' => 1, 'not_null' => 1),
+            'CreatedOn'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
             'EditorsPick'				=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
             'Status'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1,'default' => 1),
             'Priority'					=>	Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => array(), 'required' => 1, 'default' => 0),
@@ -125,7 +125,7 @@
             '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),
             'NewItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
             'PopItem'					=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
-            'Modified'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1,'default' => '#NOW#'),
+            'Modified'					=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
             'ModifiedById'				=>	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),
             'CachedTemplate'			=>	Array('type' => 'string', 'not_null' => 1, 'default' => ''),
 
@@ -139,7 +139,7 @@
 																		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
+				'not_null' => 1, 'default' => CATEGORY_TEMPLATE_INHERIT
 			),
 
 			'UseExternalUrl'	=>	Array (
@@ -158,19 +158,13 @@
 			'MenuTitle'			=>	Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => ''),
 			'MetaTitle'			=>	Array('type' => 'string', 'default' => null),
 			'IndexTools'		=>	Array('type' => 'string','default' => null),
-			'IsIndex'			=>
-				Array(
-					'type' => 'int','not_null' => 1, 'default' => 0,
-					'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Regular', 1 => 'la_CategoryIndex', 2=>'la_Container'), 'use_phrases' => 1,
-				),
 			'IsMenu'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Show', 0 => 'la_Hide'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 			'IsSystem'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_System', 0 => 'la_Regular'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 	    	'FormId'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter',
 		    												'options' => array('' => ''),
 															'options_sql' => 'SELECT Title, FormId FROM '.TABLE_PREFIX.'Forms ORDER BY Title',
 															'option_key_field' => 'FormId', 'option_title_field' => 'Title', 'default' => 0),
 			'FormSubmittedTemplate'	=>	Array('type' => 'string', 'default' => null),
-			'Translated'		=>	Array ('type' => 'int', 'formatter' => 'kMultiLanguage', 'not_null' => 1, 'default' => 0, 'db_type' => 'tinyint', 'index_type' => 'int'),
 			'FriendlyURL'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			'ThemeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
         ),