Index: trunk/core/units/configuration/configuration_config.php
===================================================================
diff -u -N -r4665 -r5119
--- trunk/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 4665)
+++ trunk/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 5119)
@@ -29,33 +29,47 @@
 											
 					'TableName'			=>	TABLE_PREFIX.'ConfigurationValues',
 
-					'ListSQLs'			=>	Array(''=>'SELECT * FROM '.TABLE_PREFIX.'ConfigurationAdmin LEFT JOIN '.TABLE_PREFIX.'ConfigurationValues Using(VariableName) '),
+					'ListSQLs'			=>	Array(''	=>	'	SELECT %1$s.* %2$s
+																FROM '.TABLE_PREFIX.'ConfigurationAdmin ca
+																LEFT JOIN %1$s USING(VariableName)'),
 					
-					'ItemSQLs'			=>	Array(''=>'SELECT * FROM '.TABLE_PREFIX.'ConfigurationAdmin LEFT JOIN '.TABLE_PREFIX.'ConfigurationValues Using(VariableName) '),
+					'ItemSQLs'			=>	Array(''	=>	'	SELECT %1$s.* %2$s
+																FROM '.TABLE_PREFIX.'ConfigurationAdmin ca
+																LEFT JOIN %1$s USING(VariableName)'),
 
 					'ListSortings'		=> 	Array( 
 													'' => Array(
-														'Sorting' => Array('DisplayOrder' => 'asc'),
+														'Sorting' => Array('DisplayOrder' => 'asc', 'GroupDisplayOrder' => 'asc'),
 													)
 											),
 																			
-					'SubTables'		=> Array(),
+					'CalculatedFields'	=>	Array (
+													''	=>	Array (
+																	'heading'	=>	'ca.heading',
+																	'prompt'	=>	'ca.prompt',
+																	'element_type'	=>	'ca.element_type',
+																	'ValueList'	=>	'ca.ValueList',
+																	'DisplayOrder'	=>	'ca.DisplayOrder',
+																	'GroupDisplayOrder'	=>	'ca.GroupDisplayOrder',
+																	'Install'	=>	'ca.Install',
+															),
+											),
 					
 				  	'Fields' 		=>	Array(
-									        'VariableName' => Array('type' => 'string','not_null' => '1','default' => ''),
-									        'VariableValue' => array('type'=>'string', 'default'=>''),
-									        'ModuleOwner'	=>	array('type'=>'string', 'default'=>'In-Portal'),
-									        'Section'	=>	array('type'=>'string','not_null' => '1','default'=>''),
+										        'VariableName' => Array('type' => 'string','not_null' => '1','default' => ''),
+										        'VariableValue' => array('type'=>'string', 'default'=>''),
+										        'ModuleOwner'	=>	array('type'=>'string', 'default'=>'In-Portal'),
+										        'Section'	=>	array('type'=>'string','not_null' => '1','default'=>''),
 											),
 
 					'VirtualFields'	=> 	Array(
-											'heading' => Array('type' => 'string','default' => ''),
-									        'prompt' => Array('type' => 'string','default' => ''),
-									        'element_type' => Array('type' => 'string','not_null' => '1','default' => ''),
-									        'validation' => Array('type' => 'string','default' => ''),
-									        'ValueList' => Array('type' => 'string','default' => ''),
-									        'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'),
-									        'Install' => Array('type' => 'int','not_null' => '1','default' => '1'),
+												'heading'			=>	Array('type' => 'string', 'default' => ''),
+										        'prompt'			=>	Array('type' => 'string', 'default' => ''),
+										        'element_type'		=>	Array('type' => 'string', 'not_null' => '1', 'default' => ''),
+										        'ValueList'			=>	Array('type' => 'string', 'default' => ''),
+										        'DisplayOrder'		=>	Array('type' => 'double', 'not_null' => '1', 'default' => 0),
+										        'GroupDisplayOrder'	=>	Array('type' => 'double', 'not_null' => '1', 'default' => 0),
+										        'Install'			=>	Array('type' => 'int', 'not_null' => '1', 'default' => 1),
 											),
 											
 					'Grids'	=> Array(),