Index: trunk/kernel/admin_templates/incs/header_mini.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/incs/header_mini.tpl	(revision 0)
+++ trunk/kernel/admin_templates/incs/header_mini.tpl	(revision 4329)
@@ -0,0 +1,25 @@
+<link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />
+
+<script language="javascript" src="incs/is.js"></script>
+<script language="javascript" src="incs/script.js"></script>
+<script language="javascript" src="incs/in-portal.js"></script>
+<script language="javascript" src="incs/toolbar.js"></script>
+<script language="javascript" src="incs/grid.js"></script>
+
+<script language="javascript">
+	var t = '<inp2:m_get param="t"/>';
+	var popups = '1';
+	var multiple_windows = '1';
+	var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
+	var tpl_changed = 0;
+	var base_url = '<inp2:m_BaseURL/>';
+	
+	var img_path = 'img/';
+</script>
+</head>
+
+<inp2:m_include t="incs/blocks"/>
+
+<inp2:m_include t="incs/in-portal"/>
+
+<inp2:m_ParseBlock name="kernel_form"/>
Index: trunk/admin/category/category_items.php
===================================================================
diff -u
--- trunk/admin/category/category_items.php	(revision 0)
+++ trunk/admin/category/category_items.php	(revision 4329)
@@ -0,0 +1,63 @@
+<?php 
+	require_once (FULL_PATH.'/admin/include/elements.php'); 
+	require_once (FULL_PATH.'/kernel/admin/include/navmenu.php'); 
+	require_once(FULL_PATH.'/admin/toolbar.php');
+	require_once(FULL_PATH.'/admin/listview/listview.php');
+	
+	$objEditItems = new clsCatList();
+	$objEditItems->SourceTable = $objSession->GetEditTable("Category");
+	
+	$application->SetVar('c_mode', 't');
+
+	// Multiedit init
+	$en = (int)$_GET['en'];
+	$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
+	
+	$itemcount=$objEditItems->NumItems();
+	$c = $objEditItems->GetItemByIndex($en);
+	
+    if ($itemcount > 1) {    
+		$en_next = ($en + 1 == $itemcount) ? -1 : $en + 1;
+		$en_prev = ($en == 0) ? -1 :  $en - 1;	
+	}
+		
+    $action = 'm_dummy';
+    $TitleVerb = prompt_language('la_Text_Editing');
+
+	$envar = 'env='.BuildEnv().'&en='.$en;
+	$section = 'in-portal:editcategory_items'; 
+	
+	$editing_category_title = $c->Get('Name') ? "'".$c->Get('Name')."'" : '';
+	$title = $TitleVerb.' '.prompt_language('la_Text_Category').' '.$editing_category_title.' - '.prompt_language('la_tab_General');
+	
+	//$saveURL = $admin."/browse.php";
+	$saveURL = $admin.'/category/category_maint.php';
+	$cancelURL = $admin.'/'.$objSession->GetVariable('ReturnScript');
+	
+	//Display header
+	$sec = $objSections->GetSection($section);
+	
+	$objCatToolBar = new clsToolBar();
+	$objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('category','CatEditStatus','$saveURL',1,'');","tool_select.gif");
+	$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('category','CatEditStatus','$cancelURL',2,'');","tool_cancel.gif");
+	
+	if (isset($en_prev) || isset($en_next)) {
+		$url = 'admin/index4_direct.php'; 
+		$StatusField = 'CatEditStatus';
+		$form = 'category';
+		MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'&t=category/category_items&prefix=c','la_PrevCategory','la_NextCategory');  
+	}
+
+	int_header($objCatToolBar,NULL,$title);
+?>
+
+<form id="category" name="category" action="" method="POST">
+	<input type="hidden" name="ParentId" value="<?php echo $c->Get('ParentId'); ?>">
+	<input type="hidden" name="CategoryId" value="<?php echo $c->parsetag('cat_id'); ?>">
+    <input type="hidden" name="Action" value="<?php echo $action; ?>">
+    <input type="hidden" name="CatEditStatus" VALUE="0">
+</form>
+
+<form method="POST" name="save_edit" id="save_edit">
+  <input type="hidden" name="CatEditStatus" value="0">
+</form>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/footer_mini.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/incs/footer_mini.tpl	(revision 0)
+++ trunk/kernel/admin_templates/incs/footer_mini.tpl	(revision 4329)
@@ -0,0 +1,6 @@
+<br /><br />
+<inp2:m_AfterScript/>
+
+<inp2:m_ParseBlock name="kernel_form_end"/>
+</body>
+</html>
\ No newline at end of file
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -r4108 -r4329
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4108)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4329)
@@ -28,7 +28,13 @@
 					'ViewMenuPhrase'	=>	'la_text_Categories',
 
 					'TitlePresets'		=>	Array(
+													'default'	=>	Array(	'new_status_labels'		=> Array('c' => '!la_title_Adding_Category!'),
+																			'edit_status_labels'	=> Array('c' => '!la_title_Editing_Category!'),
+																			'new_titlefield'		=> Array('c' => '!la_title_New_Category!'),
+																	),
 												'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
+												
+												'category_items'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"),
 											),
 
 
Index: trunk/kernel/admin/include/navmenu.php
===================================================================
diff -u -r4065 -r4329
--- trunk/kernel/admin/include/navmenu.php	(.../navmenu.php)	(revision 4065)
+++ trunk/kernel/admin/include/navmenu.php	(.../navmenu.php)	(revision 4329)
@@ -200,8 +200,13 @@
 $objSections->AddSection("in-portal:editcategory_general","la_tab_General",NULL,$admin."/category/",
                          "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory.php',0);",
                          $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
-                         NULL, "in-portal:browse",NULL, "in-portal:editcategory_relations",-1);
+                         NULL, "in-portal:browse",NULL, "in-portal:editcategory_items",-1);
 
+$objSections->AddSection("in-portal:editcategory_items","la_tab_Items",NULL, $admin."/category/",
+                         "javascript:edit_submit('category','CatEditStatus','".$admin."/index4_direct.php',0, '&t=category/category_items&prefix=c');",
+                         $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
+                         NULL,"in-portal:browse","in-portal:editcategory_general","in-portal:editcategory_relations",-1);
+                         
 $objSections->AddSection("in-portal:editcategory_relations","la_tab_Relations",NULL, $admin."/category/",
                          "javascript:edit_submit('category','CatEditStatus','".$admin."/category/addcategory_relations.php',0);",
                          $admin."/icons/icon46_struct.gif", $admin."/icons/icon24_navigate.gif",
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -r4108 -r4329
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4108)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4329)
@@ -28,7 +28,13 @@
 					'ViewMenuPhrase'	=>	'la_text_Categories',
 
 					'TitlePresets'		=>	Array(
+													'default'	=>	Array(	'new_status_labels'		=> Array('c' => '!la_title_Adding_Category!'),
+																			'edit_status_labels'	=> Array('c' => '!la_title_Editing_Category!'),
+																			'new_titlefield'		=> Array('c' => '!la_title_New_Category!'),
+																	),
 												'category_list' => Array('prefixes' => Array('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"),
+												
+												'category_items'		=>	Array('prefixes' => Array('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_Items!"),
 											),
 
 
Index: trunk/core/kernel/utility/params.php
===================================================================
diff -u -r4135 -r4329
--- trunk/core/kernel/utility/params.php	(.../params.php)	(revision 4135)
+++ trunk/core/kernel/utility/params.php	(.../params.php)	(revision 4329)
@@ -17,7 +17,7 @@
 	 */
 	function SplitParamsStr($params_str)
 	{
-		preg_match_all('/([\${}a-zA-Z0-9_.]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $params_str, $rets, PREG_SET_ORDER);
+		preg_match_all('/([\${}a-zA-Z0-9_.-]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $params_str, $rets, PREG_SET_ORDER);
 		
 		$values = Array();
 		foreach ($rets AS $key => $val){
Index: trunk/admin/index4_direct.php
===================================================================
diff -u
--- trunk/admin/index4_direct.php	(revision 0)
+++ trunk/admin/index4_direct.php	(revision 4329)
@@ -0,0 +1,40 @@
+<?php
+##############################################################
+##In-portal													##
+##############################################################
+##					      In-portal							##
+##					Intechnic Corporation					##
+##			   All Rights Reserved, 1998-2002				##
+##															##	
+##	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		##
+##	 privileges along maximum prosecution allowed by law.	##
+##############################################################
+
+	// new startup: begin
+	define('REL_PATH', 'admin');
+	$relation_level = count( explode('/', REL_PATH) );
+	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
+	require_once FULL_PATH.'/kernel/startup.php';
+	// new startup: end
+	
+	$prefix = $application->GetVar('prefix');
+	$application->SetVar($prefix.'_mode', 't');
+	
+	$id_field = $application->getUnitOption($prefix, 'IDField');
+	$temp_handler =& $application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
+	$table_name = $temp_handler->GetTempName( $application->getUnitOption($prefix, 'TableName') );
+	
+	$db =& $application->GetADODBConnection();
+	$item_id = $db->GetOne('SELECT '.$id_field.' FROM '.$table_name, (int)$application->GetVar('en'));
+	$application->SetVar($prefix.'_id', $item_id);		
+	
+	$template = $application->GetVar('t');
+	include_once FULL_PATH.'/admin/'.$template.'.php';
+	
+	$application->Run();
+	
+	int_footer();
+?>
\ No newline at end of file
Index: trunk/admin/include/elements.php
===================================================================
diff -u -r4199 -r4329
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 4199)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 4329)
@@ -95,6 +95,12 @@
         //$int_toolbar_preload = array();
 
         print "<html>\n\t<head>\n\t\t<title>In-portal</title>\n";
+        
+        $application =& kApplication::Instance();
+        $template_cache =& $application->recallObject('TemplatesCache'); // sets THEMES_PATH constant
+        $m_tag_processor =& $application->recallObject('m_TagProcessor');
+		echo $m_tag_processor->Base_Ref()."\n";
+		
         if(strlen($metatag))
         {        
             print $metatag."\n";            
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -r4325 -r4329
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4325)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4329)
@@ -501,7 +501,7 @@
 		
 		$templates_cache =& $this->Application->recallObject('TemplatesCache');
 		
-		$res = $BlockParser->Parse(	$templates_cache->GetTemplateBody($t), $t );
+		$res = $BlockParser->Parse(	$templates_cache->GetTemplateBody($t, getArrayValue($params, 'is_silent')), $t );
 		
 		if ( !$BlockParser->DataExists && (isset($params['data_exists']) || isset($params['block_no_data'])) ) {
 			if ($block_no_data = getArrayValue($params, 'block_no_data')) {
@@ -523,11 +523,25 @@
 	{
 		$ret = '';
 		$block_params = Array('is_silent' => 1); // don't make fatal errors in case if template is missing
+		$current_template = $this->Application->GetVar('t');
 		foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
 			if (!$module_data['Loaded']) continue;
 			$module_key = strtolower($module_name);
-			$block_params['t'] = $this->SelectParam($params, $module_key.'_template,'.$module_key.'_t,t');
-			$block_params['block_no_data'] = $this->SelectParam($params, $module_key.'_block_no_data,block_no_data');
+			
+			if ($module_name == 'In-Portal') {
+				$module_prefix = '';
+			}
+			else {
+				$module_prefix = $this->Application->IsAdmin() ? $module_key.'/' : $module_data['TemplatePath'].'/';
+			}
+			
+			$block_params['t'] = $module_prefix.$this->SelectParam($params, $module_key.'_template,'.$module_key.'_t,template,t');
+			if ($block_params['t'] == $current_template) continue;
+			
+			$no_data = $this->SelectParam($params, $module_key.'_block_no_data,block_no_data');
+			if ($no_data) {
+				$block_params['block_no_data'] = $module_prefix.'/'.$no_data;
+			}
 			$ret .= $this->MyInclude($block_params);
 		}
 		return $ret;
Index: trunk/kernel/admin_templates/category/category_items.tpl
===================================================================
diff -u
--- trunk/kernel/admin_templates/category/category_items.tpl	(revision 0)
+++ trunk/kernel/admin_templates/category/category_items.tpl	(revision 4329)
@@ -0,0 +1,5 @@
+<inp2:m_include t="incs/header_mini"/>
+
+<inp2:m_ModuleInclude template="category_items" />
+
+<inp2:m_include t="incs/footer_mini"/>
\ No newline at end of file
Index: trunk/core/kernel/db/db_connection.php
===================================================================
diff -u -r3999 -r4329
--- trunk/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 3999)
+++ trunk/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 4329)
@@ -260,12 +260,13 @@
 		 * otherwise
 		 * 
 		 * @param string $sql
+		 * @param int $offset
 		 * @return string
 		 * @access public
 		 */
-		function GetOne($sql)
+		function GetOne($sql, $offset = 0)
 		{
-			$row = $this->GetRow($sql);
+			$row = $this->GetRow($sql, $offset);
 			if(!$row) return false;
 			
 			return array_shift($row);
@@ -276,12 +277,13 @@
 		 * if query ok, false otherwise
 		 * 
 		 * @param stirng $sql
+		 * @param int $offset
 		 * @return Array
 		 * @access public
 		 */
-		function GetRow($sql)
+		function GetRow($sql, $offset = 0)
 		{
-			$sql .= ' '.$this->getLimitClause(0,1);
+			$sql .= ' '.$this->getLimitClause($offset, 1);
 			$ret = $this->Query($sql);
 			if(!$ret) return false;