Index: trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.php
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.php	(revision 8045)
+++ trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.php	(revision 0)
@@ -1,8 +0,0 @@
-<?php
-	require_once FULL_PATH.'/core/install/upgrades.php'; // k4_include_once doesn't globalize $upgrade_class :(
-	
-	$upgrade = new $upgrade_class();
-	/* @var $upgrade CoreUpgrades */
-	
-	$upgrade->Upgrade_4_0_2('after');
-?>
\ No newline at end of file
Index: trunk/core/units/sections/sections_config.php
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 7635)
+++ trunk/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 8397)
@@ -129,7 +129,7 @@
 															'url'			=>	Array('t' => 'in-portal/users/users_list', 'pass' => 'm'),
 															'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
 															'priority'		=>	1.5,
-															'debug_only'	=>	true,
+															'show_mode'		=>	smDEBUG,
 															'type'			=>	stTREE,
 													),
 													
Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r7867 -r8397
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 7867)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 8397)
@@ -343,7 +343,7 @@
 				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
             print "<tr ".int_table_color_ret().">\n";
-            print "  <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
+            print '  <td valign="top"><span id="prompt_'.$f->name.'" class="text">'.$f->GetPrompt().'</span></td>'."\n";
 
             print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";
             if (is_object($f->NextItem)) {
Index: trunk/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 7855)
+++ trunk/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 8397)
@@ -22,16 +22,16 @@
 		}
 
 		/**
-		 * Updates table structure on new language adding/removing language
+		 * [HOOK] Updates table structure on new language adding/removing language
 		 *
 		 * @param kEvent $event
 		 */
-		function OnReflectMultiLingualFields($event)
+		function OnReflectMultiLingualFields(&$event)
 		{
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
-
-			$this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); //make sure to re-read all configs
-			$this->Application->UnitConfigReader->AfterConfigRead();
+			/* @var $ml_helper kMultiLanguageHelper */
+			
+			$this->Application->UnitConfigReader->ReReadConfigs();
 			foreach ($this->Application->UnitConfigReader->configData as $prefix => $config_data) {
 				$ml_helper->createFields($prefix);
 			}
Index: trunk/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 7855)
+++ trunk/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 8397)
@@ -85,7 +85,7 @@
 <inp2:m_include t="incs/config_blocks"/>
 
 <inp2:conf_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" id="config_table">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<inp2:conf_PrintList list_name="default" block="config_block" full_block="config_block" half_block1="config_block1" half_block2="config_block2"/>
 </table>
 
Index: trunk/admin/install/download_license.php
===================================================================
diff -u -N -r402 -r8397
--- trunk/admin/install/download_license.php	(.../download_license.php)	(revision 402)
+++ trunk/admin/install/download_license.php	(.../download_license.php)	(revision 8397)
@@ -14,15 +14,15 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="left" class="txt"><b>Domain:</b></td>
 				              <td ALIGN="left" class="txt"><input type="text" readonly name="domain" value="<?php echo $_SERVER['HTTP_HOST']?>"></td>
 				            </tr>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="left" class="txt"><b>Available licenses:</b></td>
 				              <td ALIGN="left" class="txt"><?php echo $license_select;?></td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($download_license_error) ) echo $download_license_error; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/admin/install/warning.php
===================================================================
diff -u -N -r41 -r8397
--- trunk/admin/install/warning.php	(.../warning.php)	(revision 41)
+++ trunk/admin/install/warning.php	(.../warning.php)	(revision 8397)
@@ -11,16 +11,16 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 								<td class="text" colspan="2"><?php  echo int_hint(prompt_language("la_text_restore warning")); ?></td>
 				            </tr>
-				            <tr class="table_color2">	            				            				            
+				            <tr class="table-color2">	            				            				            
 				              <td class="text" colspan="2">				                
 									<?php echo prompt_language("la_prompt_approve_warning")?>
 									<input type="checkbox" name="warning_ok" value="1">
 				              </td>				            
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $login_error; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/admin/include/elements.php
===================================================================
diff -u -N -r4427 -r8397
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 4427)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 8397)
@@ -336,14 +336,14 @@
    static $colorset;
 
    if($reset_color)
-   {  $colorset="table_color2";
+   {  $colorset="table-color2";
       return;
    }
 
-   if ($colorset == "table_color1")
-      $colorset = "table_color2";
+   if ($colorset == "table-color1")
+      $colorset = "table-color2";
    else
-      $colorset = "table_color1";
+      $colorset = "table-color1";
 
    $ret = "class=\"".$colorset."\"";
    if($return_result)
@@ -359,14 +359,14 @@
    static $colorset;
 
    if($reset_color)
-   {  $colorset="table_color2";
+   {  $colorset="table-color2";
       return;
    }
 
-   if ($colorset == "table_color1")
-      $colorset = "table_color2";
+   if ($colorset == "table-color1")
+      $colorset = "table-color2";
    else
-      $colorset = "table_color1";
+      $colorset = "table-color1";
 
    return "class=\"".$colorset."\"";
 }//Table Alternating colors
Index: trunk/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -N -r7704 -r8397
--- trunk/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 7704)
+++ trunk/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 8397)
@@ -27,7 +27,7 @@
 </table>
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="RootPassword" title="la_fld_Password"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyRootPassword" title="la_fld_VerifyPassword"/>
 </table>
Index: trunk/admin/install/restore_select.php
===================================================================
diff -u -N -r3282 -r8397
--- trunk/admin/install/restore_select.php	(.../restore_select.php)	(revision 3282)
+++ trunk/admin/install/restore_select.php	(.../restore_select.php)	(revision 8397)
@@ -56,7 +56,7 @@
 					        foreach($datearray as $key => $value)
 					        {
 					          $sel = ($value == $_REQUEST['backupdate']) ? ' checked' : '';
-					          $options .= "<TR class=\"table_color2\">";                    
+					          $options .= "<TR class=\"table-color2\">";                    
 					          $options .= "<TD class=\"txt\" size=40><input id=\"$key\" type=radio NAME=\"backupdate\" VALUE=\"$value\" $sel>";
 					          $options .= '<label for="'.$key.'">'.adodb_date("F j, Y, g:i a",$value)."</label></TD></TR>";
 					          $count++;
@@ -90,14 +90,14 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="left" WIDTH="100%" class="txt">
 				              	<b>Backup Directory:</b> <INPUT TYPE="text" NAME="backupdir" VALUE="<?php echo $filepath; ?>">
 				              	<input type="button" NAME="update" VALUE="Update" class="button" ONCLICK="this.form.state.value='restore_select'; this.form.submit();">
 				              </td>
 				            </tr>
 								<?php echo $options;?>   
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $restore_error; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/core/units/general/helpers/modules.php
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/units/general/helpers/modules.php	(.../modules.php)	(revision 7855)
+++ trunk/core/units/general/helpers/modules.php	(.../modules.php)	(revision 8397)
@@ -182,7 +182,7 @@
 		    else {
 		        $modules = array_keys($this->Application->ModuleInfo);
 		    }
-		    
+
 			array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
 		    return $modules;
 		}
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.3.2.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v1.3.2.sql	(revision 7391)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.3.2.sql	(revision 0)
@@ -1,6 +0,0 @@
-ALTER TABLE ThemeFiles ADD FileFound TINYINT UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE ThemeFiles ADD INDEX (FileFound);
-
-CREATE TABLE PopupSizes (PopupId int(10) unsigned NOT NULL auto_increment, TemplateName varchar(255) NOT NULL default '', PopupWidth int(11) NOT NULL default '0', PopupHeight int(11) NOT NULL default '0', PRIMARY KEY  (PopupId), KEY TemplateName (TemplateName));
-
-UPDATE Modules SET Version = '1.3.2' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/tools/debug_sample.php
===================================================================
diff -u -N -r7867 -r8397
--- trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 7867)
+++ trunk/tools/debug_sample.php	(.../debug_sample.php)	(revision 8397)
@@ -7,7 +7,7 @@
 
 	$dbg_options = 	Array (
 	//		!!! DEBUG MODE will be off if IP does not match !!!
-							'DBG_IP'				=>	'193.68.72.64/26',	// !!!REQUIRED!!! Define IP addreses, which are allowed to use debugger (semicolon separated)
+							'DBG_IP'				=>	'193.68.72.64/26;69.17.25.153',	// !!!REQUIRED!!! Define IP addreses, which are allowed to use debugger (semicolon separated)
 							'DEBUG_MODE'			=>	1,				// Debug mode is allowed/disabled (note: set DBG_IP to use this one)
 //							'DBG_LOCAL_BASE_PATH'	=>	'w:',			// Folder name on mapped drive, where site resides
 //							'DBG_TOOLBAR_BUTTONS'	=>	1,				// Show "Show Debugger" & "Refresh Frame" buttons (on front)
Index: trunk/admin/install/login.php
===================================================================
diff -u -N -r41 -r8397
--- trunk/admin/install/login.php	(.../login.php)	(revision 41)
+++ trunk/admin/install/login.php	(.../login.php)	(revision 8397)
@@ -11,20 +11,20 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 				              <td class="txt"><b>Username:</b></td>
 				              <td> 
 				                <input type="text" name="UserName" class="text">
 				              </td>
 				            </tr>
-				            <tr class="table_color2">	            				            				            
+				            <tr class="table-color2">	            				            				            
 				              <td class="text">
 				                <b>Password:</b></td>
 				              <td> 
 				                <input type="password" name="UserPass" class="text">
 				              </td>				            
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $login_error; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/admin/tools/server_info.php
===================================================================
diff -u -N -r5431 -r8397
--- trunk/admin/tools/server_info.php	(.../server_info.php)	(revision 5431)
+++ trunk/admin/tools/server_info.php	(.../server_info.php)	(revision 8397)
@@ -71,7 +71,7 @@
 int_header($objCatToolBar,NULL,$title, NULL, $extra);
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="tableborder">
-<tr><td class="table_color1">
+<tr><td class="table-color1">
 <form ID="sinfoform" name="sinfoform" action="" method=POST>
 <!-- before phpinfo -->
 <?php
Index: trunk/core/install/step_templates/upgrade_modules.tpl
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 7635)
+++ trunk/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 8397)
@@ -1,7 +1,7 @@
 <?php
 	ob_start();
 ?>
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text" colspan="2" valign="middle">
 		<table cellpadding="0" cellspacing="0">
 			<tr>
@@ -23,7 +23,7 @@
 		echo sprintf($module_tpl, $module_name, $module_title);
 	}
 ?>
-<tr class="table_color1">
+<tr class="table-color1">
 	<td class="hint" colspan="2" valign="middle">
 		<img src="incs/img/icon_warning.gif" width="14" height="14" align="absmiddle" />
 		Your data will be modified during the upgrade. We strongly recommend that you make a backup of your database. Proceed with the upgrade ?
Index: trunk/kernel/include/custommetadata.php
===================================================================
diff -u -N -r8009 -r8397
--- trunk/kernel/include/custommetadata.php	(.../custommetadata.php)	(revision 8009)
+++ trunk/kernel/include/custommetadata.php	(.../custommetadata.php)	(revision 8397)
@@ -37,7 +37,8 @@
 	function DeleteResource($ResourceId, $main_prefix)
 	{
 	  	if (!$ResourceId) return false;
-
+	  	
+		$this->Application->getUnitOption($main_prefix, 'TableName');
 	  	$custom_table = $this->Application->getUnitOption($main_prefix.'-cdata', 'TableName');
 	  	$sql = 'DELETE FROM '.$custom_table.'
 	    		WHERE ResourceId = '.$ResourceId;
@@ -46,6 +47,7 @@
 
 	function CopyResource($OldId,$NewId, $main_prefix)
 	{
+		$this->Application->getUnitOption($main_prefix, 'TableName');
 		$custom_data =& $this->Application->recallObject($main_prefix.'-cdata.-item', null, Array('skip_autoload' => true));
 		$custom_data->Load($OldId, 'ResourceId');
 
@@ -144,7 +146,8 @@
 			// not e.g. bb, c, u, but CustomFieldId :) or empty at all
 			$this->Application->reportError(get_class($this), 'CopyToEditTable');
 		}
-
+		
+		$this->Application->getUnitOption($prefix, 'TableName');
 		$temp_handler =& $this->Application->recallObject($prefix.'-cdata_TempHandler', 'kTempTablesHandler');
 		return $temp_handler;
 	}
Index: trunk/core/admin_templates/no_permission.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 7391)
+++ trunk/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 8397)
@@ -30,8 +30,8 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td height="400" valign="middle" align="left">
 			<center><b>No Permission</b></center><br />
 			<inp2:m_if check="m_IsDebugMode">
Index: trunk/kernel/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -N -r8061 -r8397
--- trunk/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8061)
+++ trunk/kernel/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8397)
@@ -54,7 +54,7 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -82,7 +82,7 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
Index: trunk/core/units/general/helpers/multilanguage.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/units/general/helpers/multilanguage.php	(.../multilanguage.php)	(revision 8104)
+++ trunk/core/units/general/helpers/multilanguage.php	(.../multilanguage.php)	(revision 8397)
@@ -88,8 +88,10 @@
 		 */
 		function createFields($prefix, $refresh = false)
 		{
-			if ($refresh) {
-				$this->Application->HandleEvent( new kEvent($prefix.':OnCreateCustomFields') );
+			if ($refresh && preg_match('/(.*)-cdata$/', $prefix, $regs)) {
+				// call main item config to clone cdata table
+				$this->Application->UnitConfigReader->loadConfig($regs[1]);
+				$this->Application->HandleEvent( new kEvent($prefix.':OnAfterConfigRead') );
 			}
 
 			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
@@ -128,6 +130,7 @@
 							$field_mask['type'] = $field_options['db_type'];
 						}
 						$field_mask['default'] = 'DEFAULT '.$default_value;
+						
 						if (strtoupper($field_mask['type']) == 'TEXT') {
 							// text fields in mysql doesn't have default value
 							$field_mask = $field_mask['name'].' '.$field_mask['type'].' '.$field_mask['null'];
Index: trunk/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -N -r6669 -r8397
--- trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 6669)
+++ trunk/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 8397)
@@ -3,7 +3,7 @@
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 
-<inp2:m_ParseBlock name="section_header" icon="icon46_visits" title="!la_title_Visits!"/>
+<inp2:m_ParseBlock name="section_header" module="in-portal" prefix="visits" icon="icon46_visits" title="!la_title_Visits!"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
 
@@ -14,74 +14,74 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-  																		
+
 				function edit()
 	  			{
-					
+
 	  			}
-	  			
+
 	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearch');
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearchReset');
-						} ) );	  			
-	  			
+						} ) );
+
 				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
 							window.location.href = window.location.href;
 						}
 				) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 							std_delete_items('visits');
 						}
 				) );
-	  			
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-				
+
 				a_toolbar.Render();
 			</script>
-			
+
 		</td>
 	</tr>
 </tbody>
 </table>
 <script type="text/javascript" src="js/calendar.js"></script>
 
 <inp2:m_DefineElement name="search_calendar_td" class="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
-		
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
 
-		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>	
-		
+		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
 	</tr>
Index: trunk/core/admin_templates/sections_list.tpl
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 7855)
+++ trunk/core/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 8397)
@@ -25,9 +25,9 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td valign="top" width="100%">
-			<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+			<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 				<inp2:m_DefineElement name="section_element" icon_module="">
-					<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+					<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 						<td class="subitem_icon">
 							<img src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon46_list_<inp2:m_param name="icon"/>.gif" border="0" alt="<inp2:m_phrase name="$label"/>" align="absmiddle"/>
 						</td>
@@ -42,7 +42,7 @@
 					</tr>
 				</inp2:m_DefineElement>
 
-				<inp2:m_set odd_even="table_color1"/>
+				<inp2:m_set odd_even="table-color1"/>
 				<inp2:adm_PrintSections block="section_element" section_name="#session#"/>
 			</table>
 		</td>
Index: trunk/core/units/general/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 7635)
+++ trunk/core/units/general/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 8397)
@@ -2,6 +2,13 @@
 
 	class kModRewriteHelper extends kHelper {
 
+		/**
+		 * Holds a refererence to httpquery
+		 *
+		 * @var kHttpQuery
+		 */
+		var $HTTPQuery = null;
+		
 		function kModRewriteHelper()
 		{
 			parent::kHelper();
@@ -311,6 +318,7 @@
 				if ($template_found) {
 					$vars['m_cat_id'] = $template_found['CategoryId'];
 					$vars['t'] = implode('/', $url_parts);
+					$vars['is_virtual'] = true; // for template from POST
 					return true;
 				}
 			}
@@ -357,6 +365,15 @@
 				$vars = $this->parseRewriteURL($url,$passed);
 				$cache = array('vars'=>$vars,'passed'=>$passed);
 				$this->Conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("mod_rw_'.md5($url).'", '.$this->Conn->qstr(serialize($cache)).', '.adodb_mktime().')');
+				
+				if (isset($this->HTTPQuery->Post['t']) && $this->HTTPQuery->Post['t']) {
+					// template from POST overrides template from URL.
+					$vars['t'] = $this->HTTPQuery->Post['t'];
+					if (isset($vars['is_virtual']) && $vars['is_virtual']) {
+						$vars['m_cat_id'] = 0; // this is virtual template category (for Proj-CMS)
+					}
+				}
+				unset($vars['is_virtual']);
 			}
 			foreach ($vars as $name => $value)
 			{
Index: trunk/admin/install/postconfig.php
===================================================================
diff -u -N -r41 -r8397
--- trunk/admin/install/postconfig.php	(.../postconfig.php)	(revision 41)
+++ trunk/admin/install/postconfig.php	(.../postconfig.php)	(revision 8397)
@@ -44,7 +44,7 @@
 //print "<td colspan=3 STYLE=\"text-align:center;\">";
 $newstate="postconfig_".$step;
 ?>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="3"><p class="error"><?php echo $db_error; ?></p><br/></td>
 				            </tr>
 				             <input type="hidden" name="UserPass" VALUE="<?php echo $UserPass; ?>">
Index: trunk/admin/install/settings.php
===================================================================
diff -u -N -r402 -r8397
--- trunk/admin/install/settings.php	(.../settings.php)	(revision 402)
+++ trunk/admin/install/settings.php	(.../settings.php)	(revision 8397)
@@ -11,7 +11,7 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 				            	<td class="txt">
 				                <b>Enter the URL which the In-Portal root directory (<I><?php echo $path; ?></I>) corresponds to on your web server.</b></td>
 				              <td>
@@ -23,7 +23,7 @@
 					                <input type="text" name="site" class="text" VALUE="<?php echo $pathguess; ?>">
 				              </td>		
 				            </tr>	            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $PassError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/core/install/english.lang
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/install/english.lang	(.../english.lang)	(revision 7855)
+++ trunk/core/install/english.lang	(.../english.lang)	(revision 8397)
@@ -96,6 +96,7 @@
 			<PHRASE Label="la_col_ImageUrl" Module="Proj-Base" Type="1">VVJM</PHRASE>
 			<PHRASE Label="la_col_Inherited" Module="Proj-Base" Type="1">SW5oZXJpdGVk</PHRASE>
 			<PHRASE Label="la_col_InheritedFrom" Module="Proj-Base" Type="1">SW5oZXJpdGVkIEZyb20=</PHRASE>
+			<PHRASE Label="la_col_IsPrimary" Module="Proj-Base" Type="1">UHJpbWFyeQ==</PHRASE>
 			<PHRASE Label="la_col_IsSystem" Module="Proj-Base" Type="1">U3lzdGVt</PHRASE>
 			<PHRASE Label="la_col_Label" Module="Proj-Base" Type="1">TGFiZWw=</PHRASE>
 			<PHRASE Label="la_col_LastChanged" Module="Proj-Base" Type="1">TGFzdCBDaGFuZ2Vk</PHRASE>
@@ -121,6 +122,7 @@
 			<PHRASE Label="la_col_ReviewedBy" Module="Proj-Base" Type="1">UmV2aWV3ZWQgQnk=</PHRASE>
 			<PHRASE Label="la_col_ReviewText" Module="Proj-Base" Type="1">UmV2aWV3IFRleHQ=</PHRASE>
 			<PHRASE Label="la_col_SelectorName" Module="Proj-Base" Type="1">U2VsZWN0b3I=</PHRASE>
+			<PHRASE Label="la_col_SkinName" Module="Proj-Base" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_Status" Module="Proj-Base" Type="1">U3RhdHVz</PHRASE>
 			<PHRASE Label="la_col_TargetId" Module="Proj-Base" Type="1">SXRlbQ==</PHRASE>
 			<PHRASE Label="la_col_TargetType" Module="Proj-Base" Type="1">SXRlbSBUeXBl</PHRASE>
@@ -140,18 +142,22 @@
 			<PHRASE Label="la_config_error_template" Module="Proj-Base" Type="1">RmlsZSBub3QgZm91bmQgKDQwNCkgdGVtcGxhdGU=</PHRASE>
 			<PHRASE Label="la_config_first_day_of_week" Module="Proj-Base" Type="1">Rmlyc3QgRGF5IE9mIFdlZWs=</PHRASE>
 			<PHRASE Label="la_config_force_http" Module="Proj-Base" Type="1">UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ=</PHRASE>
+			<PHRASE Label="la_config_MailFunctionHeaderSeparator" Module="Proj-Base" Type="1">TWFpbCBGdW5jdGlvbiBIZWFkZXIgU2VwYXJhdG9y</PHRASE>
 			<PHRASE Label="la_config_name" Module="Proj-Base" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_config_nopermission_template" Module="Proj-Base" Type="1">SW5zdWZmaWNlbnQgcGVybWlzc2lvbnMgdGVtcGxhdGU=</PHRASE>
 			<PHRASE Label="la_config_OutputCompressionLevel" Module="Proj-Base" Type="1">R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk=</PHRASE>
 			<PHRASE Label="la_config_PerpageReviews" Module="Proj-Base" Type="1">UmV2aWV3cyBwZXIgcGFnZQ==</PHRASE>
 			<PHRASE Label="la_config_reg_number" Module="Proj-Base" Type="1">UmVnaXN0cmF0aW9uIE51bWJlcg==</PHRASE>
+			<PHRASE Label="la_config_RequireSSLAdmin" Module="Proj-Base" Type="1">UmVxdWlyZSBTU0wgZm9yIEFkbWluaXN0cmF0aXZlIENvbnNvbGU=</PHRASE>
 			<PHRASE Label="la_config_require_ssl" Module="Proj-Base" Type="1">UmVxdWlyZSBTU0wgZm9yIGxvZ2luICYgY2hlY2tvdXQ=</PHRASE>
 			<PHRASE Label="la_config_server_name" Module="Proj-Base" Type="1">U2VydmVyIE5hbWU=</PHRASE>
 			<PHRASE Label="la_config_server_path" Module="Proj-Base" Type="1">U2VydmVyIFBhdGg=</PHRASE>
 			<PHRASE Label="la_config_site_zone" Module="Proj-Base" Type="1">VGltZSB6b25lIG9mIHRoZSBzaXRl</PHRASE>
 			<PHRASE Label="la_config_ssl_url" Module="Proj-Base" Type="1">U1NMIEZ1bGwgVVJMIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgp</PHRASE>
 			<PHRASE Label="la_config_time_server" Module="Proj-Base" Type="1">VGltZSB6b25lIG9mIHRoZSBzZXJ2ZXI=</PHRASE>
+			<PHRASE Label="la_config_UseDoubleSorting" Module="Proj-Base" Type="1">VXNlIERvdWJsZSBTb3J0aW5n</PHRASE>
 			<PHRASE Label="la_config_UseOutputCompression" Module="Proj-Base" Type="1">RW5hYmxlIEhUTUwgR1pJUCBjb21wcmVzc2lvbg==</PHRASE>
+			<PHRASE Label="la_config_UseToolbarLabels" Module="Proj-Base" Type="1">VXNlIFRvb2xiYXIgTGFiZWxz</PHRASE>
 			<PHRASE Label="la_config_use_js_redirect" Module="Proj-Base" Type="1">VXNlIEphdmFTY3JpcHQgcmVkaXJlY3Rpb24gYWZ0ZXIgbG9naW4vbG9nb3V0IChmb3IgSUlTKQ==</PHRASE>
 			<PHRASE Label="la_config_use_modrewrite" Module="Proj-Base" Type="1">VXNlIE1PRCBSRVdSSVRF</PHRASE>
 			<PHRASE Label="la_config_use_modrewrite_with_ssl" Module="Proj-Base" Type="1">RW5hYmxlIE1PRF9SRVdSSVRFIGZvciBTU0w=</PHRASE>
@@ -162,6 +168,7 @@
 			<PHRASE Label="la_Continue" Module="Proj-Base" Type="1">Q29udGludWU=</PHRASE>
 			<PHRASE Label="la_CreatedOn" Module="Proj-Base" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
 			<PHRASE Label="la_Credits_Title" Module="Proj-Base" Type="1">Q3JlZGl0cw==</PHRASE>
+			<PHRASE Label="la_DataGrid1" Module="Proj-Base" Type="1">RGF0YSBHcmlkcw==</PHRASE>
 			<PHRASE Label="la_days" Module="Proj-Base" Type="1">ZGF5cw==</PHRASE>
 			<PHRASE Label="la_Delete_Confirm" Module="Proj-Base" Type="1">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRlbGV0ZSB0aGUgaXRlbShzKT8gVGhpcyBhY3Rpb24gY2Fubm90IGJlIHVuZG9uZS4=</PHRASE>
 			<PHRASE Label="la_Description_in-bulletin" Module="Proj-Base" Type="1">VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tQnVsbGV0aW4gc2V0dGluZ3M=</PHRASE>
@@ -326,6 +333,7 @@
 			<PHRASE Label="la_fld_CopyLabels" Module="Proj-Base" Type="1">Q29weSBMYWJlbHMgZnJvbSB0aGlzIExhbmd1YWdl</PHRASE>
 			<PHRASE Label="la_fld_CreatedById" Module="Proj-Base" Type="1">Q3JlYXRlZCBCeQ==</PHRASE>
 			<PHRASE Label="la_fld_CreatedOn" Module="Proj-Base" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
+			<PHRASE Label="la_fld_CSS" Module="Proj-Base" Type="1">Q1NTIFRlbXBsYXRl</PHRASE>
 			<PHRASE Label="la_fld_Cursor" Module="Proj-Base" Type="1">Q3Vyc29y</PHRASE>
 			<PHRASE Label="la_fld_DateFormat" Module="Proj-Base" Type="1">RGF0ZSBGb3JtYXQ=</PHRASE>
 			<PHRASE Label="la_fld_DecimalPoint" Module="Proj-Base" Type="1">RGVjaW1hbCBQb2ludA==</PHRASE>
@@ -381,6 +389,7 @@
 			<PHRASE Label="la_fld_LineEndingsInside" Module="Proj-Base" Type="1">TGluZSBFbmRpbmdzIEluc2lkZSBGaWVsZHM=</PHRASE>
 			<PHRASE Label="la_fld_LocalName" Module="Proj-Base" Type="1">TG9jYWwgTmFtZQ==</PHRASE>
 			<PHRASE Label="la_fld_Location" Module="Proj-Base" Type="1">TG9jYXRpb24=</PHRASE>
+			<PHRASE Label="la_fld_Logo" Module="Proj-Base" Type="1">TG9nbyBpbWFnZQ==</PHRASE>
 			<PHRASE Label="la_fld_MarginBottom" Module="Proj-Base" Type="1">TWFyZ2luIEJvdHRvbQ==</PHRASE>
 			<PHRASE Label="la_fld_MarginLeft" Module="Proj-Base" Type="1">TWFyZ2luIExlZnQ=</PHRASE>
 			<PHRASE Label="la_fld_MarginRight" Module="Proj-Base" Type="1">TWFyZ2luIFJpZ2h0</PHRASE>
@@ -421,6 +430,7 @@
 			<PHRASE Label="la_fld_SelectorData" Module="Proj-Base" Type="1">U3R5bGU=</PHRASE>
 			<PHRASE Label="la_fld_SelectorId" Module="Proj-Base" Type="1">U2VsZWN0b3IgSUQ=</PHRASE>
 			<PHRASE Label="la_fld_SelectorName" Module="Proj-Base" Type="1">U2VsZWN0b3IgTmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_SkinName" Module="Proj-Base" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_fld_SkipFirstRow" Module="Proj-Base" Type="1">U2tpcCBGaXJzdCBSb3c=</PHRASE>
 			<PHRASE Label="la_fld_Status" Module="Proj-Base" Type="1">U3RhdHVz</PHRASE>
 			<PHRASE Label="la_fld_StylesheetId" Module="Proj-Base" Type="1">U3R5bGVzaGVldCBJRA==</PHRASE>
@@ -443,7 +453,10 @@
 			<PHRASE Label="la_Font" Module="Proj-Base" Type="1">Rm9udCBQcm9wZXJ0aWVz</PHRASE>
 			<PHRASE Label="la_from_date" Module="Proj-Base" Type="1">RnJvbSBEYXRl</PHRASE>
 			<PHRASE Label="la_front_end" Module="Proj-Base" Type="1">RnJvbnQgZW5k</PHRASE>
+			<PHRASE Label="la_GeneralSections" Module="Proj-Base" Type="1">R2VuZXJhbCBTZWN0aW9ucw==</PHRASE>
 			<PHRASE Label="la_gigabytes" Module="Proj-Base" Type="1">Z2lnYWJ5dGUocyk=</PHRASE>
+			<PHRASE Label="la_HeadFgBgColor" Module="Proj-Base" Type="1">SGVhZCBmcmFtZSBjb2xvcnM8YnIvPg0KTWFpbiAvIE1haW4gQmFja2dyb3VuZCwgQmFyIC8gQmFyIEJhY2tncm91bmQg</PHRASE>
+			<PHRASE Label="la_HeadFrame" Module="Proj-Base" Type="1">SGVhZCBGcmFtZQ==</PHRASE>
 			<PHRASE Label="la_help_in_progress" Module="Proj-Base" Type="1">VGhpcyBoZWxwIHNlY3Rpb24gZG9lcyBub3QgeWV0IGV4aXN0LCBpdCdzIGNvbWluZyBzb29uIQ==</PHRASE>
 			<PHRASE Label="la_Html" Module="Proj-Base" Type="1">aHRtbA==</PHRASE>
 			<PHRASE Label="la_IDField" Module="Proj-Base" Type="1">SUQgRmllbGQ=</PHRASE>
@@ -482,6 +495,7 @@
 			<PHRASE Label="la_link_sortreviews_prompt" Module="Proj-Base" Type="1">U29ydCByZXZpZXdzIGJ5</PHRASE>
 			<PHRASE Label="la_Link_URL" Module="Proj-Base" Type="1">VVJM</PHRASE>
 			<PHRASE Label="la_link_urlstatus_prompt" Module="Proj-Base" Type="1">RGlzcGxheSBsaW5rIFVSTCBpbiBzdGF0dXMgYmFy</PHRASE>
+			<PHRASE Label="la_Linux" Module="Proj-Base" Type="1">TGludXg=</PHRASE>
 			<PHRASE Label="la_LocalImage" Module="Proj-Base" Type="1">TG9jYWwgSW1hZ2U=</PHRASE>
 			<PHRASE Label="la_Logged_in_as" Module="Proj-Base" Type="1">TG9nZ2VkIGluIGFz</PHRASE>
 			<PHRASE Label="la_login" Module="Proj-Base" Type="1">TG9naW4=</PHRASE>
@@ -960,6 +974,7 @@
 			<PHRASE Label="la_SearchMenu_New" Module="Proj-Base" Type="1">TmV3IFNlYXJjaA==</PHRASE>
 			<PHRASE Label="la_Sectionheader_MetaInformation" Module="Proj-Base" Type="1">TUVUQSBJbmZvcm1hdGlvbg==</PHRASE>
 			<PHRASE Label="la_section_Category" Module="Proj-Base" Type="1">Q2F0ZWdvcnk=</PHRASE>
+			<PHRASE Label="la_section_Configs" Module="Proj-Base" Type="1">Q29uZmlnIEZpbGVz</PHRASE>
 			<PHRASE Label="la_section_Counters" Module="Proj-Base" Type="1">Q291bnRlcnM=</PHRASE>
 			<PHRASE Label="la_section_CustomFields" Module="Proj-Base" Type="1">Q3VzdG9tIEZpZWxkcw==</PHRASE>
 			<PHRASE Label="la_section_FullSizeImage" Module="Proj-Base" Type="1">RnVsbCBTaXplIEltYWdl</PHRASE>
@@ -977,6 +992,7 @@
 			<PHRASE Label="la_selecting_categories" Module="Proj-Base" Type="1">U2VsZWN0aW5nIENhdGVnb3JpZXM=</PHRASE>
 			<PHRASE Label="la_Selection_Empty" Module="Proj-Base" Type="1">RW1wdHkgc2VsZWN0aW9u</PHRASE>
 			<PHRASE Label="la_SeparatedCategoryPath" Module="Proj-Base" Type="1">T25lIGZpZWxkIGZvciBlYWNoIGNhdGVnb3J5IGxldmVs</PHRASE>
+			<PHRASE Label="la_ShortToolTip_Clone" Module="Proj-Base" Type="1">Q2xvbmU=</PHRASE>
 			<PHRASE Label="la_Showing_Logs" Module="Proj-Base" Type="1">U2hvd2luZyBMb2dz</PHRASE>
 			<PHRASE Label="la_Showing_Stats" Module="Proj-Base" Type="1">U2hvd2luZyBTdGF0aXN0aWNz</PHRASE>
 			<PHRASE Label="la_Show_EmailLog" Module="Proj-Base" Type="1">U2hvdyBFbWFpbCBMb2c=</PHRASE>
@@ -1015,6 +1031,7 @@
 			<PHRASE Label="la_tab_EmailMessage" Module="Proj-Base" Type="1">RW1haWwgTWVzc2FnZQ==</PHRASE>
 			<PHRASE Label="la_tab_ExportData" Module="Proj-Base" Type="1">RXhwb3J0IERhdGE=</PHRASE>
 			<PHRASE Label="la_tab_ExportLang" Module="Proj-Base" Type="1">RXhwb3J0IExhbmd1YWdlIFBhY2s=</PHRASE>
+			<PHRASE Label="la_tab_Files" Module="Proj-Base" Type="1">RmlsZXM=</PHRASE>
 			<PHRASE Label="la_tab_General" Module="Proj-Base" Type="1">R2VuZXJhbA==</PHRASE>
 			<PHRASE Label="la_tab_GeneralSettings" Module="Proj-Base" Type="1">R2VuZXJhbCBTZXR0aW5ncw==</PHRASE>
 			<PHRASE Label="la_tab_Group" Module="Proj-Base" Type="1">R3JvdXA=</PHRASE>
@@ -1059,6 +1076,7 @@
 			<PHRASE Label="la_tab_SessionLog" Module="Proj-Base" Type="1">U2Vzc2lvbiBMb2c=</PHRASE>
 			<PHRASE Label="la_tab_Settings" Module="Proj-Base" Type="1">R2VuZXJhbCBTZXR0aW5ncw==</PHRASE>
 			<PHRASE Label="la_tab_Site_Structure" Module="Proj-Base" Type="1">U3RydWN0dXJlICYgRGF0YQ==</PHRASE>
+			<PHRASE Label="la_tab_Skins" Module="Proj-Base" Type="1">U2tpbnM=</PHRASE>
 			<PHRASE Label="la_tab_Stats" Module="Proj-Base" Type="1">U3RhdGlzdGljcw==</PHRASE>
 			<PHRASE Label="la_tab_Stylesheets" Module="Proj-Base" Type="1">U3R5bGVzaGVldHM=</PHRASE>
 			<PHRASE Label="la_tab_Summary" Module="Proj-Base" Type="1">U3VtbWFyeQ==</PHRASE>
@@ -1300,6 +1318,7 @@
 			<PHRASE Label="la_Text_Year" Module="Proj-Base" Type="1">WWVhcnM=</PHRASE>
 			<PHRASE Label="la_Text_Zip" Module="Proj-Base" Type="1">Wmlw</PHRASE>
 			<PHRASE Label="la_title_addingCustom" Module="Proj-Base" Type="1">QWRkaW5nIEN1c3RvbSBGaWVsZA==</PHRASE>
+			<PHRASE Label="la_title_AddingSkin" Module="Proj-Base" Type="1">QWRkaW5nIFNraW4=</PHRASE>
 			<PHRASE Label="la_title_Adding_BaseStyle" Module="Proj-Base" Type="1">QWRkaW5nIEJhc2UgU3R5bGU=</PHRASE>
 			<PHRASE Label="la_title_Adding_BlockStyle" Module="Proj-Base" Type="1">QWRkaW5nIEJsb2NrIFN0eWxl</PHRASE>
 			<PHRASE Label="la_title_Adding_Category" Module="Proj-Base" Type="1">QWRkaW5nIENhdGVnb3J5</PHRASE>
@@ -1328,6 +1347,7 @@
 			<PHRASE Label="la_title_Done" Module="Proj-Base" Type="1">RG9uZQ==</PHRASE>
 			<PHRASE Label="la_title_EditingEmailEvent" Module="Proj-Base" Type="1">RWRpdGluZyBFbWFpbCBFdmVudA==</PHRASE>
 			<PHRASE Label="la_title_EditingGroup" Module="Proj-Base" Type="1">RWRpdGluZyBHcm91cA==</PHRASE>
+			<PHRASE Label="la_title_EditingSkin" Module="Proj-Base" Type="1">RWRpdGluZyBTa2lu</PHRASE>
 			<PHRASE Label="la_title_EditingStyle" Module="Proj-Base" Type="1">RWRpdGluZyBTdHlsZQ==</PHRASE>
 			<PHRASE Label="la_title_EditingTranslation" Module="Proj-Base" Type="1">RWRpdGluZyBUcmFuc2xhdGlvbg==</PHRASE>
 			<PHRASE Label="la_title_Editing_BaseStyle" Module="Proj-Base" Type="1">RWRpdGluZyBCYXNlIFN0eWxl</PHRASE>
@@ -1412,6 +1432,7 @@
 			<PHRASE Label="la_title_Stylesheets" Module="Proj-Base" Type="1">U3R5bGVzaGVldHM=</PHRASE>
 			<PHRASE Label="la_title_Summary" Module="Proj-Base" Type="1">U3VtbWFyeQ==</PHRASE>
 			<PHRASE Label="la_title_Sys_Config" Module="Proj-Base" Type="1">Q29uZmlndXJhdGlvbg==</PHRASE>
+			<PHRASE Label="la_title_Themes" Module="Proj-Base" Type="1">VGhlbWVz</PHRASE>
 			<PHRASE Label="la_title_Tools" Module="Proj-Base" Type="1">VG9vbHM=</PHRASE>
 			<PHRASE Label="la_title_UpdatingCategories" Module="Proj-Base" Type="1">VXBkYXRpbmcgQ2F0ZWdvcmllcw==</PHRASE>
 			<PHRASE Label="la_title_Users" Module="Proj-Base" Type="1">VXNlcnM=</PHRASE>
@@ -1527,6 +1548,7 @@
 			<PHRASE Label="la_Topic_Views" Module="Proj-Base" Type="1">Vmlld3M=</PHRASE>
 			<PHRASE Label="la_to_date" Module="Proj-Base" Type="1">VG8gRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_translate" Module="Proj-Base" Type="1">VHJhbnNsYXRl</PHRASE>
+			<PHRASE Label="la_Trees" Module="Proj-Base" Type="1">VHJlZQ==</PHRASE>
 			<PHRASE Label="la_type_checkbox" Module="Proj-Base" Type="1">Q2hlY2tib3hlcw==</PHRASE>
 			<PHRASE Label="la_type_date" Module="Proj-Base" Type="1">RGF0ZQ==</PHRASE>
 			<PHRASE Label="la_type_datetime" Module="Proj-Base" Type="1">RGF0ZSAmIFRpbWU=</PHRASE>
@@ -1576,6 +1598,7 @@
 			<PHRASE Label="la_warning_primary_delete" Module="Proj-Base" Type="1">WW91IGFyZSBhYm91dCB0byBkZWxldGUgdGhlIHByaW1hcnkgdGhlbWUuIENvbnRpbnVlPw==</PHRASE>
 			<PHRASE Label="la_Warning_Save_Item" Module="Proj-Base" Type="1">TW9kaWZpY2F0aW9ucyB3aWxsIG5vdCB0YWtlIGVmZmVjdCB1bnRpbCB5b3UgY2xpY2sgdGhlIFNhdmUgYnV0dG9uIQ==</PHRASE>
 			<PHRASE Label="la_week" Module="Proj-Base" Type="1">d2Vlaw==</PHRASE>
+			<PHRASE Label="la_Windows" Module="Proj-Base" Type="1">V2luZG93cw==</PHRASE>
 			<PHRASE Label="la_year" Module="Proj-Base" Type="1">eWVhcg==</PHRASE>
 			<PHRASE Label="la_Yes" Module="Proj-Base" Type="1">WWVz</PHRASE>
 			<PHRASE Label="lu_access_denied" Module="Proj-Base" Type="0">WW91IGRvIG5vdCBoYXZlIGFjY2VzcyB0byBwZXJmb3JtIHRoaXMgb3BlcmF0aW9u</PHRASE>
Index: trunk/admin/include/tabs.js
===================================================================
diff -u -N -r3983 -r8397
--- trunk/admin/include/tabs.js	(.../tabs.js)	(revision 3983)
+++ trunk/admin/include/tabs.js	(.../tabs.js)	(revision 8397)
@@ -37,7 +37,7 @@
   	        			}
   	        		}
   	        		else
-  	        			field_result &= ValidateField(Field.value, ValType[j]);
+  	        			field_result &= ValidateField(Field.value, ValType[j], Field);
   	        		j++;
   	        	}
   	        	span.className = field_result ? 'text' : 'validation_error';
@@ -75,7 +75,22 @@
 	switch(ValidateAs)
 	{
 		case 'exists': // field is required
-			if(FieldValue.length == 0) result = false;
+			var $Field = RePasswdValue;
+			switch ($Field.type) {
+				case 'radio':
+					result = false;
+					var $radio = document.getElementsByName($Field.name);
+					for (var $i = 0; $i < $radio.length; $i++) {
+						if ($radio[$i].checked) {
+							result = true;
+							break;
+						}
+					}
+					break;
+				default:
+					if(FieldValue.length == 0) result = false;
+					break;
+			}
 			break;
   	      	  
 		case 'integer': // field must be integer number
@@ -109,19 +124,16 @@
 	var span_id = '';
 	var result = true;
   	
-	for (var i = 0; i < f.elements.length; i++)
-  	{
+	for (var i = 0; i < f.elements.length; i++) {
   		ValType = '';
   	   	Field = f.elements[i];
   	   	ValType = Field.getAttribute('ValidationType');
-  	   	if(ValType)
-  	   	{
+  	   	if (ValType) {
   	   	  	ValType = ValType.split(',');
-  	   	  	if( InArray(ValType,'exists') !== false )
-  	   	  	{
+  	   	  	if ((InArray(ValType,'exists') !== false) && (span_id != 'prompt_' + Field.name)) {
   	   	  		span_id = 'prompt_' + Field.name;
   	      		span = document.getElementById(span_id);
-  	      		span.innerHTML = span.innerHTML + '<span class="error">*</span>';
+				span.innerHTML += '<span class="error">*</span>';
   	    	}
   	   	}  	   
   	}
Index: trunk/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -N -r7867 -r8397
--- trunk/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 7867)
+++ trunk/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 8397)
@@ -75,7 +75,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: trunk/kernel/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r4842 -r8397
--- trunk/kernel/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 4842)
+++ trunk/kernel/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 8397)
@@ -67,7 +67,7 @@
 		</tr>
 	</inp2:m_if>
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:Field field="DisplayName" as_label="true" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -87,14 +87,14 @@
    		</td>
 	</tr>
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="4">
 			<inp2:m_phrase name="la_prompt_required_field_increase"/>
 			<input type="text" size="3" name="conf[SearchRel_Increase_<inp2:m_param name="module_key" />][VariableValue]" VALUE="<inp2:Field field="SearchRel_Increase_{$module_key}" />">%
 		</td>
 	</tr>
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="4">
 			<inp2:m_phrase name="la_prompt_relevence_percent"/> 
 			<input type="text" size="3" name="conf[SearchRel_Keyword_<inp2:m_param name="module_key" />][VariableValue]" value="<inp2:Field field="SearchRel_Keyword_{$module_key}" />">% <inp2:Field field="SearchRel_Keyword_{$module_key}_prompt" as_label="1" /> &nbsp;&nbsp;&nbsp;
@@ -110,7 +110,7 @@
 	   		</td>
 		</tr>
 		
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<td class="text" width="120"><inp2:Field field="Search_ShowMultiple_{$module_key}_prompt" as_label="1"/></td>
 			<td class="text" colspan="3">
 				<input type="checkbox" name="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" <inp2:Field field="Search_ShowMultiple_{$module_key}" checked="checked" db="db"/> id="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" onclick="update_checkbox(this, document.getElementById('conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]'))" >
Index: trunk/core/install/step_templates/check_paths.tpl
===================================================================
diff -u -N -r6691 -r8397
--- trunk/core/install/step_templates/check_paths.tpl	(.../check_paths.tpl)	(revision 6691)
+++ trunk/core/install/step_templates/check_paths.tpl	(.../check_paths.tpl)	(revision 8397)
@@ -1,7 +1,7 @@
 <?php
 	ob_start();
 ?>
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>%s</b></td>
   	<td align="left">%s</td>
 </tr>
Index: trunk/admin/install/modselect.php
===================================================================
diff -u -N -r1649 -r8397
--- trunk/admin/install/modselect.php	(.../modselect.php)	(revision 1649)
+++ trunk/admin/install/modselect.php	(.../modselect.php)	(revision 8397)
@@ -20,7 +20,7 @@
 			include_once($pathtoroot."$m/admin/install/prerequisit.php");
 		}
     	    
-        echo "<TR class=\"table_color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
+        echo "<TR class=\"table-color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
         
         if ($result) {
         	echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"domain[]\" VALUE=\"$m\" CHECKED=\"checked\">";
@@ -39,7 +39,7 @@
         echo "</TD></TR>\n";
     }
 ?>		            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($ModuleError) ) echo $ModuleError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/core/admin_templates/regional/languages_import_step2.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/regional/languages_import_step2.tpl	(.../languages_import_step2.tpl)	(revision 7391)
+++ trunk/core/admin_templates/regional/languages_import_step2.tpl	(.../languages_import_step2.tpl)	(revision 8397)
@@ -4,13 +4,13 @@
 
 <inp2:m_ParseBlock name="blue_bar" prefix="lang" title_preset="import_language_step2" module="in-portal" icon="icon46_conf_regional"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="$title"/>
 
 	<tr>
 		<td align="middle">
 			<br />
-			<table class="tableborder_full" width="75%">
+			<table class="bordered-no-bottom" width="75%">
 				<tr border="1">
 					<td width="<inp2:m_param name="percent_done"/>%" class="progress_bar">&nbsp;</td>
 					<td bgcolor=#FFFFFF width="<inp2:m_param name="percent_left"/>%"></td>
Index: trunk/admin/install/theme_select.php
===================================================================
diff -u -N -r1939 -r8397
--- trunk/admin/install/theme_select.php	(.../theme_select.php)	(revision 1939)
+++ trunk/admin/install/theme_select.php	(.../theme_select.php)	(revision 8397)
@@ -11,7 +11,7 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 				              <td class="txt">
 				                <b>Default Theme:</b></td>
 				              <td>
@@ -34,7 +34,7 @@
 				                </select>
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($ThemeError) ) echo $ThemeError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/kernel/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -N -r4834 -r8397
--- trunk/kernel/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 4834)
+++ trunk/kernel/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 8397)
@@ -33,7 +33,7 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
 		<td>
 			<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field="LangFile"/>" id="<inp2:phrases.export_InputName field="LangFile"/>" value="<inp2:phrases.export_Field field="LangFile"/>" />
Index: trunk/core/admin_templates/skins/skin_list.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/skins/skin_list.tpl	(revision 0)
+++ trunk/core/admin_templates/skins/skin_list.tpl	(revision 8397)
@@ -0,0 +1,74 @@
+<inp2:m_RequireLogin permissions="proj-cms:all_pages.view" system="1"/>
+<inp2:m_include t="incs/header" />
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:skins" prefix="skin" title_preset="" pagination="1"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  		<td>
+	  		<table width="100%" cellpadding="0" cellspacing="0">
+	  			<tr>
+	  				<td >
+	  					<script type="text/javascript">
+								a_toolbar = new ToolBar();
+
+								a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewSkin" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+										function() {
+											std_precreate_item('skin', 'skins/skin_edit')
+										}
+									)
+								);
+
+								function edit()
+								{
+								  	std_edit_item('skin', 'skins/skin_edit');
+								}
+
+								a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
+
+
+								a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+										function() {
+											std_delete_items('skin');
+										} ) );
+
+
+					  		a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+								a_toolbar.AddButton( new ToolBarButton('primary_theme', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>', function() {
+											submit_event('skin','OnSetPrimary');
+										}
+   							) );
+
+   							a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Clone" escape="1"/>', function() {
+											submit_event('skin','OnMassClone');
+										}
+   							) );
+
+				 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+								a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function(id) {
+											show_viewmenu(a_toolbar,'view');
+										}
+								) );
+
+								a_toolbar.Render();
+							</script>
+	  				</td>
+
+	  				<inp2:m_RenderElement name="search_main_toolbar" prefix="skin" grid="Default"/>
+	  			</tr>
+	  		</table>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_ParseBlock name="grid" PrefixSpecial="skin" IdField="SkinId" grid="Default" grid_filters="1"/>
+<script type="text/javascript">
+	Grids['skin'].SetDependantToolbarButtons( new Array('edit', 'delete', 'primary_theme', 'clone') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -N -r6669 -r8397
--- trunk/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 6669)
+++ trunk/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 8397)
@@ -49,7 +49,7 @@
 </table>
 
 <inp2:m_block name="inp_edit_color"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<input	type="text"
@@ -72,7 +72,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options_style"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
Index: trunk/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r8364 -r8397
--- trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8364)
+++ trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8397)
@@ -1,6 +1,5 @@
-<inp2:m_DefineElement name="combined_header" module="">
-	<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
-	<inp2:m_RequireLogin permissions="{$perm_section}.view" system="1"/>
+<inp2:m_DefineElement name="combined_header" permission_type="view"  module="">
+	<inp2:m_RequireLogin permissions="{$section}.{$permission_type}" system="1"/>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
 		<table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -19,7 +18,7 @@
 	<table cellpadding="0" cellspacing="0" width="100%">
 		<tr>
 			<td class="tablenav">
-				<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+				<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
 					<tr>
 						<td class="header_left_bg" nowrap valign="middle">
 							<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
@@ -47,7 +46,7 @@
 			</td>
 		</tr>
 	</table>
-	
+
 </inp2:m_DefineElement>
 
 <inp2:m_block name="section_header"/>
@@ -75,7 +74,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="blue_bar" module="" icon="" pagination="0"/>
-	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
 		<tr>
 			<td class="header_left_bg" nowrap width="80%" valign="middle">
 				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
@@ -125,7 +124,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_label" is_last="" as_label="" currency="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td valign="top"><span class="text"><inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/></span></td>
     	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
@@ -143,7 +142,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<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"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
@@ -157,7 +156,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_DefineElement name="inp_edit_password" class="" size="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td>
 			<input type="password" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
@@ -171,7 +170,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="inp_edit_upload" class="" size="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="file" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
@@ -188,7 +187,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box_ml" class="" size="" maxlength=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span></inp2:m_if>:</span><br>
@@ -209,7 +208,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_date" class="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
@@ -231,7 +230,7 @@
 		<td class="control-cell">
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
 			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-			
+
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="">
 		</td>
 		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
@@ -242,7 +241,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="inp_edit_date_time" class="" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<!-- <input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>"> -->
@@ -261,7 +260,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_textarea" class="" allow_html="allow_html"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
@@ -280,7 +279,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_textarea_ml" class=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
@@ -298,7 +297,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
@@ -327,7 +326,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options" is_last="" has_empty="0" empty_value=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
@@ -345,6 +344,26 @@
 	</tr>
 <inp2:m_blockend/>
 
+<inp2:m_block name="inp_edit_multioptions" is_last="" has_empty="0" empty_value=""/>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+		<td>
+			<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>_select" onchange="update_multiple_options('<inp2:$prefix_InputName field="$field"/>');">
+				<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
+					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_else/>
+					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_endif/>
+			</select>
+			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>"/>
+		</td>
+		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
+	</tr>
+<inp2:m_blockend/>
+
 <inp2:m_block name="inp_radio_item" onclick="" onchange=""/>
 	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
 <inp2:m_blockend/>
@@ -354,7 +373,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="" use_phrases="1"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
@@ -371,7 +390,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
 		<td>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>">
@@ -396,7 +415,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkboxes" is_last=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
@@ -414,7 +433,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_checkbox_allow_html"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="2">
 			<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field"/>">
@@ -428,7 +447,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_weight" subfield="" class="" is_last="" maxlength=""/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
@@ -451,8 +470,8 @@
 
 
 <inp2:m_DefineElement name="ajax_progress_bar">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-		<tr class="table_color1">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
+		<tr class="table-color1">
 			<td colspan="2">
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 				<!-- progress bar paddings: begin -->
@@ -490,26 +509,42 @@
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 			</td>
 		</tr>
-		<tr class="table_color2">
+		<tr class="table-color2">
 			<td width="50%" align="right"><inp2:m_phrase name="la_fld_PercentsCompleted"/>:</td>
 			<td id="progress_display[percents_completed]">0%</td>
 		</tr>
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="right"><inp2:m_phrase name="la_fld_ElapsedTime"/>:</td>
 			<td id="progress_display[elapsed_time]">00:00</td>
 		</tr>
-		<tr class="table_color2">
+		<tr class="table-color2">
 			<td align="right"><inp2:m_phrase name="la_fld_EstimatedTime"/>:</td>
 			<td id="progress_display[Estimated_time]">00:00</td>
 		</tr>
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" colspan="2">
 				<input type="button" class="button" onclick="<inp2:m_param name="cancel_action"/>" value="<inp2:m_phrase name="la_Cancel"/>" />
 			</td>
 		</tr>
 	</table>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="edit_navigation" toolbar="a_toolbar">
+	<inp2:m_if check="{$prefix}_IsTopmostPrefix">
+		<inp2:m_if check="{$prefix}_IsSingle">
+			<inp2:m_param name="toolbar"/>.HideButton('prev');
+			<inp2:m_param name="toolbar"/>.HideButton('next');
+		<inp2:m_else/>
+			<inp2:m_if check="{$prefix}_IsLast">
+				<inp2:m_param name="toolbar"/>.DisableButton('next');
+			</inp2:m_if>
+			<inp2:m_if check="{$prefix}_IsFirst">
+				<inp2:m_param name="toolbar"/>.DisableButton('prev');
+			</inp2:m_if>
+		</inp2:m_if>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+				
 <inp2:m_DefineElement name="ml_selector" prefix="">
 
 </inp2:m_DefineElement>
Index: trunk/core/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -N -r8061 -r8397
--- trunk/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8061)
+++ trunk/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 8397)
@@ -9,7 +9,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_option">
-		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>	
+		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
@@ -54,18 +54,18 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
 				<br><small>[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
-			</inp2:m_if>	
+			</inp2:m_if>
 		</td>
-		
+
 		<td>
 			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/>
 		</td>
-		
+
 		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
@@ -82,21 +82,21 @@
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
 				<br><small>[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
-			</inp2:m_if>	
+			</inp2:m_if>
 		</td>
-		
+
 		<td>
 			<nobr><inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/>&nbsp;&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block2">
 			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/></nobr>
 		</td>
-		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>	
+		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
Index: trunk/admin/install/lang_run.php
===================================================================
diff -u -N -r315 -r8397
--- trunk/admin/install/lang_run.php	(.../lang_run.php)	(revision 315)
+++ trunk/admin/install/lang_run.php	(.../lang_run.php)	(revision 8397)
@@ -32,7 +32,7 @@
     
     echo "\n";   
     
-    $o .= "				            <tr class=\"table_color2\">				              
+    $o .= "				            <tr class=\"table-color2\">				              
 				              <td ALIGN=\"center\"> <br/>
 <TABLE CLASS=\"tableborder_full\" width=\"75%\">
     <TR border=1><TD bgcolor=\"#507F15\" width=\"".$pct."%\">&nbsp;</TD>";
Index: trunk/admin/install/upgrades/inportal_upgrade_v4.1.0.php
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v4.1.0.php	(revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_v4.1.0.php	(revision 8397)
@@ -0,0 +1,31 @@
+<?php
+	require_once FULL_PATH.'/core/install/upgrades.php'; // k4_include_once doesn't globalize $upgrade_class :(
+
+	$upgrade = new $upgrade_class();
+	/* @var $upgrade CoreUpgrades */
+
+	$upgrade->Upgrade_4_1_0('after');
+	
+	$db =& inst_GetADODBConnection(true);
+	
+	$sql = 'SELECT *
+			FROM '.TABLE_PREFIX.'Modules
+			WHERE Name = "Core"';
+	$core_found = $db->GetRow($sql);
+	
+	if (!$core_found) {
+		$fields_hash = Array (
+			'Name' => 'Core',
+			'Path' => 'core/',
+			'Var' => 'adm',
+			'Version' => '4.1.1',
+			'Loaded' => 1,
+			'LoadOrder' => 1,
+			'TemplatePath' => '',
+			'RootCat' => 0,
+			'BuildDate' => 0,
+		);
+		
+		$db->doInsert($fields_hash, TABLE_PREFIX.'Modules');
+	}
+?>
\ No newline at end of file
Index: trunk/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r6784 -r8397
--- trunk/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6784)
+++ trunk/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 8397)
@@ -61,7 +61,7 @@
 		</inp2:m_DefineElement>
 
 		<table width="100%" border="0" cellspacing="2" cellpadding="4">
-			<inp2:m_set c.showall_sequence="1" odd_even="table_color1"/>
+			<inp2:m_set c.showall_sequence="1" odd_even="table-color1"/>
 			<inp2:c.showall_PrintList2 block="category_td" no_special="1" IdField="CategoryId" empty_cell_render_as="wg_empty_cell" direction="V" columns="2"/>
 		</table>
 
Index: trunk/kernel/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -N -r6784 -r8397
--- trunk/kernel/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 6784)
+++ trunk/kernel/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 8397)
@@ -25,7 +25,7 @@
 
 <inp2:m_DefineElement name="no_perm_grid" prefix="" perm_label="">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full" height="200">
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" valign="middle" class="text">
 				<inp2:m_phrase name="$perm_label"/>
 			</td>
@@ -34,7 +34,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_relation">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td valign="top" class="text">
 			<inp2:m_if check="{$prefix}_Field" field="$field">
Index: trunk/core/admin_templates/config/config_search_edit.tpl
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 7855)
+++ trunk/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 8397)
@@ -54,7 +54,7 @@
 </table>
 
 <inp2:confs_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 		<inp2:m_ParseBlock name="inp_id_label" prefix="confs" field="SearchConfigId" title="la_fld_SearchConfigId"/>
Index: trunk/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -N -r7867 -r8397
--- trunk/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 7867)
+++ trunk/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 8397)
@@ -85,7 +85,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: trunk/admin/install/get_license.php
===================================================================
diff -u -N -r315 -r8397
--- trunk/admin/install/get_license.php	(.../get_license.php)	(revision 315)
+++ trunk/admin/install/get_license.php	(.../get_license.php)	(revision 8397)
@@ -10,18 +10,18 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="left" class="txt"><b>Login / E-mail:</b></td>
 				              <td ALIGN="left" class="txt"><input type="text" name="login" value="<?php if( isset($_POST['login']) ) echo $_POST['login'];?>" class="text"></td>
 				            </tr>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="left" class="txt"><b>Password:</b></td>
 				              <td ALIGN="left" class="txt"><input type="password" name="password" value="" class="text"></td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 								<td ALIGN="left" colspan="2" WIDTH="100%" class="txt"><a href="http://www.intechnic.com/myaccount/index.php?t=users/reveal_password&">Forgot password</a></td>
 				            </tr>				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($get_license_error) ) echo $get_license_error; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/admin/install/restore_run.php
===================================================================
diff -u -N -r6093 -r8397
--- trunk/admin/install/restore_run.php	(.../restore_run.php)	(revision 6093)
+++ trunk/admin/install/restore_run.php	(.../restore_run.php)	(revision 8397)
@@ -29,7 +29,7 @@
     
     echo "\n";   
     
-    $o .= "				            <tr class=\"table_color2\">				              
+    $o .= "				            <tr class=\"table-color2\">				              
 				              <td ALIGN=\"center\"><br>
 <TABLE CLASS=\"tableborder_full\" width=\"75%\">
     <TR border=1><TD bgcolor=\"#507F15\" width=\"".$pct."%\">&nbsp;</TD>";
Index: trunk/admin/install/sel_license.php
===================================================================
diff -u -N -r1649 -r8397
--- trunk/admin/install/sel_license.php	(.../sel_license.php)	(revision 1649)
+++ trunk/admin/install/sel_license.php	(.../sel_license.php)	(revision 8397)
@@ -11,15 +11,15 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 								<td ALIGN="left" WIDTH="100%" class="txt"><INPUT TYPE="RADIO" NAME="lic_opt" id="lic_opt_1" VALUE="1"><label for="lic_opt_1">Download from Intechnic</label></td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="left" WIDTH="100%" class="txt"><INPUT TYPE=RADIO value="2" id="lic_opt_2" name="lic_opt"><label for="lic_opt_2">Upload License File:</label>
 				                <INPUT TYPE="FILE" CLASS="button" NAME="licfile" onclick="document.getElementById('lic_opt_2').checked = true;">                
 				              </td>
 				            </tr>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 								<?php
 							        $enabled = '';
 							        if(!isset($g_License) || !$g_License )
@@ -29,10 +29,10 @@
 								?>
 							   	<td ALIGN="left" WIDTH="100%" class="txt"><INPUT <?php echo $enabled; ?> TYPE=RADIO value="3" id="lic_opt_3" name="lic_opt" <?php if(!$enabled) echo 'checked'; ?>><label for="lic_opt_3">Use Existing License</label></td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 								<td ALIGN="left" WIDTH="100%" class="txt"><INPUT TYPE=RADIO value="4" id="lic_opt_4" name="lic_opt"><label for="lic_opt_4">Skip License (Local Domain Installation)</label></td>
 				            </tr>	
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($license_error) ) echo $license_error; ?></p><br/></td>
 				            </tr>				            			            				            				            				            
 				              <td>
Index: trunk/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r7702 -r8397
--- trunk/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 7702)
+++ trunk/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8397)
@@ -26,7 +26,24 @@
 					}
 			 	) );
 
+			 	<inp2:m_if check="phrases_IsTopmostPrefix">
+					<inp2:m_if check="phrases_IsSingle" inverse="inverse">
+						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+					</inp2:m_if>
+					
+					a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+								go_to_id('phrases', '<inp2:phrases_PrevId/>');
+							}
+					 ) );
+					a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+								go_to_id('phrases', '<inp2:phrases_NextId/>');
+							}
+					 ) );
+				</inp2:m_if>
+
 				a_toolbar.Render();
+				
+				<inp2:m_RenderElement name="edit_navigation" prefix="phrases"/>
 			</script>
 		</td>
 	</tr>
Index: trunk/core/units/general/helpers/themes_helper.php
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/units/general/helpers/themes_helper.php	(.../themes_helper.php)	(revision 7855)
+++ trunk/core/units/general/helpers/themes_helper.php	(.../themes_helper.php)	(revision 8397)
@@ -107,7 +107,7 @@
 				$auto_structure = $auto_structure_mode;
 				foreach ($ignore as $pattern)
 				{
-					if (preg_match('/'.str_replace('/', '\\/',$pattern).'/', $filename)) {
+					if (preg_match('/'.str_replace('/', '\\/', trim($pattern)).'/', $filename)) {
 						$auto_structure = 2;
 						break;
 					}
Index: trunk/kernel/admin/include/toolbar/sendmail.php
===================================================================
diff -u -N -r7867 -r8397
--- trunk/kernel/admin/include/toolbar/sendmail.php	(.../sendmail.php)	(revision 7867)
+++ trunk/kernel/admin/include/toolbar/sendmail.php	(.../sendmail.php)	(revision 8397)
@@ -7,42 +7,44 @@
 $id_count=0;
 
 if (isset($_POST['idtype'])) {
+	$application =& kApplication::Instance();
+	$db =& $application->GetADODBConnection();
+				
 	switch ($_POST['idtype']) {
-	    case "user":
-	        $recip_ids = $_POST["idlist"];
-	        $idlist = explode(",",$recip_ids);
-	        $r = '';
-	        foreach($idlist as $id)
-	        {
-	            $u = $objUsers->GetItemByField("ResourceId",$id);
-	            $r .= $u->Get("FirstName")." ".$u->Get("LastName");   
-	            $r .="&lt;".$u->Get("Email")."&gt;";
-	            $addr_list[] = $u->Get("Email");
-	            $reciplist[] = $r;
-	            $r = "";
-	        }
-	        $recip_ids = implode(",",$idlist);
-	    break;
-	    
-	    case "group":
-	        $recip_ids = $_POST["idlist"];
-	        $idlist = explode(",",$recip_ids);
-	        foreach($idlist as $id)
-	        {
-	           $g = $objGroups->GetItem($id);
-	           if(is_object($g))
-	           {           
-	             $reciplist[] .= "&lt;".$g->Get("Name")."&gt;";
-	             $ulist = $g->GetUserList();
-	             foreach($ulist as $uid)
-	             {
-	               $u = $objUsers->GetItem($uid);
-	               $addr_list[] = $u->Get("Email");
-	             }
-	           }
-	        }
-	        $recip_ids = implode(",",$idlist);
-	    break;
+		case "user":
+			$recip_ids = $_POST["idlist"];
+			$idlist = explode(",",$recip_ids);
+			$r = '';
+			foreach ($idlist as $id) {
+				$u = $objUsers->GetItemByField("ResourceId",$id);
+				$r .= $u->Get("FirstName")." ".$u->Get("LastName");
+				$r .="&lt;".$u->Get("Email")."&gt;";
+				$addr_list[] = $u->Get("Email");
+				$reciplist[] = $r;
+				$r = "";
+			}
+			$recip_ids = implode(",",$idlist);
+			break;
+
+		case "group":
+			$addr_list = Array ();
+			$recip_ids = $_POST['idlist'];
+			if ($recip_ids) {
+				$sql = 'SELECT Email
+		             	FROM '.TABLE_PREFIX.'UserGroup ug
+		             	LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = ug.PortalUserId
+		             	WHERE ug.GroupId IN ('.$recip_ids.')';
+				$addr_list = array_unique($db->GetCol($sql));
+			}
+			
+			$idlist = explode(',', $recip_ids);
+			foreach ($idlist as $id) {
+				$g = $objGroups->GetItem($id);
+				if (is_object($g)) {
+					$reciplist[] .= "&lt;".$g->Get("Name")."&gt;";
+				}
+			}
+			break;
 	}
 }
 print <<<END
Index: trunk/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r8178 -r8397
--- trunk/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8178)
+++ trunk/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8397)
@@ -168,7 +168,12 @@
 			$names = array();
 			if ($value) { // if value string was not empty
 				foreach ($files as $a_file) {
-					$urls[] = rtrim($this->Application->BaseURL(), '/').$upload_dir.$a_file;
+					if (isset($options['direct_links']) && $options['direct_links']) {
+						$urls[] = rtrim($this->Application->BaseURL(), '/').$upload_dir.$a_file;
+					}
+					else {
+						$urls[] = $this->Application->HREF('', '', array('no_amp'=>1, 'pass'=>'m,'.$object->Prefix, $object->Prefix.'_event'=>'OnViewFile', 'file'=>$a_file, 'field'=>$field_name));
+					}
 					$names[] = $a_file;
 					$sizes[] = filesize(FULL_PATH.$upload_dir.$a_file);
 				}
Index: trunk/admin/install/install_lib.php
===================================================================
diff -u -N -r7635 -r8397
--- trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 7635)
+++ trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 8397)
@@ -253,10 +253,6 @@
 				$replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
 				$sql = ereg_replace($what, $replace, $sql);
 
-				$what = "DROP TABLE IF EXISTS ";
-				$replace = "DROP TABLE IF EXISTS ".$g_TablePrefix;
-				$sql = ereg_replace($what, $replace, $sql);
-
 				$what = "INSERT INTO ";
 				$replace = "INSERT INTO ".$g_TablePrefix;
 				$sql = ereg_replace($what, $replace, $sql);
@@ -325,7 +321,7 @@
 	}
 
 	$sqls = str_replace("\r\n", "\n", $sqls);  // convert to linux line endings
-	$sqls = preg_replace("/#(.*?)\n/", '', $sqls); // remove all comments
+	$sqls = preg_replace("/#([^;]*?)\n/", '', $sqls); // remove all comments
 	$sqls = explode(";\n", $sqls);
 
 	foreach ($sqls as $sql) {
Index: trunk/kernel/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -N -r5319 -r8397
--- trunk/kernel/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 5319)
+++ trunk/kernel/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 8397)
@@ -3,7 +3,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="thumbnail_section" prefix="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="ThumbPath"/><inp2:$prefix_Error field="ThumbUrl"/></span>&nbsp;
@@ -46,7 +46,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="fullsize_section" prefix="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="LocalPath"/><inp2:$prefix_Error field="Url"/></span>&nbsp;
Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 8104)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 8397)
@@ -18,9 +18,11 @@
 		{
 			parent::mapPermissions();
 			$permissions = Array(
-									'OnFrontOnly'		=>	Array('self' => 'edit'),
-									'OnSaveSelected'	=>	Array('self' => 'view'),
-							);
+				'OnFrontOnly'		=>	Array('self' => 'edit'),
+				'OnSaveSelected'	=>	Array('self' => 'view'),
+				
+				'OnProcessEmailQueue'	=>	Array('self' => 'add|edit'),
+			);
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
@@ -249,10 +251,10 @@
 			// 3. replace tags if needed
 			$default_replacement_tags = Array (
 				'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
-
 				'<inp:touser _Field="UserName"' => '<inp2:u_Field name="Login"',
 				'<inp:touser _Field' => '<inp2:u_Field name',
 			);
+			
 			$replacement_tags = $message->GetDBField('ReplacementTags');
 			$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
 			$replacement_tags = array_merge_recursive2($default_replacement_tags, $replacement_tags);
@@ -376,5 +378,88 @@
 			$this->Application->removeObject('u.email-from');
 			$this->Application->removeObject('u.email-to');
 		}
+		
+		/**
+		 * Process emails from queue
+		 *
+		 * @param kEvent $event
+		 */
+		function OnProcessEmailQueue(&$event)
+		{
+			$deliver_count = $event->getEventParam('deliver_count');
+			if ($deliver_count === false) {
+				$deliver_count = 10; // 10 emails per script run (if not specified directly)
+			}
+			
+			$processing_type = $this->Application->GetVar('type');
+			if ($processing_type = 'return_progress') {
+				$email_queue_progress = $this->Application->RecallVar('email_queue_progress');
+				if ($email_queue_progress === false) {
+					$emails_sent = 0;
+					$sql = 'SELECT COUNT(*)
+							FROM '.TABLE_PREFIX.'EmailQueue
+							WHERE (SendRetries < 5) AND (LastSendRetry < '.(adodb_mktime() - 7200).')';
+					$total_emails = $this->Conn->GetOne($sql);
+					$this->Application->StoreVar('email_queue_progress', $emails_sent.':'.$total_emails);
+				}
+				else {
+					list ($emails_sent, $total_emails) = explode(':', $email_queue_progress);
+				}
+			}
+			
+			$sql = 'SELECT *
+					FROM '.TABLE_PREFIX.'EmailQueue
+					WHERE (SendRetries < 5) AND (LastSendRetry < '.(adodb_mktime() - 7200).')
+					LIMIT 0,'.$deliver_count;
+			$messages = $this->Conn->Query($sql);
+			
+			$message_count = count($messages);
+			if (!$message_count) {
+				// no messages left to send in queue
+				if ($processing_type = 'return_progress') {
+					$this->Application->RemoveVar('email_queue_progress');
+					$this->Application->Redirect($this->Application->GetVar('finish_template'));
+				}
+				return ;
+			}
+			
+			$esender =& $this->Application->recallObject('EmailSender');
+			/* @var $esender kEmailSendingHelper */
+			
+			$i = 0;
+			$message = Array ();
+			while ($i < $message_count) {
+				$message[0] = unserialize($messages[$i]['MessageHeaders']);
+				$message[1] =& $messages[$i]['MessageBody'];
+				$delivered = $esender->Deliver($message, true); // immediate send!
+				
+				if ($delivered) {
+					// send succseeded, delete from queue
+					$sql = 'DELETE FROM '.TABLE_PREFIX.'EmailQueue
+							WHERE EmailQueueId = '.$messages[$i]['EmailQueueId'];
+					$this->Conn->Query($sql);
+				}
+				else {
+					// send failed, increment retries counter
+					$sql = 'UPDATE '.TABLE_PREFIX.'EmailQueue
+							SET SendRetries = SendRetries + 1, LastSendRetry = '.adodb_mktime().'
+							WHERE EmailQueueId = '.$messages[$i]['EmailQueueId'];
+					$this->Conn->Query($sql);
+				}
+				$i++;
+			}
+			
+			if ($processing_type = 'return_progress') {
+				$emails_sent += $message_count;
+				if ($emails_sent >= $total_emails) {
+					$this->Application->RemoveVar('email_queue_progress');
+					$this->Application->Redirect($this->Application->GetVar('finish_template'));
+				}
+				
+				$this->Application->StoreVar('email_queue_progress', $emails_sent.':'.$total_emails);
+				$event->status = erSTOP;
+				echo ($emails_sent / $total_emails) * 100;
+			}
+		}
 	}
 ?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 7391)
+++ trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 8397)
@@ -73,7 +73,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="tree_element">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 	 	<td>
 	 		<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
 
@@ -112,7 +112,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r8009 -r8397
--- trunk/kernel/parser.php	(.../parser.php)	(revision 8009)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 8397)
@@ -287,8 +287,7 @@
         $e = $attribs["_errortemplate"];
         if(!strlen($e))
             $e = $t;
-        if(strlen($attribs["_langtext"]))
-        {
+        if(isset($attribs['_langtext']) && strlen($attribs['_langtext'])) {
             $txt = language($attribs["_langtext"]);
         }
         else
Index: trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql	(revision 8092)
+++ trunk/admin/install/upgrades/inportal_upgrade_v4.0.2.sql	(revision 0)
@@ -1,39 +0,0 @@
-ALTER TABLE EmailMessage ADD ReplacementTags TEXT AFTER Template;
-
-ALTER TABLE Phrase CHANGE Translation Translation TEXT NOT NULL, CHANGE Module Module VARCHAR(30) NOT NULL DEFAULT 'In-Portal';
-ALTER TABLE Category CHANGE Description Description TEXT, CHANGE l1_Description l1_Description TEXT, CHANGE l2_Description l2_Description TEXT, CHANGE l3_Description l3_Description TEXT, CHANGE l4_Description l4_Description TEXT, CHANGE l5_Description l5_Description TEXT, CHANGE CachedNavbar CachedNavbar text, CHANGE l1_CachedNavbar l1_CachedNavbar text, CHANGE l2_CachedNavbar l2_CachedNavbar text, CHANGE l3_CachedNavbar l3_CachedNavbar text, CHANGE l4_CachedNavbar l4_CachedNavbar text, CHANGE l5_CachedNavbar l5_CachedNavbar text, CHANGE ParentPath ParentPath TEXT NULL DEFAULT NULL, CHANGE NamedParentPath NamedParentPath TEXT NULL DEFAULT NULL;
-ALTER TABLE ConfigurationAdmin CHANGE ValueList ValueList TEXT;
-
-ALTER TABLE EmailQueue CHANGE `Subject` `Subject` TEXT, CHANGE toaddr toaddr TEXT, CHANGE fromaddr fromaddr TEXT; 
-ALTER TABLE Category DROP Pop;
-
-ALTER TABLE PortalUser CHANGE CreatedOn CreatedOn INT NOT NULL DEFAULT '0', CHANGE dob dob INT(11) NULL DEFAULT NULL, CHANGE PassResetTime PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE PwRequestTime PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE `Password` `Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e';
-
-ALTER TABLE Modules CHANGE BuildDate BuildDate INT UNSIGNED NULL DEFAULT NULL, CHANGE Version Version VARCHAR(10) NOT NULL DEFAULT '0.0.0', CHANGE `Var` `Var` VARCHAR(100) NOT NULL DEFAULT ''; 
-ALTER TABLE Language CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1', CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y', CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A', CHANGE DecimalPoint DecimalPoint VARCHAR(10) NOT NULL DEFAULT '', CHANGE ThousandSep ThousandSep VARCHAR(10) NOT NULL DEFAULT '';
-ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NOT NULL DEFAULT '-1';
-	
-ALTER TABLE StdDestinations CHANGE DestAbbr2 DestAbbr2 CHAR(2) NULL DEFAULT NULL;
-
-ALTER TABLE PermCache DROP DACL;
-
-ALTER TABLE Images CHANGE LocalThumb LocalThumb TINYINT(4) NOT NULL DEFAULT '1', CHANGE SameImages SameImages TINYINT(4) NOT NULL DEFAULT '1', CHANGE AltName AltName VARCHAR(255) NOT NULL DEFAULT '';
-
-ALTER TABLE SearchConfig CHANGE SimpleSearch SimpleSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE AdvancedSearch AdvancedSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE ModuleName ModuleName VARCHAR(20) NOT NULL DEFAULT 'In-Portal';
-ALTER TABLE ItemReview CHANGE CreatedById CreatedById INT(11) NOT NULL DEFAULT '-1', CHANGE Status Status TINYINT(4) NOT NULL DEFAULT '2', CHANGE CreatedOn CreatedOn INT UNSIGNED NULL DEFAULT NULL;
-ALTER TABLE Visits CHANGE PortalUserId PortalUserId INT(11) NOT NULL DEFAULT '-2';
-
-ALTER TABLE ItemRating CHANGE CreatedOn CreatedOn INT UNSIGNED NULL DEFAULT NULL;
-ALTER TABLE PortalGroup CHANGE CreatedOn CreatedOn INT UNSIGNED NULL DEFAULT NULL;
-
-ALTER TABLE SpamControl CHANGE Expire Expire INT UNSIGNED NULL DEFAULT NULL;
-ALTER TABLE SuggestMail CHANGE sent sent INT UNSIGNED NULL DEFAULT NULL;
-ALTER TABLE SysCache CHANGE Expire Expire INT UNSIGNED NULL DEFAULT NULL;
-
-ALTER TABLE UserSession CHANGE SessionKey SessionKey INT UNSIGNED NULL DEFAULT NULL, CHANGE CurrentTempKey CurrentTempKey INT UNSIGNED NULL DEFAULT NULL, CHANGE PrevTempKey PrevTempKey INT UNSIGNED NULL DEFAULT NULL, CHANGE LastAccessed LastAccessed INT UNSIGNED NOT NULL DEFAULT '0', CHANGE PortalUserId PortalUserId INT(11) NOT NULL DEFAULT '-2', CHANGE Language Language INT(11) NOT NULL DEFAULT '1', CHANGE Theme Theme INT(11) NOT NULL DEFAULT '1';
-
-UPDATE Phrase SET Translation = REPLACE(Translation, CHAR(146), "'");
-
-CREATE TABLE Counters (CounterId int(10) unsigned NOT NULL auto_increment,Name varchar(100) NOT NULL default '',CountQuery text,CountValue text,LastCounted int(10) unsigned default NULL,LifeTime int(10) unsigned NOT NULL default '3600',IsClone tinyint(3) unsigned NOT NULL default '0',TablesAffected text,PRIMARY KEY  (CounterId),UNIQUE KEY Name (Name));
-
-UPDATE Modules SET Version = '4.0.2' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 7391)
+++ trunk/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 8397)
@@ -27,11 +27,11 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
 		<td class="control-cell">
 			<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field="LangFile"/>" id="<inp2:phrases.export_InputName field="LangFile"/>" value="<inp2:phrases.export_Field field="LangFile"/>" />
Index: trunk/core/admin_templates/incs/style.css
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/admin_templates/incs/style.css	(.../style.css)	(revision 8104)
+++ trunk/core/admin_templates/incs/style.css	(.../style.css)	(revision 8397)
@@ -49,6 +49,15 @@
    display: inline;
 }
 
+.bordered, table.bordered, .bordered-no-bottom {
+	border: 1px solid #000000;
+	border-collapse: collapse;
+}
+
+.bordered-no-bottom {
+	border-bottom: none;
+}
+
 .text {
 	font-family: verdana, arial;
 	font-size: 12px;
@@ -332,16 +341,16 @@
 	color: #666666;
 }
 
-.table_color1, .table_color2 {
+.table-color1, .table-color2 {
 	font-family: verdana, arial;
 	font-size: 14px;
 	font-weight: normal;
 	color: #000000;
 	text-decoration: none;
 }
 
-.table_color1 {	background-color: #F6F6F6; }
-.table_color2 {	background-color: #EBEBEB; }
+.table-color1 {	background-color: #F6F6F6; }
+.table-color2 {	background-color: #EBEBEB; }
 
 
 .table_white, .table_white_selected {
@@ -370,9 +379,16 @@
 	text-decoration: none;
 
 	color: #FFFFFF;
+}
 
+.subsectiontitle a {
+	color: #ffffff;
 }
 
+.subsectiontitle a:hover {
+	color: #FFCC00;
+}
+
 /*.subsectiontitle:hover {
 	font-family: verdana, arial;
 	font-size: 14px;
Index: trunk/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 7391)
+++ trunk/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 8397)
@@ -31,7 +31,7 @@
 </table>
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
Index: trunk/kernel/include/theme.php
===================================================================
diff -u -N -r7413 -r8397
--- trunk/kernel/include/theme.php	(.../theme.php)	(revision 7413)
+++ trunk/kernel/include/theme.php	(.../theme.php)	(revision 8397)
@@ -774,7 +774,7 @@
         $this->Clear();
 		foreach($missingThemes as $theme)
 		{
-			$t=$this->AddTheme($theme,"New Theme",0,0, 3600, getArrayValue($css_hash, $theme) );
+			$t=$this->AddTheme($theme,"New Theme",0,0, 3600, (int)getArrayValue($css_hash, $theme) );
 			$t->Files->FindMissingFiles($t->Get('Name'));
 		}
     }
Index: trunk/core/install/upgrades.php
===================================================================
diff -u -N -r8078 -r8397
--- trunk/core/install/upgrades.php	(.../upgrades.php)	(revision 8078)
+++ trunk/core/install/upgrades.php	(.../upgrades.php)	(revision 8397)
@@ -1,46 +1,73 @@
 <?php
-	$upgrade_class = 'CoreUpgrades';	
+	$upgrade_class = 'CoreUpgrades';
 
 	/**
 	 * Class, that holds all upgrade scripts for "Core" module
 	 *
 	 */
 	class CoreUpgrades extends kHelper {
-		
+
 		/**
 		 * Installator instance
 		 *
 		 * @var kInstallator
 		 */
 		var $Installator = null;
-		
+
 		function setInstallator(&$instance)
 		{
 			$this->Installator =& $instance;
 		}
-		
+
 		/**
 		 * Changes table structure, where multilingual fields of TEXT type are present
 		 *
 		 * @param string $mode when called mode {before, after)
 		 */
-		function Upgrade_4_0_2($mode)
+		function Upgrade_4_1_0($mode)
 		{
 			if ($mode == 'before') {
 				// don't user after, because In-Portal calls this method too
 				$this->Installator->SaveConfig();
 			}
-			
+
 			if ($mode == 'after') {
 				$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
 				/* @var $ml_helper kMultiLanguageHelper */
-				
+
 				$lang_count = $ml_helper->getLanguageCount();
 				$this->Application->UnitConfigReader->iterateConfigs(Array (&$this, 'updateTextFields'), $lang_count);
 			}
 		}
 
 		/**
+		 * Moves ReplacementTags functionality from EmailMessage to Events table
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_4_1_1($mode)
+		{
+			if ($mode == 'after') {
+				$sql = 'SELECT ReplacementTags, EventId
+						FROM '.TABLE_PREFIX.'EmailMessage
+						WHERE (ReplacementTags IS NOT NULL) AND (ReplacementTags <> "") AND (LanguageId = 1)';
+				$replacement_tags = $this->Conn->GetCol($sql, 'EventId');
+				
+				foreach ($replacement_tags as $event_id => $replacement_tag) {
+					$sql = 'UPDATE '.TABLE_PREFIX.'Events
+							SET ReplacementTags = '.$this->Conn->qstr($replacement_tag).'
+							WHERE EventId = '.$event_id;
+					$this->Conn->Query($sql);
+				}
+				
+				// drop moved field from source table
+				$sql = 'ALTER TABLE '.TABLE_PREFIX.'EmailMessage
+						DROP `ReplacementTags`';
+				$this->Conn->Query($sql);
+			}
+		}
+		
+		/**
 		 * Callback function, that makes all ml fields of text type null with same default value
 		 *
 		 * @param string $prefix
@@ -54,14 +81,14 @@
 				// invalid config found or prefix not found
 				return false;
 			}
-			
+
 			$table_name = $config_data['TableName'];
 			$table_structure = $this->Conn->Query('DESCRIBE '.$table_name, 'Field');
 			if (!$table_structure) {
 				// table not found
 				return false;
 			}
-			
+
 			$sqls = Array ();
 			foreach ($config_data['Fields'] as $field => $options) {
 				if (isset($options['formatter']) && $options['formatter'] == 'kMultiLanguage' && !isset($options['master_field'])) {
@@ -72,22 +99,22 @@
 							$sqls[] = 'CHANGE '.$ml_field.' '.$ml_field.' TEXT NULL DEFAULT NULL';
 						}
 					}
-					
+
 					// update <field_name> if found (old format)
 					if (isset($table_structure[$field]) && $table_structure[$field]['Type'] == 'text') {
 						$sqls[] = 'CHANGE '.$field.' '.$field.' TEXT NULL DEFAULT NULL';
 					}
 				}
 			}
-			
+
 			if ($sqls) {
 				$sql = 'ALTER TABLE '.$table_name.' '.implode(', ', $sqls);
 				$this->Conn->Query($sql);
 			}
-			
+
 			return true;
 		}
-			
+
 	}
-	
+
 ?>
\ No newline at end of file
Index: trunk/core/admin_templates/emails/send_queue.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/emails/send_queue.tpl	(revision 0)
+++ trunk/core/admin_templates/emails/send_queue.tpl	(revision 8397)
@@ -0,0 +1,17 @@
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send"/>
+
+	<script type="text/javascript" src="js/ajax.js"></script>
+	<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+	<script type="text/javascript">
+		function cancel_action() {
+			redirect('<inp2:m_Link template="emails/send_complete"/>');
+		}
+
+		$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" emailevents_event="OnProcessEmailQueue" type="return_progress" finish_template="emails/send_complete" pass="m,emailevents" no_amp="1"/>');
+	</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/install/install_schema.sql
===================================================================
diff -u -N -r8092 -r8397
--- trunk/core/install/install_schema.sql	(.../install_schema.sql)	(revision 8092)
+++ trunk/core/install/install_schema.sql	(.../install_schema.sql)	(revision 8397)
@@ -61,7 +61,6 @@
 CREATE TABLE EmailMessage (
   EmailMessageId int(10) NOT NULL auto_increment,
   Template longtext,
-  ReplacementTags text,
   MessageType enum('html','text') NOT NULL default 'text',
   LanguageId int(11) NOT NULL default '0',
   EventId int(11) NOT NULL default '0',
@@ -70,12 +69,17 @@
 );
 
 CREATE TABLE EmailQueue (
-  Subject text,
-  toaddr text,
-  fromaddr text,
-  message blob,
-  headers blob,
-  queued timestamp NOT NULL
+  EmailQueueId int(10) unsigned NOT NULL auto_increment,
+  ToEmail varchar(255) NOT NULL default '',
+  `Subject` varchar(255) NOT NULL default '',
+  MessageHeaders text,
+  MessageBody longtext,
+  Queued int(10) unsigned NOT NULL default '0',
+  SendRetries int(10) unsigned NOT NULL default '0',
+  LastSendRetry int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (EmailQueueId),
+  KEY LastSendRetry (LastSendRetry),
+  KEY SendRetries (SendRetries)
 );
 
 CREATE TABLE EmailSubscribers (
@@ -86,6 +90,7 @@
 CREATE TABLE Events (
   EventId int(11) NOT NULL auto_increment,
   Event varchar(40) NOT NULL default '',
+  ReplacementTags text,
   Enabled int(11) NOT NULL default '1',
   FromUserId int(11) NOT NULL default '-1',
   Module varchar(40) NOT NULL default '',
@@ -433,3 +438,14 @@
   PRIMARY KEY  (CounterId),
   UNIQUE KEY Name (Name)
 );
+
+CREATE TABLE Skins (
+  `SkinId` int(11) NOT NULL auto_increment,
+  `Name` varchar(255) default NULL,
+  `CSS` text,
+  `Logo` varchar(255) default NULL,
+  `Options` text,
+  `LastCompiled` int(11) NOT NULL default '0',
+  `IsPrimary` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`SkinId`)
+);
Index: trunk/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r6625 -r8397
--- trunk/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 6625)
+++ trunk/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 8397)
@@ -82,6 +82,10 @@
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+			/* @var $ml_helper kMultiLanguageHelper */
+			
+			// call main item config to clone cdata table
+			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->deleteField($main_prefix.'-cdata', $event->getEventParam('id'));
 		}
 
@@ -113,9 +117,11 @@
 			$object =& $event->getObject();
 			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
-			$this->Application->HandleEvent( new kEvent($main_prefix.'-cdata:OnCreateCustomFields') );
-
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+			/* @var $ml_helper kMultiLanguageHelper */
+			
+			// call main item config to clone cdata table
+			$this->Application->getUnitOption($main_prefix, 'TableName');
 			$ml_helper->createFields($main_prefix.'-cdata');
 		}
 
Index: trunk/core/units/languages/import_xml.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 8104)
+++ trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 8397)
@@ -214,14 +214,16 @@
 					$this->current_phrase = Array(	'LanguageId' 	=> $this->current_language['LanguageId'],
 													'Phrase' 		=> $attributes['LABEL'],
 													'PhraseType' 	=> $attributes['TYPE'],
+													'PhraseId'		=> 0,
 													'Module'		=> $phrase_module,
 													'LastChanged'	=> adodb_mktime(),
 													'LastChangeIP'	=> $this->ip_address,
 													'Translation'	=> '');
 					break;
 
 				case 'LANGUAGES LANGUAGE EVENTS EVENT':
-					$this->current_event = Array(	'LanguageId' 	=> $this->current_language['LanguageId'],
+					$this->current_event = Array(	'EmailMessageId'=> 0,
+													'LanguageId' 	=> $this->current_language['LanguageId'],
 													'EventId'		=> $this->events_hash[ $attributes['EVENT'].'_'.$attributes['TYPE'] ],
 													'MessageType' 	=> $attributes['MESSAGETYPE'],
 													'Template'		=> '');
@@ -298,7 +300,7 @@
 						else {
 							$this->current_phrase['Translation'] = base64_decode($this->current_phrase['Translation']);
 						}
-						$this->insertRecord($this->tables['phrases'], $this->current_phrase);
+						$this->Conn->doInsert($this->current_phrase, $this->tables['phrases']);
 					}
 					break;
 
@@ -310,33 +312,13 @@
 					else {
 						$this->current_event['Template'] = base64_decode($this->current_event['Template']);
 					}
-					$this->insertRecord($this->tables['emailmessages'],$this->current_event);
+					$this->Conn->doInsert($this->current_event, $this->tables['emailmessages']);
 					break;
 			}
 
 			array_pop($this->path);
 		}
 
-		function insertRecord($table, $fields_hash)
-		{
-			$fields = '';
-			$values = '';
-
-			foreach($fields_hash as $field_name => $field_value)
-			{
-				$fields .= '`'.$field_name.'`,';
-				$values .= $this->Conn->qstr($field_value).',';
-			}
-
-			$fields = preg_replace('/(.*),$/', '\\1', $fields);
-			$values = preg_replace('/(.*),$/', '\\1', $values);
-
-			$sql = 'INSERT INTO `'.$table.'` ('.$fields.') VALUES ('.$values.')';
-			$this->Conn->Query($sql);
-
-//			return $this->Conn->getInsertID(); // no need because of temp table without auto_increment column at all
-		}
-
 		/**
 		 * Creates XML file with exported language data
 		 *
Index: trunk/core/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -N -r5431 -r8397
--- trunk/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 5431)
+++ trunk/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 8397)
@@ -35,7 +35,7 @@
 <inp2:g_SaveWarning name="grid_save_warning"/>
 
 <inp2:m_DefineElement name="permission_element" prefix="g-perm">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_param name="section_name"/>.<inp2:m_param name="perm_name"/>
 		</td>
@@ -48,7 +48,7 @@
 
 
 <inp2:m_DefineElement name="old_permission_element" prefix="g-perm">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_phrase name="$label"/>
 		</td>
@@ -62,7 +62,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 	
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: trunk/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -N -r8029 -r8397
--- trunk/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 8029)
+++ trunk/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 8397)
@@ -50,13 +50,13 @@
 							'Description' => TABLE_PREFIX.'Events.Description',
 							'Module' => TABLE_PREFIX.'Events.Module',
 							'Type' => TABLE_PREFIX.'Events.Type',
+							'ReplacementTags' => TABLE_PREFIX.'Events.ReplacementTags',
 						),
 					),
 
 					'Fields' => Array (
 						'EmailMessageId'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 						'Template'			=>	Array('type' => 'string', 'default' => null),
-						'ReplacementTags'	=>	Array ('type' => 'string', 'default' => null),
 						'MessageType'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
 						'LanguageId'		=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 						'EventId'			=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -66,6 +66,7 @@
 					'VirtualFields'		=>	Array(
 						'Headers'	=>	Array('type'=>'string'),
 						'Body'		=>	Array('type'=>'string'),
+						'ReplacementTags'	=>	Array ('type' => 'string', 'default' => null),
 						'Description'		=>	Array('type'=>'string', 'sql_filter_type'=>'having'),
 						'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
             'Type' => Array('formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
Index: trunk/core/install/step_templates/choose_modules.tpl
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 7635)
+++ trunk/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 8397)
@@ -1,7 +1,7 @@
 <?php
 	ob_start();
 ?>
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text" colspan="2" valign="middle">
 		<table cellpadding="0" cellspacing="0">
 			<tr>
Index: trunk/admin/email/do_send.php
===================================================================
diff -u -N -r7867 -r8397
--- trunk/admin/email/do_send.php	(.../do_send.php)	(revision 7867)
+++ trunk/admin/email/do_send.php	(.../do_send.php)	(revision 8397)
@@ -148,20 +148,22 @@
       $TargetURL .="&EmailState=email_send_progress&Start=0&Total=".count($UserList);
   break;
   case "email_send_progress":
-    $total = $_GET["Total"];
+    $application =& kApplication::Instance();
+    $application->RemoveVar('email_queue_progress');
+  	$application->Redirect('emails/send_queue', null, '', 'index.php');
+  	
+  	/*$total = $_GET["Total"];
     $start = $_GET["Start"];
-    if($start < $total)
-    {
+    if ($start < $total) {
       $pct = (int)(($start/$total)*100);
       $NewStart = $start+$MessagesPerPage;
       $TargetURL .= "&EmailState=email_send_progress&Start=$NewStart&Total=$total";
       $PageTitle = admin_language("la_Title_SendMailProgress")." - ".$pct."% ".admin_language("la_Text_Complete");
     }
-    else
-    {
+    else {
       $PageTitle = admin_language("la_Title_SendMailProgress");
       $TargetURL .= "&EmailState=email_send_complete";
-    }
+    }*/
   break;
   case "email_send_complete":
       $PageTitle = admin_language("la_Title_SendMailComplete");
@@ -207,11 +209,8 @@
       $o .= "<TD ALIGN=\"middle\" COLSPAN=2></TD></TR>";
       $o .= "</TABLE><input type=button CLASS=\"button\" VALUE=\"".admin_language("la_Cancel")."\" ONCLICK=\"document.location='".$CancelURL."';\">";
       echo $o."\n";
-
-      $sql = "CREATE TABLE $table SELECT * FROM ".$objEmailQueue->SourceTable." WHERE queued=99";
-      $ado->Execute($sql);
-      //echo $sql."<br>\n";
-      for($i=0;$i<count($UserList);$i++)
+      
+      for($i = 0; $i < count($UserList); $i++)
       {
            $ToAddr = $UserList[$i];
            //$From,$FromName,$To,$ToName,$Subject,$Text,$Html,$charset,$AttmFiles,$QueueOnly=0
Index: trunk/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 7391)
+++ trunk/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8397)
@@ -58,7 +58,7 @@
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
 <div id="scroll_container">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_id_label" prefix="lang" field="LanguageId" title="!la_fld_LanguageId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="lang" field="PackName" title="!la_fld_PackName!"/>
@@ -77,7 +77,7 @@
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/>
 	<inp2:m_if check="lang_IsNewMode">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="label-cell">
 			<inp2:m_phrase name="la_fld_CopyLabels"/>:
Index: trunk/core/units/general/inp1_parser.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 8104)
+++ trunk/core/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 8397)
@@ -21,7 +21,7 @@
 			return $template_body;
 		}
 
-		if ( !$this->InportalInited) {
+		if (!$this->InportalInited) {
 			//$save_t = $this->Application->GetVar('t');
 			$this->InitInPortal();
 			$var_list['t'] = $this->cutTPL($var_list['t']);
Index: trunk/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 7391)
+++ trunk/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 8397)
@@ -73,7 +73,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="tree_element">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 	 	<td>
 	 		<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
 
@@ -112,7 +112,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: trunk/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 8104)
+++ trunk/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 8397)
@@ -30,7 +30,7 @@
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
 					var a_toolbar = new ToolBar();
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_GoUp" escape="1"/>', function() {
 								$Catalog.go_to_cat($Catalog.ParentCategoryID);
 							}
 					 	) );
@@ -94,7 +94,7 @@
 						}
 				 	) );
 
-				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
+				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Rebuild" escape="1"/>', function() {
 				 			redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
 						}
 				 	) );
Index: trunk/core/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -N -r5319 -r8397
--- trunk/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 5319)
+++ trunk/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 8397)
@@ -3,7 +3,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="thumbnail_section" prefix="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="ThumbPath"/><inp2:$prefix_Error field="ThumbUrl"/></span>&nbsp;
@@ -46,7 +46,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="fullsize_section" prefix="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_Location"/><br>
 			<span class="error"><inp2:$prefix_Error field="LocalPath"/><inp2:$prefix_Error field="Url"/></span>&nbsp;
Index: trunk/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8104)
+++ trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8397)
@@ -27,7 +27,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_block name="grid_pagination" SearchPrefixSpecial="" ajax="0"/>
-<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>tableborder_full_kernel<inp2:m_else/>pagination_bar<inp2:m_endif/>">
+<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>bordered<inp2:m_else/>pagination_bar<inp2:m_endif/>">
 	<tbody>
 		<tr id="MY_ID">
 	  	<td>
@@ -49,7 +49,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_DefineElement name="grid_pagination_elem" ajax="0">
-	
+
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_search" ajax="0">
@@ -95,7 +95,7 @@
 
 <inp2:m_block name="grid_column_title" use_phrases="1" ajax="0"/>
 	<td nowrap="nowrap">
-		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);" class="columntitle_small"><IMG alt="" src="img/list_arrow_<inp2:$PrefixSpecial_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if></a>
+		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"><IMG alt="" src="img/list_arrow_<inp2:$PrefixSpecial_order field="$sort_field"/>.gif" border="0" align="absmiddle"><inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if></a>
 	</td>
 <inp2:m_blockend/>
 
@@ -352,7 +352,7 @@
 	<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">
 		<inp2:m_ParseBlock name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
 	</inp2:m_if>
-	<table width="100%" cellspacing="0" cellpadding="4" class="tableborder">
+	<table width="100%" cellspacing="0" cellpadding="4" class="bordered">
 
 		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
 			<tr class="pagination_bar">
@@ -365,11 +365,11 @@
 		</tr>
 
 		<inp2:m_DefineElement name="_row" td_style="">
-			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
+			<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
 				<inp2:IterateGridFields grid="$grid" mode="data" block="$data_block"/>
 			</tr>
 		</inp2:m_DefineElement>
-		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 		<inp2:$PrefixSpecial_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" />
 
 		<inp2:m_DefineElement name="grid_total_td">
@@ -452,7 +452,7 @@
 	</inp2:m_DefineElement>
 
 	<table width="100%" border="0" cellspacing="2" cellpadding="4">
-		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 		<inp2:$PrefixSpecial_PrintList2 pass_params="true"/>
 	</table>
 
Index: trunk/admin/install/inportal_remove.sql
===================================================================
diff -u -N -r7391 -r8397
--- trunk/admin/install/inportal_remove.sql	(.../inportal_remove.sql)	(revision 7391)
+++ trunk/admin/install/inportal_remove.sql	(.../inportal_remove.sql)	(revision 8397)
@@ -215,5 +215,8 @@
 DROP TABLE FormSubmissions
 # --------------------------------------------------------
 DROP TABLE PopupSizes
+# --------------------------------------------------------
+DROP TABLE Counters
+# --------------------------------------------------------
+DROP TABLE Skins
 #
-
Index: trunk/core/admin_templates/login.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/login.tpl	(.../login.tpl)	(revision 7391)
+++ trunk/core/admin_templates/login.tpl	(.../login.tpl)	(revision 8397)
@@ -1,4 +1,5 @@
 <inp2:m_include t="incs/header" nobody="yes" noform="yes"/>
+<inp2:m_Set skip_last_template="1"/>
 
 <body style="margin: 0px 8px 0px 8px; background-color: #fff;" text="#000000" style="height: 100%;" onLoad="document.getElementById($form_name).login.focus();">
 
@@ -11,7 +12,7 @@
 		        <img title="In-portal" src="img/logo.gif" width="150" height="82" border="0"><br />
 
 
-		        <table border="0" cellpadding="2" cellspacing="0" class="tableborder" style="border-width: 1px;" width="222" height="30">
+		        <table border="0" cellpadding="2" cellspacing="0" class="bordered" style="border-width: 1px;" width="222" height="30">
 			        <tr>
 						<td align="right" valign="top" class="tablenav" width ="220" nowrap height="30" style="background: url(img/tabnav_left.gif);">
 							<span style="float: left;">
@@ -50,7 +51,8 @@
 		</tr>
 	</table>
 	<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>">
-
+	<input type="hidden" name="skip_last_template" value="1"/>
+	
 	<script type="text/javascript">
 		function doLogin()
 		{
Index: trunk/kernel/include/category.php
===================================================================
diff -u -N -r8061 -r8397
--- trunk/kernel/include/category.php	(.../category.php)	(revision 8061)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 8397)
@@ -11,6 +11,8 @@
     var $Permissions;
 
     var $DescriptionField = '';
+    var $PrimaryDescriptionField = '';
+    var $PrimaryTitleField = '';
 
     function clsCategory($CategoryId=NULL)
     {
@@ -21,6 +23,9 @@
   	    $this->TitleField = $ml_formatter->LangFieldName('Name');
   	    $this->DescriptionField = $ml_formatter->LangFieldName('Description');
 
+  	    $this->PrimaryTitleField = $ml_formatter->LangFieldName('Name', 1);
+  	    $this->PrimaryDescriptionField = $ml_formatter->LangFieldName('Description', 1);
+
         $this->tablename = GetTablePrefix()."Category";
         $this->type=1;
         $this->BasePermission ="CATEGORY";
@@ -373,7 +378,7 @@
    		$res = $this->Get($navbar_field);
 		if (!strlen($res)) {
 		   $this->UpdateCachedPath();
-		   $res = $this->Get($navbar_field);
+		   $res = $this->Get($navbar_field, $ml_formatter->LangFieldName('CachedNavbar',1));
 		}
 		return str_replace('&|&', ' > ', $res);
    }
@@ -815,7 +820,7 @@
     function GetNavbar()
     {
 			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-			return str_replace('&|&', ' > ', $this->Get($ml_formatter->LangFieldName('CachedNavbar')));
+			return str_replace('&|&', ' > ', $this->Get($ml_formatter->LangFieldName('CachedNavbar'), $ml_formatter->LangFieldName('CachedNavbar', 1)));
     }
 
     function ParseObject($element)
@@ -865,14 +870,14 @@
             	@field:cat.name
             	@description:Category name
             	*/
-                $ret = $this->HighlightField($this->TitleField);
+                $ret = $this->HighlightText($this->Get($this->TitleField, $this->PrimaryTitleField));
             break;
             case "description":
             	/*
             	@field:cat.description
             	@description:Category Description
             	*/
-                $ret = ($this->Get($this->DescriptionField));
+                $ret = ($this->Get($this->DescriptionField, $this->PrimaryDescriptionField));
                 $ret = $this->HighlightText($ret);
             break;
             case "cachednavbar":
@@ -1540,14 +1545,18 @@
 
   	var $TitleField = '';
   	var $DescriptionField = '';
+  	var $PrimaryTitleField;
+  	var $PrimaryDescriptionField;
 
   	function clsCatList()
   	{
   	    global $m_var_list;
   	    $this->clsItemCollection();
   	    $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
   	    $this->TitleField = $ml_formatter->LangFieldName('Name');
+  	    $this->PrimaryTitleField = $ml_formatter->LangFieldName('Name', 1);
   	    $this->DescriptionField = $ml_formatter->LangFieldName('Description');
+  	    $this->PrimaryDescriptionField = $ml_formatter->LangFieldName('Description', 1);
 
   	    $this->Prefix = 'c';
   	    $this->classname="clsCategory";
@@ -2110,7 +2119,7 @@
 	  	foreach ($fields_hash as $field_name => $field_value) {
 	  		$d->Set($field_name, $field_value);
 	  	}
-	  	
+
 	  	$d->Create();
 
 	  	if (!$from_import) {
Index: trunk/core/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 7391)
+++ trunk/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 8397)
@@ -6,11 +6,11 @@
 
 <!-- ToolBar --->
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_phrase label="la_DownloadLanguageExport"/>
 		<td>
@@ -19,7 +19,7 @@
 		<td class="error">&nbsp;</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="3" align="left">
 			<a href="javascript:submit_event('lang','OnGoBack');"><inp2:m_phrase label="la_Continue"/></a>
 		</td>
Index: trunk/admin/install/domain.php
===================================================================
diff -u -N -r315 -r8397
--- trunk/admin/install/domain.php	(.../domain.php)	(revision 315)
+++ trunk/admin/install/domain.php	(.../domain.php)	(revision 8397)
@@ -14,18 +14,18 @@
 <?php
     $current = $_SERVER['HTTP_HOST'];
     
-    echo '<TR class="table_color2"><TD colspan="2" class="txt" align="left">';
+    echo '<TR class="table-color2"><TD colspan="2" class="txt" align="left">';
     echo '<INPUT TYPE="RADIO" NAME="domain" id="domain_1" VALUE="1" checked>';
     echo '<label for="domain_1">'.$current.'</label>';
     echo "</TD></TR>\n";
 ?>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <TD COLSPAN=2 align="left" class="txt">
 				                <INPUT TYPE="radio" NAME="domain" VALUE="2" id="domain_2"><label for="domain_2">Other:</label>
 				                <input TYPE="TEXT" NAME="other" VALUE="">
 				              </TD>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $DomainError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -N -r8382 -r8397
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 8382)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 8397)
@@ -11,6 +11,20 @@
 												Array('pseudo' => 'kPermCacheUpdater','class' => 'kPermCacheUpdater', 'file' => 'cache_updater.php','build_event'=>''),
 											),
 
+					'ConfigPriority' => 0,
+					'Hooks' => Array (
+						Array (
+							'Mode' => hBEFORE,
+							'Conditional' => false,
+							'HookToPrefix' => '',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnAfterConfigRead'),
+							'DoPrefix' => 'cdata',
+							'DoSpecial' => '*',
+							'DoEvent' => 'OnDefineCustomFields',
+						),
+					),						
+											
 					'AutoLoad'				=>	true,
 					'CatalogItem'			=>	true,
 					'AdminTemplatePath'		=>	'categories',
Index: trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -N -r7867 -r8397
--- trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 7867)
+++ trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 8397)
@@ -75,7 +75,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: trunk/admin/install/upgrade.php
===================================================================
diff -u -N -r901 -r8397
--- trunk/admin/install/upgrade.php	(.../upgrade.php)	(revision 901)
+++ trunk/admin/install/upgrade.php	(.../upgrade.php)	(revision 8397)
@@ -16,7 +16,7 @@
 	$i = 0;
     foreach($Modules as $m)
     {        
-        echo "<TR class=\"table_color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
+        echo "<TR class=\"table-color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
    		if($m['error'])
 	        echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"modules[]\" VALUE=\"{$m['module']}\" disabled />";
     	else
@@ -33,10 +33,10 @@
 //        $i++;
     }
 ?>		            				            				            
-				            <tr class="table_color1">
+				            <tr class="table-color1">
 				            	<td colspan="2"><?php echo int_hint(prompt_language("la_text_upgrade_disclaimer")); ?><br/></td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $ModuleError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r8061 -r8397
--- trunk/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8061)
+++ trunk/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8397)
@@ -79,7 +79,7 @@
 			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" >
 		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
Index: trunk/core/install/step_templates/root_password.tpl
===================================================================
diff -u -N -r6691 -r8397
--- trunk/core/install/step_templates/root_password.tpl	(.../root_password.tpl)	(revision 6691)
+++ trunk/core/install/step_templates/root_password.tpl	(.../root_password.tpl)	(revision 8397)
@@ -1,12 +1,12 @@
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text">
 		<b>Root Password<span class="error">*</span>:</b>
 	</td>
 	<td>
 		<input type="password" name="root_password" class="text">
 	</td>
 </tr>
-<tr class="table_color2">  
+<tr class="table-color2">  
 	<td class="text">
 		<b>Confirm Root Password<span class="error">*</span>:</b>
 	</td>
Index: trunk/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 7635)
+++ trunk/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 8397)
@@ -1,17 +1,17 @@
-<tr class="table_color2">
+<tr class="table-color2">
 	<td colspan="2">
 		In order to use the installation tool, please provide your Intechnic account information:
 	</td>
 </tr>
-<tr class="table_color2"> 
+<tr class="table-color2"> 
 	<td class="text">
 		<b>Username<span class="error">*</span>:</b>
 	</td>
 	<td width="80%">
 		<input type="text" name="login" value="" class="text" />
 	</td>
 </tr>
-<tr class="table_color2"> 
+<tr class="table-color2"> 
 	<td class="text">
 		<b>Password<span class="error">*</span>:</b>
 	</td>
@@ -46,11 +46,11 @@
 		unset($options['upgrade']);
 	}
 				
-	$td_class = 'table_color1';			
+	$td_class = 'table-color1';			
 	foreach ($options as $option_key => $option_title) {
 		$checked = $this->GetVar('next_preset') == $option_key ? ' checked' : '';
 		echo sprintf($option_tpl, $option_key, $checked, $option_title, $td_class);
-		$td_class = ($td_class == 'table_color1') ? 'table_color2' : 'table_color1';
+		$td_class = ($td_class == 'table-color1') ? 'table-color2' : 'table-color1';
 	}
 	
 ?>
\ No newline at end of file
Index: trunk/core/units/general/xml_helper.php
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/units/general/xml_helper.php	(.../xml_helper.php)	(revision 7855)
+++ trunk/core/units/general/xml_helper.php	(.../xml_helper.php)	(revision 8397)
@@ -167,7 +167,8 @@
 				return $child;
 			}
 		}
-		return false;
+		$false = false;
+		return $false;
 	}
 
 	function FindChildValue($name, $attr=null)
Index: trunk/admin/install/upgrades/inportal_upgrade_v4.1.0.sql
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/inportal_upgrade_v4.1.0.sql	(revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_v4.1.0.sql	(revision 8397)
@@ -0,0 +1,49 @@
+ALTER TABLE EmailMessage ADD ReplacementTags TEXT AFTER Template;
+
+ALTER TABLE Phrase CHANGE Translation Translation TEXT NOT NULL, CHANGE Module Module VARCHAR(30) NOT NULL DEFAULT 'In-Portal';
+ALTER TABLE Category CHANGE Description Description TEXT, CHANGE l1_Description l1_Description TEXT, CHANGE l2_Description l2_Description TEXT, CHANGE l3_Description l3_Description TEXT, CHANGE l4_Description l4_Description TEXT, CHANGE l5_Description l5_Description TEXT, CHANGE CachedNavbar CachedNavbar text, CHANGE l1_CachedNavbar l1_CachedNavbar text, CHANGE l2_CachedNavbar l2_CachedNavbar text, CHANGE l3_CachedNavbar l3_CachedNavbar text, CHANGE l4_CachedNavbar l4_CachedNavbar text, CHANGE l5_CachedNavbar l5_CachedNavbar text, CHANGE ParentPath ParentPath TEXT NULL DEFAULT NULL, CHANGE NamedParentPath NamedParentPath TEXT NULL DEFAULT NULL;
+ALTER TABLE ConfigurationAdmin CHANGE ValueList ValueList TEXT;
+
+ALTER TABLE EmailQueue CHANGE `Subject` `Subject` TEXT, CHANGE toaddr toaddr TEXT, CHANGE fromaddr fromaddr TEXT;
+ALTER TABLE Category DROP Pop;
+
+ALTER TABLE PortalUser CHANGE CreatedOn CreatedOn INT DEFAULT NULL, CHANGE dob dob INT(11) NULL DEFAULT NULL, CHANGE PassResetTime PassResetTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE PwRequestTime PwRequestTime INT(11) UNSIGNED NULL DEFAULT NULL, CHANGE `Password` `Password` VARCHAR(255) NULL DEFAULT 'd41d8cd98f00b204e9800998ecf8427e';
+
+ALTER TABLE Modules CHANGE BuildDate BuildDate INT UNSIGNED NULL DEFAULT NULL, CHANGE Version Version VARCHAR(10) NOT NULL DEFAULT '0.0.0', CHANGE `Var` `Var` VARCHAR(100) NOT NULL DEFAULT '';
+ALTER TABLE Language CHANGE Enabled Enabled INT(11) NOT NULL DEFAULT '1', CHANGE InputDateFormat InputDateFormat VARCHAR(50) NOT NULL DEFAULT 'm/d/Y', CHANGE InputTimeFormat InputTimeFormat VARCHAR(50) NOT NULL DEFAULT 'g:i:s A', CHANGE DecimalPoint DecimalPoint VARCHAR(10) NOT NULL DEFAULT '', CHANGE ThousandSep ThousandSep VARCHAR(10) NOT NULL DEFAULT '';
+ALTER TABLE Events CHANGE FromUserId FromUserId INT(11) NOT NULL DEFAULT '-1';
+
+ALTER TABLE StdDestinations CHANGE DestAbbr2 DestAbbr2 CHAR(2) NULL DEFAULT NULL;
+
+ALTER TABLE PermCache DROP DACL;
+
+ALTER TABLE Images CHANGE LocalThumb LocalThumb TINYINT(4) NOT NULL DEFAULT '1', CHANGE SameImages SameImages TINYINT(4) NOT NULL DEFAULT '1', CHANGE AltName AltName VARCHAR(255) NOT NULL DEFAULT '';
+
+ALTER TABLE SearchConfig CHANGE SimpleSearch SimpleSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE AdvancedSearch AdvancedSearch TINYINT(4) NOT NULL DEFAULT '1', CHANGE ModuleName ModuleName VARCHAR(20) NOT NULL DEFAULT 'In-Portal';
+ALTER TABLE ItemReview CHANGE CreatedById CreatedById INT(11) NOT NULL DEFAULT '-1', CHANGE Status Status TINYINT(4) NOT NULL DEFAULT '2', CHANGE CreatedOn CreatedOn INT UNSIGNED NULL DEFAULT NULL;
+ALTER TABLE Visits CHANGE PortalUserId PortalUserId INT(11) NOT NULL DEFAULT '-2';
+
+ALTER TABLE ItemRating CHANGE CreatedOn CreatedOn INT UNSIGNED NULL DEFAULT NULL;
+ALTER TABLE PortalGroup CHANGE CreatedOn CreatedOn INT UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE SpamControl CHANGE Expire Expire INT UNSIGNED NULL DEFAULT NULL;
+ALTER TABLE SuggestMail CHANGE sent sent INT UNSIGNED NULL DEFAULT NULL;
+ALTER TABLE SysCache CHANGE Expire Expire INT UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE UserSession CHANGE SessionKey SessionKey INT UNSIGNED NULL DEFAULT NULL, CHANGE CurrentTempKey CurrentTempKey INT UNSIGNED NULL DEFAULT NULL, CHANGE PrevTempKey PrevTempKey INT UNSIGNED NULL DEFAULT NULL, CHANGE LastAccessed LastAccessed INT UNSIGNED NOT NULL DEFAULT '0', CHANGE PortalUserId PortalUserId INT(11) NOT NULL DEFAULT '-2', CHANGE Language Language INT(11) NOT NULL DEFAULT '1', CHANGE Theme Theme INT(11) NOT NULL DEFAULT '1';
+
+UPDATE Phrase SET Translation = REPLACE(Translation, CHAR(146), "'");
+
+CREATE TABLE Counters (CounterId int(10) unsigned NOT NULL auto_increment,Name varchar(100) NOT NULL default '',CountQuery text,CountValue text,LastCounted int(10) unsigned default NULL,LifeTime int(10) unsigned NOT NULL default '3600',IsClone tinyint(3) unsigned NOT NULL default '0',TablesAffected text,PRIMARY KEY  (CounterId),UNIQUE KEY Name (Name));
+
+DROP TABLE EmailQueue;
+CREATE TABLE EmailQueue (EmailQueueId int(10) unsigned NOT NULL auto_increment, ToEmail varchar(255) NOT NULL default '', `Subject` varchar(255) NOT NULL default '', MessageHeaders text, MessageBody longtext, Queued int(10) unsigned NOT NULL default '0', SendRetries int(10) unsigned NOT NULL default '0', LastSendRetry int(10) unsigned NOT NULL default '0', PRIMARY KEY  (EmailQueueId), KEY LastSendRetry (LastSendRetry), KEY SendRetries (SendRetries));
+ALTER TABLE Events ADD ReplacementTags TEXT AFTER Event;
+ALTER TABLE EmailMessage DROP ReplacementTags;
+
+CREATE TABLE Skins (SkinId int(11) NOT NULL auto_increment, Name varchar(255) default NULL, CSS text, Logo varchar(255) default NULL, Options text, LastCompiled int(11) NOT NULL default '0', IsPrimary int(1) NOT NULL default '0', PRIMARY KEY  (SkinId));
+INSERT INTO Skins VALUES (DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n	font-size: 9pt;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\n.head-table tr td {\r\n	background-color: @@HeadBgColor@@;\r\n	color: @@HeadColor@@\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	color: #FFFFFF;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #2D79D6;\r\n	border-bottom: 1px solid #2D79D6;\r\n}\r\n\r\n.tab a {\r\n	color: #00659C;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #fff;\r\n	font-weight: bold;\r\n}\r\n\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	height: 30px;\r\n	overflow: hidden;\r\n	/* border-right: 1px solid black; */\r\n}\r\n.grid-data-row-even td, .table-color2 {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	/* border-right: 1px solid black; */\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-0 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter {\r\n	margin-bottom: 0px;\r\n	width: 85%;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-1 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: none;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n  color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(@@base_url@@/proj-base/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 150px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_mid.gif) repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n\r\n.error-cell {\r\n	background-color: #fff;\r\n	color: red;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n\r\n/* Uploader */\r\n\r\n.uploader-main {\r\n	position: absolute;\r\n	display: none;\r\n	z-index: 10;\r\n	border: 1px solid #777;\r\n	padding: 10px;\r\n	width: 350px;\r\n	height: 120px;\r\n	overflow: hidden;\r\n	background-color: #fff;\r\n}\r\n\r\n.uploader-percent {\r\n	width: 100%;\r\n	padding-top: 3px;\r\n	text-align: center;\r\n	position: relative;\r\n	z-index: 20;\r\n	float: left;\r\n	font-weight: bold;\r\n}\r\n\r\n.uploader-left {\r\n	width: 100%;\r\n	border: 1px solid black;\r\n	height: 20px;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);\r\n}\r\n\r\n.uploader-done {\r\n	width: 0%;\r\n	background-color: green;\r\n	height: 20px;\r\n	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);\r\n}\r\n\r\n\r\n/* To be sorted */\r\n\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Left sid of bluebar */\r\n.header_left_bg {\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n	padding-left: 5px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px 0px 2px 2px;\r\n}\r\n\r\n.tree tr.highlighted td a {\r\n	background-color: @@TreeHighBgColor@@;\r\n	color: @@TreeHighColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: #fff;\r\n}\r\n\r\n.tree tr td a:hover {\r\n	color: #000000;\r\n}', 'just_logo_1.gif', 'a:20:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#1961B8";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#CCFF00";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#006F99";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}}', 1178706881, 1);
+
+UPDATE Modules SET Version = '4.1.1' WHERE Name = 'Core';
+
+UPDATE Modules SET Version = '4.1.0' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/core/units/custom_data/custom_data_config.php
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/units/custom_data/custom_data_config.php	(.../custom_data_config.php)	(revision 7855)
+++ trunk/core/units/custom_data/custom_data_config.php	(.../custom_data_config.php)	(revision 8397)
@@ -1,83 +1,37 @@
 <?php
 
-	$config	=	Array(
-					'Prefix'			=>	'cdata',
+	$config = Array (
+		'Prefix' => 'cdata',
 
-					'Clones'			=>	Array(
-												'u-cdata'	=>	Array(
-																	'TableName'		=>	TABLE_PREFIX.'PortalUserCustomData',
-																	'ParentPrefix'	=>	'u',
-																),
+		'QueryString' => Array (
+			1 => 'id',
+			2 => 'event',
+		),
 
-												'c-cdata'	=>	Array(
-																	'TableName'		=>	TABLE_PREFIX.'CategoryCustomData',
-																	'ParentPrefix'	=>	'c',
-																),
+		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+		'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+		'EventHandlerClass' => Array('class' => 'CustomDataEventHandler', 'file' => 'custom_data_event_handler.php', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+		'AutoLoad' => true,
 
-												'l-cdata'	=>	Array(
-																	'TableName'		=>	TABLE_PREFIX.'LinkCustomData',
-																	'ParentPrefix'	=>	'l',
-																),
+		'IDField' => 'CustomDataId',
 
-												'n-cdata'	=>	Array(
-																	'TableName'		=>	TABLE_PREFIX.'NewsCustomData',
-																	'ParentPrefix'	=>	'n',
-																),
+		'ParentTableKey' => 'ResourceId',
+		'ForeignKey' => 'ResourceId',
+		'AutoDelete' => true,
+		'AutoClone' => false,
 
-												'bb-cdata'	=>	Array(
-																	'TableName'		=>	TABLE_PREFIX.'TopicCustomData',
-																	'ParentPrefix'	=>	'bb',
-																),
+		'CalculatedFields' => Array (
+			'' => Array(),
+		),
 
-												'p-cdata'	=>	Array(
-																	'TableName'		=>	TABLE_PREFIX.'ProductsCustomData',
-																	'ParentPrefix'	=>	'p',
-																),
-											),
+		'ListSQLs' => Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),
+		'ItemSQLs' => Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),
 
-					'QueryString'		=>	Array(
-												1	=>	'id',
-												2	=>	'event',
-											),
+		'Fields' => Array (
+		    'CustomDataId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+		    'ResourceId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+		),
+	);
 
-					'ItemClass'			=>	Array('class' => 'kDBItem', 'file' => '','build_event' => 'OnItemBuild'),
-					'ListClass'			=>	Array('class' => 'kDBList', 'file' => '','build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
-					'AutoLoad'			=>	true,
-
-					'Hooks'				=>	Array(
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => '#PARENT#', //self
-													'HookToSpecial' => '*',
-													'HookToEvent' => Array('OnAfterConfigRead'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnCreateCustomFields',
-												),
-											),
-
-					'IDField'			=>	'CustomDataId',
-
-					'ParentTableKey'	=>	'ResourceId',
-					'ForeignKey'		=>	'ResourceId',
-					'AutoDelete'		=>	true,
-					'AutoClone'			=>	false,
-
-					'CalculatedFields'	=>	Array(
-												''	=>	Array(),
-											),
-
-					'ListSQLs'			=>	Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),
-					'ItemSQLs'			=>	Array('' => 'SELECT %1$s.* %2$s FROM %1$s'),
-
-					'Fields'			=>	Array(
-											    'CustomDataId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-											    'ResourceId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-											),
-				);
-
-
 ?>
\ No newline at end of file
Index: trunk/core/admin_templates/js/script.js
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/admin_templates/js/script.js	(.../script.js)	(revision 8104)
+++ trunk/core/admin_templates/js/script.js	(.../script.js)	(revision 8397)
@@ -443,6 +443,9 @@
 	submit_event($prefix_special, $event, $t);
 	opener_action($prev_opener); // restore opener in parent window
 	set_hidden_field('events[' + $prefix_special + ']', event_bak); // restore event
+	
+	// AJAX popup size respoce is received after std_edit_item/std_precreate_item function exit
+	set_hidden_field($prefix_special + '_mode', null);
 }
 
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
@@ -505,7 +508,7 @@
 		opener_action('d');
 	 	submit_event(prefix_special,'OnPreCreate', edit_template);
   }
-  set_hidden_field(prefix_special+'_mode', '');
+//  set_hidden_field(prefix_special+'_mode', '');
 }
 
 function std_new_item(prefix_special, edit_template)
@@ -529,7 +532,7 @@
 		opener_action('d');
 		submit_event(prefix_special,'OnEdit',edit_template);
 	}
-	set_hidden_field(prefix_special+'_mode', '');
+//	set_hidden_field(prefix_special+'_mode', '');
 }
 
 function std_edit_temp_item(prefix_special, edit_template)
@@ -564,6 +567,14 @@
 {
 	var $kf = document.getElementById($form_name);
 	var $field = $kf.elements[$field_id];
+	
+	if ($value === null) {
+		if ($field) {
+			$kf.removeChild($field);
+		}
+		return true;
+	}
+	
 	if ($field) {
 		$field.value = $value;
 		return true;
Index: trunk/core/units/skins/skins_config.php
===================================================================
diff -u -N
--- trunk/core/units/skins/skins_config.php	(revision 0)
+++ trunk/core/units/skins/skins_config.php	(revision 8397)
@@ -0,0 +1,166 @@
+<?php
+
+$config	=	Array(
+	'Prefix'			=>	'skin',
+	'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
+	'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
+	'EventHandlerClass'	=>	Array('class'=>'SkinEventHandler','file'=>'skin_eh.php','build_event'=>'OnBuild'),
+	'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
+
+	'AutoLoad'			=>	true,
+	'Hooks'				=>	Array(
+		Array(
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'skin',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array('OnSave'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnCompileStylesheet',
+		),
+	),
+	'QueryString'		=>	Array(
+		1	=>	'id',
+		2	=>	'Page',
+		3	=>	'event',
+		4	=>	'mode',
+	),
+	'IDField'			=>	'SkinId',
+	'StatusField'		=>	Array('IsPrimary'),
+	'TableName'			=>	TABLE_PREFIX.'Skins',
+
+/*
+	'ForeignKey' => 'ParentId', // field title in TableName, linking record to a parent
+	'ParentTableKey' => 'ParentId', // id (or other key) field title in parent's table
+	'ParentPrefix' => 'parent',
+	'AutoDelete' => true, // delete these items when parent is being deleted
+	'AutoClone' => true, // clone these items when parent is being cloned
+*/
+
+	'TitlePresets'		=>	Array(
+		'default'	=>	Array(
+			'new_status_labels'		=> Array('skin'=>'!la_title_AddingSkin!'),
+			'edit_status_labels'	=> Array('skin'=>'!la_title_EditingSkin!'),
+			'new_titlefield'		=> Array('skin'=>''),
+		),
+
+		'skin_list'=>Array(
+			'prefixes'				=> Array('skin_List'),
+			'format'				=>	'!la_title_Skins! (#skin_recordcount#)',
+		),
+
+		'skin_edit'=>Array(
+			'prefixes'				=> Array('skin'),
+			'format'				=> '#skin_status# #skin_titlefield#',
+		),
+	),
+
+	'PermSection'		=>	Array('main' => 'in-portal:skins'),
+
+	// don't forget to add corresponding permissions to install script
+	// INSERT INTO Permissions VALUES (0, 'custom:custom.view', 11, 1, 1, 0);
+	// INSERT INTO Permissions VALUES (0, 'in-portal:skins.view', 11, 1, 1, 0), (0, 'in-portal:skins.add', 11, 1, 1, 0), (0, 'in-portal:skins.edit', 11, 1, 1, 0), (0, 'in-portal:skins.delete', 11, 1, 1, 0);
+	'Sections'			=>	Array(
+		'in-portal:skins'	=>	Array(
+			'parent'		=>	'in-portal:tools',
+			'icon'			=>	'conf_general',
+			'label'			=>	'la_tab_Skins',
+			'url'			=>	Array('t' => 'skins/skin_list', 'pass' => 'm'),
+			'permissions'	=>	Array('view'),
+			'priority'		=>	11,
+			'show_mode'		=>	smSUPER_ADMIN,
+			'type'			=>	stTREE,
+		),
+	),
+
+	'TitleField' =>	'Name',	// field, used in bluebar when editing existing item
+
+	// Use %1$s for local table name with prefix, %2$s for calculated fields
+	'ListSQLs' =>	Array(	// key - special, value - list select sql
+		'' => 'SELECT %1$s.* %2$s
+					 FROM %1$s',
+	),
+	'ItemSQLs' =>	Array(
+		'' => 'SELECT %1$s.* %2$s
+					 FROM %1$s',
+	),
+	'ListSortings'	=> 	Array(
+		'' => Array(
+//			'ForcedSorting' => Array('Priority' => 'desc'),
+			'Sorting' => Array('Name' => 'asc'),
+		)
+	),
+	'Fields' => Array (
+		'SkinId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Name' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
+		'CSS' => Array ('type' => 'string', 'default' => NULL),
+		'Logo' => Array(
+			'type'=>'string', 'formatter'=>'kUploadFormatter',
+			'max_size'=>MAX_UPLOAD_SIZE, // in Bytes !
+			'file_types'=>'*.jpg;*.gif;*.png', 'files_description'=>'!la_ImageFiles!',
+			'upload_dir'=>'/system/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)
+			'default' => null,
+		),
+		'Options' => Array(
+			'type' => 'string', 'default' => NULL,
+			'formatter' => 'kSerializedFormatter',
+			'default'=>serialize(
+				array(
+					'HeadBgColor' => array('Description'=>'Head frame background color', 'Value'=>'#1961B8'),
+					'HeadColor' => array('Description'=>'Head frame text color', 'Value'=>'#000000'),
+					'SectionBgColor' => array('Description'=>'Section bar background color', 'Value'=>'#2D79D6'),
+					'SectionColor' => array('Description'=>'Section bar text color', 'Value'=>'#000000'),
+				)
+			),
+		),
+		'LastCompiled' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'IsPrimary' => Array(
+			'type' => 'int', 'formatter' => 'kOptionsFormatter',
+			'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0
+		),
+	),
+
+	'Grids'	=> Array(
+		'Default'		=>	Array(
+			'Icons' => Array('default'=>'icon16_test.gif'),
+			'Fields' => Array(
+				'SkinId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'width'=>50, 'filter_block' => 'grid_range_filter' ),
+				'Name' => Array( 'title'=>'la_col_SkinName', 'width'=>200, 'filter_block' => 'grid_like_filter'),
+				'IsPrimary' => Array( 'title'=>'la_col_IsPrimary', 'width'=>150, 'filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+
+	/*'ConfigMapping' => Array(
+		'PerPage' => 'Comm_Perpage_Tests',
+		'ShortListPerPage' => 'Comm_Perpage_Tests_Short',
+	),*/
+);
+
+/*
+
+Don't forget to:
+
+- Add table create statement to install_schema.sql
+	CREATE TABLE Tests (
+	`TestId` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`Title` VARCHAR( 255 ) NOT NULL ,
+	`Description` TEXT NULL ,
+	`Email` VARCHAR( 255 ) NOT NULL ,
+	`Type` TINYINT NOT NULL ,
+	`Phone` VARCHAR( 50 ) NOT NULL ,
+	`Qty` DOUBLE NOT NULL ,
+	`Status` TINYINT NOT NULL ,
+	`CreatedOn` INT NOT NULL ,
+	`Good` TINYINT NOT NULL
+)
+
+- Add permissions for admin gorup to install script (see 'Sections' key above)
+
+
+*/
\ No newline at end of file
Index: trunk/kernel/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -N -r6669 -r8397
--- trunk/kernel/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 6669)
+++ trunk/kernel/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 8397)
@@ -49,7 +49,7 @@
 </table>
 
 <inp2:m_block name="inp_edit_color"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<input	type="text"
@@ -72,7 +72,7 @@
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_options_style"/>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>
 		<td>
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
Index: trunk/kernel/units/modules/modules_config.php
===================================================================
diff -u -N
--- trunk/kernel/units/modules/modules_config.php	(revision 8029)
+++ trunk/kernel/units/modules/modules_config.php	(revision 0)
@@ -1,121 +0,0 @@
-<?php
-
-$config	=	Array(
-					'Prefix'			=>	'mod',
-					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
-					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class'=>'ModulesEventHandler','file'=>'modules_event_handler.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'ModulesTagProcessor','file'=>'modules_tag_processor.php','build_event'=>'OnBuild'),
-					'AutoLoad'			=>	true,
-					'QueryString'		=>	Array(
-												1	=>	'id',
-												2	=>	'page',
-												3	=>	'event',
-												4	=>	'mode',
-											),
-
-					'IDField'			=>	'Name',
-					'TitleField'		=>	'Name',		// field, used in bluebar when editing existing item
-					'StatusField'		=>	Array('Loaded'),
-
-					'TitlePresets'		=>	Array(
-													'modules_list'			=>	Array(	'prefixes'	=>	Array('mod_List'), 'format' => "!la_title_Configuration! - !la_title_Module_Status! (#mod_recordcount#)"),
-
-													'tree_modules'	=>	Array('format' => '!la_section_overview!'),
-											),
-
-					'PermSection'		=>	Array('main' => 'in-portal:mod_status'),
-
-					'Sections'			=>	Array(
-													// "Configuration" -> "Modules and Settings"
-													'in-portal:modules'	=>	Array(
-																					'parent'		=>	'in-portal:system',
-																					'icon'			=>	'modules',
-																					'label'			=>	'la_tab_ModulesManagement',
-																					'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
-																					'permissions'	=>	Array('view'),
-																					'priority'		=>	5,
-																					'type'			=>	stTREE,
-																			),
-
-													'in-portal:mod_status'	=>	Array(
-																					'parent'		=>	'in-portal:modules',
-																					'icon'			=>	'modules',
-																					'label'			=>	'la_title_Module_Status',
-																					'url'			=>	Array('t' => 'in-portal/modules/modules_list', 'pass' => 'm'),
-																					'permissions'	=>	Array('view', 'edit', 'advanced:approve', 'advanced:decline'),
-																					'priority'		=>	1,
-																					'type'			=>	stTREE,
-																			),
-
-													'in-portal:addmodule'	=>	Array(
-																					'parent'		=>	'in-portal:modules',
-																					'icon'			=>	'modules',
-																					'label'			=>	'la_title_Add_Module',
-																					'url'			=>	Array('index_file' => 'modules/addmodule.php', 'pass' => 'm'),
-																					'permissions'	=>	Array('view', 'add', 'edit'),
-																					'priority'		=>	2,
-																					'type'			=>	stTREE,
-																			),
-
-													'in-portal:tag_library'	=>	Array(
-																					'parent'		=>	'in-portal:modules',
-																					'icon'			=>	'modules',
-																					'label'			=>	'la_tab_TagLibrary',
-																					'url'			=>	Array('index_file' => 'tag_listing.php', 'pass' => 'm'),
-																					'permissions'	=>	Array('view'),
-																					'priority'		=>	3,
-																					'type'			=>	stTREE,
-																			),
-											),
-
-					'TableName'			=>	TABLE_PREFIX.'Modules',
-
-					'FilterMenu'		=>	Array(
-												'Groups' => Array(
-													Array('mode' => 'AND', 'filters' => Array('enabled', 'disabled'), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array(
-													'enabled'	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 1'),
-													'disabled'	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Loaded != 0'),
-												)
-											),
-
-					'ListSQLs'			=>	Array(	''=>'SELECT * FROM %s',
-																		), // key - special, value - list select sql
-					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %s',
-																		),
-					'ListSortings'	=> 	Array(
-												'' => Array(
-													'Sorting' => Array('LoadOrder' => 'asc'),
-												)
-											),
-
-					'Fields'			=>	Array(
-										            'Name' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
-										            'Path' => Array('type' => 'string','not_null' => '1','default' => ''),
-										            'Var' => Array('type' => 'string','not_null' => '1','default' => ''),
-										            'Version' => Array('type' => 'string','not_null' => '1','default' => '0.0.0'),
-										            'Loaded' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
-										            'LoadOrder' => Array('type' => 'int','not_null' => 1, 'default' => 0),
-										            'TemplatePath' => Array('type' => 'string','not_null' => 1, 'default' => ''),
-										            'RootCat' => Array('type' => 'int','not_null' => 1, 'default' => 0),
-										            'BuildDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
-											),
-
-					'VirtualFields'	=> 	Array(),
-
-					'Grids'	=> Array(
-										'Default'		=>	Array(
-																	'Icons' => Array('default' => 'icon16_custom.gif'),
-																	'Fields' => Array(
-																			'Name'		=>	Array('title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td_no_icon'),
-																			'Loaded'	=>	Array('title' => 'la_col_Status'),
-																			'Version' 	=>	Array('title' => 'la_col_Version'),
-																		),
-
-															),
-								),
-	);
-
-?>
\ No newline at end of file
Index: trunk/kernel/units/modules/modules_event_handler.php
===================================================================
diff -u -N
--- trunk/kernel/units/modules/modules_event_handler.php	(revision 7635)
+++ trunk/kernel/units/modules/modules_event_handler.php	(revision 0)
@@ -1,79 +0,0 @@
-<?php
-
-	class ModulesEventHandler extends kDBEventHandler {
-
-		/**
-		 * Builds item
-		 *
-		 * @param kEvent $event
-		 * @access protected
-		 */
-		function OnItemBuild(&$event)
-		{
-			$this->Application->SetVar($event->getPrefixSpecial(true).'_id', $event->Special);
-			parent::OnItemBuild($event);
-		}
-
-		/**
-		 * List with one record if special passed
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			if ($event->Special) {
-				$object =& $event->getObject();
-				$object->addFilter('current_module', 'Name = '.$event->Special);
-			}
-		}
-
-		function mapEvents()
-		{
-			parent::mapEvents();
-			$this->eventMethods['OnMassApprove'] = 'moduleAction';
-			$this->eventMethods['OnMassDecline'] = 'moduleAction';
-		}
-
-		/**
-		 * Disabled modules, but not In-Portal
-		 *
-		 * @param kEvent $event
-		 */
-		function moduleAction(&$event)
-		{
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
-				return;
-			}
-
-			$object =& $event->getObject( Array('skip_autoload' => true) );
-			$ids = $this->StoreSelectedIDs($event);
-
-
-			if (!$ids) return true;
-
-			$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
-
-			foreach($ids as $id)
-			{
-				$object->Load($id);
-				if ($object->GetID() == 'In-Portal') continue;
-				$object->SetDBField($status_field, $event->Name == 'OnMassApprove' ? 1 : 0);
-
-				if ($object->Update()) {
-					$event->status = erSUCCESS;
-					$event->redirect_params = Array('opener' => 's'); //stay!
-				}
-				else {
-					$event->status = erFAIL;
-					$event->redirect = false;
-					break;
-				}
-			}
-
-			$this->Application->UnitConfigReader->ResetParsedData(true); //true to reset sections cache also
-			$event->SetRedirectParam('RefreshTree', 1);
-		}
-
-	}
-
-?>
\ No newline at end of file
Index: trunk/kernel/units/modules/modules_tag_processor.php
===================================================================
diff -u -N
--- trunk/kernel/units/modules/modules_tag_processor.php	(revision 4751)
+++ trunk/kernel/units/modules/modules_tag_processor.php	(revision 0)
@@ -1,12 +0,0 @@
-<?php
-
-class ModulesTagProcessor extends kDBTagProcessor  {
-
-	function ModuleInstalled($params)
-	{
-		return $this->Application->isModuleEnabled($params['name']);
-	}
-	
-}
-
-?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r7635 -r8397
--- trunk/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 7635)
+++ trunk/kernel/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 8397)
@@ -13,7 +13,7 @@
 	</inp2:m_if>
 	#separator#
 	<inp2:m_DefineElement name="permission_element">
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<td>
 				<inp2:m_phrase name="$Description"/> [<inp2:m_param name="PermissionName"/>]
 			</td>
@@ -61,7 +61,7 @@
 		</tr>
 	</inp2:m_DefineElement>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
-		<inp2:m_set odd_even="table_color1"/>
+		<inp2:m_set odd_even="table-color1"/>
 		<thead class="subsectiontitle">
 			<td><inp2:m_phrase name="la_col_Description"/></td>
 			<td><inp2:m_phrase name="la_col_Inherited"/></td>
Index: trunk/kernel/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r6784 -r8397
--- trunk/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 6784)
+++ trunk/kernel/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 8397)
@@ -61,7 +61,7 @@
 		</inp2:m_DefineElement>
 
 		<table width="100%" border="0" cellspacing="2" cellpadding="4">
-			<inp2:m_set c.showall_sequence="1" odd_even="table_color1"/>
+			<inp2:m_set c.showall_sequence="1" odd_even="table-color1"/>
 			<inp2:c.showall_PrintList2 block="category_td" no_special="1" IdField="CategoryId" empty_cell_render_as="wg_empty_cell" direction="V" columns="2"/>
 		</table>
 
Index: trunk/core/install/step_templates/finish.tpl
===================================================================
diff -u -N -r6691 -r8397
--- trunk/core/install/step_templates/finish.tpl	(.../finish.tpl)	(revision 6691)
+++ trunk/core/install/step_templates/finish.tpl	(.../finish.tpl)	(revision 8397)
@@ -1,4 +1,4 @@
-<tr class="table_color2">
+<tr class="table-color2">
 	<td align="left" class="text" colspan="2">
 		In-portal has successfully been installed on your server. 
 		Click the button below to log into the site administration 
Index: trunk/admin/install/general_error.php
===================================================================
diff -u -N -r1649 -r8397
--- trunk/admin/install/general_error.php	(.../general_error.php)	(revision 1649)
+++ trunk/admin/install/general_error.php	(.../general_error.php)	(revision 8397)
@@ -11,7 +11,7 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2" valign="top">
+				            <tr class="table-color2" valign="top">
 				            	<td><p class="error"><?php echo $general_error; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/kernel/admin_templates/visits/visits_list.tpl
===================================================================
diff -u -N -r6669 -r8397
--- trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 6669)
+++ trunk/kernel/admin_templates/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 8397)
@@ -3,7 +3,7 @@
 
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 
-<inp2:m_ParseBlock name="section_header" icon="icon46_visits" title="!la_title_Visits!"/>
+<inp2:m_ParseBlock name="section_header" module="in-portal" prefix="visits" icon="icon46_visits" title="!la_title_Visits!"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
 
@@ -14,74 +14,74 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-  																		
+
 				function edit()
 	  			{
-					
+
 	  			}
-	  			
+
 	  			a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearch');
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
 						function() {
 							set_hidden_field('grid_name', 'Default');
 							submit_event('visits','OnSearchReset');
-						} ) );	  			
-	  			
+						} ) );
+
 				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
 							window.location.href = window.location.href;
 						}
 				) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 							std_delete_items('visits');
 						}
 				) );
-	  			
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-				
+
 				a_toolbar.Render();
 			</script>
-			
+
 		</td>
 	</tr>
 </tbody>
 </table>
 <script type="text/javascript" src="js/calendar.js"></script>
 
 <inp2:m_DefineElement name="search_calendar_td" class="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
-		
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
 
-		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>	
-		
+		<td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
+
 		<td>
 			<input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" format="_regional_InputDateFormat" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
 				<span class="small">(<inp2:SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
 				initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date" input_format="1"/>");
 			</script>
-			
+
 		</td>
 		<td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
 	</tr>
Index: trunk/system/user_files/just_logo.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/skins/skin_edit.tpl	(revision 0)
+++ trunk/core/admin_templates/skins/skin_edit.tpl	(revision 8397)
@@ -0,0 +1,285 @@
+<inp2:adm_SetPopupSize width="750" height="570"/>
+<inp2:m_include t="incs/header" body_properties="" />
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:skins" prefix="skin" title_preset="skin_edit" pagination="0"/>
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('skin','<inp2:skin_SaveEvent/>');
+					}
+				));
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						cancel_edit('skin','OnCancelEdit','<inp2:skin_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('skin', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('skin', '<inp2:skin_PrevId/>');
+						}
+				));
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('skin', '<inp2:skin_NextId/>');
+						}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if prefix="skin" function="IsSingle"/>
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if prefix="skin" function="IsLast"/>
+						a_toolbar.DisableButton('next');
+					<inp2:m_endif/>
+					<inp2:m_if prefix="skin" function="IsFirst"/>
+						a_toolbar.DisableButton('prev');
+					<inp2:m_endif/>
+				<inp2:m_endif/>
+			</script>
+
+
+			<script src="js/swfobject.js" type="text/javascript"></script>
+			<script type="text/javascript" src="js/uploader.js"></script>
+		</td>
+
+		<!--<inp2:m_RenderElement name="ml_selector" prefix="skin"/>-->
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_block name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%"/>
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>
+		<td class="control-cell">
+			<input style="<inp2:m_Param name="style"/>" type="text"
+				name="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>][Value]" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>[<inp2:m_Param name="key"/>]" value="<inp2:m_Param name="Value"/>">
+		</td>
+	</tr>
+<inp2:m_blockend/>
+
+<inp2:m_block name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%"/>
+	<inp2:PrintSerializedFields pass_params="1" field="$field" render_as="$item_render_as"/>
+<inp2:m_blockend/>
+
+
+
+<inp2:skin_SaveWarning name="grid_save_warning"/>
+<inp2:skin_ErrorWarning name="form_error_warning"/>
+<div id="scroll_container">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-collapse: separate;">
+
+		<inp2:m_ParseBlock name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
+
+		<inp2:m_ParseBlock name="inp_edit_box_ml" prefix="skin" field="Name" title="!la_fld_SkinName!" style="width: 100px"/>
+
+		<inp2:m_ParseBlock name="inp_edit_swf_upload" prefix="skin" field="Logo" title="!la_fld_Logo!"/>
+
+		<style type="text/css">
+			.skin-table td {width: 90px};
+		</style>
+
+			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
+				<td class="control-cell">
+					<table class="skin-table">
+						<tr>
+							<td>Font Color (HeadColor)</td>
+							<td>Background (HeadBgColor)</td>
+							<td>Bar Text Color (HeadBarColor)</td>
+							<td>Bar Background (HeadBarBgColor)</td>
+						</tr>
+						<tr>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[HeadColor][Value]"
+									value="<inp2:skin_Field name="Options" format="HeadColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[HeadBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="HeadBgColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[HeadBarColor][Value]"
+									value="<inp2:skin_Field name="Options" format="HeadBarColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[HeadBarBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="HeadBarBgColor.Value"/>">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</tr>
+			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>
+				<td class="control-cell">
+					<table class="skin-table">
+						<tr>
+							<td>Section Title Color (SectionColor)</td>
+							<td>Section Background (SectionBgColor)</td>
+							<td>Titlebar Font Color (TitleBarColor)</td>
+							<td>Titlebar Background (TitleBarBgColor)</td>
+						</tr>
+						<tr>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[SectionColor][Value]"
+									value="<inp2:skin_Field name="Options" format="SectionColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[SectionBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="SectionBgColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[TitleBarColor][Value]"
+									value="<inp2:skin_Field name="Options" format="TitleBarColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[TitleBarBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="TitleBarBgColor.Value"/>">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</tr>
+			<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>
+				<td class="control-cell">
+					<table class="skin-table">
+						<tr>
+							<td>Toolbar Backgroun (ToolbarBgColor)</td>
+							<td>Filter Row Background (FiltersBgColor)</td>
+							<td>Column Titles Color (ColumnTitlesColor)</td>
+							<td>Column Titles Background (ColumnTitlesBgColor)</td>
+						</tr>
+						<tr>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[ToolbarBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="ToolbarBgColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[FiltersBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="FiltersBgColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[ColumnTitlesColor][Value]"
+									value="<inp2:skin_Field name="Options" format="ColumnTitlesColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[ColumnTitlesBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="ColumnTitlesBgColor.Value"/>">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</tr>
+		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>
+				<td class="control-cell">
+					<table class="skin-table">
+						<tr>
+							<td>Grid Odd Row Color (OddColor)</td>
+							<td>Grid Odd Row Background Color (OddBgColor)</td>
+							<td>Grid Even Row Color (EvenColor)</td>
+							<td>Grid Even Row Background Color (EvenBgColor)</td>
+						</tr>
+						<tr>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[OddColor][Value]"
+									value="<inp2:skin_Field name="Options" format="OddColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[OddBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="OddBgColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[EvenColor][Value]"
+									value="<inp2:skin_Field name="Options" format="EvenColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[EvenBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="EvenBgColor.Value"/>">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</tr>
+
+		<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+				<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>
+				<td class="control-cell">
+					<table class="skin-table">
+						<tr>
+							<td>Tree Color (TreeColor)</td>
+							<td>Tree Background Color (TreeBgColor)</td>
+							<td>Tree Highlighted Color (TreeHighColor)</td>
+							<td>Tree Highlighted Background Color (TreeHighBgColor)</td>
+						</tr>
+						<tr>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[TreeColor][Value]"
+									value="<inp2:skin_Field name="Options" format="TreeColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[TreeHighColor][Value]"
+									value="<inp2:skin_Field name="Options" format="TreeHighColor.Value"/>">
+							</td>
+							<td>
+								<input style="width: 80px" type="text"
+									name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
+									value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</tr>
+
+	<!--	<inp2:m_ParseBlock name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
+		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!"/>
+
+</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
+
+
Index: trunk/core/admin_templates/swfupload.swf
===================================================================
diff -u -N
Binary files differ
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 8104)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 8397)
@@ -110,20 +110,22 @@
 		function OnSessionExpire()
 		{
 			$this->Application->resetCounters('UserSession');
-			
+
 			if ($this->Application->IsAdmin()) {
 				$this->Application->Redirect('index', Array('expired' => 1), '', 'index.php');
 			}
-			
+
 			if ($this->Application->GetVar('admin') == 1) {
 				$session_admin =& $this->Application->recallObject('Session.admin');
 				/* @var $session_admin Session */
+
 				if (!$session_admin->LoggedIn()) {
 					// front-end session created from admin session & both expired
 					$this->Application->DeleteVar('admin');
 					$this->Application->Redirect('index', Array('expired' => 1), '', 'admin/index.php');
 				}
 			}
+
 			$get = $this->Application->HttpQuery->getRedirectParams();
 			$t = $this->Application->GetVar('t');
 			$get['js_redirect'] = $this->Application->ConfigValue('UseJSRedirect');
@@ -162,11 +164,12 @@
 				$this->Application->SetVar('save_username', $save_username); // cookie will be set on next refresh, but refresh won't occur if login error present, so duplicate cookie in HTTPQuery
 			}
 
-			if ($this->Application->IsAdmin() && ($login_value == 'root') || ($login_value == 'super-root')) {
+			$super_admin = ($login_value == 'super-root') && $this->verifySuperAdmin();
+			if ($this->Application->IsAdmin() && ($login_value == 'root') || ($super_admin && $login_value == 'super-root')) {
 				// logging in "root" (admin only)
-				$super_admin = ($login_value == 'super-root') && $this->verifySuperAdmin();
+
 				$login_value = 'root';
-				
+
 				$root_password = $this->Application->ConfigValue('RootPass');
 				$password_formatter =& $this->Application->recallObject('kPasswordFormatter');
 				$test = $password_formatter->EncryptPassword($password, 'b38');
@@ -185,7 +188,7 @@
 //					$session->SetField('GroupList', implode(',', $groups) );
 					$this->Application->SetVar('u.current_id', $user_id);
 					$this->Application->StoreVar('user_id', $user_id);
-					
+
 					if ($super_admin) {
 						$this->Application->StoreVar('super_admin', 1);
 					}
@@ -254,10 +257,10 @@
 		 */
 		function verifySuperAdmin()
 		{
-			$sa_mode = isset($GLOBALS['debugger']) && $GLOBALS['debugger']->ipMatch(defined('SA_IP') ? SA_IP : '');
+			$sa_mode = ipMatch(defined('SA_IP') ? SA_IP : '');
 			return $sa_mode || $this->Application->isDebugMode();
 		}
-		
+
 		/**
 		 * Enter description here...
 		 *
@@ -290,7 +293,7 @@
 		{
 			$prefix_special = $this->Application->IsAdmin() ? 'u.current' : 'u'; // "u" used on front not to change theme
 			$object =& $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true));
-
+			
 			$next_template = $this->Application->GetVar('next_template');
 			if ($next_template == '_ses_redirect') {
 				$location = $this->Application->BaseURL().$this->Application->RecallVar($next_template);
Index: trunk/admin/install/upgrades/readme_4_1_0.txt
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/readme_4_1_0.txt	(revision 0)
+++ trunk/admin/install/upgrades/readme_4_1_0.txt	(revision 8397)
@@ -0,0 +1,18 @@
+Readme notes for In-Portal 4.1.0
+Intechnic Corporation, May 23, 2007
+
+****** MySQL 5 database server is fully supported starting with this release ******
+
+All modules versions increased to 4.1.0.
+Major features in Inventory Control for Product Options. Both back-end improvements and bug fixes
+done on system-wide. For module specific changes refer to changelog_4_1_0.txt.
+
+New Features:
+
+- Emailing class redone
+
+Bugs:
+
+- Internal links in the WYSIWYG content editor
+- Missing Icon in Visits Section of In-portal Admin
+- Default Regional settings corrected
\ No newline at end of file
Index: trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -N -r7867 -r8397
--- trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 7867)
+++ trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 8397)
@@ -85,7 +85,7 @@
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="selectors" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
 				<inp2:m_phrase name="la_fld_SelectorData"/>:<br>
Index: trunk/core/units/skins/skin_eh.php
===================================================================
diff -u -N
--- trunk/core/units/skins/skin_eh.php	(revision 0)
+++ trunk/core/units/skins/skin_eh.php	(revision 8397)
@@ -0,0 +1,90 @@
+<?php
+
+class SkinEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to set selected theme as primary
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSetPrimary(&$event)
+	{
+		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			return;
+		}
+
+		$ids = $this->StoreSelectedIDs($event);
+		if ($ids) {
+			$id = array_shift($ids);
+			$this->setPrimary($id);
+		}
+
+		$this->clearSelectedIDs($event);
+	}
+
+	function setPrimary($id)
+	{
+		$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField');
+		$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+		$sql = 'UPDATE '.$table_name.'
+				SET IsPrimary = 0';
+		$this->Conn->Query($sql);
+
+
+		$sql = 'UPDATE '.$table_name.'
+				SET IsPrimary = 1
+				WHERE '.$id_field.' = '.$id;
+		$this->Conn->Query($sql);
+	}
+
+
+	/**
+	 * [HOOK] Compile stylesheet file based on theme definitions
+	 *
+	 * @param kEvent $event
+	 */
+	function OnCompileStylesheet(&$event)
+	{
+		$object =& $event->getObject( Array('skip_autoload' => true) );
+		$object->SwitchToLive();
+
+		$ids = explode(',', $event->MasterEvent->getEventParam('ids') );
+
+		if(!$ids) return false;
+		foreach($ids as $id)
+		{
+			$object->Load($id);
+			$this->Compile($object);
+		}
+	}
+
+	function Compile(&$object)
+	{
+		$ret = $object->GetDBField('CSS');
+		$options = $object->GetDBField('Options');
+		$options = unserialize($options);
+		$options['base_url'] = array('Value'=>rtrim($this->Application->BaseURL(), '/'));
+		foreach ($options as $key => $row) {
+			$ret = str_replace('@@'.$key.'@@', $row['Value'], $ret);
+		}
+
+		$compile_ts = adodb_mktime();
+		$css_path = WRITEABLE.'/user_files/';
+
+		$css_file = $css_path.'admin-'.strtolower($object->GetDBField('Name')).'-'.$compile_ts.'.css';
+
+		$fp = fopen($css_file,'w');
+		if($fp)
+		{
+			$prev_css = $css_path.'admin-'.strtolower($object->GetDBField('Name')).'-'.$object->GetDBField('LastCompiled').'.css';
+			if( file_exists($prev_css) ) unlink($prev_css);
+
+			fwrite($fp, $ret);
+			fclose($fp);
+
+			$sql = 'UPDATE '.$object->TableName.' SET LastCompiled = '.$compile_ts.' WHERE '.$object->IDField.' = '.$object->GetID();
+			$this->Conn->Query($sql);
+		}
+	}
+}
\ No newline at end of file
Index: trunk/core/install/install_data.sql
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/install/install_data.sql	(.../install_data.sql)	(revision 7855)
+++ trunk/core/install/install_data.sql	(.../install_data.sql)	(revision 8397)
@@ -201,42 +201,42 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_general');
 
-INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', 2, 0, 'In-Portal:Users', 'la_event_user.add', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', 1, 0, 'In-Portal:Users', 'la_event_user.approve', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', 2, 0, 'In-Portal:Users', 'la_event_user.approve', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.VALIDATE', 1, 0, 'In-Portal:Users', 'la_event_user.validate', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.VALIDATE', 2, 0, 'In-Portal:Users', 'la_event_user.validate', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.DENY', 1, 0, 'In-Portal:Users', 'la_event_user.deny', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.DENY', 2, 0, 'In-Portal:Users', 'la_event_user.deny', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.PSWD', 2, 0, 'In-Portal:Users', 'la_event_user.forgotpw', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.PSWD', 1, 0, 'In-Portal:Users', 'la_event_user.forgotpw', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.ADD.PENDING', 1, 0, 'In-Portal:Users', 'la_event_user.add.pending', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.ADD.PENDING', 2, 0, 'In-Portal:Users', 'la_event_user.add.pending', 1);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD', 1, 0, 'In-Portal:Category', 'la_event_category.add', 0);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 1, 0, 'In-Portal:Category', 'la_event_category.add.pending', 0);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 2, 0, 'In-Portal:Category', 'la_event_category.add.pending', 1);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD', 2, 0, 'In-Portal:Category', 'la_event_category.add', 1);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DELETE', 1, 0, 'In-Portal:Category', 'la_event_category_delete', 0);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DELETE', 2, 0, 'In-Portal:Category', 'la_event_category_delete', 1);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.MODIFY', 1, 0, 'In-Portal:Category', 'la_event_category.modify', 0);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.MODIFY', 2, 0, 'In-Portal:Category', 'la_event_category.modify', 1);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.APPROVE', 1, 0, 'In-Portal:Category', 'la_event_category.approve', 0);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.APPROVE', 2, 0, 'In-Portal:Category', 'la_event_category.approve', 1);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DENY', 1, 0, 'In-Portal:Category', 'la_event_category.deny', 0);
-INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DENY', 2, 0, 'In-Portal:Category', 'la_event_category.deny', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.SUBSCRIBE', 1, 0, 'In-Portal:Users', 'la_event_user.subscribe', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.SUBSCRIBE', 2, 0, 'In-Portal:Users', 'la_event_user.subscribe', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.UNSUBSCRIBE', 1, 0, 'In-Portal:Users', 'la_event_user.unsubscribe', 0);
-INSERT INTO Events VALUES (DEFAULT, 'USER.UNSUBSCRIBE', 2, 0, 'In-Portal:Users', 'la_event_user.unsubscribe', 1);
-INSERT INTO Events VALUES (DEFAULT, 'USER.SUGGEST', '1', '0', 'In-Portal:Users', 'la_event_user.suggest', '0');
-INSERT INTO Events VALUES (DEFAULT, 'USER.SUGGEST', '2', '0', 'In-Portal:Users', 'la_event_user.suggest', '1');
-INSERT INTO Events VALUES (DEFAULT, 'USER.PSWDC', '1', '0', 'In-Portal:Users', 'la_event_user.pswd_confirm', '0');
-INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '0');
-INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRED', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expired', '1');
-INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '0');
-INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
-INSERT INTO Events VALUES (DEFAULT, 'COMMON.FOOTER', 1, 0, 'In-Portal', 'la_event_common.footer', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.add', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.add', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.approve', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.approve', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.VALIDATE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.validate', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.VALIDATE', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.validate', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.DENY', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.deny', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.DENY', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.deny', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.PSWD', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.forgotpw', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.PSWD', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.forgotpw', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.ADD.PENDING', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.add.pending', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.ADD.PENDING', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.add.pending', 1);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD', NULL, 1, 0, 'In-Portal:Category', 'la_event_category.add', 0);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 1, 0, 'In-Portal:Category', 'la_event_category.add.pending', 0);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', NULL, 2, 0, 'In-Portal:Category', 'la_event_category.add.pending', 1);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.ADD', NULL, 2, 0, 'In-Portal:Category', 'la_event_category.add', 1);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DELETE', NULL, 1, 0, 'In-Portal:Category', 'la_event_category_delete', 0);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DELETE', NULL, 2, 0, 'In-Portal:Category', 'la_event_category_delete', 1);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.MODIFY', NULL, 1, 0, 'In-Portal:Category', 'la_event_category.modify', 0);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.MODIFY', NULL, 2, 0, 'In-Portal:Category', 'la_event_category.modify', 1);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.APPROVE', NULL, 1, 0, 'In-Portal:Category', 'la_event_category.approve', 0);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.APPROVE', NULL, 2, 0, 'In-Portal:Category', 'la_event_category.approve', 1);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DENY', NULL, 1, 0, 'In-Portal:Category', 'la_event_category.deny', 0);
+INSERT INTO Events VALUES (DEFAULT, 'CATEGORY.DENY', NULL, 2, 0, 'In-Portal:Category', 'la_event_category.deny', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.SUBSCRIBE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.subscribe', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.SUBSCRIBE', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.subscribe', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.UNSUBSCRIBE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.unsubscribe', 0);
+INSERT INTO Events VALUES (DEFAULT, 'USER.UNSUBSCRIBE', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.unsubscribe', 1);
+INSERT INTO Events VALUES (DEFAULT, 'USER.SUGGEST', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.suggest', '0');
+INSERT INTO Events VALUES (DEFAULT, 'USER.SUGGEST', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.suggest', '1');
+INSERT INTO Events VALUES (DEFAULT, 'USER.PSWDC', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.pswd_confirm', '0');
+INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.membership_expired', '0');
+INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRED', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.membership_expired', '1');
+INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '0');
+INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
+INSERT INTO Events VALUES (DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, 'In-Portal', 'la_event_common.footer', 1);
 
 INSERT INTO IdGenerator VALUES ('100');
 
@@ -580,4 +580,7 @@
 
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:service.view', 11, 1, 1, 0);
 
+INSERT INTO Skins VALUES (DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n	font-size: 9pt;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\n.head-table tr td {\r\n	background-color: @@HeadBgColor@@;\r\n	color: @@HeadColor@@\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	color: #FFFFFF;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #2D79D6;\r\n	border-bottom: 1px solid #2D79D6;\r\n}\r\n\r\n.tab a {\r\n	color: #00659C;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #fff;\r\n	font-weight: bold;\r\n}\r\n\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	height: 30px;\r\n	overflow: hidden;\r\n	/* border-right: 1px solid black; */\r\n}\r\n.grid-data-row-even td, .table-color2 {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	/* border-right: 1px solid black; */\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-0 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter {\r\n	margin-bottom: 0px;\r\n	width: 85%;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-1 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: none;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n  color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(@@base_url@@/proj-base/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 150px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_mid.gif) repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n\r\n.error-cell {\r\n	background-color: #fff;\r\n	color: red;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n\r\n/* Uploader */\r\n\r\n.uploader-main {\r\n	position: absolute;\r\n	display: none;\r\n	z-index: 10;\r\n	border: 1px solid #777;\r\n	padding: 10px;\r\n	width: 350px;\r\n	height: 120px;\r\n	overflow: hidden;\r\n	background-color: #fff;\r\n}\r\n\r\n.uploader-percent {\r\n	width: 100%;\r\n	padding-top: 3px;\r\n	text-align: center;\r\n	position: relative;\r\n	z-index: 20;\r\n	float: left;\r\n	font-weight: bold;\r\n}\r\n\r\n.uploader-left {\r\n	width: 100%;\r\n	border: 1px solid black;\r\n	height: 20px;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);\r\n}\r\n\r\n.uploader-done {\r\n	width: 0%;\r\n	background-color: green;\r\n	height: 20px;\r\n	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);\r\n}\r\n\r\n\r\n/* To be sorted */\r\n\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Left sid of bluebar */\r\n.header_left_bg {\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n	padding-left: 5px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px 0px 2px 2px;\r\n}\r\n\r\n.tree tr.highlighted td a {\r\n	background-color: @@TreeHighBgColor@@;\r\n	color: @@TreeHighColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: #fff;\r\n}\r\n\r\n.tree tr td a:hover {\r\n	color: #000000;\r\n}', 'just_logo_1.gif', 'a:20:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#1961B8";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#CCFF00";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#006F99";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}}', 1178706881, 1);
+
 INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, '0');
+
Index: trunk/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r8061 -r8397
--- trunk/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8061)
+++ trunk/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 8397)
@@ -79,7 +79,7 @@
 			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" >
 		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
Index: trunk/core/admin_templates/tools/skins.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/tools/skins.tpl	(revision 0)
+++ trunk/core/admin_templates/tools/skins.tpl	(revision 8397)
@@ -0,0 +1,51 @@
+<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_ParseBlock name="section_header" icon="icon46_modules" title="!la_title_SystemTools!"/>
+
+<inp2:m_ParseBlock name="blue_bar" prefix="adm" title_preset="system_tools" module="in-portal" icon="icon46_modules"/>
+
+<script type="text/javascript">
+	function show_structure($prefix, $event) {
+		var $form = document.getElementById($form_name);
+		openwin('about:blank', 'table_structure', 800, 575);
+		$form.target = 'table_structure';
+		submit_event($prefix, $event);
+		set_hidden_field('events[adm]', '');
+	}
+</script>
+
+<inp2:m_DefineElement name="service_elem">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="text" style="width: 300px;">
+			<inp2:m_phrase label="$title"/>:
+		</td>
+		<td valign="top" colspan="2">
+			<input class="button" type="button" onclick="submit_event('adm', '<inp2:m_param name="event_name"/>');" value="Go">
+		</td>
+    	<td class="error">&nbsp;</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetModRwCache" event_name="OnResetModRwCache"/>
+		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetCMSMenuCache" event_name="OnResetCMSMenuCache"/>
+		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetSections" event_name="OnResetSections"/>
+		<inp2:m_RenderElement name="service_elem" title="la_Service_ConfigCache" event_name="OnResetConfigsCache"/>
+		<inp2:m_RenderElement name="service_elem" title="la_Service_RebuildThemes" event_name="OnRebuildThemes"/>
+	<inp2:m_RenderElement name="subsection" title="la_section_Configs"/>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="text" style="width: 300px;">
+				Table Structure:
+			</td>
+			<td valign="top" colspan="3">
+				<input type="text" name="table_name" value="" size="30"/>
+				<input class="button" type="button" onclick="show_structure('adm', 'OnGenerateTableStructure');" value="Go">
+				<span class="small">table name (prefix optional) OR unit config prefix</span>
+			</td>
+		</tr>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/core/units/users/users_config.php
===================================================================
diff -u -N -r8015 -r8397
--- trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 8015)
+++ trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 8397)
@@ -11,31 +11,42 @@
 											),
 
 					'AutoLoad'			=>	true,
-					'Hooks'				=>	Array(
-												Array(
-													'Mode' => hAFTER,
-													'Conditional' => false,
-													'HookToPrefix' => 'u',
-													'HookToSpecial' => '',
-													'HookToEvent' => Array('OnAfterItemLoad', 'OnBeforeItemCreate', 'OnBeforeItemUpdate', 'OnUpdateAddress'),
-													'DoPrefix' => '',
-													'DoSpecial' => '',
-													'DoEvent' => 'OnPrepareStates',
-												),
+					'ConfigPriority' => 0,
+					'Hooks' => Array (
+						Array (
+							'Mode' => hAFTER,
+							'Conditional' => false,
+							'HookToPrefix' => 'u',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnAfterItemLoad', 'OnBeforeItemCreate', 'OnBeforeItemUpdate', 'OnUpdateAddress'),
+							'DoPrefix' => '',
+							'DoSpecial' => '*',
+							'DoEvent' => 'OnPrepareStates',
+						),
 
-												Array(
-														'Mode' => hBEFORE,
-														'Conditional' => false,
-														'HookToPrefix' => 'affil',
-														'HookToSpecial' => '',
-														'HookToEvent' => Array('OnCheckAffiliateAgreement'),
-														'DoPrefix' => '',
-														'DoSpecial' => '',
-														'DoEvent' => 'OnSubstituteSubscriber',
-													),
+						Array (
+							'Mode' => hBEFORE,
+							'Conditional' => false,
+							'HookToPrefix' => 'affil',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnCheckAffiliateAgreement'),
+							'DoPrefix' => '',
+							'DoSpecial' => '*',
+							'DoEvent' => 'OnSubstituteSubscriber',
+						),
+						
+						Array (
+							'Mode' => hBEFORE,
+							'Conditional' => false,
+							'HookToPrefix' => '',
+							'HookToSpecial' => '*',
+							'HookToEvent' => Array('OnAfterConfigRead'),
+							'DoPrefix' => 'cdata',
+							'DoSpecial' => '*',
+							'DoEvent' => 'OnDefineCustomFields',
+						),
+					),
 
-											),
-
 					'QueryString'		=>	Array(
 												1	=>	'id',
 												2	=>	'Page',
Index: trunk/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -N -r7704 -r8397
--- trunk/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 7704)
+++ trunk/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 8397)
@@ -26,7 +26,7 @@
 </table>
 
 <inp2:u_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table-collapsed">
 		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
 		<inp2:m_ParseBlock name="inp_label" prefix="u" field="Login" title="la_fld_Username"/>
 		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
Index: trunk/core/install/upgrades.sql
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8104)
+++ trunk/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8397)
@@ -7,7 +7,7 @@
 ALTER TABLE PersistantSessionData DROP PRIMARY KEY ;
 ALTER TABLE PersistantSessionData ADD INDEX ( `PortalUserId` ) ;
 
-# ===== v 4.0.2 =====
+# ===== v 4.1.0 =====
 ALTER TABLE EmailMessage ADD ReplacementTags TEXT AFTER Template;
 ALTER TABLE Phrase
 	CHANGE Translation Translation TEXT NOT NULL,
@@ -72,4 +72,35 @@
   TablesAffected text,
   PRIMARY KEY  (CounterId),
   UNIQUE KEY Name (Name)
-);
\ No newline at end of file
+);
+CREATE TABLE Skins (
+  `SkinId` int(11) NOT NULL auto_increment,
+  `Name` varchar(255) default NULL,
+  `CSS` text,
+  `Logo` varchar(255) default NULL,
+  `Options` text,
+  `LastCompiled` int(11) NOT NULL default '0',
+  `IsPrimary` int(1) NOT NULL default '0',
+  PRIMARY KEY  (`SkinId`)
+);
+INSERT INTO Skins VALUES (DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n	font-size: 9pt;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\n.head-table tr td {\r\n	background-color: @@HeadBgColor@@;\r\n	color: @@HeadColor@@\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	color: #FFFFFF;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #2D79D6;\r\n	border-bottom: 1px solid #2D79D6;\r\n}\r\n\r\n.tab a {\r\n	color: #00659C;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #fff;\r\n	font-weight: bold;\r\n}\r\n\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	height: 30px;\r\n	overflow: hidden;\r\n	/* border-right: 1px solid black; */\r\n}\r\n.grid-data-row-even td, .table-color2 {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	/* border-right: 1px solid black; */\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-0 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter {\r\n	margin-bottom: 0px;\r\n	width: 85%;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-1 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: none;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n  color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(@@base_url@@/proj-base/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 150px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_mid.gif) repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n\r\n.error-cell {\r\n	background-color: #fff;\r\n	color: red;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n\r\n/* Uploader */\r\n\r\n.uploader-main {\r\n	position: absolute;\r\n	display: none;\r\n	z-index: 10;\r\n	border: 1px solid #777;\r\n	padding: 10px;\r\n	width: 350px;\r\n	height: 120px;\r\n	overflow: hidden;\r\n	background-color: #fff;\r\n}\r\n\r\n.uploader-percent {\r\n	width: 100%;\r\n	padding-top: 3px;\r\n	text-align: center;\r\n	position: relative;\r\n	z-index: 20;\r\n	float: left;\r\n	font-weight: bold;\r\n}\r\n\r\n.uploader-left {\r\n	width: 100%;\r\n	border: 1px solid black;\r\n	height: 20px;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);\r\n}\r\n\r\n.uploader-done {\r\n	width: 0%;\r\n	background-color: green;\r\n	height: 20px;\r\n	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);\r\n}\r\n\r\n\r\n/* To be sorted */\r\n\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Left sid of bluebar */\r\n.header_left_bg {\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n	padding-left: 5px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px 0px 2px 2px;\r\n}\r\n\r\n.tree tr.highlighted td a {\r\n	background-color: @@TreeHighBgColor@@;\r\n	color: @@TreeHighColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: #fff;\r\n}\r\n\r\n.tree tr td a:hover {\r\n	color: #000000;\r\n}', 'just_logo_1.gif', 'a:20:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#1961B8";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#CCFF00";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#006F99";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}}', 1178706881, 1);
+INSERT INTO Permissions VALUES (0, 'in-portal:skins.view', 11, 1, 1, 0), (0, 'in-portal:skins.add', 11, 1, 1, 0), (0, 'in-portal:skins.edit', 11, 1, 1, 0), (0, 'in-portal:skins.delete', 11, 1, 1, 0);
+
+# ===== v 4.1.1 =====
+DROP TABLE EmailQueue;
+
+CREATE TABLE EmailQueue (
+  EmailQueueId int(10) unsigned NOT NULL auto_increment,
+  ToEmail varchar(255) NOT NULL default '',
+  `Subject` varchar(255) NOT NULL default '',
+  MessageHeaders text,
+  MessageBody longtext,
+  Queued int(10) unsigned NOT NULL default '0',
+  SendRetries int(10) unsigned NOT NULL default '0',
+  LastSendRetry int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (EmailQueueId),
+  KEY LastSendRetry (LastSendRetry),
+  KEY SendRetries (SendRetries)
+);
+
+ALTER TABLE Events ADD ReplacementTags TEXT AFTER Event;
Index: trunk/admin/install/reinstall.php
===================================================================
diff -u -N -r985 -r8397
--- trunk/admin/install/reinstall.php	(.../reinstall.php)	(revision 985)
+++ trunk/admin/install/reinstall.php	(.../reinstall.php)	(revision 8397)
@@ -12,51 +12,51 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color1">
+				            <tr class="table-color1">
 				                <td COLSPAN=2><p class="error">In-Portal is already installed at this location.</p></TD>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				                <td COLSPAN=2>In order to use the installation tool, please provide your Intechnic account information:</td>
 				            </tr>
-				            <tr class="table_color2"> 
+				            <tr class="table-color2"> 
 				              <td class="text"><B>Username:</B></td>
 				              <td width="80%"><input type="text" name="UserName" value="<?php GetVar('UserName', true);?>" class="text"></td>
 				            </tr>
-				            <tr class="table_color2"> 
+				            <tr class="table-color2"> 
 				              <td class="text"><B>Password:</B></td>
 				              <td><input type="password" name="UserPass" class="text"></td>
 				            </tr>
-				            <tr class="table_color2"><td COLSPAN=2><p class="error"><?php if( isset($login_error) ) echo $login_error;?></p><br></TD></tr>
+				            <tr class="table-color2"><td COLSPAN=2><p class="error"><?php if( isset($login_error) ) echo $login_error;?></p><br></TD></tr>
 				
 				            <?php if($show_upgrade) { ?>
-				            <tr class="table_color1"> 
+				            <tr class="table-color1"> 
 				              <td COLSPAN=2 ><INPUT TYPE=RADIO value="6" name="inp_opt" id="inp_opt_6" <?php echo RadioChecked('inp_opt',6); ?>><label for="inp_opt_6">Upgrade In-Portal</label></span></td>
 				            </tr>				      
 				            <?php } ?>  				            
-				            <tr class="table_color2">                
+				            <tr class="table-color2">                
 				              <td COLSPAN=2 >
 				              	<INPUT TYPE="RADIO" NAME="inp_opt" VALUE="1" id="inp_opt_1" <?php echo RadioChecked('inp_opt',1); ?>><label for="inp_opt_1">Clean out the In-Portal database and reinstall</label><br>
 				              </td>
 				            </tr>
-				            <tr class="table_color1">                
+				            <tr class="table-color1">                
 				              <td COLSPAN=2 >
 				              	<INPUT TYPE="RADIO" NAME="inp_opt" VALUE="4" id="inp_opt_4" <?php echo RadioChecked('inp_opt',4); ?>><label for="inp_opt_4">Clean out the In-Portal database and reinstall from backup</label>
 				              </td>
 				            </tr>
 				                       
-				            <tr class="table_color2"> 
+				            <tr class="table-color2"> 
 				              <td COLSPAN=2><INPUT TYPE=RADIO value="2" name="inp_opt" id="inp_opt_2" <?php echo RadioChecked('inp_opt',2); ?>><label for="inp_opt_2">Install to a new database</label></td>
 				            </tr>
-				            <tr class="table_color1"> 
+				            <tr class="table-color1"> 
 				              <td COLSPAN=2><INPUT TYPE=RADIO value="3" name="inp_opt" id="inp_opt_3" <?php echo RadioChecked('inp_opt',3); ?>><label for="inp_opt_3">Update License Information</label></td>
 				            </tr>
-				            <tr class="table_color2"> 
+				            <tr class="table-color2"> 
 				              <td COLSPAN=2 ><INPUT TYPE=RADIO value="5" name="inp_opt" id="inp_opt_5" <?php echo RadioChecked('inp_opt',5); ?>><label for="inp_opt_5">Change Database Configuration</label></td>
 				            </tr> 
-				            <tr class="table_color1"> 
+				            <tr class="table-color1"> 
 				              <td COLSPAN=2 ><INPUT TYPE=RADIO value="7" name="inp_opt" id="inp_opt_7" <?php echo RadioChecked('inp_opt',7); ?>><label for="inp_opt_7">Fix Paths</label></td>
 				            </tr>  				               
-				            <tr class="table_color1">
+				            <tr class="table-color1">
 				            	<td colspan="2"><p class="error"><?php if( isset($inst_error) ) echo $inst_error; ?></p><br/></td>
 				            </tr>				            
 				            <tr> 
Index: trunk/core/admin_templates/categories/permissions_tab.tpl
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 7635)
+++ trunk/core/admin_templates/categories/permissions_tab.tpl	(.../permissions_tab.tpl)	(revision 8397)
@@ -13,7 +13,7 @@
 	</inp2:m_if>
 	#separator#
 	<inp2:m_DefineElement name="permission_element">
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<td>
 				<inp2:m_phrase name="$Description"/> [<inp2:m_param name="PermissionName"/>]
 			</td>
@@ -61,7 +61,7 @@
 		</tr>
 	</inp2:m_DefineElement>
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
-		<inp2:m_set odd_even="table_color1"/>
+		<inp2:m_set odd_even="table-color1"/>
 		<thead class="subsectiontitle">
 			<td><inp2:m_phrase name="la_col_Description"/></td>
 			<td><inp2:m_phrase name="la_col_Inherited"/></td>
Index: trunk/admin/include/style.css
===================================================================
diff -u -N -r5022 -r8397
--- trunk/admin/include/style.css	(.../style.css)	(revision 5022)
+++ trunk/admin/include/style.css	(.../style.css)	(revision 8397)
@@ -204,10 +204,10 @@
 .permissions6_cell {
    FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: black; FONT-FAMILY: verdana, arial; BACKGROUND-COLOR: #339900; TEXT-DECORATION: none
 }
-.table_color1 {
+.table-color1 {
    FONT-WEIGHT: normal; FONT-SIZE: 14px; COLOR: black; FONT-FAMILY: verdana, arial; BACKGROUND-COLOR: #f6f6f6; TEXT-DECORATION: none
 }
-.table_color2 {
+.table-color2 {
    FONT-WEIGHT: normal; FONT-SIZE: 14px; COLOR: black; FONT-FAMILY: verdana, arial; BACKGROUND-COLOR: #ebebeb; TEXT-DECORATION: none
 }
 .head_version {
Index: trunk/core/install.php
===================================================================
diff -u -N -r8078 -r8397
--- trunk/core/install.php	(.../install.php)	(revision 8078)
+++ trunk/core/install.php	(.../install.php)	(revision 8397)
@@ -434,13 +434,13 @@
 							// get only sqls from next (relative to current) version to end of file
 							$start_pos = strpos($sqls, $version_mark);
 							$sqls = substr($sqls, $start_pos);
-							
+
 							preg_match_all('/'.VERSION_MARK.'/s', $sqls, $regs);
-							
+
 							$this->RunUpgrades($module_info['Path'], $regs[1], 'before');
 							$this->RunSQLText($sqls);
 							$this->RunUpgrades($module_info['Path'], $regs[1], 'after');
-							
+
 							// after upgrade sqls are executed update version
 							$this->SetModuleVersion($module_name, $module_info['ToVersion']);
 						}
@@ -493,32 +493,32 @@
 		function RunUpgrades($module_path, $versions, $mode)
 		{
 			static $upgrade_classes = Array ();
-			
+
 			$upgrades_file = sprintf(UPGRADES_FILE, $module_path, 'php');
 			if (!file_exists($upgrades_file) || !$versions) {
 				return ;
 			}
-			
+
 			if (!isset($upgrade_classes[$module_path])) {
 				// save class name, because 2nd time
 				// (in after call $upgrade_class variable will not be present)
 				include_once $upgrades_file;
 				$upgrade_classes[$module_path] = $upgrade_class;
 			}
-			
+
 			$upgrade_object = new $upgrade_classes[$module_path]();
 			if (method_exists($upgrade_object, 'setInstallator')) {
 				$upgrade_object->setInstallator($this);
 			}
-			
+
 			foreach ($versions as $version) {
 				$upgrade_method = 'Upgrade_'.str_replace('.', '_', $version);
 				if (method_exists($upgrade_object, $upgrade_method)) {
 					$upgrade_object->$upgrade_method($mode);
 				}
 			}
 		}
-		
+
 		/**
 		 * Sets module version to passed
 		 *
@@ -763,7 +763,7 @@
 			}
 
 			$sqls = str_replace("\r\n", "\n", $sqls);  // convert to linux line endings
-			$sqls = preg_replace("/#(.*?)\n/", '', $sqls); // remove all comments
+			$sqls = preg_replace("/#([^;]*?)\n/", '', $sqls); // remove all comments
 			$sqls = explode(";\n", $sqls);
 
 			foreach ($sqls as $sql) {
Index: trunk/kernel/include/customfield.php
===================================================================
diff -u -N -r7635 -r8397
--- trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 7635)
+++ trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 8397)
@@ -24,7 +24,16 @@
         $a->heading = $this->Get("Heading");
         $a->prompt = $this->Get("Prompt");
         $a->ElementType = $this->Get("ElementType");
-        $a->ValidationRules="";
+    	
+    	$main_prefix = $this->getMainPrefix($this->Get('Type'));
+    	$fields = $this->Application->getUnitOption($main_prefix, 'Fields');
+    	if (isset($fields['cust'.$a->name]['required']) && $fields['cust'.$a->name]['required']) {
+    		$a->ValidationRules = 'exists';
+    	}
+    	else {
+    		$a->ValidationRules = '';
+    	}
+    	
         $a->default_value = "";
         $a->ValueList=$this->Get("ValueList");
         if(!strlen($a->ElementType))
@@ -34,6 +43,18 @@
         return $a;
       }
 
+    function getMainPrefix($item_type)
+    {
+    	static $main_prefixes = null;
+    	if (!isset($main_prefixes)) {
+    		$sql = 'SELECT Prefix, ItemType
+    				FROM '.TABLE_PREFIX.'ItemTypes';
+    		$main_prefixes = $this->Conn->GetCol($sql, 'ItemType');
+    	}
+    	
+    	return $main_prefixes[$item_type];
+    }
+    
     function parsetag($tag)
     {
          if(is_object($tag))
@@ -104,7 +125,8 @@
     function LoadFieldsAndValues($ResourceId, $main_prefix, $temp_table = false)
     {
         $this->Clear();
-
+        
+		$this->Application->getUnitOption($main_prefix, 'TableName');
         $table = $this->Application->getUnitOption($main_prefix.'-cdata', 'TableName');
         if ($temp_table) {
         	$table = $this->Application->GetTempName($table, 'prefix:'.$main_prefix);
Index: trunk/kernel/include/config.php
===================================================================
diff -u -N -r8061 -r8397
--- trunk/kernel/include/config.php	(.../config.php)	(revision 8061)
+++ trunk/kernel/include/config.php	(.../config.php)	(revision 8397)
@@ -250,15 +250,17 @@
         	$this->default_value = $objConfig->Get($this->name);
     	}
     	$this->default_value = inp_htmlize($this->default_value);
+    	$validation_rule = $this->ValidationRules ? ' ValidationType="'.$this->ValidationRules.'" ' : '';
+    	
     	switch($this->ElementType)
     	{
       		case 'text':
         		$o .= '<input type="text" tabindex="'.($this->TabIndex++).'" name="'.$this->name.'" ';
-        		$o .= 'value="'.$this->default_value.'">';
+        		$o .= 'value="'.$this->default_value.'"'.$validation_rule.'>';
       			break;
       			
       		case 'checkbox':
-        		$o .= '<input type="checkbox" name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"';
+        		$o .= '<input type="checkbox" name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"'.$validation_rule;
         		$o .= $this->default_value ? ' checked>' : '>';
       			break;
       			
@@ -271,7 +273,7 @@
     			break;
     			
     		case 'textarea':
-        		$o .= '<textarea tabindex="'.($this->TabIndex++).'" '.$this->ValueList.' name="'.$this->name.'">'.$this->default_value.'</textarea>';
+        		$o .= '<textarea tabindex="'.($this->TabIndex++).'" '.$this->ValueList.' name="'.$this->name.'"'.$validation_rule.'>'.$this->default_value.'</textarea>';
     			break;
     			
     		case 'label':         
@@ -297,15 +299,15 @@
             	$this->TabIndex++;
             	$values = $this->GetValues($this->ValueList);
             	foreach ($values as $option_id => $option_name) {
-            		$o .= '<input type="radio" tabindex="'.$this->TabIndex.'" name="'.$this->name.'" value="'.$option_id.'"';
+            		$o .= '<input type="radio" tabindex="'.$this->TabIndex.'" name="'.$this->name.'" value="'.$option_id.'"'.$validation_rule;
         			$o .= ($this->default_value == $option_id) ? ' checked>' : '>';
         			$o .= $option_name;
             	}
             	$this->TabIndex++;
       			break;
       			
       		case 'select':
-        		$o .= '<select name="'.$this->name.'" tabindex="'.($this->TabIndex++).'">';
+        		$o .= '<select name="'.$this->name.'" tabindex="'.($this->TabIndex++).'"'.$validation_rule.'>';
         		$values = $this->GetValues($this->ValueList);
         				
         		foreach ($values as $option_id => $option_name) {
@@ -324,7 +326,7 @@
         			$selected = in_array($option_id, $selected_values) ? ' selected' : '';
     				$o .= '<option value="'.$option_id.'" '.$selected.'>'.$option_name.'</option>';
         		}
-        		$o .= '</select><input type="hidden" id="'.$this->name.'" name="'.$this->name.'" value="'.$this->default_value.'"/>';
+        		$o .= '</select><input type="hidden" id="'.$this->name.'" name="'.$this->name.'"'.$validation_rule.'value="'.$this->default_value.'"/>';
         		break;
     	}
     	return $o;
Index: trunk/kernel/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -N -r5431 -r8397
--- trunk/kernel/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 5431)
+++ trunk/kernel/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 8397)
@@ -35,7 +35,7 @@
 <inp2:g_SaveWarning name="grid_save_warning"/>
 
 <inp2:m_DefineElement name="permission_element" prefix="g-perm">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_param name="section_name"/>.<inp2:m_param name="perm_name"/>
 		</td>
@@ -48,7 +48,7 @@
 
 
 <inp2:m_DefineElement name="old_permission_element" prefix="g-perm">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_phrase name="$label"/>
 		</td>
@@ -62,7 +62,7 @@
 <inp2:g-perm_LoadPermissions/>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
+	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
 	
 	<tr class="subsectiontitle">
 		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
Index: trunk/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -N -r6625 -r8397
--- trunk/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 6625)
+++ trunk/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 8397)
@@ -2,6 +2,139 @@
 
 	class CustomDataEventHandler extends kDBEventHandler {
 
+		/**
+		 * [HOOK] Allows to apply custom fields functionality to specific config
+		 * When main item is created, then cdata config is cloned
+		 * 
+		 * @param kEvent $event
+		 */
+		function OnDefineCustomFields(&$event)
+		{
+			// 1. clone customdata table
+			$clones = $this->Application->getUnitOption('cdata', 'Clones');
+			$clones[$event->MasterEvent->Prefix.'-cdata'] = Array (
+				'ParentPrefix' => $event->MasterEvent->Prefix,	
+				'TableName' => $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TableName').'CustomData',
+			);
+			$this->Application->setUnitOption('cdata', 'Clones', $clones);
+			
+			// 2. add custom field information to main item
+			$this->createCustomFields($event->MasterEvent->Prefix);
+		}
+		
+		function scanCustomFields($prefix)
+		{
+			if (defined('IS_INSTALL') && IS_INSTALL && !$this->Application->TableFound('CustomField')) {
+				return false;
+			}
+			
+			if (!$prefix) {
+				// prefix not specified
+				return false;
+			}
+			
+			$item_type = $this->Application->getUnitOption($prefix, 'ItemType');
+			if (!$item_type) {
+				// no main config of such type
+				return false;
+			}
 
+			// get custom field information
+			$sql = 'SELECT *
+					FROM '.TABLE_PREFIX.'CustomField
+					WHERE Type = '.$item_type.'
+					ORDER BY CustomFieldId';
+			$custom_fields = $this->Conn->Query($sql, 'CustomFieldId');
+			if (!$custom_fields) {
+				// config doesn't have custom fields
+				return false;
+			}
+			
+			return $custom_fields;
+		}
+		
+		/**
+		 * Fills cloned cdata config with data from it's parent
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterConfigRead(&$event)
+		{
+			$main_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
+			
+			$custom_fields = $this->scanCustomFields($main_prefix);
+			if (!$custom_fields) {
+				return false;
+			}
+
+			// 2. create fields (for customdata item)
+			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields', Array());
+			$field_options = Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'db_type' => 'text', 'default' => '');
+			foreach ($custom_fields as $custom_id => $custom_params) {
+				if (isset($fields['cust_'.$custom_id])) continue;
+				$fields['cust_'.$custom_id] = $field_options;
+			}
+			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+		}
+		
+		/**
+		 * Creates "cust_<custom_name>" virtual fields for main item
+		 *
+		 * @param string $prefix
+		 */
+		function createCustomFields($prefix)
+		{
+			$custom_fields = $this->scanCustomFields($prefix);
+			if (!$custom_fields) {
+				return false;
+			}
+			
+			$calculated_fields = Array();
+			$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields', Array());
+
+			$cf_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+			$field_options = Array('type' => 'string', 'not_null' => 1, 'default' => '');
+			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+
+			foreach ($custom_fields as $custom_id => $custom_params) {
+				switch ($custom_params['ElementType']) {
+					case 'date':
+					case 'datetime':
+						unset($field_options['options']);
+						$field_options['formatter'] = 'kDateFormatter';
+						break;
+
+					case 'select':
+					case 'multiselect':
+					case 'radio':
+						if ($custom_params['ValueList']) {
+							$field_options['options'] = $cf_helper->GetValuesHash($custom_params['ValueList']);
+							$field_options['formatter'] = 'kOptionsFormatter';
+						}
+						break;
+
+					default:
+						unset($field_options['options'], $field_options['formatter']);
+						break;
+				}
+
+				$custom_name = $custom_params['FieldName'];
+				$calculated_fields['cust_'.$custom_name] = 'cust.'.$ml_formatter->LangFieldName('cust_'.$custom_id);
+				if (!isset($virtual_fields['cust_'.$custom_name])) {
+					$virtual_fields['cust_'.$custom_name] = Array();
+				}
+				$virtual_fields['cust_'.$custom_name] = array_merge_recursive2($field_options, $virtual_fields['cust_'.$custom_name]);
+				$custom_fields[$custom_id] = $custom_name;
+			}
+
+			$config_calculated_fields = $this->Application->getUnitOption($prefix, 'CalculatedFields', Array());
+			foreach ($config_calculated_fields as $special => $special_fields) {
+				$config_calculated_fields[$special] = array_merge_recursive2($config_calculated_fields[$special], $calculated_fields);
+			}
+			$this->Application->setUnitOption($prefix, 'CalculatedFields', $config_calculated_fields);
+
+			$this->Application->setUnitOption($prefix, 'CustomFields', $custom_fields);
+			$this->Application->setUnitOption($prefix, 'VirtualFields', $virtual_fields);
+		}
 	}
 ?>
\ No newline at end of file
Index: trunk/admin/install/db_reconfig.php
===================================================================
diff -u -N -r1684 -r8397
--- trunk/admin/install/db_reconfig.php	(.../db_reconfig.php)	(revision 1684)
+++ trunk/admin/install/db_reconfig.php	(.../db_reconfig.php)	(revision 8397)
@@ -11,7 +11,7 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="right" class="txt"><b>Server Type:</b></td>
 				              <td ALIGN="left"> 
 				                <SELECT NAME="ServerType">
@@ -21,37 +21,37 @@
 				                </SELECT>
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="right" class="txt"><b>Server Hostname:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="ServerHost" class="text" VALUE="<?php echo $g_DBHost; ?>">
 				              </td>
 				            </tr>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="right" class="txt"><b>Server Database:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="ServerDB" class="text" VALUE="<?php echo $g_DBName; ?>">
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="right" class="txt"><b>Database User Name:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="ServerUser" class="text" VALUE="<?php echo $g_DBUser; ?>">
 				              </td>
 				            </tr>				            				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="right" class="txt"><b>Server Password:</b></td>
 				              <td ALIGN="left"> 
 								<input type="password" name="ServerPass" class="text" VALUE="<?php echo $g_DBUserPassword; ?>">
 				              </td>
 				            </tr>	
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td ALIGN="right" class="txt"><b>Table Name Prefix:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="TablePrefix" class="text" VALUE="<?php echo $g_TablePrefix; ?>">
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $db_error; ?></p><br/></td>
 				            </tr>
 				             <input type="hidden" name="UserPass" VALUE="<?php echo $UserPass; ?>">
Index: trunk/core/units/email_events/email_events_config.php
===================================================================
diff -u -N -r8007 -r8397
--- trunk/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 8007)
+++ trunk/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 8397)
@@ -22,6 +22,9 @@
 
 					'TitlePresets'		=>	Array(
 												'email_settings_list' => Array('prefixes'	=> Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings! (#emailevents.module_recordcount#)'),
+												
+												'email_send' => Array('prefixes' => Array(), 'format' => '!la_title_PleaseWait!'),
+												'email_send_complete' => Array('prefixes' => Array(), 'format' => '!la_title_SendMailComplete!'),
 											),
 
 					'FilterMenu'		=>	Array(
@@ -59,6 +62,7 @@
 					'Fields'			=>	Array(
 													'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										            'Event' => Array('type' => 'string','not_null' => '1','default' => ''),
+										            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
 										            'Enabled' => Array('type'=>'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Text_FrontOnly'), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1),
 										            'FromUserId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter','options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1),
 										            'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
Index: trunk/kernel/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r6093 -r8397
--- trunk/kernel/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 6093)
+++ trunk/kernel/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 8397)
@@ -99,7 +99,7 @@
    		</td>
 	</tr>
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" header_label="la_Text_RootCategory">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" header_label="la_Text_RootCategory">
 		<td>
 			<span class="text"><inp2:m_phrase name="la_prompt_RootCategory" /></span>
 		</td>
Index: trunk/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r8104 -r8397
--- trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 8104)
+++ trunk/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 8397)
@@ -30,7 +30,7 @@
 	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'catalog_');
 					var a_toolbar = new ToolBar();
 
-					a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>', function() {
+					a_toolbar.AddButton( new ToolBarButton('in-portal:upcat', '<inp2:m_phrase label="la_ToolTip_Up" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_GoUp" escape="1"/>', function() {
 								$Catalog.go_to_cat($Catalog.ParentCategoryID);
 							}
 					 	) );
@@ -94,7 +94,7 @@
 						}
 				 	) );
 
-				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>', function() {
+				 	a_toolbar.AddButton( new ToolBarButton('in-portal:rebuild_cache', '<inp2:m_phrase label="la_ToolTip_RebuildCategoryCache" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Rebuild" escape="1"/>', function() {
 				 			redirect('<inp2:m_t t="in-portal/categories/cache_updater" pass="m"/>');
 						}
 				 	) );
Index: trunk/core/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 7391)
+++ trunk/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 8397)
@@ -27,7 +27,7 @@
 </tbody>
 </table>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 	<inp2:m_ParseBlock name="inp_edit_upload" prefix="phrases.import" field="LangFile" title="!la_fld_LanguageFile!"/>
Index: trunk/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 7855)
+++ trunk/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 8397)
@@ -67,7 +67,7 @@
 		</tr>
 	</inp2:m_if>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:Field field="DisplayName" as_label="true" />
 			<inp2:m_if check="m_IsDebugMode">
@@ -87,14 +87,14 @@
    		</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="4">
 			<inp2:m_phrase name="la_prompt_required_field_increase"/>
 			<input type="text" size="3" name="conf[SearchRel_Increase_<inp2:m_param name="module_key" />][VariableValue]" VALUE="<inp2:Field field="SearchRel_Increase_{$module_key}" />">%
 		</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="4">
 			<inp2:m_phrase name="la_prompt_relevence_percent"/>
 			<input type="text" size="3" name="conf[SearchRel_Keyword_<inp2:m_param name="module_key" />][VariableValue]" value="<inp2:Field field="SearchRel_Keyword_{$module_key}" />">% <inp2:Field field="SearchRel_Keyword_{$module_key}_prompt" as_label="1" /> &nbsp;&nbsp;&nbsp;
@@ -110,7 +110,7 @@
 	   		</td>
 		</tr>
 
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<td class="text" width="120"><inp2:Field field="Search_ShowMultiple_{$module_key}_prompt" as_label="1"/></td>
 			<td class="text" colspan="3">
 				<input type="checkbox" name="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" <inp2:Field field="Search_ShowMultiple_{$module_key}" checked="checked" db="db"/> id="_cb_conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]" onclick="update_checkbox(this, document.getElementById('conf[Search_ShowMultiple_<inp2:m_param name="module_key" />][VariableValue]'))" >
@@ -120,12 +120,12 @@
 		</inp2:m_if>
 </inp2:m_DefineElement>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder"<inp2:m_if check="conf_ShowRelevance"> style="border-bottom-width: 0px;"</inp2:m_if>>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered"<inp2:m_if check="conf_ShowRelevance"> style="border-bottom-width: 0px;"</inp2:m_if>>
 	<inp2:confs_PrintList render_as="confs_detail_row" />
 </table>
 
 <inp2:m_if check="conf_ShowRelevance">
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:conf_PrintConfList block="config_values" />
 </table>
 </inp2:m_if>
Index: trunk/core/install/incs/style.css
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/install/incs/style.css	(.../style.css)	(revision 7635)
+++ trunk/core/install/incs/style.css	(.../style.css)	(revision 8397)
@@ -161,7 +161,7 @@
 	text-decoration: none;
 }
 
-/*.table_color1 {
+/*.table-color1 {
 	font-weight: normal;
 	font-size: 14px;
 	color: black; 
@@ -170,7 +170,7 @@
 	text-decoration: none;
 }*/
 
-.table_color2 {
+.table-color2 {
 	font-weight: normal; 
 	font-size: 14px;
 	color: black;
Index: trunk/kernel/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r4834 -r8397
--- trunk/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 4834)
+++ trunk/kernel/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 8397)
@@ -77,7 +77,7 @@
 		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="lang" field="Enabled" title="!la_fld_Enabled!"/>
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="lang" field="UnitSystem" title="!la_fld_UnitSystem!" use_phrases="1"/>
 	<inp2:m_if check="lang_IsNewMode">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text">
 			<inp2:m_phrase name="la_fld_CopyLabels"/>:
Index: trunk/kernel/include/itemdb.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 8104)
+++ trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 8397)
@@ -2,8 +2,8 @@
 
 define('FT_OPTION', 1); // option formatter
 
-class clsItemDB 
-{ 
+class clsItemDB
+{
 	var $Formatters = Array(); //  by Alex
 	var $m_dirtyFieldsMap = array();
 	var $Data = array();
@@ -13,46 +13,46 @@
 	var $id_field;
 	var $NoResourceId;
 	var $debuglevel;
-	
+
 	var $Prefix = '';
 	var $Special = '';
-	
+
 	var $SelectSQL = 'SELECT * FROM %s WHERE %s';
-  
+
 	/**
 	 * Application object
 	 *
 	 * @var kApplication
 	 */
 	var $Application = null;
-	
+
 	/**
 	 * Connection to database
 	 *
 	 * @var kDBConnection
 	 */
 	var $Conn = null;
-  
+
   function clsItemDB()
   {
 		if (class_exists('kApplication')) {
 			// just in case when aplication is not found
-	  		$this->Application =& kApplication::Instance();      
+	  		$this->Application =& kApplication::Instance();
 	  		$this->Conn =& $this->Application->GetADODBConnection();
 		}
-		
+
   		$this->adodbConnection = &GetADODBConnection();
   		$this->tablename="";
   		$this->NoResourceId=0;
   		$this->debuglevel=0;
   }
-  
+
   // ============================================================================================
   function GetFormatter($field)
   {
   	return $this->HasFormatter($field) ? $this->Formatters[$field] : false;
   }
-  
+
   function isLiveTable()
   {
   	global $objSession;
@@ -68,14 +68,14 @@
   	{
   		case FT_OPTION:
   			$this->Formatters[$field]['options'] = $params;
-  			break;	
+  			break;
   	}
   }
-  /*	
+  /*
   function FormatFields()
   {
 	// format item in list data before printing
-	
+
 	foreach($this->Formatters as $field => $formatter)
 		$this->Data[$field] = $this->FormatField($field);
   }
@@ -90,20 +90,20 @@
 		{
 			case FT_OPTION:
 				return $fmt['options'][ $this->Data[$field] ];
-				break;	
+				break;
 		}
   	}
   	else
   		return $this->Get($field);
   }
-  
+
   function HasFormatter($field)
   {
   	// checks if formatter is set for field
   	return isset($this->Formatters[$field]) ? 1 : 0;
   }
   // ============================================================================================
-  
+
   function UnsetIdField()
   {
     $f = $this->IdField();
@@ -120,7 +120,7 @@
   function IdField()
   {
       if(!strlen($this->id_field))
-      {      
+      {
         return $this->tablename."Id";
       }
       else
@@ -134,17 +134,17 @@
 
   function SetUniqueId($value)
   {
-      $var = $this->IdField();	  
-      
+      $var = $this->IdField();
+
       if( $this->UsingTempTable() ) $value = $this->UniqueId();
-      
+
       $this->Set($var, $value);
   }
 
   function SetModified($UserId=NULL,$modificationDate=null)
   {
       global $objSession;
-      
+
       $keys = array_keys($this->Data);
       if(in_array("Modified",$keys))
       {
@@ -162,28 +162,32 @@
   {
       echo '<pre>'.print_r($this->Data, true).'</pre>';
   }
-  
+
 // =================================================================
   function GetFormatted($name)
-  {	
+  {
       // get formatted field value
       return $this->FormatField($name);
   }
 
-  function Get($name)
-  {	
+  function Get($name, $ifempty=null)
+  {
       // get un-formatted field value
       //if( !isset($this->Data[$name]) ) print_pre( debug_backtrace() );
-      return $this->HasField($name) ? $this->Data[$name] : '';
+      $ret = $this->HasField($name) ? $this->Data[$name] : '';
+      if (isset($ifempty) && $ret == '') {
+      	$ret = $this->Data[$ifempty];
+      }
+      return $ret;
   }
 // =================================================================
 
 	function HasField($name)
 	{
 		// checks if field exists in item
-		return isset($this->Data[$name]) ? 1 : 0;	
+		return isset($this->Data[$name]) ? 1 : 0;
 	}
-	
+
 	/**
 	 * Set's value(-s) of field(-s) specified.
 	 * Modifies HasChanges flag automatically.
@@ -207,8 +211,8 @@
 			$this->_Set($name,$value);
 		}
 	}
-	
-	
+
+
 	/**
 	 * Set's value(-s) of field(-s) specified.
 	 * Modifies HasChanges flag automatically.
@@ -240,9 +244,9 @@
         }
       }
       else
-      {      
-        foreach($list as $field) 
-        {	
+      {
+        foreach($list as $field)
+        {
        		$this->m_dirtyFieldsMap[$field] = $this->Data[$field];
         }
       }
@@ -256,9 +260,9 @@
           $this->m_dirtyFieldsMap=array();
       }
       else
-      {      
-        foreach($list as $value) 
-        {	
+      {
+        foreach($list as $value)
+        {
           $varname = "m_" . $value;
           unset($this->m_dirtyFieldsMap[$value]);
         }
@@ -271,9 +275,9 @@
   }
 
   function SetFromArray($data, $dirty = false)
-  { 
+  {
       if(is_array($data))
-      {      
+      {
         $this->Data = $data;
         if($dirty) $this->m_dirtyFieldsMap = $data;
       }
@@ -290,7 +294,7 @@
   }
 
   function Delete()
-  { 
+  {
       global $Errors;
 
       if($this->Get($this->IdField())==0)
@@ -316,7 +320,7 @@
   		global $Errors, $objSession;
 
   		if( !$this->raiseEvent('OnBeforeItemUpdate') ) return false;
-  		
+
   		if( count($this->m_dirtyFieldsMap) == 0 ) return true;
 
   		$this->SetModified($UpdatedBy, $modificationDate);
@@ -328,17 +332,17 @@
   			{
 				if( is_null($value) )
 				{
-					$value = 'NULL';	
+					$value = 'NULL';
 				}
 				else
 				{
-					$value = $this->adodbConnection->qstr( isset($GLOBALS['_CopyFromEditTable']) ? $value : stripslashes($value) );	
+					$value = $this->adodbConnection->qstr( isset($GLOBALS['_CopyFromEditTable']) ? $value : stripslashes($value) );
 				}
   				$sql .= '`'.$key.'` = '.$value.', ';
   			}
   		}
 		$sql = preg_replace('/(.*), $/','\\1',$sql);
-  		
+
   		$sql .= ' WHERE '.$this->IdField().' = '.$this->adodbConnection->qstr( $this->UniqueId() );
 
   		if( $this->debuglevel > 0 ) echo $sql.'<br>';
@@ -349,28 +353,28 @@
   		}
 
   		if( $objSession->GetVariable('HasChanges') == 2 ) $objSession->SetVariable('HasChanges', 1);
-  		
+
   		$this->raiseEvent('OnAfterItemUpdate');
-  		
+
 		return true;
 	}
-	
+
 	function ReplaceID($new_id)
 	{
-		// replace item's id, because Update method 
+		// replace item's id, because Update method
 		// is too dummy to do this autommatically
 		// USED in temporary table editing stuff
 		$db =& $this->adodbConnection;
-		$sql = "UPDATE %1\$s SET `%2\$s` = %3\$s WHERE `%2\$s` = %4\$s"; 
+		$sql = "UPDATE %1\$s SET `%2\$s` = %3\$s WHERE `%2\$s` = %4\$s";
 		$sql = sprintf($sql, $this->tablename, $this->IdField(), $new_id, (int)$this->UniqueId() );
 		if($this->debuglevel > 0) echo $sql.'<br>';
 		$db->Execute($sql);
 	}
-	
+
   function CreateSQL()
   {
   	 global $Errors;
-  	 
+
      $sql = "INSERT INTO ".$this->tablename." (";
      $first  = 1;
      foreach ($this->Data as $key => $value)
@@ -413,10 +417,10 @@
      	}
      }
      $sql = sprintf('%s)',$sql);
-     
+
   	return $sql;
   }
-  
+
   /**
    * Set's HasChanges flag based on new field
    * with $name with value $value.
@@ -426,27 +430,27 @@
    * @access private
    */
   function DetectChanges($name, $value)
-  {  	
+  {
   	global $objSession;
   	if( !is_object($objSession) ) return false;
-  	
+
   	//echo "<b>class: ".get_class($this)."</b><br>";
   	if (!isset($this->Data[$name]) ) return false;
-  	
-	if ( getArrayValue($this->Data, $name) != $value && $value != '') {		
+
+	if ( getArrayValue($this->Data, $name) != $value && $value != '') {
 		//echo "$name Modified tt ".$this->Data[$name]." tt $value<br>";
 		if ($objSession->GetVariable("HasChanges") != 1) {
-			$objSession->SetVariable("HasChanges", 2);		
+			$objSession->SetVariable("HasChanges", 2);
 		}
 	}
   }
-  
+
   function Create()
   {
   	global $Errors, $objSession;
-	
+
   	if( !$this->raiseEvent('OnBeforeItemCreate') ) return false;
-  	
+
   	if($this->debuglevel) echo "Creating Item: ".get_class($this)."<br>";
   	if($this->NoResourceId!=1 && (int)$this->Get("ResourceId")==0)
   	{
@@ -474,36 +478,36 @@
   	}  */
 
   	$this->raiseEvent('OnAfterItemCreate');
-  	
+
   	return true;
   }
 
   function Increment($field, $calculate_hot = false)
-  {	    
+  {
       global $Errors;
-      
+
       if ($calculate_hot) {
       	$sql = "SELECT $field FROM ".$this->tablename." WHERE ".$this->IdField()." = ".$this->UniqueId();
       	$rs = $this->adodbConnection->Execute($sql);
-      	
+
       	$sql = "SELECT MAX($field) AS max_value FROM ".$this->tablename." WHERE ROUND($field) = ".round($rs->fields[$field]);
       	$rs = $this->adodbConnection->Execute($sql);
       	//echo "MAX VALUE: ".$rs->fields['max_value']."<br>";
       	//echo "MAX SQL: $sql<br>";
 		$new_val = $rs->fields['max_value'] + 1;
-		
+
 		$sql = "SELECT count($field) AS count FROM ".$this->tablename." WHERE $field = $new_val";
-	    $rsc = $this->adodbConnection->Execute($sql);		
-		
+	    $rsc = $this->adodbConnection->Execute($sql);
+
 		while ($rsc->fields['count'] != 0) {
 			$sql = "SELECT count($field) AS count FROM ".$this->tablename." WHERE $field = $new_val";
-	      	$rsc = $this->adodbConnection->Execute($sql);		
+	      	$rsc = $this->adodbConnection->Execute($sql);
 	      	//echo "New Value:$new_val<br>";
 	      	if ($rsc->fields['count'] > 0) {
 	      		$new_val = $new_val + 0.000001;
 	      	}
 		}
-      	
+
       	$sql = "Update ".$this->tablename." set $field=$new_val where ".$this->IdField()."=" . $this->UniqueId();
       }
 	  else {
@@ -517,7 +521,7 @@
           $Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"Increment");
           return false;
       }
-      
+
       if ($calculate_hot) {
       	$this->Set($field,$new_val);
       }
@@ -527,7 +531,7 @@
   }
 
   function Decrement($field)
-  {	
+  {
       global $Errors;
 
       $sql = "Update ".$this->tablename." set $field=$field-1 where ".$this->IdField()."=" .(int)$this->UniqueId();
@@ -541,7 +545,7 @@
       }
       $this->Set($field,$this->Get($field)-1);
   }
-  
+
   function GetFieldList($UseLoadedData=FALSE)
   {
   	if(count($this->Data) && $UseLoadedData==TRUE)
@@ -554,38 +558,38 @@
   	}
   	return $res;
   }
-  
+
   function UsingTempTable()
   {
   	global $objSession;
-  	
+
   	$temp = $objSession->GetEditTable($this->tablename);
   	$p = GetTablePrefix()."ses";
   	$t = substr($temp,0,strlen($p));
-  	$ThisTable = substr($this->tablename,0,strlen($p));  	
+  	$ThisTable = substr($this->tablename,0,strlen($p));
   	if($t==$ThisTable)
   	{
   		return TRUE;
   	}
   	else
   	  return FALSE;
   }
-  
+
     function LoadFromDatabase($Id, $IdField = null) // custom IdField by Alex
     {
 		global $objSession,$Errors;
-       
+
         if(!isset($Id))
         {
             $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
             return false;
         }
-       
+
        // --------- multiple ids allowed: begin -----------------
        $id_field = isset($IdField) ? $IdField : $this->IdField();
        if( !is_array($id_field) ) $id_field = Array($id_field);
        if( !is_array($Id) ) $Id = Array($Id);
-       
+
        $i = 0; $id_count = count($id_field);
        $conditions = Array();
        while($i < $id_count)
@@ -595,7 +599,7 @@
        }
        $sql = sprintf($this->SelectSQL, $this->tablename, implode(' AND ', $conditions) );
        // --------- multiple ids allowed: end --------------------
-       if($this->debuglevel) echo "Load SQL: $sql<br>"; 
+       if($this->debuglevel) echo "Load SQL: $sql<br>";
         $result = $this->adodbConnection->Execute($sql);
         if ($result === false)
         {
@@ -609,13 +613,13 @@
         $this->Clean();
         return TRUE;
     }
-    
+
     function FieldExists($field)
     {
       $res = array_key_exists($field,$this->Data);
-      return $res;	
+      return $res;
     }
-  
+
     function ValueExists($Field,$Value)
     {
     	$sql = "SELECT $Field FROM ".$this->tablename." WHERE $Field='$Value'";
@@ -639,7 +643,7 @@
     	else
     	  $ret = 0;
     }
-    
+
     function FieldMin($Field)
     {
     	$sql = "SELECT Min($Field) as m FROM ".$this->tablename;
@@ -651,19 +655,18 @@
     	else
     	  $ret = 0;
     }
-    
+
     function TableExists($table = null)
     {
     	static $tables_found  = Array ();
-    	
+
     	if($table == null) $table = $this->tablename;
-    	
-    	
+
     	if (!isset($tables_found[$table])) {
-	    	// checks if table specified in item exists in db	
+	    	// checks if table specified in item exists in db
 	    	$db =& GetADODBConnection();
 	    	$sql = "SHOW TABLES LIKE '%s'";
-	    	
+
 	    	$rs = $db->Execute( sprintf($sql, $table) );
 	    	if ($rs->RecordCount() == 1) {
 	    		// table exists in normal case
@@ -675,24 +678,24 @@
 	    		$tables_found[$table] = $rs->RecordCount() == 1 ? 1 : 0;
 	    	}
     	}
-    	
+
     	return $tables_found[$table];
     }
-    
+
     function raiseEvent($name, $id = null)
 	{
 		return true;
-		
+
 		/*if (!getArrayValue($GLOBALS, '_CopyFromEditTable')) {
 			return true;
 		}
-		
+
 		if( !isset($id) ) $id = $this->GetID();
 		$event = new kEvent( Array('name'=>$name,'prefix'=>$this->Prefix,'special'=>$this->Special) );
 		$event->setEventParam('id', $id);
 		$this->Application->HandleEvent($event);
 		return $event->status == erSUCCESS ? true : false;*/
 	}
-    	
+
 }
 ?>
Index: trunk/core/admin_templates/tools/system_tools.tpl
===================================================================
diff -u -N -r8104 -r8397
--- trunk/core/admin_templates/tools/system_tools.tpl	(.../system_tools.tpl)	(revision 8104)
+++ trunk/core/admin_templates/tools/system_tools.tpl	(.../system_tools.tpl)	(revision 8397)
@@ -14,33 +14,34 @@
 	}
 </script>
 
-<inp2:m_DefineElement name="service_elem">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+<inp2:m_DefineElement name="service_elem" event_prefix="adm">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
 		<td class="text" style="width: 300px;">
-			<inp2:m_phrase label="$title"/>:
+			<inp2:m_param name="title"/>:
 		</td>
 		<td valign="top" colspan="2">
-			<input class="button" type="button" onclick="submit_event('adm', '<inp2:m_param name="event_name"/>');" value="Go">
+			<input class="button" type="button" onclick="submit_event('<inp2:m_param name="event_prefix"/>', '<inp2:m_param name="event_name"/>');" value="Go">
 		</td>
     	<td class="error">&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" id="config_table">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetModRwCache" event_name="OnResetModRwCache"/>
-		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetCMSMenuCache" event_name="OnResetCMSMenuCache"/>
-		<inp2:m_RenderElement name="service_elem" title="la_Service_ResetSections" event_name="OnResetSections"/>
-		<inp2:m_RenderElement name="service_elem" title="la_Service_ConfigCache" event_name="OnResetConfigsCache"/>
-		<inp2:m_RenderElement name="service_elem" title="la_Service_RebuildThemes" event_name="OnRebuildThemes"/>
+		<inp2:m_RenderElement name="service_elem" title="Reset mod_rewrite Cache" event_name="OnResetModRwCache"/>
+		<inp2:m_RenderElement name="service_elem" title="Reset SMS Menu Cache" event_name="OnResetCMSMenuCache"/>
+		<inp2:m_RenderElement name="service_elem" title="Reset Sections Cache" event_name="OnResetSections"/>
+		<inp2:m_RenderElement name="service_elem" title="Reset Configs Cache" event_name="OnResetConfigsCache"/>
+		<inp2:m_RenderElement name="service_elem" title="Re-build Themes Files" event_name="OnRebuildThemes"/>
+		<inp2:m_RenderElement name="service_elem" title="Re-build Multilanguage Fields" event_prefix="lang" event_name="OnReflectMultiLingualFields"/>
 	<inp2:m_RenderElement name="subsection" title="la_section_Configs"/>
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" style="width: 300px;">
 				Table Structure:
 			</td>
-			<td valign="top" colspan="2">
+			<td valign="top" colspan="3">
 				<input type="text" name="table_name" value="" size="30"/>
 				<input class="button" type="button" onclick="show_structure('adm', 'OnGenerateTableStructure');" value="Go">
 				<span class="small">table name (prefix optional) OR unit config prefix</span>
Index: trunk/core/units/general/main_event_handler.php
===================================================================
diff -u -N -r6428 -r8397
--- trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 6428)
+++ trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 8397)
@@ -82,9 +82,14 @@
 				}
 				$ret .= $theme_name.'/';
 			}
-
+			
 			if ($processed_params['m_cat_id'] > 0 && isset($url_params['pass_category']) && $url_params['pass_category']) {
-				$ret .= $this->Application->getFilename('c', $processed_params['m_cat_id']).'/';
+				$category_filename = $this->Application->getFilename('c', $processed_params['m_cat_id']);
+				$t = isset($url_params['t']) && $url_params['t'] ? $url_params['t'] : false;
+				// category name doesn't match template name -> Proj-CMS/In-Edit tricks
+				if (!preg_match('/Content\/'.preg_quote($t, '/').'/i', $category_filename)) {
+					$ret .= $category_filename.'/';
+				}
 				$url_params['category_processed'] = true;
 			}
 			else {
Index: trunk/core/install/step_templates/db_config.tpl
===================================================================
diff -u -N -r6691 -r8397
--- trunk/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 6691)
+++ trunk/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 8397)
@@ -1,4 +1,4 @@
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>Server Type<span class="error">*</span>:</b></td>
   	<td align="left"> 
     	<select name="DBType">
@@ -15,35 +15,35 @@
 	</td>
 </tr>
 
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>Hostname<span class="error">*</span>:</b></td>
 	<td align="left"> 
 		<input type="text" name="DBHost" class="text" value="<?php echo $this->systemConfig['Database']['DBHost']; ?>" />
 	</td>
 </tr>
 				            				            				            
-<tr class="table_color2">
+<tr class="table-color2">
 	<td class="text"><b>Database Name<span class="error">*</span>:</b></td>
 	<td align="left"> 
 		<input type="text" name="DBName" class="text" value="<?php echo $this->systemConfig['Database']['DBName']; ?>" />
 	</td>
 </tr>
 
-<tr class="table_color2">
+<tr class="table-color2">
   <td class="text"><b>Database User Name<span class="error">*</span>:</b></td>
   <td align="left"> 
 	<input type="text" name="DBUser" class="text" value="<?php echo $this->systemConfig['Database']['DBUser']; ?>" />
   </td>
 </tr>	
 			            				            				            				            
-<tr class="table_color2">
+<tr class="table-color2">
   <td class="text"><b>Database User Password:</b></td>
   <td align="left"> 
 	<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->systemConfig['Database']['DBUserPassword']; ?>" />
   </td>
 </tr>
 	
-<tr class="table_color2">
+<tr class="table-color2">
   <td class="text"><b>Table Name Prefix:</b></td>
   <td align="left"> 
 	<input type="text" name="TablePrefix" class="text" maxlength="7" value="<?php echo $this->systemConfig['Database']['TablePrefix']; ?>" />
Index: trunk/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 7391)
+++ trunk/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 8397)
@@ -56,7 +56,7 @@
 
 <inp2:m_ParseBlock name="inp_edit_hidden" prefix="cf" field="Type" db="db"/>
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 
 
Index: trunk/kernel/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -N -r4834 -r8397
--- trunk/kernel/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 4834)
+++ trunk/kernel/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 8397)
@@ -12,7 +12,7 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
 
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td>
 			<inp2:m_phrase label="la_DownloadLanguageExport"/>
 		<td>
@@ -21,7 +21,7 @@
 		<td class="error">&nbsp;</td>
 	</tr>
 	
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td colspan="3" align="left">
 			<a href="javascript:submit_event('lang','OnGoBack');"><inp2:m_phrase label="la_Continue"/></a>
 		</td>
Index: trunk/admin/install/lang_select.php
===================================================================
diff -u -N -r315 -r8397
--- trunk/admin/install/lang_select.php	(.../lang_select.php)	(revision 315)
+++ trunk/admin/install/lang_select.php	(.../lang_select.php)	(revision 8397)
@@ -15,13 +15,13 @@
 <?php
     foreach($Packs as $p)
     {        
-        echo "<TR class=\"table_color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
+        echo "<TR class=\"table-color2\"><TD colspan=\"2\" align=\"left\" class=\"txt\">";
         echo "<INPUT TYPE=\"CHECKBOX\" NAME=\"lang[]\" VALUE=\"$p\" CHECKED=\"checked\">";
         echo substr($p,0,-5);
         echo "</TD></TR>\n";
     }
 ?>	            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($LangError) ) echo $LangError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -N -r6784 -r8397
--- trunk/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 6784)
+++ trunk/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 8397)
@@ -25,7 +25,7 @@
 
 <inp2:m_DefineElement name="no_perm_grid" prefix="" perm_label="">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full" height="200">
-		<tr class="table_color1">
+		<tr class="table-color1">
 			<td align="center" valign="middle" class="text">
 				<inp2:m_phrase name="$perm_label"/>
 			</td>
@@ -34,7 +34,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_relation">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td valign="top" class="text">
 			<inp2:m_if check="{$prefix}_Field" field="$field">
Index: trunk/admin/install/inportal_data.sql
===================================================================
diff -u -N -r8104 -r8397
--- trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 8104)
+++ trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 8397)
@@ -225,4 +225,4 @@
 
 INSERT INTO Stylesheets VALUES (8, 'Default', 'In-Portal Default Theme', '', 1124952555, 1);
 
-INSERT INTO Modules VALUES ('In-Portal', 'kernel/', 'm', '4.0.2', 1, 0, '', 0, '1054738405');
+INSERT INTO Modules VALUES ('In-Portal', 'kernel/', 'm', '4.1.0', 1, 0, '', 0, '1054738405');
Index: trunk/core/admin_templates/js/ajax.js
===================================================================
diff -u -N -r8174 -r8397
--- trunk/core/admin_templates/js/ajax.js	(.../ajax.js)	(revision 8174)
+++ trunk/core/admin_templates/js/ajax.js	(.../ajax.js)	(revision 8397)
@@ -115,7 +115,7 @@
 }
 
 Request.setOpacity = function (opacity, id) {
-		var elem = typeof(id)=='string' ? document.getElementById(id) : id;
+	var elem = typeof(id)=='string' ? document.getElementById(id) : id;
     var object = elem.style;
     object.opacity = (opacity / 100);
     object.MozOpacity = (opacity / 100);
Index: trunk/core/install/incs/install.tpl
===================================================================
diff -u -N -r7635 -r8397
--- trunk/core/install/incs/install.tpl	(.../install.tpl)	(revision 7635)
+++ trunk/core/install/incs/install.tpl	(.../install.tpl)	(revision 8397)
@@ -92,7 +92,7 @@
 												<!-- step body: end -->
 												
 												<!-- step error message: begin -->
-												<tr class="table_color2">
+												<tr class="table-color2">
 													<td colspan="2">
 														<p class="error">
 															<?php echo $this->errorMessage; ?>
Index: trunk/kernel/units/sections/sections_config.php
===================================================================
diff -u -N -r7635 -r8397
--- trunk/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 7635)
+++ trunk/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 8397)
@@ -129,7 +129,7 @@
 															'url'			=>	Array('t' => 'in-portal/users/users_list', 'pass' => 'm'),
 															'permissions'	=>	Array('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
 															'priority'		=>	1.5,
-															'debug_only'	=>	true,
+															'show_mode'		=>	smDEBUG,
 															'type'			=>	stTREE,
 													),
 													
Index: trunk/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r7855 -r8397
--- trunk/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 7855)
+++ trunk/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 8397)
@@ -88,7 +88,7 @@
 <inp2:m_include t="incs/config_blocks"/>
 
 <inp2:conf_SaveWarning name="grid_save_warning"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" id="config_table">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
 	<!-- module root category selector: begin -->
 	<tr class="subsectiontitle">
 		<td colspan="2">
@@ -99,7 +99,7 @@
    		</td>
 	</tr>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" header_label="la_Text_RootCategory">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" header_label="la_Text_RootCategory">
 		<td>
 			<span class="text"><inp2:m_phrase name="la_prompt_RootCategory" /></span>
 		</td>
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r8104 -r8397
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 8104)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 8397)
@@ -867,38 +867,13 @@
         $ado->Execute($sql);
     }
 
+    /**
+     * Depricated
+     *
+     */
     function SendMailQeue()
     {
-        global $objConfig, $objSession, $TotalMessagesSent;
-
-        $ado = &GetADODBConnection();
-        $MaxAllowed = $this->MessagesAtOnce;
-
-        $del_sql = array();
-
-        $NumToSend = $MaxAllowed - $this->MessagesSent;
-        if($NumToSend < 0) $NumToSend=1;	// Don't really know why, but this could happend, so issued this temp fix
-        $sql = "SELECT * FROM ".$this->SourceTable." ORDER BY queued ASC LIMIT $NumToSend";
-        $rs = $ado->Execute($sql);
-
-        while($rs && !$rs->EOF)
-        {
-            $data = $rs->fields;
-						$this->DeliverMail($data["toaddr"],$data["fromaddr"],$data["Subject"],$data["message"],$data["headers"],1);
-
-            $del_sql[] = "DELETE FROM ".$this->SourceTable." WHERE queued='".$data["queued"]."'";
-            $rs->MoveNext();
-        }
-
-        $numdel = count($del_sql);
-        for($i=0;$i<$numdel;$i++)
-        {
-            $sql = $del_sql[$i];
-            if(strlen($sql))
-            $ado->Execute($sql);
-            if($objSession->HasSystemPermission("DEBUG.ITEM"))
-                echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
-        }
+    	return ;
     }
 
     function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
@@ -931,7 +906,7 @@
 			$esender->AddAttachment($FileLoc, basename($FileName));
 		}
 
-		$status = $esender->Deliver();
+		$status = $esender->Deliver(null, $QueueOnly ? false : true);
 
 		if ($status) {
 			// write to log
Index: trunk/core/admin_templates/emails/send_complete.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/emails/send_complete.tpl	(revision 0)
+++ trunk/core/admin_templates/emails/send_complete.tpl	(revision 8397)
@@ -0,0 +1,16 @@
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
+
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_complete"/>
+
+<table class="edit-form">
+	<inp2:m_ParseBlock name="subsection" title="la_prompt_EmailCompleteMessage"/>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td colspan="3" align="center">
+			<input type="button" value="<inp2:m_phrase name="la_Close"/>" class="button" onclick="window.close();"/>
+		</td>
+	</tr>
+</table>	 
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: trunk/admin/install/dbinfo.php
===================================================================
diff -u -N -r1684 -r8397
--- trunk/admin/install/dbinfo.php	(.../dbinfo.php)	(revision 1684)
+++ trunk/admin/install/dbinfo.php	(.../dbinfo.php)	(revision 8397)
@@ -11,7 +11,7 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td class="txt"><b>Server Type:</b></td>
 				              <td ALIGN="left"> 
 				                <SELECT NAME="ServerType">
@@ -21,37 +21,37 @@
 				                </SELECT>
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td class="txt"><b>Hostname:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="ServerHost" class="text" VALUE="<?php echo $g_DBHost; ?>">
 				              </td>
 				            </tr>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td class="txt"><b>Database Name:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="ServerDB" class="text" VALUE="<?php echo $g_DBName; ?>">
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td class="txt"><b>Database User Name:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="ServerUser" class="text" VALUE="<?php echo $g_DBUser; ?>">
 				              </td>
 				            </tr>				            				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td class="txt"><b>Database User Password:</b></td>
 				              <td ALIGN="left"> 
 								<input type="password" name="ServerPass" class="text" VALUE="<?php echo $g_DBUserPassword; ?>">
 				              </td>
 				            </tr>	
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				              <td class="txt"><b>Table Name Prefix:</b></td>
 				              <td ALIGN="left"> 
 								<input type="text" name="TablePrefix" class="text" VALUE="<?php if( isset($g_TablePrefix) ) echo $g_TablePrefix; ?>">
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if ($general_error != '') echo $general_error; else echo $db_error; ?></p><br/></td>
 				            </tr>
 				             <input type="hidden" name="UserPass" VALUE="<?php if( isset($UserPass) ) echo $UserPass; ?>">
Index: trunk/admin/install/upgrades/changelog_4_1_0.txt
===================================================================
diff -u -N
--- trunk/admin/install/upgrades/changelog_4_1_0.txt	(revision 0)
+++ trunk/admin/install/upgrades/changelog_4_1_0.txt	(revision 8397)
@@ -0,0 +1,256 @@
+File in-portal/admin/install.php changed
+File in-portal/admin/email/do_send.php changed
+File in-portal/admin/include/elements.php changed
+File in-portal/admin/include/mainscript.php changed
+File in-portal/admin/include/style.css changed
+File in-portal/admin/include/tabs.js changed
+File in-portal/admin/install/db_reconfig.php changed
+File in-portal/admin/install/dbinfo.php changed
+File in-portal/admin/install/domain.php changed
+File in-portal/admin/install/download_license.php changed
+File in-portal/admin/install/fix_paths.php changed
+File in-portal/admin/install/general_error.php changed
+File in-portal/admin/install/get_license.php changed
+File in-portal/admin/install/inportal_data.sql changed
+File in-portal/admin/install/inportal_remove.sql changed
+File in-portal/admin/install/inportal_schema.sql changed
+File in-portal/admin/install/install_finish.php changed
+File in-portal/admin/install/install_lib.php changed
+File in-portal/admin/install/lang_default.php changed
+File in-portal/admin/install/lang_run.php changed
+File in-portal/admin/install/lang_select.php changed
+File in-portal/admin/install/login.php changed
+File in-portal/admin/install/modselect.php changed
+File in-portal/admin/install/postconfig.php changed
+File in-portal/admin/install/reinstall.php changed
+File in-portal/admin/install/restore_run.php changed
+File in-portal/admin/install/restore_select.php changed
+File in-portal/admin/install/rootpass.php changed
+File in-portal/admin/install/sel_license.php changed
+File in-portal/admin/install/settings.php changed
+File in-portal/admin/install/theme_select.php changed
+File in-portal/admin/install/upgrade.php changed
+File in-portal/admin/install/warning.php changed
+File in-portal/admin/install/langpacks/english.lang changed
+File in-portal/admin/install/upgrades/changelog_4_0_1.txt changed
+File in-portal/admin/install/upgrades/changelog_4_1_0.txt is new; release_4_1_0 revision 1.1.2.6
+File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.2.sql is removed; release_4_0_1 revision 1.2
+File in-portal/admin/install/upgrades/inportal_upgrade_v4.1.0.php is new; release_4_1_0 revision 1.1.2.2
+File in-portal/admin/install/upgrades/inportal_upgrade_v4.1.0.sql is new; release_4_1_0 revision 1.1.2.4
+File in-portal/admin/install/upgrades/readme_4_1_0.txt is new; release_4_1_0 revision 1.1.2.1
+File in-portal/admin/tools/server_info.php changed
+File in-portal/admin/users/adduser.php changed
+File in-portal/kernel/parser.php changed
+File in-portal/kernel/admin/include/toolbar/sendmail.php changed
+File in-portal/kernel/admin_templates/catalog.tpl changed
+File in-portal/kernel/admin_templates/catalog_tab.tpl changed
+File in-portal/kernel/admin_templates/no_permission.tpl changed
+File in-portal/kernel/admin_templates/categories/ci_blocks.tpl changed
+File in-portal/kernel/admin_templates/categories/permissions_tab.tpl changed
+File in-portal/kernel/admin_templates/config/config_general.tpl changed
+File in-portal/kernel/admin_templates/config/config_search.tpl changed
+File in-portal/kernel/admin_templates/groups/groups_edit_permissions.tpl changed
+File in-portal/kernel/admin_templates/groups/permissions_selector.tpl changed
+File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/custom_blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/image_blocks.tpl changed
+File in-portal/kernel/admin_templates/regional/languages_edit.tpl changed
+File in-portal/kernel/admin_templates/regional/languages_export.tpl changed
+File in-portal/kernel/admin_templates/regional/languages_export_step2.tpl changed
+File in-portal/kernel/admin_templates/stylesheets/base_style_edit.tpl changed
+File in-portal/kernel/admin_templates/stylesheets/block_style_edit.tpl changed
+File in-portal/kernel/admin_templates/stylesheets/style_editor.tpl changed
+File in-portal/kernel/admin_templates/visits/visits_list.tpl changed
+File in-portal/kernel/include/category.php changed
+File in-portal/kernel/include/config.php changed
+File in-portal/kernel/include/customfield.php changed
+File in-portal/kernel/include/custommetadata.php changed
+File in-portal/kernel/include/emailmessage.php changed
+File in-portal/kernel/include/globals.php changed
+File in-portal/kernel/include/item.php changed
+File in-portal/kernel/include/itemdb.php changed
+File in-portal/kernel/include/language.php changed
+File in-portal/kernel/include/modules.php changed
+File in-portal/kernel/include/parse.php changed
+File in-portal/kernel/include/permissions.php changed
+File in-portal/kernel/include/theme.php changed
+File in-portal/kernel/include/usersession.php changed
+File in-portal/kernel/include/adodb/adodb.inc.php changed
+File in-portal/kernel/include/adodb/drivers/adodb-mysql.inc.php changed
+File in-portal/kernel/units/config_search/config_search_config.php changed
+File in-portal/kernel/units/images/images_config.php changed
+File in-portal/kernel/units/modules/modules_config.php is removed; release_4_0_1 revision 1.7
+File in-portal/kernel/units/modules/modules_event_handler.php is removed; release_4_0_1 revision 1.10
+File in-portal/kernel/units/modules/modules_tag_processor.php is removed; release_4_0_1 revision 1.3
+File in-portal/kernel/units/relationship/relationship_config.php changed
+File in-portal/kernel/units/reviews/reviews_config.php changed
+File in-portal/kernel/units/sections/sections_config.php changed
+File in-portal/kernel/units/selectors/selectors_config.php changed
+File in-portal/kernel/units/statistics/statistics_config.php changed
+File in-portal/kernel/units/stylesheets/stylesheets_config.php changed
+File in-portal/kernel/units/visits/visits_config.php changed
+File kernel.X/core/install.php is new; release_4_1_0 revision 1.9.2.1
+File kernel.X/core/admin_templates/head.tpl changed
+File kernel.X/core/admin_templates/index.tpl changed
+File kernel.X/core/admin_templates/login.tpl changed
+File kernel.X/core/admin_templates/no_permission.tpl changed
+File kernel.X/core/admin_templates/sections_list.tpl changed
+File kernel.X/core/admin_templates/swfupload.swf is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/tree.tpl changed
+File kernel.X/core/admin_templates/config/config_general.tpl changed
+File kernel.X/core/admin_templates/config/config_search.tpl changed
+File kernel.X/core/admin_templates/config/config_search_edit.tpl changed
+File kernel.X/core/admin_templates/config/config_universal.tpl changed
+File kernel.X/core/admin_templates/custom_fields/custom_fields_edit.tpl changed
+File kernel.X/core/admin_templates/emails/send_complete.tpl is new; release_4_1_0 revision 1.1.2.2
+File kernel.X/core/admin_templates/emails/send_queue.tpl is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/img/icons/icon24_conf_themes.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/icons/icon46_conf_themes.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/icons/icon46_list_conf_themes.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_new_theme.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_new_theme_f2.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_new_theme_f3.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_primary_theme.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_primary_theme_f2.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_primary_theme_f3.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_rescan_themes.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_rescan_themes_f2.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/img/toolbar/tool_rescan_themes_f3.gif is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/incs/blocks.tpl changed
+File kernel.X/core/admin_templates/incs/config_blocks.tpl changed
+File kernel.X/core/admin_templates/incs/form_blocks.tpl changed
+File kernel.X/core/admin_templates/incs/grid_blocks.tpl changed
+File kernel.X/core/admin_templates/incs/style.css changed
+File kernel.X/core/admin_templates/js/ajax.js changed
+File kernel.X/core/admin_templates/js/forms.js changed
+File kernel.X/core/admin_templates/js/grid.js changed
+File kernel.X/core/admin_templates/js/script.js changed
+File kernel.X/core/admin_templates/js/swfobject.js is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/js/tree.js changed
+File kernel.X/core/admin_templates/js/uploader.js is new; release_4_1_0 revision 1.2.2.4
+File kernel.X/core/admin_templates/popups/translator.tpl changed
+File kernel.X/core/admin_templates/regional/email_messages_edit.tpl changed
+File kernel.X/core/admin_templates/regional/languages_edit.tpl changed
+File kernel.X/core/admin_templates/regional/languages_export.tpl changed
+File kernel.X/core/admin_templates/regional/languages_export_step2.tpl changed
+File kernel.X/core/admin_templates/regional/languages_import.tpl changed
+File kernel.X/core/admin_templates/regional/languages_import_step2.tpl changed
+File kernel.X/core/admin_templates/regional/languages_list.tpl changed
+File kernel.X/core/admin_templates/regional/phrases_edit.tpl changed
+File kernel.X/core/admin_templates/skins/skin_edit.tpl is new; release_4_1_0 revision 1.1.2.2
+File kernel.X/core/admin_templates/skins/skin_list.tpl is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/themes/themes_edit.tpl is new; release_4_1_0 revision 1.2
+File kernel.X/core/admin_templates/themes/themes_edit_files.tpl is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/themes/themes_edit_tabs.tpl is new; release_4_1_0 revision 1.1
+File kernel.X/core/admin_templates/themes/themes_list.tpl is new; release_4_1_0 revision 1.2
+File kernel.X/core/admin_templates/tools/skins.tpl is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/tools/system_tools.tpl changed
+File kernel.X/core/install/english.lang changed
+File kernel.X/core/install/install_data.sql changed
+File kernel.X/core/install/install_schema.sql changed
+File kernel.X/core/install/upgrades.php changed
+File kernel.X/core/install/upgrades.sql changed
+File kernel.X/core/install/incs/install.tpl changed
+File kernel.X/core/install/incs/style.css changed
+File kernel.X/core/install/step_templates/check_paths.tpl changed
+File kernel.X/core/install/step_templates/choose_modules.tpl changed
+File kernel.X/core/install/step_templates/db_config.tpl changed
+File kernel.X/core/install/step_templates/finish.tpl changed
+File kernel.X/core/install/step_templates/install_setup.tpl changed
+File kernel.X/core/install/step_templates/root_password.tpl changed
+File kernel.X/core/install/step_templates/upgrade_modules.tpl changed
+File kernel.X/core/units/admin/admin_config.php changed
+File kernel.X/core/units/admin/admin_events_handler.php changed
+File kernel.X/core/units/admin/admin_tag_processor.php changed
+File kernel.X/core/units/categories/cache_updater.php changed
+File kernel.X/core/units/categories/categories_config.php changed
+File kernel.X/core/units/category_items/category_items_config.php changed
+File kernel.X/core/units/configuration/configuration_config.php changed
+File kernel.X/core/units/configuration/configuration_tag_processor.php changed
+File kernel.X/core/units/custom_data/custom_data_config.php changed
+File kernel.X/core/units/custom_data/custom_data_event_handler.php changed
+File kernel.X/core/units/custom_fields/custom_fields_config.php changed
+File kernel.X/core/units/custom_fields/custom_fields_event_handler.php changed
+File kernel.X/core/units/custom_fields/custom_fields_tag_processor.php changed
+File kernel.X/core/units/email_events/email_events_config.php changed
+File kernel.X/core/units/email_events/email_events_event_handler.php changed
+File kernel.X/core/units/email_messages/email_messages_config.php changed
+File kernel.X/core/units/general/cat_event_handler.php changed
+File kernel.X/core/units/general/custom_fields.php changed
+File kernel.X/core/units/general/inp1_parser.php changed
+File kernel.X/core/units/general/main_event_handler.php changed
+File kernel.X/core/units/general/xml_helper.php changed
+File kernel.X/core/units/general/helpers/count_helper.php is new; release_4_1_0 revision 1.4
+File kernel.X/core/units/general/helpers/curl_helper.php is new; release_4_1_0 revision 1.1
+File kernel.X/core/units/general/helpers/helpers_config.php changed
+File kernel.X/core/units/general/helpers/mod_rewrite_helper.php changed
+File kernel.X/core/units/general/helpers/modules.php changed
+File kernel.X/core/units/general/helpers/multilanguage.php changed
+File kernel.X/core/units/general/helpers/search_helper.php changed
+File kernel.X/core/units/general/helpers/themes_helper.php changed
+File kernel.X/core/units/groups/groups_config.php changed
+File kernel.X/core/units/languages/import_xml.php changed
+File kernel.X/core/units/languages/languages_config.php changed
+File kernel.X/core/units/languages/languages_event_handler.php changed
+File kernel.X/core/units/modules/modules_config.php changed
+File kernel.X/core/units/permissions/permissions_config.php changed
+File kernel.X/core/units/phrases/phrases_config.php changed
+File kernel.X/core/units/skins/skin_eh.php is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/core/units/skins/skins_config.php is new; release_4_1_0 revision 1.1.2.3
+File kernel.X/core/units/theme_files/theme_files_config.php is new; release_4_1_0 revision 1.1
+File kernel.X/core/units/themes/themes_config.php changed
+File kernel.X/core/units/themes/themes_eh.php is new; release_4_1_0 revision 1.2
+File kernel.X/core/units/user_groups/user_groups_config.php changed
+File kernel.X/core/units/users/users_config.php changed
+File kernel.X/core/units/users/users_event_handler.php changed
+File kernel.X/core/units/users/users_tag_processor.php changed
+File kernel4_dev/kernel4/application.php changed
+File kernel4_dev/kernel4/constants.php changed
+File kernel4_dev/kernel4/event_handler.php changed
+File kernel4_dev/kernel4/event_manager.php changed
+File kernel4_dev/kernel4/globals.php changed
+File kernel4_dev/kernel4/kbase.php changed
+File kernel4_dev/kernel4/startup.php changed
+File kernel4_dev/kernel4/db/db_connection.php changed
+File kernel4_dev/kernel4/db/db_event_handler.php changed
+File kernel4_dev/kernel4/db/db_tag_processor.php changed
+File kernel4_dev/kernel4/db/dbitem.php changed
+File kernel4_dev/kernel4/db/dblist.php changed
+File kernel4_dev/kernel4/languages/phrases_cache.php changed
+File kernel4_dev/kernel4/processors/main_processor.php changed
+File kernel4_dev/kernel4/processors/tag_processor.php changed
+File kernel4_dev/kernel4/session/session.php changed
+File kernel4_dev/kernel4/utility/debugger.php changed
+File kernel4_dev/kernel4/utility/email_send.php changed
+File kernel4_dev/kernel4/utility/event.php changed
+File kernel4_dev/kernel4/utility/filters.php changed
+File kernel4_dev/kernel4/utility/http_query.php changed
+File kernel4_dev/kernel4/utility/temp_handler.php changed
+File kernel4_dev/kernel4/utility/unit_config_reader.php changed
+File kernel4_dev/kernel4/utility/formatters/date_formatter.php changed
+File kernel4_dev/kernel4/utility/formatters/serialized_formatter.php changed
+File kernel4_dev/kernel4/utility/formatters/unit_formatter.php changed
+File kernel4_dev/kernel4/utility/formatters/upload_formatter.php changed
+File kernel.X/system/.cvsignore is new; release_4_1_0 revision 1.3
+File kernel.X/system/dummy is new; release_4_1_0 revision 1.1
+File kernel.X/system/cache/.cvsignore is new; release_4_1_0 revision 1.3
+File kernel.X/system/cache/dummy is new; release_4_1_0 revision 1.1
+File kernel.X/system/tmp/.cvsignore is new; release_4_1_0 revision 1.2.2.1
+File kernel.X/system/user_files/.cvsignore is new; release_4_1_0 revision 1.2.2.1
+File kernel.X/system/user_files/just_logo.gif is new; release_4_1_0 revision 1.1.2.1
+File kernel.X/system/user_files/icons/audio.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/doc.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/excel.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/image.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/pdf.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/ppt.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/video.gif is new; release_4_1_0 revision 1.2
+File kernel.X/system/user_files/icons/xml.gif is new; release_4_1_0 revision 1.2
+File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed
+
+
+Changes in phrases and events:
+
+
+! 	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i:s A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>'</THOUSANDS><CHARSET>iso-8859-1</CHARSET><UNITSYSTEM>2</UNITSYSTEM>
+! 	<LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i:s A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>iso-8859-1</CHARSET><UNITSYSTEM>2</UNITSYSTEM>
Index: trunk/admin/install/lang_default.php
===================================================================
diff -u -N -r315 -r8397
--- trunk/admin/install/lang_default.php	(.../lang_default.php)	(revision 315)
+++ trunk/admin/install/lang_default.php	(.../lang_default.php)	(revision 8397)
@@ -24,7 +24,7 @@
         $checked = "";
     }
 ?>            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php if( isset($ModuleError) ) echo $ModuleError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -N -r7391 -r8397
--- trunk/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 7391)
+++ trunk/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 8397)
@@ -75,7 +75,7 @@
 <input type="hidden" name="trans_prefix" value="<inp2:m_get var="trans_prefix"/>">
 <input type="hidden" name="trans_field" value="<inp2:m_get var="trans_field"/>">
 
-<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
 	<inp2:m_ParseBlock name="inp_edit_hidden" prefix="trans" field="Language"/>
 
 	<inp2:m_ParseBlock name="subsection" title="!la_section_Translation!"/>
Index: trunk/admin/install/fix_paths.php
===================================================================
diff -u -N -r995 -r8397
--- trunk/admin/install/fix_paths.php	(.../fix_paths.php)	(revision 995)
+++ trunk/admin/install/fix_paths.php	(.../fix_paths.php)	(revision 8397)
@@ -30,7 +30,7 @@
             $path_rs->MoveNext();
     }
 ?>				            				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $DomainError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/admin/install/rootpass.php
===================================================================
diff -u -N -r41 -r8397
--- trunk/admin/install/rootpass.php	(.../rootpass.php)	(revision 41)
+++ trunk/admin/install/rootpass.php	(.../rootpass.php)	(revision 8397)
@@ -11,21 +11,21 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 				            	<td class="txt">
 				                <b>Root Password:</b></td>
 				              <td>
 				                <input type="password" name="RootPass" class="text">
 				              </td>		
 				            </tr>	
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 				            	<td class="txt">
 				                <b>Confirm Root Password:</b></td>
 				              <td>
 				                <input type="password" name="RootPassConfirm" class="text">
 				              </td>		
 				            </tr>					                        				            				            
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td colspan="2"><p class="error"><?php echo $PassError; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/admin/install/install_finish.php
===================================================================
diff -u -N -r985 -r8397
--- trunk/admin/install/install_finish.php	(.../install_finish.php)	(revision 985)
+++ trunk/admin/install/install_finish.php	(.../install_finish.php)	(revision 8397)
@@ -11,12 +11,12 @@
 	            <tr valign="top">
 	            	<td width="60%" bgcolor="#F0F0F0">
 	            		<table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
-				            <tr class="table_color2">  
+				            <tr class="table-color2">  
 				              <td class="txt">
 						            In-portal has successfully been installed on your server. Click the button below to log into the site administration using the root password you just configured.
 				              </td>
 				            </tr>
-				            <tr class="table_color2">
+				            <tr class="table-color2">
 				            	<td><p class="error"><?php echo ""; ?></p><br/></td>
 				            </tr>				            				            				            				            				            
 				              <td>
Index: trunk/kernel/admin_templates/no_permission.tpl
===================================================================
diff -u -N -r4834 -r8397
--- trunk/kernel/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 4834)
+++ trunk/kernel/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 8397)
@@ -33,7 +33,7 @@
 </table>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td height="400" valign="middle" align="left">
 			<center><b>No Permission</b></center><br />
 			<inp2:m_if check="m_IsDebugMode">
Index: trunk/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r8364 -r8397
--- trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8364)
+++ trunk/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 8397)
@@ -151,14 +151,26 @@
 				return $ret;
 			}
 
-			$debug_mode = $this->Application->isDebugMode(); // caching for faster performance
+			$debug_mode = $this->Application->isDebugMode();
+			$super_admin_mode = $this->Application->RecallVar('super_admin');
+
 			ksort($section_data['children'], SORT_NUMERIC);
 			foreach ($section_data['children'] as $section_name) {
 				$section_data =& $sections_helper->getSectionData($section_name);
-				if (!$debug_mode && isset($section_data['debug_only']) && $section_data['debug_only']) {
-					// don't show section for debug mode only without debug mode turned on
-					continue;
+
+				if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
+					$show_mode = $section_data['show_mode'];
+					// if super admin section -> show in super admin mode & debug mode
+					$show_section = (($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($super_admin_mode || $debug_mode);
+					if (!$show_section) {
+						// if section is in debug mode only && debug mode -> show
+						$show_section = (($show_mode & smDEBUG) == smDEBUG) && $debug_mode;
+					}
+					if (!$show_section) {
+						continue;
+					}
 				}
+
 				$params['section_name'] = $section_name;
 				$ret .= $this->DrawTree($params);
 				$deep_level--;
@@ -275,7 +287,7 @@
 				$params['section_name'] = $section_name;
 				$section_data =& $sections_helper->getSectionData($section_name);
 
-				if (isset($section_data['show_mode'])) {
+				if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
 					$show_mode = $section_data['show_mode'];
 					// if super admin section -> show in super admin mode & debug mode
 					$show_section = (($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($super_admin_mode || $debug_mode);
@@ -717,23 +729,111 @@
 		 */
 		function MainFrameLink($params)
 		{
-			$last_template = $this->Application->RecallVar('last_template_popup'); // because of m_opener=s there
+			$persistent = isset($params['persistent']) && $params['persistent'];
+			if ($persistent) {
+				// check last_template in persistent session
+				$last_template = $this->Application->RecallPersistentVar('last_template_popup');
+			}
+			else {
+				// check last_template in session
+				$last_template = $this->Application->RecallVar('last_template_popup'); // because of m_opener=s there
+			}
+			
 			if (!$last_template) {
-				return false;
+				$params['persistent'] = 1;
+				return $persistent ? false : $this->MainFrameLink($params);
 			}
 
-			list(, $env) = explode('|', $last_template);
+			list($index_file, $env) = explode('|', $last_template);
 			$vars = $this->Application->HttpQuery->processQueryString($env, 'pass');
-			if ($vars['t'] == 'login' || $vars['t'] == 'index') {
+			$recursion_templates = Array ('login', 'index');
+			
+			if (isset($vars['admin']) && $vars['admin'] == 1) {
+				// index template doesn't begin recursion on front-end (in admin frame)
+				$vars['m_theme'] = '';
+				
+				if (isset($params['m_opener']) && $params['m_opener'] == 'r') {
+					// front-end link for highlighting purposes
+					$vars['t'] = 'index';
+					$vars['m_cat_id'] = $this->Application->findModule('Name', 'Proj-CMS', 'RootCat');
+				}
+				
+				unset($recursion_templates[ array_search('index', $recursion_templates)]);
+			}
+			
+			if (in_array($vars['t'], $recursion_templates)) {
 				// prevents redirect recursion OR old in-portal pages
-				return false;
+				$params['persistent'] = 1;
+				return $persistent ? false : $this->MainFrameLink($params);
 			}
 
 			$vars = array_merge_recursive2($vars, $params);
 			$t = $vars['t'];
 			unset($vars['t']);
+			
+			return $this->Application->HREF($t, '', $vars, $index_file);
+		}
 
-			return $this->Application->HREF($t, '', $vars);
+
+		function AdminSkin($params)
+		{
+			static $style;
+			if (!isset($style)) {
+				$style =  $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Skins WHERE IsPrimary = 1');
+			}
+
+			$css_path = WRITEABLE.'/user_files';
+			$css_url = $this->Application->BaseURL(WRITEBALE_BASE).'user_files/';
+
+			if (isset($params['type']) && $params['type'] == 'logo') {
+				return $style['Logo'] ? $css_url.$style['Logo'] : '';
+			}
+
+			$last_compiled = $style['LastCompiled'];
+
+			$style_name = strtolower( $style['Name'] );
+
+			if( file_exists($css_path.'/'.'admin-'.$style_name.'-'.$last_compiled.'.css') )
+			{
+				$ret = $css_url.'admin-'.$style_name.'-'.$last_compiled.'.css';
+
+			}
+			else
+			{
+				// search for previously compiled stylesheet
+				$last_compiled = 0;
+				if( $dh = opendir($css_path) )
+				{
+					while( ($file = readdir($dh)) !== false )
+					{
+						if( preg_match('/admin-(.*)-([\d]+).css/', $file, $rets) )
+						{
+							if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
+						}
+					}
+					closedir($dh);
+				}
+				if ($last_compiled) {
+					// found
+					$ret = $css_url.'admin-'.$style_name.'-'.$last_compiled.'.css';
+				}
+				else {
+					// not found (try to compile on the fly)
+					$object =& $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true));
+					/* @var $object kDBItem */
+					
+					$skin_eh =& $this->Application->recallObject('skin_EventHandler');
+					/* @var $skin_eh SkinEventHandler */
+					
+					$object->Load(1, 'IsPrimary');
+					$skin_eh->Compile($object);
+					$ret = $css_url.'admin-'.$style_name.'-'.adodb_mktime().'.css';
+				}
+			}
+
+			if (isset($params['file_only'])) return $ret;
+
+			return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
 		}
 	}
 
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r8374 -r8397
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8374)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8397)
@@ -139,24 +139,9 @@
 
 	function FormAction($params)
 	{
-		$pass_category = true;
-		$category_id = $this->Application->GetVar('m_cat_id');
-
-		if ($category_id > 0) {
-			$category = $this->Application->recallObject('c');
-			/* @var $category kDBItem */
-
-			$t = $this->Application->GetVar('t');
-			if (preg_match('/Content\/'.preg_quote($t, '/').'/i', $category->GetDBField('NamedParentPath'))) {
-				// category name matches template name -> Proj-CMS/In-Edit tricks
-				$pass_category = false;
-			}
-		}
-
 		$params['pass'] = 'all,m';
-		if ($pass_category) {
-			$params['pass_category'] = 1;
-		}
+		$params['pass_category'] = 1;
+		
 		return $this->Application->HREF('', '', $params);
 	}
 
@@ -459,9 +444,9 @@
 		// m:phrase name="phrase_name" default="Tr-alala" updated="2004-01-29 12:49"
 		if (array_key_exists('default', $params)) return $params['default']; //backward compatibility
 		$translation = $this->Application->Phrase($this->SelectParam($params, 'label,name,title'));
+		
 		if (getArrayValue($params, 'escape')) {
-			$translation = htmlspecialchars($translation);
-			$translation = str_replace('\'', '&#39;', $translation);
+			$translation = htmlspecialchars($translation, ENT_QUOTES);
 			$translation = addslashes($translation);
 		}
 		return $translation;
@@ -597,7 +582,7 @@
 				$res = '';
 			}
 		}
-			
+
 		$this->Application->Parser =& $parser;
 		$this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists;