Index: trunk/themes/default2007/no_permission.tpl
===================================================================
diff -u -N -r8508 -r8521
--- trunk/themes/default2007/no_permission.tpl	(.../no_permission.tpl)	(revision 8508)
+++ trunk/themes/default2007/no_permission.tpl	(.../no_permission.tpl)	(revision 8521)
@@ -8,7 +8,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/designs/navigation_bar" titles="lu_title_NoPermission" templates="no_permission"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_NoPermission" templates="no_permission"/>
 
 	<!-- no permission -->
 	<inp2:m_DefineElement name="permission_content">
Index: trunk/themes/default2007/platform/designs/navigation_bar.tpl
===================================================================
diff -u -N
--- trunk/themes/default2007/platform/designs/navigation_bar.tpl	(revision 8503)
+++ trunk/themes/default2007/platform/designs/navigation_bar.tpl	(revision 0)
@@ -1,36 +0,0 @@
-<inp2:m_DefineElement name="root_category">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="category_link">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_param name="cat_name"/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="template_link">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:m_Link template="$template" m_cat_id="0"/>"><inp2:m_phrase name="$title"/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="current_category">
-	<inp2:m_param name="separator"/>
-	<span> <inp2:m_param name="cat_name"/></span>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="current_template">
-	<inp2:m_param name="separator"/>
-	<span> <inp2:m_phrase name="$title"/></span>
-</inp2:m_DefineElement>
-
-
-<table style="width: 100%;">
-	<tr>
-		<td class="navigation-bar">
-			<inp2:m_if check="m_Param" name="titles">
-				<inp2:c_NavigationBar separator="&gt;" render_as="template_link" current_render_as="current_template" root_cat_render_as="root_category" titles="$titles" templates="$templates"/>
-			<inp2:m_else/>
-				<inp2:c_CategoryPath separator="&gt;" render_as="category_link" current_render_as="current_category" root_cat_render_as="root_category" />
-			</inp2:m_if>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: trunk/themes/default2007/phrases_edit.tpl
===================================================================
diff -u -N -r8508 -r8521
--- trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8508)
+++ trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8521)
@@ -8,7 +8,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/designs/navigation_bar" titles="lu_title_MissingPhraseAdding" templates="phrases_edit"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MissingPhraseAdding" templates="phrases_edit"/>
 
 	<!-- phrases -->
 	<inp2:m_DefineElement name="pharses_content">
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r8514 -r8521
--- trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8514)
+++ trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8521)
@@ -7,7 +7,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/designs/navigation_bar" titles="lu_title_MyAccount,lu_title_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount,lu_title_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
 
 	<!-- my profile -->
 	<inp2:m_DefineElement name="users_content">
@@ -16,14 +16,14 @@
 		</inp2:m_DefineElement>
 		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
 
-		
+
 		<span class="error">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-		
+
 		<inp2:m_if check="u_HasError" field="any">
 			<inp2:m_RenderElement name="error_message" />
-		</inp2:m_if>		
-		
-		
+		</inp2:m_if>
+
+
 		<form method="post" action="<inp2:m_FormAction/>">
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 			<table class="form-data fullwidth">
@@ -62,8 +62,8 @@
 						<br />
 						<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
 						<br /><br />
-						
-					</td>					
+
+					</td>
 				</tr>
 
 			</table>
Index: trunk/themes/default2007/index.tpl
===================================================================
diff -u -N -r8477 -r8521
--- trunk/themes/default2007/index.tpl	(.../index.tpl)	(revision 8477)
+++ trunk/themes/default2007/index.tpl	(.../index.tpl)	(revision 8521)
@@ -8,7 +8,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/designs/navigation_bar"/>
+	<inp2:m_include template="platform/elements/navigation_bar"/>
 	Index Page
 </inp2:m_DefineElement>
 
Index: trunk/themes/default2007/platform/categories/suggest_category.tpl
===================================================================
diff -u -N -r8491 -r8521
--- trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8491)
+++ trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8521)
@@ -15,7 +15,7 @@
 		</inp2:m_DefineElement>
 		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
 
-		<inp2:m_include template="platform/designs/navigation_bar"/>
+		<inp2:m_include template="platform/elements/navigation_bar"/>
 
 		<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
 			<inp2:c_PresetFormFields/>
Index: trunk/themes/default2007/platform/my_account/my_account.tpl
===================================================================
diff -u -N -r8478 -r8521
--- trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8478)
+++ trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8521)
@@ -7,7 +7,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/designs/navigation_bar" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
 
 	<!-- my account -->
 	<inp2:m_DefineElement name="my_account_content">
Index: trunk/themes/default2007/platform/elements/navigation_bar.tpl
===================================================================
diff -u -N
--- trunk/themes/default2007/platform/elements/navigation_bar.tpl	(revision 0)
+++ trunk/themes/default2007/platform/elements/navigation_bar.tpl	(revision 8521)
@@ -0,0 +1,36 @@
+<inp2:m_DefineElement name="root_category">
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="category_link">
+	<inp2:m_param name="separator"/>
+	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_param name="cat_name"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="template_link">
+	<inp2:m_param name="separator"/>
+	<a href="<inp2:m_Link template="$template" m_cat_id="0"/>"><inp2:m_phrase name="$title"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="current_category">
+	<inp2:m_param name="separator"/>
+	<span> <inp2:m_param name="cat_name"/></span>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="current_template">
+	<inp2:m_param name="separator"/>
+	<span> <inp2:m_phrase name="$title"/></span>
+</inp2:m_DefineElement>
+
+
+<table style="width: 100%;">
+	<tr>
+		<td class="navigation-bar">
+			<inp2:m_if check="m_Param" name="titles">
+				<inp2:c_NavigationBar separator="&gt;" render_as="template_link" current_render_as="current_template" root_cat_render_as="root_category" titles="$titles" templates="$templates"/>
+			<inp2:m_else/>
+				<inp2:c_CategoryPath separator="&gt;" render_as="category_link" current_render_as="current_category" root_cat_render_as="root_category" />
+			</inp2:m_if>
+		</td>
+	</tr>
+</table>
\ No newline at end of file