Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r5290 -r7287
--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 5290)
+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 7287)
@@ -22,16 +22,16 @@
 							submit_event('selectors','OnCancel');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 							submit_event('selectors','OnResetToBase');
 						}
 				) );
-				
+
 				a_toolbar.Render();
-	
+
 				function ValidateRequired()
 				{
 					var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
@@ -48,20 +48,20 @@
 							$ret = false;
 							break;
 						}
-						$i++;	
+						$i++;
 					}
 					return $ret;
 				}
-				
+
 				function editStyle()
 				{
 					if( ValidateRequired() )
 					{
-						openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
+						openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
 					}
 					else
 					{
-						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );	
+						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
 					}
 				}
 			</script>
@@ -75,16 +75,16 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
 		<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
-		
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
 		<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"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
@@ -107,7 +107,7 @@
 			</td>
 			<td class="error">&nbsp;</td>
 		</tr>
-		
+
 </table>
 <input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.124.2/kernel/action.php
===================================================================
diff -u -r6101 -r7287
--- branches/unlabeled/unlabeled-1.124.2/kernel/action.php	(.../action.php)	(revision 6101)
+++ branches/unlabeled/unlabeled-1.124.2/kernel/action.php	(.../action.php)	(revision 7287)
@@ -1,7 +1,7 @@
 <?php
 
 	$ro_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
-	
+
 	// ====== Debugger related: begin ======
 	$script = basename($_SERVER['PHP_SELF']);
 	$skipDebug = Array('index.php', 'credits.php');
@@ -42,7 +42,7 @@
 						);
 	checkActionPermission($action_mapping, $Action, 1);
 	// permission checking: end
-			
+
 	switch($Action)
 	{
 		case "m_save_import_config":
@@ -140,7 +140,10 @@
 										'Zip'		=>	$_POST['user_zip'],
 										'Status'	=>	$_POST['status'],
 										'CreatedOn'	=>	$CreatedOn,
-										'dob'		=>	$dob
+										'dob'		=>	$dob,
+
+										// customizaton Vana
+										// 'Accredited'	=>	$_POST['accredited_status'],
 								);
 
                 $u =& $objEditItems->Add_User_NEW($fields_hash);
@@ -181,6 +184,9 @@
 									'Fax'		=>	$_POST['user_fax'],
 									'Status'	=>	$_POST['status'],
 									'dob'		=>	$dob,
+
+									// customizaton Vana
+									//'Accredited'	=>	$_POST['accredited_status'],
 							);
 			$u =& $objEditItems->Edit_User_NEW($UserId, $fields_hash);
 			saveCustomFields('u', $u->Get('ResourceId'), 6);
@@ -427,7 +433,7 @@
 	      	}
 	      }
 	      break;
-     
+
       case "m_group_removeuser":
           if($ro_perm) break;
           $objSession->SetVariable("HasChanges", 1);
@@ -499,7 +505,7 @@
 	           $application->StoreVar('refresh_tree', 1);
 	       }
      	break;
-     	
+
      case "m_cat_cut":
      	if($ro_perm) break;
      	if(isset($_POST["catlist"]))
@@ -679,7 +685,7 @@
 	case "m_add_category":
 		$application =& kApplication::Instance();
 		$application->SetVar('c_mode', 't');
-        
+
 		$created_on = GetVar('cat_date');
 		if (ValidDate($created_on, GetDateFormat(0, true))) {
 			$created_on = DateTimestamp($created_on, GetDateFormat(0, true));
@@ -690,7 +696,7 @@
 
 		$objEditItems = new clsCatList();
 		$objEditItems->SourceTable = $objSession->GetEditTable("Category");
-   
+
 		$fields_hash = Array(	'ParentId'						=>	GetVar('ParentId'),
 								$objCatList->TitleField			=>	inp_escape(GetVar('cat_name'), (int)GetVar('html_enable')),
 								$objCatList->DescriptionField	=>	inp_escape(GetVar('cat_desc'), (int)GetVar('html_enable')),
@@ -708,16 +714,16 @@
 								'CategoryTemplate'				=>	GetVar('category_template'),
 								'ItemTemplate'					=>	GetVar('item_template'),
 						);
-						
-        $objSession->SetVariable('PermCache_UpdateRequired', 1); 
+
+        $objSession->SetVariable('PermCache_UpdateRequired', 1);
 		$cat =& $objEditItems->Add_NEW($fields_hash);
 		saveCustomFields('c', $cat->Get('ResourceId'), 1);
 		break;
 
 	case 'm_edit_category':
      	$application =& kApplication::Instance();
         $application->SetVar('c_mode', 't');
-       
+
         $objEditItems = new clsCatList();
         $objEditItems->SourceTable = $objSession->GetEditTable('Category');
 
@@ -730,7 +736,7 @@
 									'Filename'				=>	'filename',
 									'CategoryTemplate'		=>	'category_template',
 									'ItemTemplate'			=>	'item_template');
-									
+
 			foreach ($match_fields as $db_field => $submit_field) {
 				if ($original_cat->Get($db_field) != stripslashes( GetVar($submit_field) )) {
 					$objSession->SetVariable('PermCache_UpdateRequired', 1);
@@ -743,7 +749,7 @@
 			$objSession->SetVariable('PermCache_UpdateRequired', 1);
 		}
 		// check if name of cat isn't changed: end
-		
+
 		$fields_hash = Array(	$objCatList->TitleField			=>	inp_escape(GetVar('cat_name'), (int)GetVar('html_enable')),
 								$objCatList->DescriptionField	=>	inp_escape(GetVar('cat_desc'), (int)GetVar('html_enable')),
 								'CreatedOn'						=>	DateTimestamp(GetVar('cat_date'), GetDateFormat(0, true)),
@@ -760,11 +766,11 @@
 								'CategoryTemplate'				=>	GetVar('category_template'),
 								'ItemTemplate'					=>	GetVar('item_template'),
 						);
-		
+
 		$cat =& $objEditItems->Edit_Category(GetVar('CategoryId'), $fields_hash);
 		saveCustomFields('c', $cat->Get('ResourceId'), 1);
 		break;
-		
+
      case "m_edit_custom_data":
 	     	$resource_id = $_POST['ItemId'];
 			$db =& GetADODBConnection(true);
@@ -773,18 +779,18 @@
         			WHERE ItemType = '.GetVar('CustomType');
         	$main_prefix = $db->GetOne($sql);
         	$application->SetVar($main_prefix.'_mode', 't');
-	     	
+
         	saveCustomFields($main_prefix, $resource_id, $_POST['CustomType']);
 			break;
 
-			
+
 	case 'm_save_custom_data':
 		$main_prefix = $application->GetVar('prefix');
      	$application->SetVar($main_prefix.'_mode', 't');
 		$event = new kEvent($main_prefix.':OnUpdate');
      	$application->HandleEvent($event);
 		break;
-     		
+
      case "m_keyword_reset":
          if($ro_perm) break;
          $objSearchList = new clsSearchLogList();
@@ -1133,7 +1139,7 @@
 			$dummy->Delete();
 		}
      	break;
-     	
+
      case "m_lang_select":
         if($ro_perm) break;
      	$LangId = (int)$_POST["langselect"];
@@ -1229,12 +1235,12 @@
         }
         unset($objPhraseList);
      break;
-    
+
      case "m_dlid":
          echo $Action.":".$DownloadId;
          die();
      break;
-     
+
      case "m_emailevent_user":
          if($ro_perm) break;
          $objEvents = new clsEventList();
@@ -1283,7 +1289,7 @@
              $m->Update();
          }
      break;
-     
+
      case "m_mod_enable":
         if($ro_perm) break;
          if (isset($_POST["itemlist"]))
@@ -1741,12 +1747,12 @@
     		$SqlErrorNum = $ado->ErrorNo();
     	}
     break;
-    
+
 	case 'm_purge_email_log':
  		$conn =& $application->GetADODBConnection();
 		$conn->Query('DELETE FROM '.TABLE_PREFIX.'EmailLog');
 		break;
-		
+
     case "m_session_delete":
 	 	 if($ro_perm) break;
 	 	 $ado = &GetADODBConnection();
@@ -1764,7 +1770,7 @@
       		$ado->Execute($sql);
          }
     break;
-    
+
     case "m_add_rule":
     	$objEditItems = new clsBanRuleList();
     	$objEditItems->SourceTable = $objSession->GetEditTable("BanRules");
@@ -1943,7 +1949,7 @@
 				$objCustomDataList->CopyFromEditTable('c');
 			}
 		    $objCatList->Clear();
-	    
+
 	    	$objImages = new clsImageList();
 	    	$objImages->CopyFromEditTable("ImageId");
 		}
Index: branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php
===================================================================
diff -u -r5439 -r7287
--- branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php	(.../adduser.php)	(revision 5439)
+++ branches/unlabeled/unlabeled-1.26.2/admin/users/adduser.php	(.../adduser.php)	(revision 7287)
@@ -1,12 +1,12 @@
-<?php 
+<?php
 ##############################################################
 ##In-portal													##
 ##############################################################
 ##					      In-portal							##
 ##					Intechnic Corporation					##
 ##			   All Rights Reserved, 1998-2002				##
-##															##	
-##	No portion of this code may be copied, reproduced or	##	
+##															##
+##	No portion of this code may be copied, reproduced or	##
 ##	   otherwise redistributed without proper written		##
 ##	  consent of Intechnic Corporation.  Violation will		##
 ##	   result in revocation of the license and support		##
@@ -21,9 +21,9 @@
 // new startup: end
 checkViewPermission('in-portal:user_list');
 
-require_once ($pathtoroot.$admin."/include/elements.php"); 
-require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
-//require_once ($pathtolocal."admin/include/navmenu.php"); 
+require_once ($pathtoroot.$admin."/include/elements.php");
+require_once ($pathtoroot."kernel/admin/include/navmenu.php");
+//require_once ($pathtolocal."admin/include/navmenu.php");
 require_once($pathtoroot.$admin."/toolbar.php");
 
 unset($objEditItems);
@@ -47,27 +47,27 @@
     $objUsers->CreateEmptyEditTable("PortalUserId");
     $objRelList->CreateEmptyEditTable("RelationshipId");
     $objCustomDataList->CreateEmptyEditTable('u');
-    $objImages->CreateEmptyEditTable("ResourceId");  
+    $objImages->CreateEmptyEditTable("ResourceId");
     $objUserGroupsList->CreateEmptyEditTable("PortalUserId");
-    
+
     $objItemTypes->BuildUserItemTable(-1, 1); // 0 - user_id, 1 - clear table
 }
 else
-{   
+{
 	$direct_id = GetVar('direct_id');
 	if($direct_id) $_POST['itemlist'] = Array($direct_id);
-	
+
 	$en = GetVar('en');
     if (isset($_POST["itemlist"]))
-    {         
-        $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);                
-    }   
+    {
+        $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);
+    }
     $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
     $first=1;
     foreach($objEditItems->Items as $u)
     {
-        $objItemTypes->BuildUserItemTable($u->Get("PortalUserId"),$first);            
-        $first=0;        
+        $objItemTypes->BuildUserItemTable($u->Get("PortalUserId"),$first);
+        $first=0;
     }
 
     if(isset($_POST["itemlist"]))
@@ -86,24 +86,24 @@
     $c = $objEditItems->GetItemByIndex($en);
 
     if($itemcount>1)
-    {    
+    {
 	  if ($en+1 == $itemcount)
 		$en_next = -1;
 	  else
 		$en_next = $en+1;
-	
+
 	  if ($en == 0)
 		$en_prev = -1;
 	  else
-		$en_prev = $en-1;	
+		$en_prev = $en-1;
     }
     $action = "m_edit_user";
 }
 
 $envar = "env=" . BuildEnv() . "&en=$en";
-	
-$section = 'in-portal:edituser_general'; 
 
+$section = 'in-portal:edituser_general';
+
 if (strlen($c->Get("Login")))
 	$editing_title = "'".$c->Get("Login")."' ";
 else
@@ -123,10 +123,10 @@
 
 if ( isset($en_prev) || isset($en_next) )
 {
-  $url = $RootUrl.$admin."/users/adduser.php"; 
+  $url = $RootUrl.$admin."/users/adduser.php";
   $StatusField = "UserEditStatus";
   $form = "edituser";
-  MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');  
+  MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');
 }
 
 int_header($objCatToolBar,NULL,$title);
@@ -140,149 +140,149 @@
     </td>
   </tr>
 </table>
-<?php } ?> 
+<?php } ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-<form ID="edituser" name="edituser" action="" method=POST>	 
-  
+<form ID="edituser" name="edituser" action="" method=POST>
+
   <?php int_subsection_title(prompt_language("la_Text_User")); ?>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_login" class="text"><?php echo prompt_language("la_prompt_Usermame"); ?></span></td>
-    <td> 
+    <td>
       <input type="text" tabindex="1" name="user_login" ID="user_login" class="text" ValidationType="exists" size="20" value="<?php echo isset($dupe_user) && $dupe_user ? $dupe_user : $c->parsetag("user_login"); ?>">
       <span class="validation_error"><?php if( isset($dupe_user) && $dupe_user ) echo admin_language($lvErrorString); ?></span>
     </td>
     <td></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span ID="prompt_password" class="text"><?php echo prompt_language("la_prompt_Password"); ?></span></td>
-    <td> 
+    <td>
       <input type="password" id="password" tabindex="2" name="password" class="text" ValidationType="password" size="20" value="">
       <?php if( !GetVar('new') ) echo prompt_language("la_password_info"); ?>
-    </td>     
+    </td>
     <td></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span ID="prompt_password_verify" class="text"><?php echo prompt_language("la_prompt_PasswordRepeat"); ?></span></td>
-    <td> 
+    <td>
      <input type="password" id="password_verify" tabindex="4" name="password_verify" class="text" size="20" value="">
     </td>
     <td></td>
   </tr>
 
   <?php int_subsection_title(prompt_language("la_prompt_PersonalInfo")); ?>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_firstname" class="text"><?php echo prompt_language("la_prompt_FirstName"); ?></span></td>
-    <td> 
+    <td>
       <input type="text" name="user_firstname" class="text" tabindex="5" size="30" value="<?php echo $c->parsetag("user_firstname"); ?>">
     </td>
     <td></td>
   </tr>
-  
-	<tr <?php int_table_color(); ?>> 
+
+	<tr <?php int_table_color(); ?>>
     	<td valign="top">
     		<span id="prompt_user_lastname" class="text"><?php echo prompt_language("la_prompt_LastName"); ?></span>
     	</td>
-    	<td> 
+    	<td>
      		<input type="text" name="user_lastname" class="text" tabindex="6" size="30" value="<?php echo $c->parsetag("user_lastname"); ?>">
     	</td>
     	<td></td>
   	</tr>
-  	
-  	<tr <?php int_table_color(); ?>> 
+
+  	<tr <?php int_table_color(); ?>>
     	<td valign="top">
     		<span id="prompt_user_company" class="text"><?php echo prompt_language("la_fld_Company"); ?></span>
     	</td>
-    	<td> 
+    	<td>
      		<input type="text" name="user_company" class="text" tabindex="7" size="30" value="<?php echo inp_htmlize($c->Get('Company')); ?>">
     	</td>
     	<td></td>
   	</tr>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span ID="prompt_user_email" class="text"><?php echo prompt_language("la_prompt_Email"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" ValidationType="exists" name="user_email" tabindex="8" ID="user_email" class="text" size="30" value="<?php echo $c->parsetag("user_email"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><SPAN id="prompt_user_dob" class="text"><?php echo prompt_language("la_prompt_birthday"); ?></SPAN></td>
-    <td> 
-      <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">            
+    <td>
+      <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
     <td></td>
   </tr>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_phone" class="text"><?php echo prompt_language("la_prompt_Phone"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_phone" tabindex="10" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Phone')); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-  
-	<tr <?php int_table_color(); ?>> 
+
+	<tr <?php int_table_color(); ?>>
     	<td valign="top">
     		<span id="prompt_user_fax" class="text"><?php echo prompt_language("la_fld_Fax"); ?></span>
     	</td>
-    	<td> 
+    	<td>
      		<input type="text" name="user_fax" tabindex="11" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Fax')); ?>">
     	</td>
     	<td>
     		<span class="text">&nbsp;</span>
     	</td>
 	</tr>
 
-	<tr <?php int_table_color(); ?>> 
+	<tr <?php int_table_color(); ?>>
 		<td valign="top">
 			<span id="prompt_user_street" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 1</span>
 		</td>
-		<td> 
+		<td>
      		<input type="text" name="user_street" tabindex="12" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street')); ?>">
     	</td>
     	<td>
     		<span class="text">&nbsp;</span>
     	</td>
   	</tr>
-  	
-  	<tr <?php int_table_color(); ?>> 
+
+  	<tr <?php int_table_color(); ?>>
 		<td valign="top">
 			<span id="prompt_user_street2" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 2</span>
 		</td>
-		<td> 
+		<td>
      		<input type="text" name="user_street2" tabindex="13" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street2')); ?>">
     	</td>
     	<td>
     		<span class="text">&nbsp;</span>
     	</td>
   	</tr>
-  
-  <tr <?php int_table_color(); ?>> 
+
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_city" class="text"><?php echo prompt_language("la_prompt_City"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_city" class="text" tabindex="14" size="30" value="<?php echo $c->parsetag("user_city"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-    <tr <?php int_table_color(); ?>> 
+    <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_state" class="text"><?php echo prompt_language("la_prompt_State"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_state" class="text" tabindex="15" size="20" value="<?php echo $c->parsetag("user_state"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_zip" class="text"><?php echo prompt_language("la_prompt_Zip"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_zip" class="text" size="6" tabindex="16" value="<?php echo $c->parsetag("user_zip"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-    <tr <?php int_table_color(); ?>> 
+    <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_country" class="text"><?php echo prompt_language("la_prompt_Country"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_country" class="text" tabindex="17" size="30" value="<?php echo $c->parsetag("user_country"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
@@ -297,33 +297,35 @@
      </td>
     <td class="text">&nbsp;</td>
   </tr>
+
+
   <!-- User: CreatedOn: begin -->
- <tr <?php int_table_color(); ?>> 
+ <tr <?php int_table_color(); ?>>
     <td valign="top"><SPAN id="prompt_user_date" class="text"><?php echo prompt_language("la_prompt_CreatedOn"); ?></SPAN></td>
-    <td> 
-      <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">            
+    <td>
+      <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
     <td></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><SPAN id="prompt_user_time" class="text"><?php echo prompt_language("la_prompt_CreatedOn_Time"); ?></SPAN></td>
-    <td> 
+    <td>
       <input type="text" name="user_time" tabindex="20" class="text" size="20" value="<?php echo $c->parsetag("user_time"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_TimeFormat"); ?></span></td>
     <td></td>
   </tr>
   <!-- User: CreatedOn: end -->
-  
+
 <?php
 
 $CustomFieldUI = $objCustomFields->GetFieldUIList(TRUE); // get custom fields to show on general tab
 if($CustomFieldUI->NumItems()>0)
 {
   $objCustomDataList->SetTable('edit');
-  
+
   if((int)$c->Get("ResourceId")>0)
 	$objCustomDataList->LoadResource($c->Get("ResourceId"));
-	
+
   $headings = $CustomFieldUI->GetHeadingList();
   // draw headings
   for($i = 0; $i < count($headings); $i++)
@@ -340,13 +342,13 @@
         	if (is_object($cfield)) {
 				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
-            print "<tr ".int_table_color_ret().">\n"; 
+            print "<tr ".int_table_color_ret().">\n";
             print "  <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
-            
-            print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";       
+
+            print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";
             if (is_object($f->NextItem)) {
                 $n = $f->NextItem;
-                print "  <td>".$n->ItemFormElement(17)."</TD>";       
+                print "  <td>".$n->ItemFormElement(17)."</TD>";
             }
             else {
               	print "  <td><span class=\"text\">&nbsp;</span></td>\n";
@@ -367,8 +369,8 @@
 <SCRIPT language="JavaScript">
     initCalendar("user_date_selector", CalDateFormat);
     initCalendar("user_dob_selector", CalDateFormat);
-</SCRIPT> 
-<?php 
+</SCRIPT>
+<?php
 	MarkFields('edituser');
-	int_footer(); 
+	int_footer();
 ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php
===================================================================
diff -u -r7008 -r7287
--- branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php	(.../debug_sample.php)	(revision 7008)
+++ branches/unlabeled/unlabeled-1.13.2/tools/debug_sample.php	(.../debug_sample.php)	(revision 7287)
@@ -3,58 +3,59 @@
 //	define('SILENT_LOG', 1);					// Log all php errors on site to separate file (/silent_log.txt)
 //	define('DBG_REQUREST_LOG', '/path/to/file');// Log all user requests to site into filename specified
 //	define('DBG_SITE_PATH', '/relative_path/');	// set alternative BASE_PATH for old in-portal parts (where no K4 included)
-//		define('DBG_ZEND_PRESENT',0);			// Set to 0 to debug debugger (because debugger automatically got disabled during zend debug sessions)
+//	define('DBG_ZEND_PRESENT',0);			// Set to 0 to debug debugger (because debugger automatically got disabled during zend debug sessions)
 
 	$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)
 							'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)
-		
+
 //							'DBG_USE_HIGHLIGHT'		=>	0,				// Use "highlight_string" php function for debugger output formatting
 //							'DBG_RAISE_ON_WARNINGS'	=>	1,				// Show debugger output in case of any non-fatal error
 							'DBG_SQL_PROFILE'		=>	1,				// Profile SQL queries
 							'DBG_SQL_FAILURE'		=>	defined('IS_INSTALL') && IS_INSTALL ? 0 : 1,	// treat sql errors as fatal errors except for installation process
-							
+
 							'DBG_SHOW_HTTPQUERY'	=>	1,				// Show http query content (parsed user submit, GPC)
 							'DBG_SHOW_SESSIONDATA'	=>	1,				// Show session data (at script finish)
-							
+
 							'DBG_EDIT_HELP'			=>	1,				// Show help filename on help screen
 //							'DBG_HELP'				=>	1,				// Show FCK editor when viewing help screen
-							
+
 //							'DBG_FORCE_THEME'		=>	1,				// Use this theme_id instead of one in url
 							'DBG_PHRASES'			=>	1,				// Add ability to translate phrases on the fly (K4 templates only)
 //							'DBG_WINDOW_WIDTH'		=>	700,			// Set custom debugger layer width (in pixels)
-							
+
 //							'DBG_REDIRECT'			=>	1,				// Show links with redirect url instead of performing it (useful in events debugging)
 
 //							'DBG_VALIDATE_CONFIGS'	=>	1,				// Check that config fields match ones from database
 //							'DBG_SHOW_TAGS'			=>	1,				// Show tags beeing processed
 					);
-		
-		
+
+
 		// for ADODB to work: begin
 		define('ADODB_OUTP', 'dbg_SQLLog');
 		function dbg_SQLLog($msg, $new_line = false) { }
 		// for ADODB to work: end
-		
 
+
 		function isSkipTable($sql)
 		{
 //		return false;
-		
+
 			// don't show sqls that use one or more tables from list below
 			static $skipTables = Array(	'PermissionConfig','SessionData','Permissions',
 									'Phrase','Cache','Modules','Events',
 										'PersistantSessionData','EmailQueue','UserSession',
 										'ThemeFiles', 'Language','ConfigurationValues');
-			
+
 			foreach ($skipTables as $table) {
 			if( dbg_tableMatch($table, $sql) ) {
 					return true;
 				}
 			}
-		
+
 			return false;
 		}
 
@@ -64,5 +65,5 @@
 			$prefix = defined('TABLE_PREFIX')?TABLE_PREFIX:GetTablePrefix();
 			return strpos($sql,$prefix.$table_name)!==false;
 		}
-	
+
 ?>
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -r5290 -r7287
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 5290)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 7287)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" icon="icon46_style" title="!la_title_Stylesheets!"/>
 
-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="block_styles" module="in-portal" icon="icon46_style"/>
 
@@ -23,9 +23,9 @@
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
-				
+
 				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('css', '<inp2:css_PrevId/>');
 						}
@@ -34,58 +34,58 @@
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBlockStyle" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[selectors.block]',1);
-							std_new_item('selectors.block', 'stylesheets/block_style_edit') 
+							std_new_item('selectors.block', 'in-portal/stylesheets/block_style_edit')
 						} ) );
-										
+
 				function edit()
 	  			{
 	  				set_hidden_field('remove_specials[selectors.block]',1);
-	  				std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit');
+	  				std_edit_temp_item('selectors.block', 'in-portal/stylesheets/block_style_edit');
 	  			}
-						
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('selectors.block')
 						} ) );
-				
-						
+
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.block]',1);
 						submit_event('selectors.block','OnMassClone');
 						}
 				) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.block]',1);
 						submit_event('selectors.block','OnMassResetToBase');
 						}
 				) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-				 
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-					
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="css" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="css" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
===================================================================
diff -u -r7083 -r7287
--- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7083)
+++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7287)
@@ -2136,26 +2136,54 @@
 		return $current_prefix;
 	}
 
+	/**
+	 * Triggers email event of type Admin
+	 *
+	 * @param string $email_event_name
+	 * @param int $to_user_id
+	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
+	 * @return unknown
+	 */
 	function &EmailEventAdmin($email_event_name, $to_user_id = -1, $send_params = false)
 	{
 		return $this->EmailEvent($email_event_name, 1, $to_user_id, $send_params);
 	}
 
+	/**
+	 * Triggers email event of type User
+	 *
+	 * @param string $email_event_name
+	 * @param int $to_user_id
+	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
+	 * @return unknown
+	 */
 	function &EmailEventUser($email_event_name, $to_user_id = -1, $send_params = false)
 	{
 		return $this->EmailEvent($email_event_name, 0, $to_user_id, $send_params);
 	}
 
+	/**
+	 * Triggers general email event
+	 *
+	 * @param string $email_event_name
+	 * @param int $email_event_type ( 0 for User, 1 for Admin)
+	 * @param int $to_user_id
+	 * @param array $send_params associative array of direct send params,
+	 *  possible keys: to_email, to_name, from_email, from_name, message, message_text
+	 * @return unknown
+	 */
 	function &EmailEvent($email_event_name, $email_event_type, $to_user_id = -1, $send_params = false)
 	{
-		$event = new kEvent('emailevents:OnEmailEvent');
-		$event->setEventParam('EmailEventName', $email_event_name);
-		$event->setEventParam('EmailEventToUserId', $to_user_id);
-		$event->setEventParam('EmailEventType', $email_event_type);
-		if ($send_params){
-			$event->setEventParam('DirectSendParams', $send_params);
+		$params = array(
+			'EmailEventName' => $email_event_name,
+			'EmailEventToUserId' => $to_user_id,
+			'EmailEventType' => $email_event_type,
+		);
+		if ($send_params) {
+			$params['DirectSendParams'] = $send_params;
 		}
-		$this->HandleEvent($event);
+		$event_str = isset($send_params['use_special']) ? 'emailevents.'.$send_params['use_special'].':OnEmailEvent' : 'emailevents:OnEmailEvent';
+		$this->HandleEvent($event, $event_str, $params);
 
 		return $event;
 	}
Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -r5290 -r7287
--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 5290)
+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 7287)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" icon="icon46_style" title="!la_title_Stylesheets!"/>
 
-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="block_styles" module="in-portal" icon="icon46_style"/>
 
@@ -23,9 +23,9 @@
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
-				
+
 				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('css', '<inp2:css_PrevId/>');
 						}
@@ -34,58 +34,58 @@
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBlockStyle" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[selectors.block]',1);
-							std_new_item('selectors.block', 'stylesheets/block_style_edit') 
+							std_new_item('selectors.block', 'in-portal/stylesheets/block_style_edit')
 						} ) );
-										
+
 				function edit()
 	  			{
 	  				set_hidden_field('remove_specials[selectors.block]',1);
-	  				std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit');
+	  				std_edit_temp_item('selectors.block', 'in-portal/stylesheets/block_style_edit');
 	  			}
-						
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('selectors.block')
 						} ) );
-				
-						
+
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.block]',1);
 						submit_event('selectors.block','OnMassClone');
 						}
 				) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.block]',1);
 						submit_event('selectors.block','OnMassResetToBase');
 						}
 				) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-				 
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-					
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="css" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="css" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r7015 -r7287
--- branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 7015)
+++ branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 7287)
@@ -34,7 +34,7 @@
 		if ($this->Prefix != 'c') {
 			return parent::ItemIcon($params);
 		}
-		
+
 		$object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
 		$status = $object->GetDBField('Status');
 		if($status == 1)
@@ -291,7 +291,7 @@
 		}
 		else {
 			return false;
-		}		
+		}
 	}
 
 	/**
@@ -391,7 +391,7 @@
 			parent::SaveWarning($params);
 			return ;
 		}
-		
+
 		$main_prefix = getArrayValue($params, 'main_prefix');
 		if ($main_prefix && $main_prefix != '$main_prefix') {
 			$top_prefix = $main_prefix;
Index: branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php
===================================================================
diff -u -r6108 -r7287
--- branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php	(.../user_list.php)	(revision 6108)
+++ branches/unlabeled/unlabeled-1.19.2/admin/users/user_list.php	(.../user_list.php)	(revision 7287)
@@ -5,8 +5,8 @@
 ##					      In-portal							##
 ##					Intechnic Corporation					##
 ##			   All Rights Reserved, 1998-2002				##
-##															##	
-##	No portion of this code may be copied, reproduced or	##	
+##															##
+##	No portion of this code may be copied, reproduced or	##
 ##	   otherwise redistributed without proper written		##
 ##	  consent of Intechnic Corporation.  Violation will		##
 ##	   result in revocation of the license and support		##
@@ -38,8 +38,8 @@
 $objSession->SetVariable('ReturnScript', 'users/'.basename($_SERVER['PHP_SELF']) );
 
 /* -------------------------------------- Section configuration ------------------------------------------- */
-$section = 'in-portal:user_list'; 
-$envar = "env=" . BuildEnv(); 
+$section = 'in-portal:user_list';
+$envar = "env=" . BuildEnv();
 
 $SortFieldVar = "User_SortField";
 $SortOrderVar = "User_SortOrder";
@@ -59,7 +59,7 @@
 $objListToolBar->Set("load_menu_func","");
 $objListToolBar->Set("CheckClass",$CheckClass);
 $objListToolBar->Set("CheckForm",$ListForm);
-  
+
 $listImages = array();
                     //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick
 
@@ -98,6 +98,9 @@
                     "tool_deny.gif",FALSE,TRUE);
 $listImages[] = "UserChecks.addImage('user_ban','$imagesURL/toolbar/tool_ban_user.gif','$imagesURL/toolbar/tool_ban_user_f3.gif',1); ";
 
+
+
+
 $objListToolBar->Add("divider");
 
 $objListToolBar->Add("user_mail","la_ToolTip_SendMail","#", "if (UserChecks.itemChecked()) swap('user_mail','toolbar/tool_e-mail_f2.gif');",
@@ -133,7 +136,7 @@
 $UserView = $objConfig->Get("User_View");
 
 if(!is_numeric($UserView))
-{   
+{
    $UserView = $Bit_All; //Set all bits ON
    $UserFilter = "";
 }
@@ -147,7 +150,7 @@
       $Status[] = 2;
 
   if(count($Status)>0)
-  {  
+  {
     $UserFilter = "Status IN (".implode(",",$Status).")";
   }
   else
@@ -167,7 +170,7 @@
 if(strlen($UserFilter))
   $where .= " AND (".$UserFilter.")";
 
-  
+
 /* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/
 
 $sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
@@ -183,15 +186,15 @@
 if(strlen($orderBy))
     $sql .=" ORDER BY ".$orderBy;
 
-if( GetVar('resetpage') )    
+if( GetVar('resetpage') )
 {
   $page = 1;
   $objSession->SetVariable($CurrentPageVar,1);
 }
 else
-{  
+{
   if( GetVar('lpn') )
-  {    
+  {
     $page = GetVar('lpn');
     $objSession->SetVariable($CurrentPageVar, $page);
   }
@@ -223,8 +226,8 @@
     }
 else
   $title = prompt_language("la_Text_ShowingUsers")." (".$itemcount.")";
-  
- $objListView->SetListItems($objUsers); 
+
+ $objListView->SetListItems($objUsers);
 /* ---------------------------------------- Configure the list view ---------------------------------------- */
 
 $objListView->IdField = "ResourceId";
@@ -252,8 +255,8 @@
   foreach($FilterLabels as $Bit=>$Label)
   {
   	$objListView->AddViewMenuFilter($Label,$Bit);
-  }		
-  
+  }
+
 for($i=0;$i<count($objUsers->Items);$i++)
 {
     $u =& $objUsers->GetItemRefByIndex($i);
@@ -264,7 +267,7 @@
 $filter = false; // always initialize variables before use
 if($objSession->GetVariable("UserSearchWord") != '') {
 	$filter = true;
-} 
+}
 else {
 	if ($UserView != $Bit_All) {
 		$filter = true;
@@ -304,15 +307,17 @@
     <INPUT TYPE="hidden" NAME="grouplist">
     <input TYPE="hidden" NAME="Action" VALUE="m_user_primarygroup">
     <input type="hidden" NAME="userlist">
-</FORM>    
+</FORM>
 <FORM ID="ListSearchForm" NAME="ListSearchForm" method="POST" action="<?php echo $_SERVER["PHP_SELF"]."?env=".BuildEnv(); ?>">
    <INPUT TYPE="HIDDEN" NAME="Action" VALUE="">
    <INPUT TYPE="HIDDEN" NAME="list_search">
 </FORM>
 <script src="<?php echo $adminURL; ?>/listview/listview.js"></script>
 <script>
   initSelectiorContainers();
-<?php echo $objListToolBar->Get("CheckClass").".setImages();"; ?> 
+<?php echo $objListToolBar->Get("CheckClass").".setImages();"; ?>
+
+
 </script>
 
 <!-- END CODE-->
Index: branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl
===================================================================
diff -u -r6146 -r7287
--- branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 6146)
+++ branches/unlabeled/unlabeled-1.8.2/core/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 7287)
@@ -15,47 +15,47 @@
   			//do not rename - this function is used in default grid for double click!
   			function edit()
   			{
-  				std_edit_item('css', 'stylesheets/stylesheets_edit');
+  				std_edit_item('css', 'in-portal/stylesheets/stylesheets_edit');
   			}
-  		
+
   			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('new_style', '<inp2:m_phrase label="la_ToolTip_NewStylesheet" escape="1"/>',
 						function() {
-							std_precreate_item('css', 'stylesheets/stylesheets_edit')
+							std_precreate_item('css', 'in-portal/stylesheets/stylesheets_edit')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('css')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('css','OnMassApprove');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('css','OnMassDecline');
 						}
-				 ) ); 
-				
+				 ) );
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						submit_event('css','OnMassClone');
 						}
 				 ) );
-				 		
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				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>
Index: branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r7031 -r7287
--- branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 7031)
+++ branches/unlabeled/unlabeled-1.27.2/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 7287)
@@ -179,7 +179,7 @@
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" style="border-top-width: 0px;">
 	<tr bgcolor="#e0e0da" height="20">
-		<td width="100%" valign="middle">
+		<td valign="middle">
 			<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
 		</td>
 		<td align="right" class="search-cell">
Index: branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql
===================================================================
diff -u -r7051 -r7287
--- branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 7051)
+++ branches/unlabeled/unlabeled-1.73.2/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 7287)
@@ -226,4 +226,4 @@
 
 INSERT INTO Stylesheets VALUES (8, 'Default', 'In-Portal Default Theme', '', 1124952555, 1);
 
-INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.3.2', 1, 0, '', 0, '1054738405');
\ No newline at end of file
+INSERT INTO Modules (Name, Path, Var, Version, Loaded, LoadOrder, TemplatePath, RootCat, BuildDate) VALUES ('In-Portal', 'kernel/', 'm', '1.4.0', 1, 0, '', 0, '1054738405');
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl
===================================================================
diff -u -r6146 -r7287
--- branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 6146)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 7287)
@@ -15,47 +15,47 @@
   			//do not rename - this function is used in default grid for double click!
   			function edit()
   			{
-  				std_edit_item('css', 'stylesheets/stylesheets_edit');
+  				std_edit_item('css', 'in-portal/stylesheets/stylesheets_edit');
   			}
-  		
+
   			var a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('new_style', '<inp2:m_phrase label="la_ToolTip_NewStylesheet" escape="1"/>',
 						function() {
-							std_precreate_item('css', 'stylesheets/stylesheets_edit')
+							std_precreate_item('css', 'in-portal/stylesheets/stylesheets_edit')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('css')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('css','OnMassApprove');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('css','OnMassDecline');
 						}
-				 ) ); 
-				
+				 ) );
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						submit_event('css','OnMassClone');
 						}
 				 ) );
-				 		
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				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>
Index: branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php
===================================================================
diff -u -r6146 -r7287
--- branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php	(.../step2.php)	(revision 6146)
+++ branches/unlabeled/unlabeled-1.8.2/admin/import/step2.php	(.../step2.php)	(revision 7287)
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 // new startup: begin
 define('REL_PATH', 'admin/import');
@@ -15,24 +15,24 @@
 require_once($pathtoroot.$admin."/toolbar.php");
 	//Set Section
 	$section = "in-portal:main_import";
-	
+
 	//Set Environment Variable
 	$envar = "env=" . BuildEnv();
 	$var = '?env='.BuildEnv();
-	
+
 	$sec = $objSections->GetSection($section);
 	$objCatToolBar = new clsToolBar();
-   	
+
    	// Previous Button
 	$MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
 	$MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');";
 	$link = $adminURL.'/import/step1.php'.$var;
 	$objCatToolBar->Add('moveleft','la_ToolTip_PreviousStep', $link, $MouseOver, $MouseOut,'','tool_prev.gif');
-	
+
 	// Next Button
 	$MouseOver = "if( ChoiseMade('import_form','choose') !== false ) swap('moveright','toolbar/tool_next_f2.gif');";
 	$MouseOut = "if( ChoiseMade('import_form','choose') !== false ) swap('moveright', 'toolbar/tool_next.gif');";
-	
+
 	if($ro_perm)
 	{
 		$click_url = $adminURL."/import/step1.php".$var;
@@ -41,24 +41,24 @@
 	else
 	{
 		$application =& kApplication::Instance();
-		$click_url = $application->HREF('import_redirect', '', null, 'index.php'); //  $adminURL."/import/step3.php".$var;
+		$click_url = $application->HREF('in-portal/import_redirect', '', null, 'index.php'); //  $adminURL."/import/step3.php".$var;
 		$onClick = "ImportRedirect('import_form', ChoiseMade('import_form','choose'), '$click_url');";
 	}
 	$objCatToolBar->Add("moveright",'la_ToolTip_NextStep','#',$MouseOver,$MouseOut,$onClick,"tool_next_f3.gif");
-	
+
 	// header
 	$title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 2";
   	int_header($objCatToolBar,NULL,$title);
-  	
+
 	$objSession->SetVariable("ReturnScript", 'browse.php'); // return to catalog if import is made
-	
+
 ?>
 <form name="import_form" id="import_form" method="post" action="<?php echo $click_url; ?>">
 	<input type="hidden" name="import_id" id="import_id" value="">
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 
 	<?php int_subsection_title("Import Source"); ?>
- 	<tr <?php echo int_table_color(); ?>> 
+ 	<tr <?php echo int_table_color(); ?>>
     	<td><span class="text">Select the program you are importing the data from:</span></td>
  	</tr>
  	<tr <?php echo int_table_color(); ?>>
Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r5290 -r7287
--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 5290)
+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 7287)
@@ -22,9 +22,9 @@
 							submit_event('selectors','OnCancel');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
-	
+
 				function ValidateRequired()
 				{
 					var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
@@ -41,20 +41,20 @@
 							$ret = false;
 							break;
 						}
-						$i++;	
+						$i++;
 					}
 					return $ret;
 				}
-				
+
 				function editStyle()
 				{
 					if( ValidateRequired() )
 					{
-						openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
+						openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
 					}
 					else
 					{
-						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );	
+						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
 					}
 				}
 			</script>
@@ -68,13 +68,13 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
 		<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="1">
-		
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
 		<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"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
@@ -97,7 +97,7 @@
 			</td>
 			<td class="error">&nbsp;</td>
 		</tr>
-		
+
 </table>
 <input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -r5450 -r7287
--- branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 7287)
@@ -1,13 +1,13 @@
 <?php
-	
+
 $config	=	Array(
 					'Prefix'			=>	'css',
 					'ItemClass'			=>	Array('class'=>'StylesheetsItem','file'=>'stylesheets_item.php','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'StylesheetsEventHandler','file'=>'stylesheets_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
-					'Hooks'	=>	Array( 
+					'Hooks'	=>	Array(
 												Array(
 													'Mode' => hAFTER,
 													'Conditional' => false,
@@ -26,81 +26,81 @@
 												4	=>	'mode',
 											),
 					'IDField'			=>	'StylesheetId',
-					
+
 					'StatusField'		=>	Array('Enabled'),
-					
+
 					'TitleField'		=>	'Name',
-					
+
 					'TitlePresets'		=>	Array(
 												'default'	=>	Array(	'new_status_labels'		=> Array('css'=>'!la_title_Adding_Stylesheet!'),
 																		'edit_status_labels'	=> Array('css'=>'!la_title_Editing_Stylesheet!'),
 																		'new_titlefield'		=> Array('css'=>'!la_title_New_Stylesheet!'),
 																),
-												
+
 												'styles_list'				=>	Array('prefixes' => Array('css_List'), 'format' => "!la_title_Stylesheets! (#css_recordcount#)"),
-												
+
 												'stylesheets_edit'			=>	Array('prefixes' => Array('css'), 'format' => "#css_status# '#css_titlefield#' - !la_title_General!"),
-												
+
 												'base_styles'				=>	Array('prefixes' => Array('css','selectors.base_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BaseStyles! (#selectors.base_recordcount#)"),
-												
+
 												'block_styles'				=>	Array('prefixes' => Array('css','selectors.block_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BlockStyles! (#selectors.block_recordcount#)"),
-												
+
 												'base_style_edit'			=>	Array(	'prefixes' => Array('css','selectors'),
 																						'new_status_labels'		=> Array('selectors'=>'!la_title_Adding_BaseStyle!'),
 																						'edit_status_labels'	=> Array('selectors'=>'!la_title_Editing_BaseStyle!'),
 																						'new_titlefield'		=> Array('selectors'=>'!la_title_New_BaseStyle!'),
 																						'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
-																						
+
 												'block_style_edit'			=>	Array(	'prefixes' => Array('css','selectors'),
 																						'new_status_labels'		=> Array('selectors'=>'!la_title_Adding_BlockStyle!'),
 																						'edit_status_labels'	=> Array('selectors'=>'!la_title_Editing_BlockStyle!'),
 																						'new_titlefield'		=> Array('selectors'=>'!la_title_New_BlockStyle!'),
 																						'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
-																						
+
 												'style_edit'				=>	Array('prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'"),
 											),
-											
+
 					'PermSection'		=>	Array('main' => 'in-portal:configure_styles'),
-					
+
 					'Sections'			=>	Array(
 													'in-portal:configure_styles'	=>	Array(
 																								'parent'		=>	'in-portal:system',
 																								'icon'			=>	'style',
 																								'label'			=>	'la_tab_Stylesheets',
-																								'url'			=>	Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'),
+																								'url'			=>	Array('t' => 'in-portal/stylesheets/stylesheets_list', 'pass' => 'm'),
 																								'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 																								'priority'		=>	4,
 																								'type'			=>	stTREE,
 																						),
-					
-											),						
-											
+
+											),
+
 					'TableName'			=>	TABLE_PREFIX.'Stylesheets',
 					'SubItems' => Array('selectorsbase', 'selectorsblock'),
-					
+
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(
 													Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
 												),
-												
+
 												'Filters' => Array(
 													0	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
 													1	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'  ),
 												)
 											),
-					
+
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
-										
+
 					'ListSQLs'			=>	Array(	''=>'SELECT * FROM %s',
 																		), // key - special, value - list select sql
 					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %s',
 																		),
-					'ListSortings'	=> 	Array( 
+					'ListSortings'	=> 	Array(
 																'' => Array(
 																	'Sorting' => Array('Name' => 'asc'),
 																)
-															),																		
+															),
 					'Fields' => Array(
 										'StylesheetId' => Array(),
 										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
@@ -111,7 +111,7 @@
 								),
 
 					'VirtualFields'	=> 	Array(),
-											
+
 					'Grids'	=> Array(
 								'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif',0=>'icon16_style_disabled.gif',1=>'icon16_style.gif'),
@@ -121,7 +121,7 @@
 																			'Enabled' 	=> Array( 'title'=>'la_col_Status' ),
 																			'LastCompiled'	=>	Array('title' => 'la_col_LastCompiled'),
 																		),
-																	
+
 																),
 													),
 	);
Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl
===================================================================
diff -u -r5154 -r7287
--- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 5154)
+++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 7287)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" icon="icon46_style" title="!la_title_Stylesheets!"/>
 
-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="stylesheets_edit" module="in-portal" icon="icon46_style"/>
 
@@ -23,9 +23,9 @@
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
-				
+
 				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('css', '<inp2:css_PrevId/>');
 						}
@@ -34,14 +34,14 @@
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="css" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="css" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
@@ -57,14 +57,13 @@
 
 <inp2:css_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
-		
+	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="css" field="StylesheetId" title="!la_fld_StylesheetId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="css" field="Name" title="!la_fld_Name!" size="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
-		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>	
-</table>	
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
+</table>
 
 <inp2:m_include t="incs/footer"/>
-		
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -r5450 -r7287
--- branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 5450)
+++ branches/unlabeled/unlabeled-1.9.2/kernel/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 7287)
@@ -1,13 +1,13 @@
 <?php
-	
+
 $config	=	Array(
 					'Prefix'			=>	'css',
 					'ItemClass'			=>	Array('class'=>'StylesheetsItem','file'=>'stylesheets_item.php','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'StylesheetsEventHandler','file'=>'stylesheets_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
-					'Hooks'	=>	Array( 
+					'Hooks'	=>	Array(
 												Array(
 													'Mode' => hAFTER,
 													'Conditional' => false,
@@ -26,81 +26,81 @@
 												4	=>	'mode',
 											),
 					'IDField'			=>	'StylesheetId',
-					
+
 					'StatusField'		=>	Array('Enabled'),
-					
+
 					'TitleField'		=>	'Name',
-					
+
 					'TitlePresets'		=>	Array(
 												'default'	=>	Array(	'new_status_labels'		=> Array('css'=>'!la_title_Adding_Stylesheet!'),
 																		'edit_status_labels'	=> Array('css'=>'!la_title_Editing_Stylesheet!'),
 																		'new_titlefield'		=> Array('css'=>'!la_title_New_Stylesheet!'),
 																),
-												
+
 												'styles_list'				=>	Array('prefixes' => Array('css_List'), 'format' => "!la_title_Stylesheets! (#css_recordcount#)"),
-												
+
 												'stylesheets_edit'			=>	Array('prefixes' => Array('css'), 'format' => "#css_status# '#css_titlefield#' - !la_title_General!"),
-												
+
 												'base_styles'				=>	Array('prefixes' => Array('css','selectors.base_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BaseStyles! (#selectors.base_recordcount#)"),
-												
+
 												'block_styles'				=>	Array('prefixes' => Array('css','selectors.block_List'), 'format' => "#css_status# '#css_titlefield#' - !la_title_BlockStyles! (#selectors.block_recordcount#)"),
-												
+
 												'base_style_edit'			=>	Array(	'prefixes' => Array('css','selectors'),
 																						'new_status_labels'		=> Array('selectors'=>'!la_title_Adding_BaseStyle!'),
 																						'edit_status_labels'	=> Array('selectors'=>'!la_title_Editing_BaseStyle!'),
 																						'new_titlefield'		=> Array('selectors'=>'!la_title_New_BaseStyle!'),
 																						'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
-																						
+
 												'block_style_edit'			=>	Array(	'prefixes' => Array('css','selectors'),
 																						'new_status_labels'		=> Array('selectors'=>'!la_title_Adding_BlockStyle!'),
 																						'edit_status_labels'	=> Array('selectors'=>'!la_title_Editing_BlockStyle!'),
 																						'new_titlefield'		=> Array('selectors'=>'!la_title_New_BlockStyle!'),
 																						'format' => "#css_status# '#css_titlefield#' - #selectors_status# '#selectors_titlefield#'"),
-																						
+
 												'style_edit'				=>	Array('prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'"),
 											),
-											
+
 					'PermSection'		=>	Array('main' => 'in-portal:configure_styles'),
-					
+
 					'Sections'			=>	Array(
 													'in-portal:configure_styles'	=>	Array(
 																								'parent'		=>	'in-portal:system',
 																								'icon'			=>	'style',
 																								'label'			=>	'la_tab_Stylesheets',
-																								'url'			=>	Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'),
+																								'url'			=>	Array('t' => 'in-portal/stylesheets/stylesheets_list', 'pass' => 'm'),
 																								'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 																								'priority'		=>	4,
 																								'type'			=>	stTREE,
 																						),
-					
-											),						
-											
+
+											),
+
 					'TableName'			=>	TABLE_PREFIX.'Stylesheets',
 					'SubItems' => Array('selectorsbase', 'selectorsblock'),
-					
+
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(
 													Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
 												),
-												
+
 												'Filters' => Array(
 													0	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
 													1	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'  ),
 												)
 											),
-					
+
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
-										
+
 					'ListSQLs'			=>	Array(	''=>'SELECT * FROM %s',
 																		), // key - special, value - list select sql
 					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %s',
 																		),
-					'ListSortings'	=> 	Array( 
+					'ListSortings'	=> 	Array(
 																'' => Array(
 																	'Sorting' => Array('Name' => 'asc'),
 																)
-															),																		
+															),
 					'Fields' => Array(
 										'StylesheetId' => Array(),
 										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
@@ -111,7 +111,7 @@
 								),
 
 					'VirtualFields'	=> 	Array(),
-											
+
 					'Grids'	=> Array(
 								'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif',0=>'icon16_style_disabled.gif',1=>'icon16_style.gif'),
@@ -121,7 +121,7 @@
 																			'Enabled' 	=> Array( 'title'=>'la_col_Status' ),
 																			'LastCompiled'	=>	Array('title' => 'la_col_LastCompiled'),
 																		),
-																	
+
 																),
 													),
 	);
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r5290 -r7287
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 5290)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 7287)
@@ -22,9 +22,9 @@
 							submit_event('selectors','OnCancel');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
-	
+
 				function ValidateRequired()
 				{
 					var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
@@ -41,20 +41,20 @@
 							$ret = false;
 							break;
 						}
-						$i++;	
+						$i++;
 					}
 					return $ret;
 				}
-				
+
 				function editStyle()
 				{
 					if( ValidateRequired() )
 					{
-						openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
+						openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
 					}
 					else
 					{
-						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );	
+						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
 					}
 				}
 			</script>
@@ -68,13 +68,13 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
 		<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="1">
-		
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
 		<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"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
@@ -97,7 +97,7 @@
 			</td>
 			<td class="error">&nbsp;</td>
 		</tr>
-		
+
 </table>
 <input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl
===================================================================
diff -u -r5154 -r7287
--- branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 5154)
+++ branches/unlabeled/unlabeled-1.5.2/kernel/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 7287)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" icon="icon46_style" title="!la_title_Stylesheets!"/>
 
-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="stylesheets_edit" module="in-portal" icon="icon46_style"/>
 
@@ -23,9 +23,9 @@
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
-				
+
 				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('css', '<inp2:css_PrevId/>');
 						}
@@ -34,14 +34,14 @@
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
-				
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="css" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="css" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
@@ -57,14 +57,13 @@
 
 <inp2:css_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>	
-		
+	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="css" field="StylesheetId" title="!la_fld_StylesheetId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="css" field="Name" title="!la_fld_Name!" size="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="Description" title="!la_fld_Description!" rows="10" cols="40"/>
 		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="css" field="AdvancedCSS" title="!la_fld_AdvancedCSS!" rows="10" cols="40"/>
-		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>	
-</table>	
+		<inp2:m_ParseBlock name="inp_edit_checkbox" prefix="css" field="Enabled" title="!la_fld_Enabled!"/>
+</table>
 
 <inp2:m_include t="incs/footer"/>
-		
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r7031 -r7287
--- branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 7031)
+++ branches/unlabeled/unlabeled-1.27.2/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 7287)
@@ -179,7 +179,7 @@
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" style="border-top-width: 0px;">
 	<tr bgcolor="#e0e0da" height="20">
-		<td width="100%" valign="middle">
+		<td valign="middle">
 			<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0"><span id="category_path"></span>
 		</td>
 		<td align="right" class="search-cell">
Index: branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -r5561 -r7287
--- branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 5561)
+++ branches/unlabeled/unlabeled-1.6.2/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 7287)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" icon="icon46_style" title="!la_title_Stylesheets!"/>
 
-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="base_styles" module="in-portal" icon="icon46_style"/>
 
@@ -23,9 +23,9 @@
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
-				
+
 				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('css', '<inp2:css_PrevId/>');
 						}
@@ -34,50 +34,50 @@
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				 
+
 				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBaseStyle" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[selectors.base]',1);
-							std_new_item('selectors.base', 'stylesheets/base_style_edit') 
+							std_new_item('selectors.base', 'in-portal/stylesheets/base_style_edit')
 						} ) );
-										
+
 				function edit()
 	  			{
 	  				set_hidden_field('remove_specials[selectors.base]',1);
-	  				std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit');
+	  				std_edit_temp_item('selectors.base', 'in-portal/stylesheets/base_style_edit');
 	  			}
-						
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('selectors.base')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.base]',1);
 						submit_event('selectors.base','OnMassClone');
 						}
 				 ) );
-						
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-				 
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-					
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="css" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="css" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt
===================================================================
diff -u -r6786 -r7287
--- branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt	(.../changelog_1_3_0.txt)	(revision 6786)
+++ branches/unlabeled/unlabeled-1.2.2/admin/install/upgrades/changelog_1_3_0.txt	(.../changelog_1_3_0.txt)	(revision 7287)
@@ -1,82 +1,624 @@
-File in-portal/index.php changed
-File in-portal/admin/advanced_view.php is removed; release_1_2_1 revision 1.25
-File in-portal/admin/browse.php is removed; release_1_2_1 revision 1.35
-File in-portal/admin/install.php changed
-File in-portal/admin/category/addcategory.php is removed; release_1_2_1 revision 1.20
-File in-portal/admin/category/addcategory_custom.php is removed; release_1_2_1 revision 1.14
-File in-portal/admin/category/addcategory_customfields.php is removed; release_1_2_1 revision 1.5
-File in-portal/admin/category/addcategory_images.php is removed; release_1_2_1 revision 1.9
-File in-portal/admin/category/addcategory_permissions.php is removed; release_1_2_1 revision 1.11
-File in-portal/admin/category/addcategory_relations.php is removed; release_1_2_1 revision 1.8
-File in-portal/admin/category/addimage.php is removed; release_1_2_1 revision 1.9
-File in-portal/admin/category/addpermission.php is removed; release_1_2_1 revision 1.9
-File in-portal/admin/category/addpermission_modules.php is removed; release_1_2_1 revision 1.10
-File in-portal/admin/category/addrelation.php is removed; release_1_2_1 revision 1.8
-File in-portal/admin/category/category_items.php is removed; release_1_2_1 revision 1.4
-File in-portal/admin/category/category_maint.php is removed; release_1_2_1 revision 1.23.32.1
-File in-portal/admin/category/permcacheupdate.php is removed; release_1_2_1 revision 1.10
-File in-portal/admin/category/images/ddarrow.gif is removed; release_1_2_1 revision 1.1
-File in-portal/admin/category/images/ddarrow_active.gif is removed; release_1_2_1 revision 1.1
-File in-portal/admin/category/images/ddarrow_over.gif is removed; release_1_2_1 revision 1.1
-File in-portal/admin/category/js/core.js is removed; release_1_2_1 revision 1.1
-File in-portal/admin/category/js/lang.js is removed; release_1_2_1 revision 1.1
-File in-portal/admin/category/js/main.js is removed; release_1_2_1 revision 1.1
-File in-portal/admin/help/manual.pdf changed
-File in-portal/admin/install/inportal_data.sql changed
-File in-portal/admin/install/inportal_remove.sql changed
-File in-portal/admin/install/install_lib.php changed
-File in-portal/admin/install/langpacks/english.lang changed
-File in-portal/admin/install/upgrades/changelog_1_3_0.txt is new; release_1_3_0 revision 1.1.2.12
-File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.0.sql is new; release_1_3_0 revision 1.1.2.1
-File in-portal/admin/install/upgrades/readme_1_3_0.txt is new; release_1_3_0 revision 1.1.2.2
-File in-portal/kernel/parser.php changed
-File in-portal/kernel/admin/advanced_view.php is removed; release_1_2_1 revision 1.4
-File in-portal/kernel/admin/include/toolbar/advanced_view.php is removed; release_1_2_1 revision 1.11.2.1
-File in-portal/kernel/admin/include/toolbar/browse.php is removed; release_1_2_1 revision 1.17.2.1
-File in-portal/kernel/admin/include/toolbar/editcategory_permissions.php is removed; release_1_2_1 revision 1.1
-File in-portal/kernel/admin/include/toolbar/editcategory_relations.php is removed; release_1_2_1 revision 1.2
-File in-portal/kernel/admin/include/toolbar/editcategory_relationselect.php is removed; release_1_2_1 revision 1.6.2.1
-File in-portal/kernel/admin/include/toolbar/editgroup_permissions.php is removed; release_1_2_1 revision 1.1
-File in-portal/kernel/admin/include/toolbar/editgroup_users.php is removed; release_1_2_1 revision 1.1
-File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed
-File in-portal/kernel/admin_templates/incs/form_blocks.tpl changed
-File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed
-File in-portal/kernel/admin_templates/incs/script.js changed
-File in-portal/kernel/admin_templates/regional/phrases_edit.tpl changed
-File in-portal/kernel/admin_templates/tools/system_tools.tpl changed
-File in-portal/kernel/include/emailmessage.php changed
-File in-portal/kernel/include/image.php changed
-File in-portal/kernel/include/modules.php changed
-File in-portal/kernel/units/admin/admin_config.php changed
-File in-portal/kernel/units/categories/categories_tag_processor.php changed
-File in-portal/kernel/units/configuration/configuration_event_handler.php changed
-File in-portal/kernel/units/email_events/email_events_event_handler.php changed
-File in-portal/kernel/units/general/cat_event_handler.php changed
-File in-portal/kernel/units/general/cat_tag_processor.php changed
-File in-portal/kernel/units/general/inp_ses_storage.php changed
-File in-portal/kernel/units/general/main_event_handler.php changed
-File in-portal/kernel/units/general/helpers/mod_rewrite_helper.php changed
-File in-portal/kernel/units/general/helpers/permissions_helper.php changed
-File in-portal/kernel/units/users/users_event_handler.php changed
-File in-portal/themes/default/search_results.tpl changed
-File in-portal/themes/default/common/head.tpl changed
-File in-portal/themes/default/common/pagetop.tpl changed
-File kernel4_dev/kernel4/application.php changed
-File kernel4_dev/kernel4/event_manager.php changed
-File kernel4_dev/kernel4/startup.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/dblist.php changed
-File kernel4_dev/kernel4/parser/template_parser.php changed
-File kernel4_dev/kernel4/processors/main_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.php changed
-File kernel4_dev/kernel4/utility/formatters/password_formatter.php changed
-File cmseditor/fckeditor.js changed
-File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed
+File in-portal/.cvsignore is removed; release_1_3_1 revision 1.5
+File in-portal/compat.php is removed; release_1_3_1 revision 1.2
+File in-portal/globals.php is removed; release_1_3_1 revision 1.109
+File in-portal/html_parse.php is removed; release_1_3_1 revision 1.1
+File in-portal/index.php is removed; release_1_3_1 revision 1.22
+File in-portal/new_phrases.txt is removed; release_1_3_1 revision 1.11
+File in-portal/obscure.php is removed; release_1_3_1 revision 1.8
+File in-portal/png_replace.php is removed; release_1_3_1 revision 1.1
+File in-portal/robots_list.txt is removed; release_1_3_1 revision 1.1
+File in-portal/root.flg is removed; release_1_3_1 revision 1.1
+File in-portal/sql.error is removed; release_1_3_1 revision 1.1
+File in-portal/admin/.cvsignore is removed; release_1_3_1 revision 1.2
+File in-portal/admin/addreview_direct.php is removed; release_1_3_1 revision 1.5
+File in-portal/admin/cat_select.php is removed; release_1_3_1 revision 1.12
+File in-portal/admin/confirm.php is removed; release_1_3_1 revision 1.2
+File in-portal/admin/index.php is removed; release_1_3_1 revision 1.24
+File in-portal/admin/index4.php is removed; release_1_3_1 revision 1.10
+File in-portal/admin/index4_direct.php is removed; release_1_3_1 revision 1.2
+File in-portal/admin/install.php is removed; release_1_3_1 revision 1.108.2.2
+File in-portal/admin/main.php is removed; release_1_3_1 revision 1.1
+File in-portal/admin/relation_select.php is removed; release_1_3_1 revision 1.16
+File in-portal/admin/reviews.php is removed; release_1_3_1 revision 1.13
+File in-portal/admin/save_redirect.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/subitems.php is removed; release_1_3_1 revision 1.14
+File in-portal/admin/tag_listing.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/toolbar.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/backup/backup1.php is removed; release_1_3_1 revision 1.10
+File in-portal/admin/backup/backup2.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/backup/backup3.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/backup/restore1.php is removed; release_1_3_1 revision 1.7
+File in-portal/admin/backup/restore2.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/backup/restore3.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/backup/restore4.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/backupdata/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/backupdata/dummy is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/checkboxes.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/checkboxes_002.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/checkboxes_new.js is removed; release_1_3_1 revision 1.5
+File in-portal/admin/browse/checkboxes_old.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/common.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/fw_menu.js is removed; release_1_3_1 revision 1.6
+File in-portal/admin/browse/toolbar.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/toolbar.js is removed; release_1_3_1 revision 1.5
+File in-portal/admin/browse/toolbar.php is removed; release_1_3_1 revision 1.3
+File in-portal/admin/browse/toolbar_002.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/browse/utility.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/config/addtheme.php is removed; release_1_3_1 revision 1.15
+File in-portal/admin/config/addtheme_templates.php is removed; release_1_3_1 revision 1.12
+File in-portal/admin/config/config_theme.php is removed; release_1_3_1 revision 1.13
+File in-portal/admin/config/edit_banlist.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/config/edit_label.php is removed; release_1_3_1 revision 1.15
+File in-portal/admin/config/edit_template.php is removed; release_1_3_1 revision 1.9
+File in-portal/admin/config/email_edit.php is removed; release_1_3_1 revision 1.10
+File in-portal/admin/config/missing_label_edit.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/config/missing_label_search.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/editor/editor.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/editor.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/editor/editor_new.php is removed; release_1_3_1 revision 1.10
+File in-portal/admin/editor/inp_fckconfig.js is removed; release_1_3_1 revision 1.6
+File in-portal/admin/editor/inp_styles.xml is removed; release_1_3_1 revision 1.2
+File in-portal/admin/editor/FCKeditor/fckeditor.htc is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/fckeditor.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/fckeditor.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/fckeditor.php is removed; release_1_3_1 revision 1.6
+File in-portal/admin/editor/FCKeditor/license.txt is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/css/fck_dialog.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/css/fck_editor.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/css/fck_editorarea.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/css/fck_editorarea.php is removed; release_1_3_1 revision 1.5
+File in-portal/admin/editor/FCKeditor/dialog/fck_about.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_flash.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_image.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_link.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_selcolor.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_smiley.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_specialchar.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_table.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_tablecell.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fckeditor_1.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fckeditor_2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fredck.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fredck_bottom.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_about/logo_fredck_top.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/dialog/fck_about/spacer.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/filemanager/upload/php/upload.php is removed; release_1_3_1 revision 1.5
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/angel_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/angry_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/broken_heart.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/cake.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/confused_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/cry_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/devil_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/embaressed_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/envelope.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/heart.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/kiss.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/lightbulb.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/omg_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/regular_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/sad_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/shades_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/teeth_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/thumbs_down.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/thumbs_up.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/tounge_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/whatchutalkingabout_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/smiley/msn/wink_smile.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.about.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.bgcolor.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.bold.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.copy.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.cut.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.find.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.flash.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.image.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.indent.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.insertorderedlist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.insertunorderedlist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.italic.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifycenter.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifyfull.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifyleft.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.justifyright.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.link.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.outdent.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.paste.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.pastetext.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.pasteword.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.print.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.redo.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.removeformat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.rule.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.selectall.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.showdetails.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.showtableborders.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.smiley.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.specialchar.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.spellcheck.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.strikethrough.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.subscript.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.superscript.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.table.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.textcolor.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.underline.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.undo.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/button.unlink.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/images/toolbar/separator.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/dhtmled.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_actions.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_config.js is removed; release_1_3_1 revision 1.3
+File in-portal/admin/editor/FCKeditor/js/fck_contextmenu.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_displaychange.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_editor.js is removed; release_1_3_1 revision 1.2
+File in-portal/admin/editor/FCKeditor/js/fck_events.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_init.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_lang.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_toolbar.js is removed; release_1_3_1 revision 1.2
+File in-portal/admin/editor/FCKeditor/js/fck_toolbaritems.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/js/fck_xhtml.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/editor/FCKeditor/lang/en.js is removed; release_1_3_1 revision 1.1
+File in-portal/admin/email/do_send.php is removed; release_1_3_1 revision 1.15
+File in-portal/admin/email/log.txt is removed; release_1_3_1 revision 1.2
+File in-portal/admin/email/sendmail.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/export/.cvsignore is removed; release_1_3_1 revision 1.2
+File in-portal/admin/export/dummy is removed; release_1_3_1 revision 1.3
+File in-portal/admin/help/blank.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/help/credits.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/help/credits.txt is removed; release_1_3_1 revision 1.4
+File in-portal/admin/help/help.php is removed; release_1_3_1 revision 1.15
+File in-portal/admin/help/help_styles.css is removed; release_1_3_1 revision 1.1
+File in-portal/admin/help/install_help.php is removed; release_1_3_1 revision 1.8
+File in-portal/admin/help/legal_warning.txt is removed; release_1_3_1 revision 1.1
+File in-portal/admin/help/manual.pdf is removed; release_1_3_1 revision 1.25.2.1
+File in-portal/admin/help/topics/download.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/help/topics/introdution.html is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_banlist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_cat_settings.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_catalog.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_catsearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_community.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_conf.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_conf_general.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_conf_regional.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_conf_security.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_conf_themes.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_email_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_general.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_help.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_in-portal.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_itemsearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_link_editor.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_lock.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_lock_login.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_logs_reports.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_mailinglist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_modules.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_navigate.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_search_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_searchgroups.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_searchusers.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_sessions_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_settings_custom.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_settings_email.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_settings_general.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_settings_output.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_settings_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_site.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_stats.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_struct.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_summary.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_summary_logs.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_tool_backup.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_tool_export.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_tool_import.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_tool_restore.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_tools.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_usergroups.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_users.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_users_primary_group.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon24_users_settings.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_advanced_view.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/icons/icon46_banlist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_catalog.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_catsearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_community.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_conf.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_conf_general.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_conf_regional.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_conf_security.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_conf_themes.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_email_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_foldersearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_groupsearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_help.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_itemsearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_advanced_view.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/icons/icon46_list_banlist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_cat_settings.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_catalog.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_community.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_conf.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_conf_general.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_conf_regional.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_conf_themes.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_help.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_modules.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_products.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_reviews.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_search_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_sessions_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_struct.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_summary.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_summary_logs.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_tool_backup.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_tool_export.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_tool_import.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_tool_restore.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_tools.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_usergroups.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_users.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_users_settings.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_list_usersearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_logs_reports.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_mailinglist.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_modules.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_navigate.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_products.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_reviews.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_search_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_server_info.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_sessions_log.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_censor.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_custom.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_email.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_general.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_in-bulletin.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_in-link.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_in-newz.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_output.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_settings_smiley.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_site.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_stats.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_struct.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_summary.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_summary_logs.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_tool_backup.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_tool_export.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_tool_import.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_tool_restore.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_tools.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_usergroups.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_users.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_users_settings.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_usersearch.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/icon46_validate.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/logout.png is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/Leftover/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/Leftover/icon24_products.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/Leftover/icon24_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/icons/Leftover/icon46_list_conf_security.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/about.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/about.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/arrow.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/arrow16.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/arrow16_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/arrow_down.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/arrows.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/bg_install_menu.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/blocks.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/blocks2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/blue_bar_help.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/blue_bar_logout.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/box.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/button_back.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/check.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/check_on.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/cros.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/ddarrow.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/divider_dn.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/divider_left_sel.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/divider_right.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/divider_sel_right.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/divider_up.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/folder.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/globe.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/help.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon16_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon16_search_reset.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon24_link_cat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon24_link_date.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon24_link_editor.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon24_link_user.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_browse.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_error.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_install.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_question.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_question_sm.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_user_sm.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_users_sm.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/icon_warning.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/list_arrow_dn.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/list_arrow_rt.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/list_arrow_up.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/logo.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/logo_bg.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/logo_bg_in-bulletin.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/logo_bg_in-link.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/logo_bg_in-news.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/max_rate.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/menu_arrow.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/menu_bar.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/menu_dot.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/perm_green.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/perm_red.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/progress_bar_segment.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon1.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon4.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon5.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon6.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/smicon7.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/images/spacer.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/status_cancel.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/status_check.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_active_back.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_active_back2.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_active_back3.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_active_left.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_active_right.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_back.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_back.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_left.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_middle.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tab_right.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tabnav_back.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tabnav_dots.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/tabnav_left.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar_divider.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar_start.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/version_bg.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_attn.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_deleted.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_denied.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_hot.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_new.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_pending.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_pick.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_cat_top.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_custom.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_custom_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_image.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_image_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_language.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_language_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_language_primary.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_language_var.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_permission.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_relation_one-way.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_relation_one-way_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_relation_reciprocal.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_relation_reciprocal_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_review.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_review_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_review_pending.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_search_dropdown.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_search_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_search_reset.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_search_reset_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_template.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_theme.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_theme_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_theme_primary.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_user.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_user_attn.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_user_deleted.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_user_denied.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_user_disabled.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icon16_user_pending.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/icons16_permissions_inherited.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemicons/.xvpics/icon16_search_dropdown.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/divider_dn.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/divider_empty.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/divider_up.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/tab_active.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/tab_active_l.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/tab_active_r.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/tab_inactive.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/tab_inactive_l.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/itemtabs/tab_inactive_r.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/overviewbox_bg.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/overviewbox_cl.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/overviewbox_ex.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/overviewbox_header.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/searchbox_bg.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/searchbox_cl.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/searchbox_ex.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/searchbox_header.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/searchbox_header.jpg is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/usersbox_bg.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/usersbox_cl.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/usersbox_ex.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/summary/usersbox_header.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/.cvsignore is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/arrow16.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/arrow16_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/icon16_search.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/icon16_search_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/icon16_search_reset.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/icon16_search_reset_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_apply_rules.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_apply_rules_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_apply_rules_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_approve.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_approve_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_approve_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_ban_user.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_ban_user_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_ban_user_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_cancel.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_cancel_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_cancel_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_clear_selected.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_clear_selected_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_clear_selected_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_copy.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_copy_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_copy_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_cut.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_cut_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_cut_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_decline.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_decline_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_decline_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_delete.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_delete_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_delete_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_deny.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_deny_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_deny_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_disconnect.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_disconnect_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_disconnect_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_divider.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_e-mail.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_e-mail_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_e-mail_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_edit.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/images/toolbar/tool_edit_f2.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/images/toolbar/tool_edit_f3.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/images/toolbar/tool_editcat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_editcat_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_editcat_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_export.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_export_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_export_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_export_language.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_export_language_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_export_language_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_forum_new_custom.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_forum_new_custom_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_forum_new_custom_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_frontend_mail.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_frontend_mail_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_frontend_mail_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_homecat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_homecat_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_homecat_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_import.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_import_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_import_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_import_language.gif is removed; release_1_3_1 revision 1.3
+File in-portal/admin/images/toolbar/tool_import_language_f2.gif is removed; release_1_3_1 revision 1.3
+File in-portal/admin/images/toolbar/tool_import_language_f3.gif is removed; release_1_3_1 revision 1.3
+File in-portal/admin/images/toolbar/tool_move_down.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_move_down_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_move_down_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_move_up.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_move_up_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_move_up_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_cat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_cat_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_cat_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_group.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_group_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_group_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_image.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_image_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_image_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_item.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_item_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_item_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_language.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_language_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_language_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_language_var.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_language_var_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_language_var_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_permission.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_permission_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_permission_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_relation.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_relation_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_relation_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_review.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_review_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_review_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_rule.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_rule_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_rule_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_template.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_template_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_template_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_theme.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_theme_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_theme_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_user.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_user_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_new_user_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_next.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_next_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_next_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_paste.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_paste_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_paste_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_prev.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_prev_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_prev_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_language.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_language_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_language_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_template.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_template_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_template_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_theme.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_theme_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_preview_theme_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_cat.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_cat_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_cat_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_group.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_group_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_group_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_image.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_image_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_image_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_language.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_language_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_language_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_theme.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_theme_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_theme_f3.gif is removed; release_1_3_1 revision 1.2
+File in-portal/admin/images/toolbar/tool_primary_user_group.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_user_group_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_primary_user_group_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_print.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_print_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_print_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_rebuild_cache.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_rebuild_cache_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_refresh.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_refresh_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_refresh_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_rescan_themes.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_rescan_themes_f2.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/images/toolbar/tool_rescan_themes_f3.gif is removed; release_1_3_1 revision 1.1
+File in-portal/admin/im
 
-
 Changes in phrases and events:
 
 
Index: branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl
===================================================================
diff -u -r1719 -r7287
--- branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl	(.../stylesheets_tabs.tpl)	(revision 1719)
+++ branches/unlabeled/unlabeled-1.3.52/core/admin_templates/stylesheets/stylesheets_tabs.tpl	(.../stylesheets_tabs.tpl)	(revision 7287)
@@ -3,9 +3,9 @@
 	<td align="right" width="100%">
   	<table cellpadding="0" cellspacing="0" border="0" height="23">
 		<tr>
-			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="stylesheets/stylesheets_edit" main_prefix="css"/>
-			<inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="stylesheets/stylesheets_edit_block" main_prefix="css"/>
-			<inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="stylesheets/stylesheets_edit_base" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-portal/stylesheets/stylesheets_edit" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="in-portal/stylesheets/stylesheets_edit_block" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="in-portal/stylesheets/stylesheets_edit_base" main_prefix="css"/>
 		</tr>
 		</table>
 	</td>
Index: branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -r5561 -r7287
--- branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 5561)
+++ branches/unlabeled/unlabeled-1.6.2/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 7287)
@@ -4,7 +4,7 @@
 <body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
 <inp2:m_ParseBlock name="section_header" icon="icon46_style" title="!la_title_Stylesheets!"/>
 
-<inp2:m_include t="stylesheets/stylesheets_tabs"/>
+<inp2:m_include t="in-portal/stylesheets/stylesheets_tabs"/>
 
 <inp2:m_ParseBlock name="blue_bar" prefix="css" title_preset="base_styles" module="in-portal" icon="icon46_style"/>
 
@@ -23,9 +23,9 @@
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
-				
+
 				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('css', '<inp2:css_PrevId/>');
 						}
@@ -34,50 +34,50 @@
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
-				 
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-				 
+
 				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBaseStyle" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[selectors.base]',1);
-							std_new_item('selectors.base', 'stylesheets/base_style_edit') 
+							std_new_item('selectors.base', 'in-portal/stylesheets/base_style_edit')
 						} ) );
-										
+
 				function edit()
 	  			{
 	  				set_hidden_field('remove_specials[selectors.base]',1);
-	  				std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit');
+	  				std_edit_temp_item('selectors.base', 'in-portal/stylesheets/base_style_edit');
 	  			}
-						
+
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('selectors.base')
 						} ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.base]',1);
 						submit_event('selectors.base','OnMassClone');
 						}
 				 ) );
-						
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-				 
+
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
-					
+
 				a_toolbar.Render();
-				
+
 				<inp2:m_if prefix="css" function="IsSingle"/>
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>			
+				<inp2:m_else/>
 					<inp2:m_if prefix="css" function="IsLast"/>
 						a_toolbar.DisableButton('next');
 					<inp2:m_endif/>
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r5290 -r7287
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 5290)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 7287)
@@ -22,16 +22,16 @@
 							submit_event('selectors','OnCancel');
 						}
 				 ) );
-				
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 							submit_event('selectors','OnResetToBase');
 						}
 				) );
-				
+
 				a_toolbar.Render();
-	
+
 				function ValidateRequired()
 				{
 					var $fields = new Array('<inp2:selectors_InputName field="Name"/>',
@@ -48,20 +48,20 @@
 							$ret = false;
 							break;
 						}
-						$i++;	
+						$i++;
 					}
 					return $ret;
 				}
-				
+
 				function editStyle()
 				{
 					if( ValidateRequired() )
 					{
-						openSelector('selectors', '<inp2:m_t t="stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
+						openSelector('selectors', '<inp2:m_t t="in-portal/stylesheets/style_editor" pass="all"/>', '', '850x460', 'OnOpenStyleEditor');
 					}
 					else
 					{
-						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );	
+						alert( RemoveTranslationLink('<inp2:m_phrase name="la_RequiredWarning"/>') );
 					}
 				}
 			</script>
@@ -75,16 +75,16 @@
 	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="selectors" field="StylesheetId"/>
 		<input type="hidden" name="<inp2:selectors_InputName field="Type"/>" value="2">
-		
+
 		<inp2:m_ParseBlock name="inp_id_label" prefix="selectors" field="SelectorId" title="!la_fld_SelectorId!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="SelectorName" title="!la_fld_SelectorName!" size="40"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="selectors" field="ParentId" title="!la_fld_SelectorBase!"/>
-		
+
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="selectors" field="Name" title="!la_fld_Name!" size="40"/>
 		<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"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td class="text" valign="top">
@@ -107,7 +107,7 @@
 			</td>
 			<td class="error">&nbsp;</td>
 		</tr>
-		
+
 </table>
 <input type="hidden" name="main_prefix" id="main_prefix" value="selectors">
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt
===================================================================
diff -u
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt	(revision 7287)
@@ -0,0 +1,5 @@
+
+
+Changes in phrases and events:
+
+
Index: branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl
===================================================================
diff -u -r1719 -r7287
--- branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl	(.../stylesheets_tabs.tpl)	(revision 1719)
+++ branches/unlabeled/unlabeled-1.3.52/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl	(.../stylesheets_tabs.tpl)	(revision 7287)
@@ -3,9 +3,9 @@
 	<td align="right" width="100%">
   	<table cellpadding="0" cellspacing="0" border="0" height="23">
 		<tr>
-			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="stylesheets/stylesheets_edit" main_prefix="css"/>
-			<inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="stylesheets/stylesheets_edit_block" main_prefix="css"/>
-			<inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="stylesheets/stylesheets_edit_base" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-portal/stylesheets/stylesheets_edit" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="in-portal/stylesheets/stylesheets_edit_block" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="in-portal/stylesheets/stylesheets_edit_base" main_prefix="css"/>
 		</tr>
 		</table>
 	</td>