Index: branches/1.2.x/platform/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N -r15269 -r15276
--- branches/1.2.x/platform/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 15269)
+++ branches/1.2.x/platform/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 15276)
@@ -35,7 +35,11 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="nb_module_item_element">
-	<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
+	<inp2:m_if check="m_Param" name="current">
+		<span><inp2:m_param name="title"/></span>
+	<inp2:m_else/>
+		<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="nb_custom_element">
@@ -44,7 +48,11 @@
 	</inp2:m_ifnot>
 
 	<inp2:m_if check="m_Param" name="title" equals_to="__page__">
-		<a href="<inp2:m_Link template='$template' m_cat_id='0' m_cat_page='1'/>"><inp2:st_PageInfo type="title"/></a>
+		<inp2:m_if check="m_Param" name="current">
+			<span><inp2:st_PageInfo type="title"/></span>
+		<inp2:m_else/>
+			<a href="<inp2:m_Link template='$template' m_cat_id='0' m_cat_page='1'/>"><inp2:st_PageInfo type="title"/></a>
+		</inp2:m_if>
 	<inp2:m_elseif check="m_Param" name="title" equals_to="__item__"/>
 		<inp2:c_CategoryItemElement render_as="nb_module_item_element" pass_params="1"/>
 	</inp2:m_if>