Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -N -r8751 -r8759
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8751)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8759)
@@ -1,119 +1,97 @@
 <table class="top-menu fullwidth">
 	<tr>
 		<td align="left">
-
-			<table style="width:auto">
+			<table style="width: auto;">
 				<tr>
-					<!-- menu: Home -->
-					<inp2:m_Capture to_var="menu_href">
-						<inp2:m_Link template="index" m_cat_id="0"/>
-					</inp2:m_Capture>
-
-					<inp2:m_Capture to_var="menu_icon">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_home.gif" width="23" height="20" alt="" /><br />
-					</inp2:m_Capture>
-
-				<!--	<inp2:m_Capture to_var="menu_title">
-						Home
-					</inp2:m_Capture>
-
-					<inp2:m_IsActive template="index" result_to_var="current"/>
-					<inp2:m_RenderElement name="__this__" design="menu_element"/>
-
-					<inp2:m_ModuleInclude template="elements/menu"/>-->
-
 					<td>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
 
 						<link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
-
 						<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"/>
-								<inp2:m_Set m_cat_id="$root_cat"/>
-								<item id="sub-elem<inp2:m_Param name="root_cat"/>"
-									url="<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root"/>"
-									ico="['<inp2:m_TemplatesBase module="$module"/>img/<inp2:m_Param name="icon"/>']"
-									enb="true" title=""
-									subid="sub<inp2:m_Param name="root_cat"/>"
-									suburl="<inp2:m_link template="platform/elements/subcats.xml"
-									 m_cat_id="$root_cat"
-									 c_menu_Page="1" pass="m,c.menu"
-									 level="0" max_level="4" rand="$rand"
-									/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
-							</inp2:m_DefineElement>
 
-		        	<inp2:m_DefineElement name="menu_xml">
-								<menumgr id="mgr" flowoverformelement="false" defaulteffect="slide" icpath="">
-								  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_">
-								    <items>
-								    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[Home]]></item>
-								    	<inp2:m_ModuleInclude template="elements/menu.xml" />
-								    </items>
-								  </menubar>
-								</menumgr>
-		        	</inp2:m_DefineElement>
+				        <script type="text/javascript">
+				        	<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"/>
+										<inp2:m_Set m_cat_id="$root_cat"/>
+										<item id="sub-elem<inp2:m_Param name="root_cat"/>"
+											url="<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root"/>"
+											ico="['<inp2:m_TemplatesBase module="$module"/>img/<inp2:m_Param name="icon"/>']"
+											enb="true" title=""
+											subid="sub<inp2:m_Param name="root_cat"/>"
+											suburl="<inp2:m_link template="platform/elements/subcats.xml"
+											 m_cat_id="$root_cat"
+											 c_menu_Page="1" pass="m,c.menu"
+											 level="0" max_level="4" rand="$rand"
+											/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
+									</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"/>
+				        	<inp2:m_DefineElement name="menu_xml">
+										<menumgr id="mgr" flowoverformelement="false" defaulteffect="slide" icpath="">
+										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_">
+										    <items>
+										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
+										    	<inp2:m_ModuleInclude template="elements/menu.xml" />
+										    </items>
+										  </menubar>
+										</menumgr>
+				        	</inp2:m_DefineElement>
 
-		        	menu_mgr.renderMenus();
-		        	menu_mgr.renderMenubar('xmlMenuDiv');
-		        </script>
+				        	<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"/>
+							<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
+
+				        	menu_mgr.renderMenus();
+				        	menu_mgr.renderMenubar('xmlMenuDiv');
+				        </script>
 					</td>
 				</tr>
 			</table>
-
 		</td>
 		<td align="right">
-
-			<table style="width:auto">
+			<table style="width: auto;">
 				<tr>
 					<!-- menu: My Account -->
-					<inp2:m_Capture to_var="menu_href">
-						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
-					</inp2:m_Capture>
+					<inp2:m_RenderElement design="menu_element">
+						<inp2:m_Capture to_var="menu_href">
+							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_icon">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_icon">
+							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_title">
-						My Account
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_title">
+							<inp2:m_Phrase name="lu_title_MyAccount"/>
+						</inp2:m_Capture>
 
-					<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
-					<inp2:m_RenderElement name="__this__" design="menu_element"/>
+						<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
+					</inp2:m_RenderElement>
 					<!-- // menu: My Account -->
 
 					<!-- menu: ShoppingCart -->
+					<inp2:m_RenderElement design="menu_element">
+						<inp2:m_Capture to_var="menu_href">
+							<inp2:m_Link template="in-commerce/checkout/shop_cart" m_cat_id="0"/>
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_href">
-						<inp2:m_Link template="in-commerce/checkout/shop_cart" m_cat_id="0"/>
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_icon">
+							<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_icon">
-						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_title">
+							<inp2:m_Phrase name="lu_title_ShoppingCart"/>
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_title">
-						Shopping Cart
-					</inp2:m_Capture>
-
-					<inp2:m_IsActive template="in-commerce/checkout/shop_cart" result_to_var="current"/>
-					<inp2:m_RenderElement name="__this__" design="menu_element"/>
+						<inp2:m_IsActive template="in-commerce/checkout/shop_cart" result_to_var="current"/>
+					</inp2:m_RenderElement>
 					<!-- // menu: ShoppingCart -->
 				</tr>
 			</table>
-
 		</td>
 	</tr>
-</table>
-
-
+</table>
\ No newline at end of file