Index: branches/RC/themes/default2009/platform/elements/menu.elm.tpl
===================================================================
diff -u -N -r11678 -r11868
--- branches/RC/themes/default2009/platform/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 11678)
+++ branches/RC/themes/default2009/platform/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 11868)
@@ -36,14 +36,20 @@
 					        );
 				        </script>
 				        <noscript>
-				        	<inp2:m_DefineElement name="static_menu_element">
-				        		<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
-								<inp2:m_Random result_to_var="rand"/>
-								<inp2:m_Set m_cat_id="$root_cat"/>
-								<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
-								<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
-								<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
-								<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}"/>
+							<inp2:m_DefineElement name="static_top_menu_element">
+								<inp2:m_if check="m_Param" name="external_url">
+									<inp2:m_Param name="external_url" result_to_var="link"/>
+								<inp2:m_else/>
+									<inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1" result_to_var="link"/>
+								</inp2:m_if>
+
+								<inp2:m_if check="m_Param" name="menu_icon">
+									<inp2:m_TemplatesBase result_to_var="module_path"/>
+									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}{$menu_icon}"/>
+								<inp2:m_else/>
+									<inp2:m_TemplatesBase module="In-Portal" result_to_var="module_path"/>
+									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_inedit.gif"/>
+								</inp2:m_if>
 							</inp2:m_DefineElement>
 
 							<table>
@@ -52,6 +58,7 @@
 									<inp2:m_RootCategoryName result_to_var="title"/>
 									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
 									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif"/>
+									<inp2:st_CachedMenu level="0" category_id="0" render_as="static_top_menu_element"/>
 								</tr>
 							</table>
 				        </noscript>