Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r14781 -r14785
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14781)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14785)
@@ -125,4 +125,16 @@
 			<p class="date"><strong><inp2:DateField name="CreatedOn" format="F j, Y"/></strong></p>
 		</div>
 	</div>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement no_editing="1" name="prev_next_element" prefix="" id_field="" special="prefix-navigation" main_list="">
+	<inp2:{$prefix}.{$special}_InitList per_page="-1" main_list="$main_list" skip_quering="1"/>
+
+	<inp2:m_if check="{$prefix}.previous_Field" name="$id_field" item="$prefix" list="{$prefix}.{$special}">
+		<a href="<inp2:{$prefix}.previous_ItemLink template='__default__'/>" class="product-prev" title="Previous"></a>
+	</inp2:m_if>
+
+	<inp2:m_if check="{$prefix}.next_Field" name="$id_field" item="$prefix" list="{$prefix}.{$special}">
+		<a href="<inp2:{$prefix}.next_ItemLink template='__default__'/>" class="product-next" title="Next"></a>
+	</inp2:m_if>
+ </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.0.x/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N -r14747 -r14785
--- branches/1.0.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 14747)
+++ branches/1.0.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 14785)
@@ -4,7 +4,7 @@
 	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="module_root">	
+<inp2:m_DefineElement name="module_root">
 	<i></i> <a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
 </inp2:m_DefineElement>
 
@@ -29,9 +29,7 @@
 	<inp2:c_CategoryPath separator="" 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="html:" titles="$titles" templates="$templates" show_category="$show_category"/><span></span>
 
 <inp2:m_if check="m_Param" name="navigation_buttons">
-	<a href="#" class="product-prev" title="Previous"></a>
-	<a href="#" class="product-next" title="Next"></a>
+	<inp2:m_RenderElement name="prev_next_element" prefix="p" id_field="ProductId" special="product-navigation" main_list="1"/>
 </inp2:m_if>
 
-</h2>
-	
\ No newline at end of file
+</h2>
\ No newline at end of file