Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -N -r11623 -r11635
--- branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 11623)
+++ branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 11635)
@@ -1011,7 +1011,7 @@
 
 CREATE TABLE MailingLists (
   MailingId int(10) unsigned NOT NULL auto_increment,
-  PortalUserId int(11) NOT NULL,
+  PortalUserId int(11) NOT NULL default '-1',
   `To` longtext,
   ToParsed longtext,
   Attachments text,
Index: branches/RC/core/admin_templates/js/uploader/upload_manager.js
===================================================================
diff -u -N -r11418 -r11635
--- branches/RC/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 11418)
+++ branches/RC/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 11635)
@@ -10,6 +10,8 @@
 
 /* ==== Private Attributes ==== */
 UploadsManager._nextId = 0;
+UploadsManager._uploadersReady = 0;
+
 UploadsManager._debugMode = false;
 UploadsManager._Uploaders = new Object();
 UploadsManager._singleUpload = true;
@@ -380,6 +382,12 @@
 
 UploadsManager.onFlashReady = function ($uploader_id) {
 	this._Uploaders[$uploader_id].onFlashReady();
+	this._uploadersReady++;
+
+	if (this._uploadersReady == this._nextId) {
+		// all uploaders are ready
+		Application.processHooks('m:OnUploadersReady');
+	}
 }
 
 UploadsManager.onDebug = function (message) {
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11623 -r11635
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11623)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11635)
@@ -972,7 +972,7 @@
 
 CREATE TABLE MailingLists (
   MailingId int(10) unsigned NOT NULL auto_increment,
-  PortalUserId int(11) NOT NULL,
+  PortalUserId int(11) NOT NULL default '-1',
   `To` longtext,
   ToParsed longtext,
   Attachments text,
Index: branches/RC/core/units/skins/skins_config.php
===================================================================
diff -u -N -r11538 -r11635
--- branches/RC/core/units/skins/skins_config.php	(.../skins_config.php)	(revision 11538)
+++ branches/RC/core/units/skins/skins_config.php	(.../skins_config.php)	(revision 11635)
@@ -113,8 +113,18 @@
 			'as_image'=>true, 'thumb_width'=>100, 'thumb_height'=>100,
 			'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
 			'direct_links'=>false, // use direct file urls or send files through wrapper (requires mod_mime_magic)
-			'default' => null,
+			'not_null' => 1, 'default' => '',
 		),
+		'LogoLogin' => Array(
+			'type'=>'string', 'formatter'=>'kUploadFormatter',
+			'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
+			'file_types'=>'*.jpg;*.gif;*.png', 'files_description'=>'!la_ImageFiles!',
+			'upload_dir' => WRITEBALE_BASE . '/user_files/', // relative to project's home
+			'as_image'=>true, 'thumb_width'=>100, 'thumb_height'=>100,
+			'multiple'=>false, // false or max number of files - will be stored as serialized array of paths
+			'direct_links'=>false, // use direct file urls or send files through wrapper (requires mod_mime_magic)
+			'not_null' => 1, 'default' => '',
+		),
 		'Options' => Array(
 			'type' => 'string', 'default' => NULL,
 			'formatter' => 'kSerializedFormatter',
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r11623 -r11635
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11635)
@@ -696,7 +696,7 @@
 <inp2:m_DefineElement name="inp_edit_weight" subfield="" class="" is_last="" maxlength="">
 	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
 				<input type="text" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
 				<inp2:m_phrase label="la_kg" />
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r11610 -r11635
--- branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 11610)
+++ branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 11635)
@@ -1641,7 +1641,7 @@
 
 		$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
 		$theme_id = $this->_getCurrentThemeId();
-		$fields['ParentId']['default'] = $this->Application->GetVar('m_cat_id');
+		$fields['ParentId']['default'] = (int)$this->Application->GetVar('m_cat_id');
 		$fields['ParentId']['options'] = $this->_printChildren($data, $root_category, $this->Application->GetVar('m_lang'), $theme_id);
 
 		// limit design list by theme
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -N -r11623 -r11635
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11623)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11635)
@@ -42,7 +42,7 @@
 
 # Section "in-portal:configure_general":
 INSERT INTO ConfigurationAdmin VALUES ('Site_Name', 'la_Text_Website', 'la_config_website_name', 'text', '', '', 10.02, 0, 1);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Name', 'In-Portal', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Name', 'In-Portal CMS', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationAdmin VALUES ('FirstDayOfWeek', 'la_Text_Date_Time_Settings', 'la_config_first_day_of_week', 'select', '', '0=la_sunday,1=la_monday', 20.03, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FirstDayOfWeek', '1', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationAdmin VALUES ('Smtp_AdminMailFrom', 'la_Text_smtp_server', 'la_prompt_AdminMailFrom', 'text', NULL, 'size="40"', 30.07, 0, 1);
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),
Index: branches/RC/core/units/languages/languages_config.php
===================================================================
diff -u -N -r11623 -r11635
--- branches/RC/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 11623)
+++ branches/RC/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 11635)
@@ -207,7 +207,7 @@
 										'ThousandSep' => Array('type' => 'string','not_null' => 1, 'default' => ''),
 										'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'UnitSystem' => Array('type' => 'int','not_null' => 1, 'default' => 1, 'formatter' => 'kOptionsFormatter','options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'),'use_phrases' => 1),
-										'FilenameReplacements' => Array('type' => 'string'),
+										'FilenameReplacements' => Array ('type' => 'string', 'default' => NULL),
 										'Locale' => Array('type' => 'string','not_null' => 1, 'default' => 'en-US', 'formatter' => 'kOptionsFormatter',
 														  'options' => Array('' => ''),
 														  'options_sql' => "SELECT CONCAT(LocaleName, ' ' ,'\/',Locale,'\/') AS name, Locale FROM ".TABLE_PREFIX."LocalesList ORDER BY LocaleId", 'option_title_field' => "name", 'option_key_field' => 'Locale',