Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -N -r8539 -r8599
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8539)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8599)
@@ -5,25 +5,18 @@
 			<table style="width:auto">
 				<tr>
 					<!-- menu: Home -->
-					<inp2:m_DefineElement name="menu_href1">
+					<inp2:m_Capture to_var="menu_href">
 						<inp2:m_Link template="index" m_cat_id="0"/>
-					</inp2:m_DefineElement>
+					</inp2:m_Capture>
 
-					<inp2:m_RenderElement name="menu_href1" strip_nl="2" result_to_var="menu_href"/>
-
-
-					<inp2:m_DefineElement name="menu_icon1">
+					<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_DefineElement>
-					<inp2:m_RenderElement name="menu_icon1" strip_nl="2" result_to_var="menu_icon"/>
+					</inp2:m_Capture>
 
-				<!--	<inp2:m_DefineElement name="menu_title1">
+				<!--	<inp2:m_Capture to_var="menu_title">
 						Home
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_title1" strip_nl="2" result_to_var="menu_title"/>
+					</inp2:m_Capture>
 
-
-
 					<inp2:m_IsActive template="index" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 
@@ -51,40 +44,34 @@
 			<table style="width:auto">
 				<tr>
 					<!-- menu: My Account -->
-					<inp2:m_DefineElement name="menu_href10">
+					<inp2:m_Capture to_var="menu_href">
 						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_href10" strip_nl="2" result_to_var="menu_href"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_icon10">
+					<inp2:m_Capture to_var="menu_icon">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon10" strip_nl="2" result_to_var="menu_icon"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_title10">
+					<inp2:m_Capture to_var="menu_title">
 						My Account
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_title10" strip_nl="2" result_to_var="menu_title"/>
+					</inp2:m_Capture>
 
 					<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 					<!-- // menu: My Account -->
 
 					<!-- menu: ShoppingCart -->
-					<inp2:m_DefineElement name="menu_href11">
+					<inp2:m_Capture to_var="menu_href">
 						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_href11" strip_nl="2" result_to_var="menu_href"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_icon11">
+					<inp2:m_Capture to_var="menu_icon">
 						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon11" strip_nl="2" result_to_var="menu_icon"/>
+					</inp2:m_Capture>
 
-					<inp2:m_DefineElement name="menu_title11">
+					<inp2:m_Capture to_var="menu_title">
 						Shopping Cart
-					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_title11" strip_nl="2" result_to_var="menu_title"/>
+					</inp2:m_Capture>
 
 					<inp2:m_IsActive template="in-commerce/checkout/shopping_cart" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>