Index: trunk/themes/default2007/platform/elements/pagination.tpl
===================================================================
diff -u -N -r8737 -r8751
--- trunk/themes/default2007/platform/elements/pagination.tpl	(.../pagination.tpl)	(revision 8737)
+++ trunk/themes/default2007/platform/elements/pagination.tpl	(.../pagination.tpl)	(revision 8751)
@@ -18,6 +18,8 @@
 	<a href="<inp2:PageLink/>" class="pagenation-noselect"><inp2:m_param name="page"/></a>
 </inp2:m_DefineElement>
 
+<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+<br />
 
 <table style="width: 100%; text-align: left;">
 	<tr>
Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r8605 -r8751
--- trunk/core/kernel/application.php	(.../application.php)	(revision 8605)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 8751)
@@ -866,7 +866,7 @@
 	function SetVar($var,$val)
 	{
 //		$http_query =& $this->recallObject('HTTPQuery');
-		return $this->HttpQuery->Set($var,$val);
+		return $this->HttpQuery->Set($var, $val);
 	}
 
 	/**
Index: trunk/kernel/admin_templates/img/toolbar/tool_primary_file.gif
===================================================================
diff -u -N -r2329 -r8751
Binary files differ
Index: trunk/themes/default2007/platform/img/master_card.gif
===================================================================
diff -u -N -r8619 -r8751
Binary files differ
Index: trunk/kernel/admin_templates/img/toolbar/tool_primary_file_f2.gif
===================================================================
diff -u -N -r2329 -r8751
Binary files differ
Index: trunk/kernel/admin_templates/img/toolbar/tool_primary_file_f3.gif
===================================================================
diff -u -N -r2329 -r8751
Binary files differ
Index: trunk/themes/default2007/platform/img/visa.gif
===================================================================
diff -u -N -r8619 -r8751
Binary files differ
Index: trunk/themes/default2007/platform/img/american_express.gif
===================================================================
diff -u -N -r8619 -r8751
Binary files differ
Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -N -r8741 -r8751
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8741)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8751)
@@ -32,7 +32,6 @@
 
 						<div id="xmlMenuDiv"><span style="color:#ffffff">Loading menu...</span></div>
 		        <script>
-
 		        	<inp2:m_DefineElement name="dmenu_element">
 								<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
 								<inp2:m_Random result_to_var="rand"/>
@@ -60,7 +59,10 @@
 								</menumgr>
 		        	</inp2:m_DefineElement>
 
+		        	<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
 		        	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
+		        	<inp2:m_Set m_cat_id="$current_category"/>
+
 		        	menu_mgr.renderMenus();
 		        	menu_mgr.renderMenubar('xmlMenuDiv');
 		        </script>
Index: trunk/themes/default2007/platform/elements/side_boxes/credit_cards.tpl
===================================================================
diff -u -N
--- trunk/themes/default2007/platform/elements/side_boxes/credit_cards.tpl	(revision 8599)
+++ trunk/themes/default2007/platform/elements/side_boxes/credit_cards.tpl	(revision 0)
@@ -1,19 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_CreditCards"/>
-</inp2:m_Capture>
-
-<table border="0" cellspacing="0" cellpadding="0" class="block">
-	<tr>
-		<td class="block-data-big"> <strong><inp2:m_Phrase label="lu_WeAcceptCards"/></strong><br />
-			<br />
-			<table style="text-align: center">
-				<tr>
-					<td>
-						<img alt="" src="<inp2:m_TemplatesBase module="In-Portal"/>img/visa.gif" /> <img alt="" src="<inp2:m_TemplatesBase module="In-Portal"/>img/american_express.gif" /> <img alt="" src="<inp2:m_TemplatesBase module="In-Portal"/>img/master_card.gif" /> <img alt="" src="<inp2:m_TemplatesBase module="In-Portal"/>img/novus.gif" />
-						<br />
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: trunk/themes/default2007/platform/img/novus.gif
===================================================================
diff -u -N -r8619 -r8751
Binary files differ
Index: trunk/core/units/general/helpers/category_helper.php
===================================================================
diff -u -N -r8718 -r8751
--- trunk/core/units/general/helpers/category_helper.php	(.../category_helper.php)	(revision 8718)
+++ trunk/core/units/general/helpers/category_helper.php	(.../category_helper.php)	(revision 8751)
@@ -6,24 +6,27 @@
 		{
 			$main_category_id = isset($params['cat_id']) ? $params['cat_id'] : $this->Application->GetVar('m_cat_id');
 
-			$ret = $this->getHomeCategoryPath($params);
+			$home_element = $this->getHomeCategoryPath($params);
 			if (!getArrayValue($params, 'titles') && !getArrayValue($params, 'templates')) {
 				// no static templates given, show only category path
-				return $ret . $this->getCategoryPath($main_category_id, $params);
+				return $home_element . $this->getCategoryPath($main_category_id, $params);
 			}
 
 			$navigation_parts = $this->getNavigationParts($params['titles'], $params['templates']);
 
+			$ret = '';
 			$block_params = Array ('category' => 0);
 			$block_params['separator'] = $params['separator'];
 			$current_template = $this->Application->GetVar('t');
+			$show_category = getArrayValue($params, 'show_category');
 
 			foreach ($navigation_parts as $template => $title) {
 				$block_params['template'] = $template;
 
 				if ($title == '__item__') {
-					if (getArrayValue($params, 'show_category')) {
+					if ($show_category) {
 						$ret .= $this->getCategoryPath($main_category_id, $params);
+						$show_category = false;
 					}
 
 					$category_path = $this->getCategoryParentPath($main_category_id);
@@ -49,7 +52,12 @@
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 
-			return $ret;
+			if ($show_category) {
+				$params['no_current'] = true;
+				return $home_element . ($show_category ? $this->getCategoryPath($main_category_id, $params) : '') . $ret;
+			}
+
+			return $home_element . $ret;
 		}
 
 		/**
@@ -88,10 +96,19 @@
 			$ret = '';
 			$block_params['category'] = 1;
 			$block_params['separator'] = $params['separator'];
+			$no_current = isset($params['no_current']) && $params['no_current'];
+
 			foreach ($category_path as $category_id => $category_name) {
 				$block_params['cat_id'] = $category_id;
 				$block_params['cat_name'] = $block_params['title'] = $category_name;
-				$block_params['current'] = ($main_category_id == $category_id) && !$module_item_id ? 1 : 0;
+
+				if ($no_current) {
+					$block_params['current'] = 0;
+				}
+				else {
+					$block_params['current'] = ($main_category_id == $category_id) && !$module_item_id ? 1 : 0;
+				}
+
 				$block_params['is_module_root'] = $category_id == $module_category_id ? 1 : 0;
 				$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 
Index: trunk/themes/default2007/platform/elements/navigation_bar.tpl
===================================================================
diff -u -N -r8718 -r8751
--- trunk/themes/default2007/platform/elements/navigation_bar.tpl	(.../navigation_bar.tpl)	(revision 8718)
+++ trunk/themes/default2007/platform/elements/navigation_bar.tpl	(.../navigation_bar.tpl)	(revision 8751)
@@ -31,7 +31,8 @@
 <table style="width: 100%;">
 	<tr>
 		<td class="navigation-bar">
-			<inp2:c_CategoryPath separator="&gt;" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" module_root_render_as="module_root" titles="$titles" templates="$templates" show_category="$show_category"/>
+			<!-- module_root_render_as="module_root" -->
+			<inp2:c_CategoryPath separator="&gt;" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/>
 		</td>
 	</tr>
 </table>
\ No newline at end of file