Index: branches/RC/themes/default2009/in-commerce/detail.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/detail.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/detail.tpl	(revision 11475)
@@ -1,283 +1,283 @@
 <!--## ADD CURRENT PRODUCT TO RECENTLY VIEWED PRODUCTS ##-->
 <inp2:p_AddToRecent />
 <!--## /ADD CURRENT PRODUCT TO RECENTLY VIEWED PRODUCTS ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:p_Field name="Name"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" data_exists="1" design="blue_box"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" data_exists="1" design="blue_box"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box" item_actions="1" design="blue_box"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## ADDITIONAL IMAGE ELEMENT ##-->
 <inp2:m_DefineElement name="additional_image_element">
 	<td>
 		<a href="<inp2:ImageSrc format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:m_param name="alt"/>">
 			<img src="<inp2:m_param name="img_path"/>" title="<inp2:m_param name="alt"/>" alt="<inp2:m_param name="alt"/>" <inp2:m_param name="img_size"/> border="0" /><br />
 		</a>
 	</td>
 	<inp2:m_if check="m_Param" name="not_last">
 		<td>
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="8" height="1" alt="" />
 		</td>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 <!--## /ADDITIONAL IMAGE ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__" templates="__default__" show_category="1"/>
 
 	<!-- Product Details -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_ProductDetails"/>
 		</inp2:m_Capture>
 
 		<table class="fullwidth table-border">
 			<tr>
 				<td class="item-padding">
 					<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" alt=""/> <span class="text-title"><inp2:p_Field name="Name"/></span>
 
 					<inp2:m_if check="p_Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
 					<inp2:m_if check="p_Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
 					<inp2:m_if check="p_Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
 					<inp2:m_if check="p_IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
 					<inp2:m_if check="p_IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
 
 					<inp2:p_VotesIndicator render_as="rating_element"/>
 
 					<br />
 					<br />
 
 					<table>
 						<tr>
 							<td style="text-align: center; padding-right: 10px;" valign="top">
 								<!--## Check if image exists ##-->
 								<inp2:m_if check="p_ImageSrc" MaxWidth="fullsize">
 									<a href="<inp2:p_ImageSrc DefaultImage="platform/img/no_picture.gif" format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:p_Field name='Name' html_escape='1'/>">
 										<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" align="center"/><br />
 									</a>
 								<!--## Check if image exists ##-->
 								<inp2:m_else/>
 									<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" align="center"/><br />
 								</inp2:m_if>
 								<br />
 
 								<inp2:m_if check="p_HasAdditionalImages">
 									<a href="<inp2:p_ProductLink template="__default__" />#images"><inp2:m_Phrase label="lu_btn_MoreImages"/></a>
 									<br /><br />
 								</inp2:m_if>
 
 								<span class="product-price-large"><inp2:p_Field name="Price" currency="selected"/></span><br /><br />
 
 								<inp2:m_if check="p_Available">
 									<inp2:m_if check="p_ShouldListOptions" required_only="1"><inp2:m_else/>
 										<input class="button" onclick=" window.location.href='<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_comm_BuyNow"/>" />
 									</inp2:m_if>
 								<inp2:m_else />
 									<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
 								</inp2:m_if>
 							</td>
 							<td valign="top">
 								<strong><inp2:m_phrase label="lu_Added"/>:</strong> <inp2:p_field field="CreatedOn_date" format="_regional_DateFormat"/><br />
 								<strong><inp2:m_phrase label="lu_Hits"/>:</strong> <inp2:p_field field="Hits"/><br />
 								<strong><inp2:m_phrase label="lu_Reviews"/>:</strong> <inp2:p_field field="CachedReviewsQty"/>
 
 								<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a><br />
 								<strong><inp2:m_phrase label="lu_Rating"/>:</strong> <inp2:p_field field="CachedRating"/> (<inp2:m_phrase label="lu_Votes"/>: <inp2:p_field field="CachedVotesQty"/>)
 
 								<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_RateThisProduct"/></a><br />
 
 								<br />
 
 								<inp2:m_if check="p_Field" name="SKU">
 									<strong><inp2:m_Phrase label="lu_fld_SKU"/>:</strong> <inp2:p_field name="SKU"/><br />
 								</inp2:m_if>
 
 								<inp2:m_if check="p_Field" name="ManufacturerId">
 									<strong><inp2:m_Phrase label="lu_fld_Manufacturer"/>:</strong> <inp2:p_field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:p_Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
 								</inp2:m_if>
 
 								<inp2:m_if check="p_Field" name="MSRP">
 									<strong><inp2:m_Phrase label="lu_fld_MSRP"/>:</strong> <span class="product-price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br />
 								</inp2:m_if>
 
 								<strong><inp2:m_Phrase label="lu_fld_OurPrice"/>: <span class="product-price"><inp2:p_Field name="Price" currency="selected"/></span></strong> <br />
 
 								<inp2:m_if check="p_Savings">
 									<strong><inp2:m_Phrase label="lu_fld_YouSave"/>: <span class="product-price"><inp2:p_Savings currency="selected" /> (<inp2:p_Savings type="percent"/>%)</span></strong><br/>
 								</inp2:m_if>
 								<br />
 
 								<inp2:m_if check="p_CustomField" name="Availability">
 									<strong><inp2:p_CustomFieldLabel field="Availability"/>:</strong>
 									<inp2:p_CustomField name="Availability"/>
 									<br />
 									<br />
 								</inp2:m_if>
 
 								<inp2:m_if check="p_HasQuantityPricing">
 									<inp2:m_if check="p_IsTangible">
 										<table>
 											<tr>
 												<td colspan="2" class="block-header">
 													<inp2:m_Phrase label="lu_comm_QuantityPricing"/>
 												</td>
 											</tr>
 											<tr class="cart-header">
 												<td>
 													<inp2:m_Phrase label="lu_comm_Quantity"/>
 												</td>
 												<td>
 													<inp2:m_Phrase label="lu_comm_Price"/>
 												</td>
 											</tr>
 											<inp2:m_DefineElement name="price_bracket">
 												<tr class="cart-item-small">
 													<td>
 														<inp2:Field name="MinQty"/> - <inp2:Field name="MaxQty"/>
 													</td>
 													<td>
 														<inp2:m_if check="Field" name="Negotiated">
 															<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>
 														<inp2:m_else/>
 															<inp2:Field name="Price" currency="selected"/>
 														</inp2:m_if>
 													</td>
 												</tr>
 											</inp2:m_DefineElement>
 											<inp2:p_ListPriceBrackets render_as="price_bracket"/>
 										</table>
 										<br />
 									</inp2:m_if>
 
 									<inp2:m_if check="p_IsSubscription">
 										<table>
 											<tr>
 												<td colspan="3" class="block-header">
 													<inp2:m_Phrase label="lu_comm_Pricing"/>
 												</td>
 											</tr>
 											<tr class="cart-header">
 												<td>
 													<inp2:m_Phrase label="lu_comm_AccessDuration"/>
 												</td>
 												<td>
 													<inp2:m_Phrase label="lu_comm_Price"/>
 												</td>
 												<td>&nbsp;
 
 												</td>
 											</tr>
 											<inp2:m_DefineElement name="access_price_bracket">
 												<tr class="cart-item-small">
 													<td>
 														<inp2:Field name="AccessDuration"/> <inp2:Field name="AccessUnit"/>
 														<br />
 														<small><inp2:Field name="Description"/></small>
 													</td>
 													<td>
 														<inp2:Field name="Price" currency="selected"/>
 													</td>
 													<td>
 														<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" /></a>
 													</td>
 												</tr>
 											</inp2:m_DefineElement>
 											<inp2:p_ListPriceBrackets render_as="access_price_bracket"/>
 										</table>
 										<br />
 									</inp2:m_if>
 								</inp2:m_if>
 
 								<inp2:m_include template="in-commerce/products/form_options"/>
 
 								<inp2:m_if check="p_Field" name="Description">
 									<strong><inp2:m_Phrase label="lu_fld_Description"/>:</strong> <inp2:p_Field name="Description"/> <br />
 								</inp2:m_if>
 
 								<br />
 								<inp2:m_if check="p_CustomField" name="Features">
 									<strong><inp2:p_CustomFieldLabel field="Features"/>:</strong>
 									<inp2:p_CustomField name="Features"/>
 									<br />
 									<br />
 								</inp2:m_if>
 
 								<inp2:m_if check="p_IsFavorite">
 									<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:p_FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromWishList"/></a>
 								<inp2:m_else/>
 									<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:p_FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToWishList"/></a>
 								</inp2:m_if>
 							</td>
 						</tr>
 					</table>
 
 			        <br />
 					<inp2:m_if check="p_HasAdditionalImages">
 						<a name="images"></a>
 
 						<inp2:m_RenderElement name="subsection" title="lu_section_AdditionalImages"/>
 						<table>
 							<tr>
 								<inp2:p_ListImages render_as="additional_image_element" types="additional" per_page="-1" no_table="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif"/>
 							</tr>
 						</table>
 					</inp2:m_if>
 				</td>
 			</tr>
 		</table>
 	</inp2:m_RenderElement>
 	<!-- // Product Details -->
 
 	<!-- Product Reviews -->
 	<inp2:m_DefineElement name="no_reviews">
 		<inp2:m_phrase name="lu_NoReviews"/>
 	</inp2:m_DefineElement>
 
 	<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_reviews">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_section_Reviews"/> (<inp2:p-rev_TotalRecords/>)
 		</inp2:m_Capture>
 
 		<table>
 			<inp2:p-rev_PrintList render_as="review_element"/>
 		</table>
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p-rev"/>
 	</inp2:m_RenderElement>
 	<!-- // Product Reviews -->
 
 	<a name="related"></a>
-	<inp2:m_include template="in-commerce/elements/content_boxes/related_products"/>
+	<inp2:m_include template="in-commerce/elements/content_boxes/related_products.elm"/>
 
 	<!--## RELATED TO PRODUCT ITEMS ##-->
 	<inp2:m_RenderElement design="content_box" related_to="Product" data_exists="1">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_RelatedItems"/>
 		</inp2:m_Capture>
 
 		<inp2:m_ModuleInclude template="elements/content_boxes/related_items.elm" related_to="$related_to" skip_prefixes="p" />
 	</inp2:m_RenderElement>
 	<!--## // RELATED TO PRODUCT ITEMS ##-->
 
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/detail.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl	(revision 11475)
@@ -1,81 +1,81 @@
 <!--## LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin login_template="platform/login/register"/>
 <!--## /LOGIN REQUIRED ##-->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!--## /CHECK IF SSL REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:p_Field name="Name" /> - <inp2:m_phrase name="lu_title_ProductFiles"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
-			in-commerce/elements/side_boxes/credit_cards,
+			in-commerce/elements/side_boxes/credit_cards.elm,
 		"
 		design="blue_box"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyDownloads,__item__,lu_title_ProductFiles" templates="platform/my_account/my_account,in-commerce/my_account/my_downloads,__default__,in-commerce/my_account/my_downloads_more"/>
 
 	<!--## MORE DOWNLOADS ##-->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:p_Field name="Name" /> - <inp2:m_phrase name="lu_title_ProductFiles"/>
 		</inp2:m_Capture>
 
 		<table>
 			<tr>
 				<td style="text-align: center; padding-right: 10px;" valign="top">
 					<a href="<inp2:p_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" target="_blank">
 						<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
 					</a>
 				</td>
 
 				<td>
 					<a href="<inp2:p_ProductLink template="__default__"/>" class="text-title"><inp2:p_field name="Name"/></a><br />
 
 					<inp2:m_if check="p_Field" name="ManufacturerId">
 						<inp2:m_Phrase label="lu_fld_Manufacturer"/>: <inp2:p_field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_OtherProductsBy"/> <a href="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:p_Field name="ManufacturerId"/></a>) <br />
 					</inp2:m_if>
 					<br />
 
 					<inp2:m_Phrase label="lu_fld_Description"/>: <inp2:p_Field name="Description"/> <br /><br />
 
 					<inp2:m_if check="p_CustomField" name="Features">
 						<inp2:p_CustomFieldLabel field="Features"/>:
 						<inp2:p_CustomField name="Features"/>
 						<br />
 						<br />
 					</inp2:m_if>
 
-					<inp2:m_include template="in-commerce/designs/product_files"/>
+					<inp2:m_include template="in-commerce/designs/product_files.elm"/>
 
 					<inp2:m_RenderElement name="subsection" title="lu_section_Files"/>
 					<table>
 						<inp2:p_ListFiles render_as="product_file_element" per_page="-1"/>
 					</table>
 				</td>
 			</tr>
 		</table>
 	</inp2:m_RenderElement>
 	<!--## /MORE DOWNLOADS ##-->
 
 </inp2:m_DefineElement>
 <!--## MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl	(revision 11475)
@@ -1,67 +1,67 @@
 <!--## LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin login_template="platform/login/register"/>
 <!--## /LOGIN REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_comm_MyAddresses"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 		<inp2:m_RenderElements
 			elements="
 				platform/elements/side_boxes/login.elm,
 				platform/elements/side_boxes/search.elm,
 			"
 			design="blue_box"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyAddresses" templates="platform/my_account/my_account,in-commerce/my_account/my_addresses"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:addr_InitList list_name="my_addresses" types="myaddresses"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_comm_MyAddresses"/>
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/designs/addresses"/>
+		<inp2:m_include template="in-commerce/designs/addresses.elm"/>
 
 		<inp2:m_if check="ord_AllowAddAddress">
 			<a href="<inp2:m_Link template="in-commerce/my_account/new_address"/>"><inp2:m_Phrase label="lu_btn_NewAddress"/></a>
 			<br /><br />
 		</inp2:m_if>
 
 		<inp2:m_if check="addr_TotalRecords" list_name="my_addresses">
 			<table class="fullwidth">
 				<tr>
 					<td colspan="4">
 						<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
 					</td>
 				</tr>
 				<tr class="sub-section-header">
 					<td><inp2:m_Phrase label="lu_Address"/></td>
 					<td><inp2:m_Phrase label="lu_ContactInfo"/></td>
 					<td><inp2:m_Phrase label="lu_AddressUsedAs"/></td>
 					<td>&nbsp;</td>
 				</tr>
 				<inp2:addr_PrintList list_name="my_addresses" render_as="my_address_element" direction="H"/>
 			</table>
 
 			<inp2:m_include template="platform/elements/pagination.elm" prefix="addr" list_name="my_addresses"/>
 		<inp2:m_else/>
 			<strong><inp2:m_Phrase label="lu_comm_DontHaveAddresses"/></strong>
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl	(revision 11475)
@@ -1,63 +1,63 @@
 <!--## LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin login_template="platform/login/register"/>
 <!--## /LOGIN REQUIRED ##-->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!--## /CHECK IF SSL REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_MyOrders"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders" templates="platform/my_account/my_account,in-commerce/my_account/my_orders"/>
 	<!--## my orders ##-->
 	<inp2:ord_InitList list_name="my_orders" types="myorders"/>
 
 	<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyOrders"/> (<inp2:ord_TotalRecords list_name="my_orders"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/designs/orders"/>
+		<inp2:m_include template="in-commerce/designs/orders.elm"/>
 
 		<table class="fullwidth">
 			<tr>
 				<td colspan="4">
 					<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
 				</td>
 			</tr>
 			<tr  class="sub-section-header">
 				<td><inp2:m_Phrase label="lu_comm_OrderNumberText"/></td>
 				<td><inp2:m_Phrase label="lu_comm_Date"/></td>
 				<td><inp2:m_Phrase label="lu_comm_Amount"/></td>
 				<td><inp2:m_Phrase label="lu_comm_Status"/></td>
 			</tr>
 			<inp2:ord_PrintList list_name="my_orders" render_as="my_order_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="ord" list_name="my_orders"/>
 	</inp2:m_RenderElement>
 	<!--## // my orders ##-->
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl	(revision 11475)
@@ -1,55 +1,55 @@
 <!--## LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin login_template="platform/login/register"/>
 <!--## /LOGIN REQUIRED ##-->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!--## /CHECK IF SSL REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_OrderPreview"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
-			in-commerce/elements/side_boxes/credit_cards,
+			in-commerce/elements/side_boxes/credit_cards.elm,
 		"
 		design="blue_box"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders,lu_title_OrderPreview" templates="platform/my_account/my_account,in-commerce/my_account/my_orders,in-commerce/my_account/my_order_details"/>
 
 	<inp2:m_RenderElement design="content_box">
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_OrderPreview"/>
 		</inp2:m_Capture>
 
 		<form method="post" action="<inp2:m_FormAction/>">
-			<inp2:m_include template="in-commerce/elements/order_details"/>
+			<inp2:m_include template="in-commerce/elements/order_details.elm"/>
 		</form>
 
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
 
 
 
 
 
 
 

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl	(revision 11475)
@@ -1,59 +1,59 @@
 <inp2:m_RequireLogin login_template="platform/login/register" />
 <inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_AffiliatePaymentType"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payment_type"/>
 	<inp2:m_RenderElement design="content_box">
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_AffiliatePaymentType"/>
 		</inp2:m_Capture>
 
 		<table class="form-data fullwidth">
 			<tr>
 				<td class="field-name" style="width:155px">
 					<strong><inp2:m_Phrase label="lu_CurrentAffiliatePaymentType" />:</strong>
 				</td>
 				<td class="field-name"><inp2:u_AffiliateField name="PaymentTypeId" /></td>
 			</tr>
 			<tr><td colspan="2" style="padding-left:15px"><inp2:m_Phrase label="lu_ChangeAffiliatePaymentTypeDescription"/><br /><br /></td></tr>
 		</table>
 
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
 		<br />
-		<inp2:m_include template="in-commerce/elements/forms"/>
+		<inp2:m_include template="in-commerce/elements/forms.elm"/>
 		<form method="post" action="<inp2:m_FormAction/>">
 			<table border="0" class="form-data fullwidth">
 				<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
 				<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px" is_last="1"/>
 
 				<inp2:m_RenderElement design="inp_edit_buttons">
 					<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_payment_type_changed" />
 					<input type="submit" class="button" name="events[affil][OnChangePaymentType]" id="events[affil][OnChangePaymentType]" value="<inp2:m_Phrase label="lu_ChangePaymentType"/>" />
 				</inp2:m_RenderElement>
 			</table>
 		</form>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl	(revision 11475)
@@ -1,94 +1,94 @@
 <inp2:m_RequireLogin login_template="platform/login/register"/>
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <inp2:m_DefineElement name="affiliate_element">
 	<a href="<inp2:m_Link template="$template"/>">
 	<strong><inp2:m_Phrase label="$label"/></strong></a><br />
 	<inp2:m_Phrase label="$text"/><br /><br />
 </inp2:m_DefineElement>
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_Affiliate"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate"/>
 
 	<inp2:m_RenderElement design="content_box">
 
 		<inp2:m_if check="u_IsAffiliate">
 		<!-- Affiliate Section List -->
 			<inp2:m_Capture to_var="header">
 				<inp2:m_Phrase label="lu_title_Affiliate"/>
 			</inp2:m_Capture>
 
 			<inp2:m_if check="u_AffiliateIsNotActive">
 				<table class="warning-message fullwidth">
 					<tr>
 						<td width="30">
 							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
 						</td>
 						<td><inp2:m_phrase name="lu_Warning"/></td>
 					</tr>
 				</table>
 				<br />
 				<inp2:m_Phrase label="lu_AffiliateIsPendingOrDisabled"/><br /><br />
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_statistics" label="lu_comm_AffiliateStatistics" text="lu_AffiliateStatisticsText"/>
 			<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payments" label="lu_AffiliatePayments" text="lu_AffiliatePaymentsText"/>
 			<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_materials" label="lu_AffiliateMaterials" text="lu_AffiliateMaterialsText"/>
 			<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payment_type" label="lu_ChangePaymentType" text="lu_ChangePaymentTypeText"/>
 
 			<a href="<inp2:m_Link t='in-commerce/my_account/affiliate'/>" onclick="showAffiliateAgreement();return false;">
 			<strong><inp2:m_Phrase label="lu_TermsAndConditionsLink"/></strong></a><br />
 			<inp2:m_Phrase label="lu_TermsAndConditionsText"/><br /><br />
 		<!-- End Of Affiliate Section List -->
 		<inp2:m_else />
 		<!-- Affiliate Registration -->
 			<inp2:m_Capture to_var="header">
 				<inp2:m_Phrase label="lu_title_AffiliateRegistration"/>
 			</inp2:m_Capture>
 
 			<inp2:m_Phrase label="lu_BecomeAnAffiliateDescription"/><br /><br />
 
 			<inp2:m_if check="u_HasError" field="any">
 				<inp2:m_RenderElement name="error_message" />
 			</inp2:m_if>
 
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
 			<br />
-			<inp2:m_include template="in-commerce/elements/forms"/>
+			<inp2:m_include template="in-commerce/elements/forms.elm"/>
 			<form method="post" action="<inp2:m_FormAction/>">
 				<table border="0" class="form-data fullwidth">
 					<inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" style="width:155px" required="1"/>
 					<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
 					<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
 					<inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
 
 					<inp2:m_RenderElement design="inp_edit_buttons">
 						<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_thankyou" />
 						<input type="submit" class="button" name="events[affil][OnBecomeAffiliate]" id="events[affil][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate"/>" />
 					</inp2:m_RenderElement>
 				</table>
 			</form>
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl	(revision 11475)
@@ -1,60 +1,60 @@
 <inp2:m_RequireLogin login_template="platform/login/register" />
 <inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_ComissionPayments"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_ComissionPayments"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payments"/>
 	<inp2:m_RenderElement design="content_box" block_no_data="no_payments">
 
 		<inp2:apayments_InitList list_name="my_payments_list" types="my_payments"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_ComissionPayments"/> (<inp2:apayments_TotalRecords list_name="my_payments_list" />)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/designs/affiliates"/>
+		<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
 
 		<table class="fullwidth">
 			<inp2:m_RenderElement name="separator" colspan="4"/>
 			<tr class="sub-section-header">
 				<td><inp2:m_Phrase label="lu_Date"/></td>
 				<td><inp2:m_Phrase label="lu_PaymentReference"/></td>
 				<td><inp2:m_Phrase label="lu_PaymentAmount"/></td>
 			</tr>
 			<inp2:m_RenderElement name="separator" colspan="4"/>
-			<inp2:m_include template="in-commerce/designs/affiliates"/>
+			<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
 			<inp2:apayments_PrintList list_name="my_payments_list" render_as="payment_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="apayments" list_name="my_payments_list"/>
 
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 
 
 
 
 
 
 

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl	(revision 11475)
@@ -1,62 +1,62 @@
 <inp2:m_RequireLogin login_template="platform/login/register" />
 <inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_AffiliateMaterials"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_AffiliateMaterials"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_materials"/>
 	<inp2:m_RenderElement design="content_box">
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_AffiliateMaterials"/>
 		</inp2:m_Capture>
 
 		<inp2:m_if check="u_IsAffiliate">
 			<table>
 				<tr>
 					<td colspan="2"><inp2:m_Phrase label="lu_AffiliateMaterials"/></td>
 				</tr>
 				<tr>
 					<td>
 						<inp2:m_Phrase label="lu_comm_AffilliateMaterialsToRefer"/>:
 						<br /><br />
 						 <a href="<inp2:affil_GetUserAffiliateLink template="index"/>"><inp2:affil_GetUserAffiliateLink template="index"/></a>
 					</td>
 				</tr>
 				<tr>
 					<td>
 						<inp2:m_Phrase label="lu_comm_AffilliateMaterialsCode"/>:
 						<blockquote style="border: 1px dashed #cccccc; background-color: #f3f3f3; padding: 8px">
 						<small>
 						&lt;a href="<inp2:affil_GetUserAffiliateLink template="index"/>"&gt;
 							<inp2:conf_ConfigValue name="Site_Name"/>
 						&lt;/a&gt;
 						</small>
 						</blockquote>
 						<inp2:m_Phrase label="lu_comm_AffilliateMaterialsCopy"/>
 					</td>
 				</tr>
 			</table>
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl	(revision 11475)
@@ -1,57 +1,57 @@
 <inp2:m_RequireLogin login_template="platform/login/register" />
 <inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_AffiliateStatisticsOrders"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliateStatisticsOrders"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_statistics_orders_list"/>
 
 	<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
 
 		<inp2:visits_InitList list_name="visitors_orders_list" types="myvisitororders" grid="visitsincommerce"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_AffiliateStatisticsOrders"/>
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/affiliate_date_filter" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
+		<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
 
-		<inp2:m_include template="in-commerce/designs/affiliates"/>
+		<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
 
 		<table class="fullwidth">
 			<inp2:m_RenderElement name="separator" colspan="4"/>
 			<tr class="sub-section-header">
 				<td><inp2:m_Phrase label="lu_col_Date"/></td>
 				<td><inp2:m_Phrase label="lu_col_OrderNumber"/></td>
 				<td><inp2:m_Phrase label="lu_col_OrderTotalAmount"/></td>
 				<td><inp2:m_Phrase label="lu_col_OrderCommissionEarned"/></td>
 			</tr>
 			<inp2:m_RenderElement name="separator" colspan="5"/>
 			<inp2:visits_PrintList list_name="visitors_orders_list" render_as="my_order_element"/>
 			<inp2:visits_AffiliateOrderInfo list_name="visitors_orders_list" types="myvisitors" render_as="affiliate_orders_info" currency="selected" />
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="visits" list_name="visitors_orders_list"/>
 
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl	(revision 11475)
@@ -1,58 +1,58 @@
 <inp2:m_RequireLogin login_template="platform/login/register" />
 <inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_AffiliateStatisticsVisits"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliateStatisticsVisits"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_statistics_visits_list"/>
 
 	<inp2:m_RenderElement design="content_box" block_no_data="no_visitors">
 		<inp2:visits_InitList list_name="visitors_list" types="myvisitors" grid="visitsincommerce"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_AffiliateStatisticsVisits"/> (<inp2:visits_TotalRecords list_name="visitors_list" />)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/affiliate_date_filter" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
+		<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
 
-		<inp2:m_include template="in-commerce/designs/affiliates"/>
+		<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
 
 		<table class="fullwidth">
 			<inp2:m_RenderElement name="separator" colspan="5"/>
 			<tr class="sub-section-header">
 				<td><inp2:m_Phrase label="lu_col_Date"/></td>
 				<td><inp2:m_Phrase label="lu_col_Referer"/></td>
 				<td><inp2:m_Phrase label="lu_col_OrderCount"/></td>
 				<td><inp2:m_Phrase label="lu_col_OrderTotalAmount"/></td>
 				<td><inp2:m_Phrase label="lu_col_OrderCommissionEarned"/></td>
 			</tr>
 			<inp2:m_RenderElement name="separator" colspan="5"/>
 			<inp2:visits_PrintList list_name="visitors_list" render_as="my_visitor_element"/>
 			<inp2:visits_AffiliateOrderInfo list_name="visitors_list" types="myvisitors" render_as="affiliate_visits_info" currency="selected" />
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="visits" list_name="visitors_list"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 
 

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl	(revision 11475)
@@ -1,33 +1,33 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_AffiliatePaymentTypeChanged"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType,lu_title_AffiliatePaymentTypeChanged"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payment_type,in-commerce/my_account/affiliate/affiliate_payment_type_changed"/>
 	<inp2:m_RenderElement design="content_box">
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_AffiliatePaymentTypeChanged"/>
 		</inp2:m_Capture>
 
 		<inp2:m_Phrase label="lu_AffiliatePaymentTypeChangedMessage"/>
 
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl	(revision 11475)
@@ -1,48 +1,48 @@
 <inp2:m_RequireLogin login_template="platform/login/register" />
 <inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_AffiliateStatistics"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_AffiliateStatistics"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
 
 	<inp2:m_if check="u_IsAffiliate">
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation" design="blue_box"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
 	</inp2:m_if>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"
 					titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics"
 					templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:visits_InitList list_name="visitors_list" types="myvisitors" grid="visitsincommerce" per_page="5"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_AffiliateStatistics"/>
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/affiliate_date_filter" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
+		<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
 
-		<inp2:m_include template="in-commerce/designs/affiliates"/>
+		<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
 
 		<inp2:visits_AffiliateOrderInfo list_name="visitors_list" types="myvisitors" render_as="affiliate_info" currency="selected"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl	(revision 11475)
@@ -1,57 +1,57 @@
 <!--## LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin login_template="platform/login/register"/>
 <!--## /LOGIN REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_MyDownloads"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!--## /CHECK IF SSL REQUIRED ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyDownloads" templates="platform/my_account/my_account,in-commerce/my_account/my_downloads"/>
-	<inp2:m_include template="in-commerce/designs/products"/>
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 	<!--## MY DOWNLOADS LIST ##-->
 	<inp2:p_InitList list_name="my_downloads" types="my_downloads" parent_cat_id="any" recursive="1"/>
 
 	<inp2:m_RenderElement design="content_box" block_no_data="no_products">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyDownloads"/> (<inp2:p_TotalRecords list_name="my_downloads"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="my_downloads"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="my_downloads"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="my_downloads" render_as="downloadable_product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="my_downloads"/>
 	</inp2:m_RenderElement>
 	<!--## /MY DOWNLOADS LIST ##-->
 
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/featured_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/featured_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/featured_products.tpl	(revision 11475)
@@ -1,50 +1,50 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_FeaturedProducts"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_Products,lu_title_FeaturedProducts" templates="in-commerce/store/category,in-commerce/products/featured_products"/>
 
 	<inp2:m_RenderElement design="content_box" data_exists="1">
 		<inp2:p_InitList list_name="featured_products" types="featured" recursive="1"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_FeaturedProducts"/> (<inp2:p_TotalRecords list_name="featured_products"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="featured_products"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="featured_products"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 		<table class="fullwidth item-listing-featured table-border">
 			<inp2:p_ListProducts list_name="featured_products" render_as="product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="featured_products"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/featured_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/recent_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/recent_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/recent_products.tpl	(revision 11475)
@@ -1,43 +1,43 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_RecentlyViewedProducts"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_RecentlyViewedProducts" templates="in-commerce/products/recent_products"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:p_InitList list_name="recent_products" types="recent" parent_cat_id="any" recursive="1" except="in_cart"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_RecentlyViewedProducts"/> (<inp2:p_TotalRecords list_name="recent_products"/>)
 		</inp2:m_Capture>
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="recent_products"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="recent_products"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="recent_products" render_as="product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="recent_products"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>

Property changes on: branches/RC/themes/default2009/in-commerce/products/recent_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl	(revision 11475)
@@ -1,30 +1,30 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
 		<inp2:m_RenderElements
 			elements="
 				platform/elements/side_boxes/login.elm,
 				platform/elements/side_boxes/search.elm,
-				in-commerce/elements/side_boxes/action_box,
+				in-commerce/elements/side_boxes/action_box.elm,
 			"
 			design="blue_box"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_ReviewProduct,lu_title_AddProductReviewConfirm" templates="__default__,in-commerce/products/add_review,in-commerce/products/add_review_confirm" show_category="1"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
 		</inp2:m_Capture>
 
 		<inp2:m_phrase name="lu_text_AddProductReviewConfirm"/><br /><br />
 		<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Field name="Name"/></a>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/search_results.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/search_results.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/search_results.tpl	(revision 11475)
@@ -1,50 +1,50 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_ProductSearchResults"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ProductSearchResults" templates="in-commerce/search/search_results"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:p_InitList list_name="product_search_results" types="search" parent_cat_id="any" recursive="1" except="in_cart"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_ProductSearchResults"/> (<inp2:p_TotalRecords list_name="product_search_results"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="product_search_results"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="product_search_results"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 		<inp2:m_include template="platform/designs/search_results.elm"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="product_search_results" render_as="product_element" show_relevance="1"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="product_search_results"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/search_results.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/add_review.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/add_review.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/add_review.tpl	(revision 11475)
@@ -1,135 +1,135 @@
 <inp2:m_RequireLogin login_template="platform/login/register" permissions="PRODUCT.REVIEW|PRODUCT.REVIEW.PENDING"/>
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:p_Field name="Name"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
 		<inp2:m_RenderElements
 			elements="
 				platform/elements/side_boxes/login.elm,
 				platform/elements/side_boxes/search.elm,
 			"
 			design="blue_box"/>
 
-			<inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box" item_actions="1" design="blue_box"/>
+			<inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_ReviewProduct" templates="__default__,in-commerce/products/add_review" show_category="1"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_ProductDetails"/>
 		</inp2:m_Capture>
 
 		<table class="fullwidth table-border">
 			<tr><td class="item-padding">
 
 		<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" alt=""/> <span class="text-title">
 		<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Field name="Name"/></a></span>
 
 		<inp2:m_if check="p_Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
 		<inp2:m_if check="p_Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
 		<inp2:m_if check="p_Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
 		<inp2:m_if check="p_IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
 		<inp2:m_if check="p_IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
 
 		<inp2:p_VotesIndicator render_as="rating_element"/>
 
 		<br />
 		<br />
 
 		<table>
 			<tr>
 				<td style="text-align: center; padding-right: 10px;" valign="top">
 					<!--## Check if image exists ##-->
 					<inp2:m_if check="p_ImageSrc" MaxWidth="fullsize">
 						<a href="<inp2:p_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="product-images" target="_blank" title="<inp2:p_Field name='Name' html_escape='1'/>">
 						<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
 					</a>
 					<!--## Check if image exists ##-->
 					<inp2:m_else/>
 						<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
 					</inp2:m_if>
 					<br />
 				</td>
 				<td valign="top">
 					<strong><inp2:m_phrase label="lu_Added"/>:</strong> <inp2:p_field field="CreatedOn_date" format="_regional_DateFormat"/><br />
 					<strong><inp2:m_phrase label="lu_Hits"/>:</strong> <inp2:p_field field="Hits"/><br />
 					<strong><inp2:m_phrase label="lu_Reviews"/>:</strong> <inp2:p_field field="CachedReviewsQty"/>
 
 					<strong><inp2:m_phrase label="lu_Rating"/>:</strong> <inp2:p_field field="CachedRating"/> (<inp2:m_phrase label="lu_Votes"/>: <inp2:p_field field="CachedVotesQty"/>)
 
 					<br />
 
 					<inp2:m_if check="p_Field" name="ManufacturerId">
 						<strong><inp2:m_Phrase label="lu_fld_Manufacturer"/>:</strong> <inp2:p_field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:p_Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
 					</inp2:m_if>
 
 					<inp2:m_if check="p_Field" name="MSRP">
 						<strong><inp2:m_Phrase label="lu_fld_MSRP"/>:</strong> <span class="product-price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br />
 					</inp2:m_if>
 
 					<strong><inp2:m_Phrase label="lu_fld_OurPrice"/>: <span class="product-price"><inp2:p_Field name="Price" currency="selected"/></span></strong> <br />
 
 					<inp2:m_if check="p_Savings">
 						<strong><inp2:m_Phrase label="lu_fld_YouSave"/>: <span class="product-price"><inp2:p_Savings currency="selected" /> (<inp2:p_Savings type="percent"/>%)</span></strong><br/>
 					</inp2:m_if>
 					<br />
 
 					<inp2:m_if check="p_Field" name="DescriptionExcerpt">
 						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:p_Field name="DescriptionExcerpt" nl2br="1"/><br/>
 					</inp2:m_if>
 
 
 				</td>
 			</tr>
 			</table>
 		</td></tr></table>
 	</inp2:m_RenderElement>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_ReviewThisProduct"/>
 		</inp2:m_Capture>
 
 		<inp2:m_if check="p_HasPermission" permissions="PRODUCT.REVIEW|PRODUCT.REVIEW.PENDING">
 			<inp2:m_if check="p-rev_AlreadyReviewed">
 				<inp2:m_Phrase label="lu_ErrorAlreadyReviewed"/><br/><br/>
 				<table>
 					<inp2:p-rev_PrintList render_as="review_element" type="current_user"/>
 				</table>
 				<inp2:m_include template="platform/elements/pagination.elm" prefix="p-rev"/>
 			<inp2:m_else/>
 				<inp2:p-rev_PresetFormFields/>
 				<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
 				<inp2:m_if check="p-rev_HasError" field="any">
 					<inp2:m_RenderElement name="error_message" />
 				</inp2:m_if>
 
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
 						<inp2:m_RenderElement name="inp_edit_radio" prefix="p-rev" field="Rating" title="lu_fld_Rating"/>
 						<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-rev" field="ReviewText" rows="8" cols="40" title="lu_fld_ReviewText" is_last="1"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons">
 							<input type="hidden" name="success_template" value="in-commerce/products/add_review_confirm" />
 								<input type="hidden" name="success_pending_template" value="in-commerce/products/add_review_pending_confirm" />
 								<input class="button" type="submit" name="events[p-rev][OnCreate]" value="<inp2:m_phrase label="lu_btn_Create"/>" />
 						</inp2:m_RenderElement>
 					</table>
 				</form>
 			</inp2:m_if>
 		<inp2:m_else/>
 			<inp2:m_phrase name="lu_text_NoProductReviewPermission"/>
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/add_review.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/pick_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/pick_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/pick_products.tpl	(revision 11475)
@@ -1,51 +1,51 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_PickProducts"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PickProducts" templates="in-commerce/products/pick_products"/>
 	<!-- Editors Pick Products List -->
 	<inp2:m_RenderElement design="content_box" data_exists="1">
 		<inp2:p_InitList list_name="pick_products" types="pick" recursive="true"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_PickProducts"/> (<inp2:p_TotalRecords list_name="pick_products"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="pick_products"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="pick_products"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="pick_products" render_as="product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="pick_products"/>
 	</inp2:m_RenderElement>
 	<!-- //Editors Pick Products List -->
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/pick_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl	(revision 11475)
@@ -1,30 +1,30 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <inp2:m_DefineElement name="sidebar">
 		<inp2:m_RenderElements
 			elements="
 				platform/elements/side_boxes/login.elm,
 				platform/elements/side_boxes/search.elm,
-				in-commerce/elements/side_boxes/action_box,
+				in-commerce/elements/side_boxes/action_box.elm,
 			"
 			design="blue_box"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_ReviewPendingProduct,lu_title_AddProductReviewPendingConfirm" templates="__default__,in-commerce/products/add_review,in-commerce/products/add_review_pending_confirm" show_category="1"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
 		</inp2:m_Capture>
 
 		<inp2:m_phrase name="lu_text_AddProductReviewPendingConfirm"/><br /><br />
 		<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Field name="Name"/></a>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl	(revision 11475)
@@ -1,48 +1,48 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_TopSellerProducts"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 	<inp2:m_RenderElements
 		elements="
-			in-commerce/elements/side_boxes/checkout_steps,
+			in-commerce/elements/side_boxes/checkout_steps.elm,
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_TopSellerProducts" templates="in-commerce/products/top_seller_products"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:p_InitList list_name="top_seller_products" types="hot" recursive="1"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_TopSellerProducts"/> (<inp2:p_TotalRecords list_name="top_seller_products"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="top_seller_products"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="top_seller_products"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="top_seller_products" render_as="product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="top_seller_products"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/new_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/new_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/new_products.tpl	(revision 11475)
@@ -1,54 +1,54 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_phrase name="lu_title_NewProducts"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_NewProducts" templates="in-commerce/products/new_products"/>
 
 	<!-- New Products List -->
 	<inp2:m_RenderElement design="content_box" data_exists="1">
 		<inp2:p_InitList list_name="new_products" types="new" recursive="true"/>
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_NewProducts"/> (<inp2:p_TotalRecords list_name="new_products"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="new_products"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="new_products"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="new_products" render_as="product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="new_products"/>
 	</inp2:m_RenderElement>
 	<!-- //New Products List -->
 
 </inp2:m_DefineElement>
 <!--## MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/new_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl	(revision 11475)
@@ -1,51 +1,51 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_ProductsByManufacturer"/> <inp2:manuf_Field name="Name" />
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products" design="blue_box" data_exists="1"/>
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ProductsByManufacturer" templates="in-commerce/products/manufacturer_products"/>
 
 	<inp2:m_RenderElement design="content_box" data_exists="1">
 		<inp2:p_InitList list_name="manufacturer_products" types="manufacturer" recursive="1" parent_cat_id="any" />
 
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_ProductsByManufacturer"/> <inp2:manuf_Field name="Name" /> (<inp2:p_TotalRecords list_name="manufacturer_products"/>)
 		</inp2:m_Capture>
 
-		<inp2:m_include template="in-commerce/elements/sorting" list_name="manufacturer_products"/>
+		<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="manufacturer_products"/>
 
-		<inp2:m_include template="in-commerce/designs/products"/>
+		<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 		<table class="fullwidth item-listing">
 			<inp2:p_ListProducts list_name="manufacturer_products" render_as="product_element"/>
 		</table>
 
 		<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="manufacturer_products"/>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/preview.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/preview.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/checkout/preview.tpl	(revision 11475)
@@ -1,53 +1,53 @@
 <!--## CHECK IF LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/>
 <!--## /CHECK IF LOGIN REQUIRED ##-->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!--## /CHECK IF SSL REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_comm_OrderPreview"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
-			in-commerce/elements/side_boxes/checkout_steps,
+			in-commerce/elements/side_boxes/checkout_steps.elm,
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
 
 	<inp2:m_DefineElement name="preview_content">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_comm_OrderPreview"/>
 		</inp2:m_Capture>
 
 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
 		<tr>
 			<td class="main-column-center">
-				<inp2:m_include template="in-commerce/elements/order_preview"/>
+				<inp2:m_include template="in-commerce/elements/order_preview.elm"/>
 			</td>
 		</tr>
 		</table>
 	</inp2:m_DefineElement>
 	<inp2:m_RenderElement name="preview_content" design="content_box"/>
 
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->

Property changes on: branches/RC/themes/default2009/in-commerce/checkout/preview.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl	(revision 11475)
@@ -1,62 +1,62 @@
 <!--## CHECK IF LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/>
 <!--## /CHECK IF LOGIN REQUIRED ##-->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!--## /CHECK IF SSL REQUIRED ##-->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_comm_ShippingInfo"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 
 	<inp2:m_RenderElements
 		elements="
-			in-commerce/elements/side_boxes/checkout_steps,
+			in-commerce/elements/side_boxes/checkout_steps.elm,
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
 
 	<script type="text/javascript">
 		function catchFormEnter(e, id)
 		{
 			if (typeof(e) == 'undefined') e = window.event;
 			if (!e) return;
 
 		 	if (e.keyCode == 13) { //enter
 		 		if (typeof(document.all) == 'undefined') e.preventDefault();
 		 		e.cancelBubble = true;
 				e.returnValue = false;
 
 		 		document.getElementById(id).focus();
 		 		document.getElementById(id).click();
 				return false;
 		 	}
 		}
 	</script>
 
 	<form method="post" onkeypress="catchFormEnter(event, 'events[ord][OnUpdate]')" action="<inp2:m_FormAction />">
-		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_address"/>
-		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_options"/>
-<!--		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_calendar"/>-->
+		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_address.elm"/>
+		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_options.elm"/>
+<!--		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_calendar.elm"/>-->
 	</form>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl	(revision 11475)
@@ -1,308 +1,308 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_title_ShoppingCart"/><inp2:m_if check="orditems_TotalRecords"> (<inp2:orditems_TotalRecords/>)</inp2:m_if>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
-			in-commerce/elements/side_boxes/checkout_steps,
+			in-commerce/elements/side_boxes/checkout_steps.elm,
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_title_ShoppingCart"/><inp2:m_if check="orditems_TotalRecords"> (<inp2:orditems_TotalRecords/>)</inp2:m_if>
 		</inp2:m_Capture>
 
 		<form method="post" action="<inp2:m_FormAction />">
 
 		<inp2:m_if check="ord_CartHasError">
 			<table class="warning-message fullwidth">
 				<tr>
 					<td width="30">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
 					</td>
 					<td>
 						<inp2:m_phrase name="lu_Warning"/>
 					</td>
 				</tr>
 			</table>
 			<br />
 			<inp2:ord_CheckoutError state_changed="lu_comm_msg_state_changed" qty_unavailable="lu_comm_msg_qty_unavailable" outofstock="lu_comm_msg_outofstock"
 									coupon_applied="lu_comm_CouponApplied"
 									gift_certificate_applied="lu_comm_GiftCertificateApplied"
 									invalid_code="lu_comm_invalid_code" code_expired="lu_comm_code_expired"
 									min_qty="lu_min_qty_error" code_removed="lu_comm_CouponRemoved"
 									gc_code_removed="lu_comm_GiftCertificateRemoved"
 									code_removed_automatically="lu_comm_CouponIsNotEffective"
 									gc_code_removed_automatically="lu_comm_GiftCertificateIsNotEffective"
 									changed_after_login="lu_comm_CartChangedAfterLogin" /><br /><br />
 		</inp2:m_if>
 
 		<table class="fullwidth">
 			<inp2:m_DefineElement name="shop_cart_header">
 				<tr>
 					<td colspan="5">
 						<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
 					</td>
 				</tr>
 				<tr class="sub-section-header">
 					<td><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
 					<td width="60"><inp2:m_Phrase label="lu_comm_YourPrice"/></td>
 					<td width="50"><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
 					<td width="50"><inp2:m_Phrase label="lu_comm_Total"/></td>
 					<td width="25">&nbsp;</td>
 				</tr>
 				<tr>
 					<td colspan="5">
 						<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
 					</td>
 				</tr>
 			</inp2:m_DefineElement>
 
-			<inp2:m_include template="in-commerce/elements/options_blocks"/>
+			<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
 
 			<inp2:m_DefineElement name="shop_cart_item">
 				<tr>
 					<td class="shopping-cart-cell-item-padding">
 
 						<table>
 							<tr>
 								<td class="shopping-cart-icpn-padding-right">
 									<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" width="16" height="14" alt="" />
 								</td>
 								<td>
 									<inp2:m_if check="FieldEquals" field="Virtual" value="0">
 										<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
 										<inp2:m_if check="ord_FreePromoShippingAvailable">&nbsp;<sup><inp2:m_phrase label="lu_cart_FreeShippingAvailable" /></sup>
 										</inp2:m_if>
 									<inp2:m_else/>
 										<inp2:Field name="Name" />
 									</inp2:m_if>
 
 									<inp2:m_if check="ord_BackorderFlag"> <span class="error"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
 									<inp2:m_if check="HasOptions">
 										<br/>
 										<span style="font-size: 8pt">
 										<inp2:m_if check="DisplayOptionsPricing">
 											<inp2:PrintOptions render_as="option_element" currency="selected"/>
 										<inp2:m_else/>
 											<inp2:PrintOptions render_as="option_element_no_price" currency="selected"/>
 										</inp2:m_if>
 										<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0">
 											<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a>
 										</inp2:m_if>
 										</span>
 									</inp2:m_if>
 									<inp2:m_if check="p_CustomField" name="Availability">
 										<br />
 										<inp2:p_CustomField name="Availability"/>
 									</inp2:m_if>
 									<inp2:m_if check="HasDiscount">
 										<br />
 										<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
 										<inp2:m_Phrase label="lu_comm_Discount" />: <span class="price1"><inp2:Field name="ItemDiscount" currency="selected" negative="1" /></span>
 										<!--<a href="javascript:showDiscountInfo('<inp2:ord_DiscountHelpLink template="in-commerce/checkout/discount_info" />')">[?]</a>-->
 									</inp2:m_if>
 
 								</td>
 							</tr>
 						</table>
 
 
 					</td>
 					<td class="shopping-cart-cell-item-padding"><strong><inp2:Field name="Price" currency="selected"/></strong></td>
 					<td class="shopping-cart-cell-item-padding">
 						<inp2:m_if check="IsTangible">
 
 							<inp2:m_if check="m_ModuleEnabled" module="In-Auction">
 								<inp2:m_if check="ebay-sections_IseBayItem">
 									<inp2:Field field="Quantity"/>
 								<inp2:m_else />
 									<input value="<inp2:Field field="Quantity"/>" style="width:20px" class="input-text" name="<inp2:InputName field="Quantity"/>" />
 								</inp2:m_if>
 							<inp2:m_else />
 								<input value="<inp2:Field field="Quantity"/>" style="width:20px" class="input-text" name="<inp2:InputName field="Quantity"/>" />
 							</inp2:m_if>
 							<!--<inp2:m_if check="ProductsInStock">
 								<inp2:m_Phrase name="lu_of"/> <inp2:ProductsInStock/>
 							</inp2:m_if>-->
 						<inp2:m_else />
 							1
 						</inp2:m_if>
 					</td>
 					<td class="shopping-cart-cell-item-padding"><strong><inp2:Field name="ExtendedPrice" currency="selected"/></strong></td>
 					<td class="shopping-cart-cell-item-padding" align="center">
 						<inp2:m_if check="m_ModuleEnabled" module="In-Auction">
 							<inp2:m_if check="ebay-sections_IseBayItem">
 								&nbsp;
 							<inp2:m_else />
 								<a href="<inp2:LinkRemoveFromCart/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="Delete" alt="Delete" width="8" height="10" border="0" /></a>
 							</inp2:m_if>
 						<inp2:m_else />
 							<a href="<inp2:LinkRemoveFromCart/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="Delete" alt="Delete" width="8" height="10" border="0" /></a>
 						</inp2:m_if>
 					</td>
 				</tr>
 				<tr>
 					<td colspan="5">
 						<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
 					</td>
 				</tr>
 			</inp2:m_DefineElement>
 
 
 			<inp2:m_DefineElement name="shop_cart_footer">
 			</table>
 
 			<table width="100%">
 				<tr >
 					<td class="cart-subtotal">
 						<table width="100%">
 						<inp2:m_if check="ord_HasDiscount">
 							<tr>
 								<td>
 									<strong><inp2:m_Phrase label="lu_comm_TotalSavings" />:</strong>&nbsp;
 								</td>
 								<td>
 									<span class="price1"><strong><inp2:ord_Field name="DiscountTotal" currency="selected" /></strong></span>
 								</td>
 							</tr>
 							<tr>
 								<td colspan="2">
 									<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt="" />
 								</td>
 							</tr>
 						</inp2:m_if>
 						<inp2:m_if check="ord_Field" name="CouponId">
 							<tr>
 								<td>
 									<inp2:m_Phrase label="lu_comm_CouponHasBeenApplied" />:&nbsp;
 								</td>
 								<td>
 									<inp2:ord_Field field="CouponName" />&nbsp;&nbsp;
 
 									<a href="<inp2:ord_RemoveCouponLink type="coupon"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="<inp2:m_Phrase label="lu_comm_RemoveCoupon"/>" alt="<inp2:m_Phrase label="lu_comm_RemoveCoupon"/>" width="8" height="10" border="0" /></a>
 								</td>
 							</tr>
 						<inp2:m_else />
 							<tr>
 								<td><inp2:m_Phrase label="lu_comm_EnterCouponCode" />:&nbsp;</td>
 								<td><input size="15" class="input-text"  name="coupon_code" /></td>
 							</tr>
 						</inp2:m_if>
 						<tr>
 							<td colspan="2">
 								<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="3" alt="" />
 							</td>
 						</tr>
 						<inp2:m_if check="ord_Field" name="GiftCertificateId">
 							<tr>
 								<td><inp2:m_Phrase label="lu_comm_GiftCertificateHasBeenApplied" />:&nbsp;</td>
 								<td>
 									<inp2:ord_Field field="GiftCertificateDiscount" currency="selected" />&nbsp;&nbsp;
 									<a href="<inp2:ord_RemoveCouponLink type="gift_certificate"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="<inp2:m_Phrase label="lu_comm_RemoveGiftCertificate"/>" alt="<inp2:m_Phrase label="lu_comm_RemoveGiftCertificate"/>" width="8" height="10" border="0" /></a>
 								</td>
 							</tr>
 						<inp2:m_else />
 							<tr>
 								<td><inp2:m_Phrase label="lu_comm_EnterGiftCertificateCode" />:&nbsp;</td>
 								<td><input size="15" class="input-text"  name="giftcert_code" /></td>
 							</tr>
 						</inp2:m_if>
 						</table>
 					</td>
 					<td class="cart-subtotal" align="right">
 						<span class="cart-subtotal-text"><inp2:m_Phrase label="lu_comm_Subtotal"/>: <inp2:ord_Field field="SubtotalWithDiscount" currency="selected"/></span>
 					</td>
 				</tr>
 				<tr>
 					<td colspan="2">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="2" alt="" /><br />
 						<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
 					</td>
 				</tr>
 				<input type="hidden" name="next_step_template" value="<inp2:m_if check="ord_OrderHasTangibleItems">in-commerce/checkout/shipping<inp2:m_else/>in-commerce/checkout/billing</inp2:m_if>" />
 				<tr>
 					<td class="shopping-cart-button-padding">
 						<input class="button" type="submit" name="events[ord][OnUpdateCart]" value="<inp2:m_Phrase label="lu_comm_UpdateCart"/>" />
 						&nbsp;
 						<input class="button" type="submit" name="events[ord][OnCleanupCart]" onclick="return confirm('<inp2:m_Phrase label="lu_comm_ClearCartConfirmation" />')" value="<inp2:m_Phrase label="lu_comm_CleanupCart"/>" />
 					</td>
 					<td class="shopping-cart-button-padding" align="right">
 
 						<input type="hidden" name="continue_shopping_template" value="__default__"/>
 						<input class="button" type="submit" name="events[ord][OnContinueShopping]" value="<inp2:m_Phrase label="lu_comm_Continue_Shopping"/>">
 						&nbsp;
 						<input class="button" type="submit" name="events[ord][OnCheckout]" value="<inp2:m_Phrase label="lu_comm_ProceedCheckout"/>" />
 					</td>
 				</tr>
 			</inp2:m_DefineElement>
 
 			<inp2:m_DefineElement name="shop_cart_empty">
 				<tr>
 					<td>
 						<strong><inp2:m_Phrase label="lu_comm_YourCartIsEmpty"/></strong>
 					</td>
 				</tr>
 			</inp2:m_DefineElement>
 
 			<script language="JavaScript">
 			function showDiscountInfo(url)
 			{
 				window.open(url, null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
 			}
 			</script>
 
 			<inp2:ord_PrintCart item_render_as="shop_cart_item" header_render_as="shop_cart_header" footer_render_as="shop_cart_footer" empty_cart_render_as="shop_cart_empty" per_page="-1"/>
 		</table>
 		</form>
 
 		<inp2:m_if check="ord_CartNotEmpty">
 			<inp2:m_if check="ord_HasPaymentGateway" name="Google Checkout">
 				<inp2:m_DefineElement name="google_checkout_button">
 					<form method="POST" target="_blank" action="<inp2:ord_GetFormAction payment_type_id="$payment_type_id"/>">
 						<inp2:ord_GetFormHiddenFields return_template="in-commerce/checkout/checkout_success"
 													  cancel_template="in-commerce/checkout/billing"
 													  payment_type_id="$payment_type_id"/>
 
 						<inp2:m_if check="m_Param" name="submit_url" equals_to="https://checkout.google.com/api/checkout/v2">
 							<input type="image" name="Google Checkout" alt="Fast checkout through Google"
 					        	src="https://checkout.google.com/buttons/checkout.gif?merchant_id=<inp2:m_Param name="merchant_id"/>
 					              &w=180&h=46&style=white&variant=text&loc=en_US" height="46" width="180">
 						<inp2:m_else/>
 							<input type="image" name="Google Checkout" alt="Fast checkout through Google"
 					        src="http://sandbox.google.com/checkout/buttons/checkout.gif?merchant_id=<inp2:m_Param name="merchant_id"/>
 					              &w=180&h=46&style=white&variant=text&loc=en_US" height="46" width="180">
 						</inp2:m_if>
 					</form>
 				</inp2:m_DefineElement>
 
 				<inp2:ord_DisplayPaymentGateway name="Google Checkout" render_as="google_checkout_button"/>
 			</inp2:m_if>
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 
 	<inp2:m_if check="ord_CartIsEmpty">
-		<inp2:m_include template="in-commerce/elements/content_boxes/pick_products"/>
+		<inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
 	</inp2:m_if>
 
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->

Property changes on: branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl	(revision 11475)
@@ -1,43 +1,43 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_comm_OrderCompleted"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="0"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="0"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
 
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_Phrase label="lu_comm_OrderCompleted"/>
 		</inp2:m_Capture>
 
 		<inp2:m_Phrase label="lu_comm_ThankYou"/>!
 		<br/>
 		<inp2:m_Phrase label="lu_comm_OrderSuccessfullyPlaced"/>
 	</inp2:m_RenderElement>
 
 	<inp2:m_if check="u_SuggestRegister">
-		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/form_register"/>
+		<inp2:m_include template="in-commerce/elements/content_boxes/checkout/form_register.elm"/>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
 

Property changes on: branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/billing.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/billing.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/checkout/billing.tpl	(revision 11475)
@@ -1,65 +1,65 @@
 <!--## CHECK IF LOGIN REQUIRED ##-->
 <inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/>
 <!-- /CHECK IF LOGIN REQUIRED -->
 
 <!--## CHECK IF SSL REQUIRED ##-->
 <inp2:m_CheckSSL mode="required" condition="Require_SSL" />
 <!-- /CHECK IF SSL REQUIRED -->
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_Phrase label="lu_comm_BillingInfo"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
-			in-commerce/elements/side_boxes/checkout_steps,
+			in-commerce/elements/side_boxes/checkout_steps.elm,
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
 		"
 		design="blue_box"/>
 
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
 	<table width="100%" border="0" cellspacing="0" cellpadding="0">
 		<tr>
 			<td class="main-column-center">
 				<script type="text/javascript">
 					function catchFormEnter(e, id)
 					{
 						if (typeof(e) == 'undefined')	e = window.event;
 						if (!e) return;
 
 					 	if (e.keyCode == 13) { //enter
 					 		if (typeof(document.all) == 'undefined') e.preventDefault();
 					 		e.cancelBubble = true;
 							e.returnValue = false;
 
 					 		document.getElementById(id).focus();
 					 		document.getElementById(id).click();
 							return false;
 					 	}
 					}
 				</script>
 
 				<form id="billing_info" method="post" onkeypress="catchFormEnter(event, 'events[ord][OnUpdate]')" action="<inp2:m_FormAction />">
-					<inp2:m_include template="in-commerce/elements/content_boxes/checkout/billing_address"/>
-					<inp2:m_include template="in-commerce/elements/content_boxes/checkout/billing_options"/>
+					<inp2:m_include template="in-commerce/elements/content_boxes/checkout/billing_address.elm"/>
+					<inp2:m_include template="in-commerce/elements/content_boxes/checkout/billing_options.elm"/>
 				</form>
 			</td>
 		</tr>
 	</table>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/checkout/billing.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/index.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/index.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/index.tpl	(revision 11475)
@@ -1,79 +1,79 @@
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
 	<inp2:m_include template="platform/elements/title_bar.elm"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
 <!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
 
 	<!--## PRODUCTS CATEGORIES LEFT MENU  ##-->
-		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories" design="blue_box" data_exists="1"/>
+		<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
 	<!--## /PRODUCTS CATEGORIES LEFT MENU ##-->
 
 	<inp2:m_RenderElements
 		elements="
 			platform/elements/side_boxes/login.elm,
 			platform/elements/side_boxes/search.elm,
-			in-commerce/elements/side_boxes/credit_cards,
+			in-commerce/elements/side_boxes/credit_cards.elm,
 		"
 		design="blue_box"/>
 
-	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/pick_products" design="blue_box" data_exists="1"/>
+	<inp2:m_RenderElement name="in-commerce/elements/side_boxes/pick_products.elm" design="blue_box" data_exists="1"/>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar.elm"/>
 
 	<!--## IF IN-COMMERCE HOME PAGE ##-->
 	<inp2:m_if check="p_IsModuleHome">
-		<inp2:m_include template="in-commerce/elements/content_boxes/featured_products"/>
-		<inp2:m_include template="in-commerce/elements/content_boxes/new_products"/>
-		<inp2:m_include template="in-commerce/elements/content_boxes/pick_products"/>
+		<inp2:m_include template="in-commerce/elements/content_boxes/featured_products.elm"/>
+		<inp2:m_include template="in-commerce/elements/content_boxes/new_products.elm"/>
+		<inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
 	<inp2:m_else/>
 	<!--## /IF IN-COMMERCE HOME PAGE ##-->
 
 		<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
 
 		<!-- Category Products List -->
 		<inp2:m_RenderElement design="content_box" block_no_data="no_products">
 			<inp2:p_InitList list_name="products_in_category" />
 
 			<inp2:m_Capture to_var="header">
 				<inp2:m_phrase name="lu_title_Products"/> (<inp2:p_TotalRecords list_name="products_in_category"/>)
 			</inp2:m_Capture>
 
-			<inp2:m_include template="in-commerce/elements/sorting" list_name="products_in_category"/>
+			<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="products_in_category"/>
 
-			<inp2:m_include template="in-commerce/designs/products"/>
+			<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 			<table class="fullwidth table-border">
 				<inp2:p_ListProducts list_name="products_in_category" render_as="product_element"/>
 			</table>
 
 			<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="products_in_category"/>
 		</inp2:m_RenderElement>
 		<!-- // Category Products List -->
 
 		<!--## RELATED CATEGORIES ##-->
 		<!--##
 		<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
 			<inp2:m_Capture to_var="header">
 				<inp2:m_Phrase label="lu_title_RelatedCategories"/>
 			</inp2:m_Capture>
 
 			<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
 		</inp2:m_RenderElement>
 		##-->
 		<!--## // RELATED CATEGORIES ##-->
 
 	</inp2:m_if>
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/index.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/orders.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/orders.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/designs/orders.tpl	(nonexistent)
@@ -1,23 +0,0 @@
-<!--## NO ORDERS ELEMENT ##-->
-<inp2:m_DefineElement name="no_orders">
-	<inp2:m_phrase name="lu_NoOrders"/>
-</inp2:m_DefineElement>
-<!--## /NO ORDERS ELEMENT ##-->
-
-<!--## MY ORDER ELEMENT ##-->
-<inp2:m_DefineElement name="my_order_element">
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-	<tr class="listing-row">
-		<td><a href="<inp2:m_Link template="in-commerce/my_account/my_order_details" pass="m,ord"/>"><inp2:Field field="OrderNumber"/></a> <inp2:m_if check="FieldEquals" field="IsRecurringBilling" value="1"><strong>(<inp2:m_Phrase label="lu_Recurring"/>)</strong></inp2:m_if></td>
-		<td ><inp2:Field field="OrderDate" format="_regional_DateFormat"/></td>
-		<td>
-			<strong><inp2:Field field="TotalAmount" currency="selected"/></strong>
-		</td>
-		<td><inp2:Field field="Status"/></td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /MY ORDER ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/orders.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/affiliates.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/affiliates.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/designs/affiliates.tpl	(nonexistent)
@@ -1,151 +0,0 @@
-<!--## NO PAYMENTS ELEMENT ##-->
-<inp2:m_DefineElement name="no_payments">
-	<inp2:m_Phrase label="lu_DontHavePayments"/>
-</inp2:m_DefineElement>
-<!--## /NO PAYMENTS ELEMENT ##-->
-
-<!--## NO VISITORS ELEMENT ##-->
-<inp2:m_DefineElement name="no_visitors">
-	<inp2:m_include template="in-commerce/elements/affiliate_date_filter" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
-
-	<inp2:m_Phrase label="lu_DontHaveVisitors"/>
-</inp2:m_DefineElement>
-<!--## /NO VISITORS ELEMENT ##-->
-
-<!--## NO ORDERS ELEMENT ##-->
-<inp2:m_DefineElement name="no_orders">
-	<inp2:m_include template="in-commerce/elements/affiliate_date_filter" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
-
-	<inp2:m_Phrase label="lu_DontHaveOrders"/>
-</inp2:m_DefineElement>
-<!--## /NO ORDERS ELEMENT ##-->
-
-<!--## PAYMENT ELEMENT ##-->
-<inp2:m_DefineElement name="payment_element">
-	<tr class="listing-row">
-		<td><inp2:Field field="PaymentDate" /></td>
-		<td><inp2:Field field="PaymentReference" /></td>
-		<td>
-			<strong><inp2:Field field="Amount" currency="selected"/></strong>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="separator" colspan="4"/>
-</inp2:m_DefineElement>
-<!--## /PAYMENT ELEMENT ##-->
-
-<!--## AFF. VISITS INFO ELEMENT ##-->
-<inp2:m_DefineElement name="affiliate_visits_info">
-	<tr class="listing-row">
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>
-			<strong><inp2:m_Phrase label="lu_Total"/>:<inp2:m_param name="OrderTotalAmount" /></strong>
-		</td>
-		<td>
-			<strong><inp2:m_Phrase label="lu_Total"/>:<inp2:m_param name="OrderAffiliateCommission" /></strong>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /AFF. VISITS INFO ELEMENT ##-->
-
-<!--## AFF. ORDERS ELEMENT ##-->
-<inp2:m_DefineElement name="affiliate_orders_info">
-	<tr class="listing-row">
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>
-			<inp2:m_Phrase label="lu_Total"/>:
-			<inp2:m_param name="OrderTotalAmount" />
-		</td>
-		<td>
-			<inp2:m_Phrase label="lu_Total"/>:
-			<inp2:m_param name="OrderAffiliateCommission" />
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /AFF. ORDERS ELEMENT ##-->
-
-<!--## MY VISITOR ELEMENT ##-->
-<inp2:m_DefineElement name="my_visitor_element">
-	<tr class="listing-row">
-		<td><inp2:Field field="VisitDate" format="_regional_DateFormat"/></td>
-		<td>
-			<inp2:m_if check="FieldEquals" field="Referer" value="">
-				<inp2:m_Phrase label="lu_visit_DirectReferer"/>
-			<inp2:m_else/>
-				<div style="overflow: hidden"><a href="<inp2:Field field="Referer"/>"><inp2:m_Phrase label="lu_RefererLink"/></a></div>
-			</inp2:m_if>
-		</td>
-		<td><inp2:Field field="OrderCountByVisit" /></td>
-		<td>
-			<inp2:Field field="OrderTotalAmountSum" currency="selected"/>
-		</td>
-		<td>
-			<inp2:Field field="OrderAffiliateCommissionSum" currency="selected"/>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="separator" colspan="5"/>
-</inp2:m_DefineElement>
-<!--## /MY VISITOR ELEMENT ##-->
-
-<!--## MY ORDER ELEMENT ##-->
-<inp2:m_DefineElement name="my_order_element">
-	<tr class="listing-row">
-		<td><inp2:Field field="VisitDate" format="_regional_DateFormat"/></td>
-		<td><inp2:Field field="OrderNumber"/></td>
-		<td>
-			<strong><inp2:Field field="OrderTotalAmount" currency="selected"/></strong>
-		</td>
-		<td>
-			<strong><inp2:Field field="OrderAffiliateCommission" currency="selected"/></strong>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="separator" colspan="4"/>
-</inp2:m_DefineElement>
-<!--## /MY VISITOR ELEMENT ##-->
-
-<inp2:m_DefineElement name="separator" colspan="0">
-	<tr>
-		<td colspan="<inp2:m_param name="colspan" />">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<!--## AFF. INFO TR ELEMENT ##-->
-<inp2:m_DefineElement name="affiliate_info_tr" type="">
-	<tr class="listing-row">
-		<td width="25%"><inp2:m_phrase label="$title"/></td>
-		<td width="25%"><inp2:m_param name="param" /></td>
-		<td align="left">
-			<a href="<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_statistics_{$type}_list"/>"><inp2:m_Phrase label="lu_details"/></a>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /AFF. INFO TR ELEMENT ##-->
-
-<!--## AFF. INFO ELEMENT ##-->
-<inp2:m_DefineElement name="affiliate_info">
-	<table class="fullwidth">
-		<tr>
-			<td align="center">
-				<table width="400">
-					<inp2:m_RenderElement name="separator" colspan="3"/>
-					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalVisitors" param="$TotalVisitors" type="visits"/>
-					<inp2:m_RenderElement name="separator" colspan="3"/>
-
-					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalOrders" param="$OrderCount" type="orders"/>
-					<inp2:m_RenderElement name="separator" colspan="3"/>
-
-					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalOrderAmount" param="$OrderTotalAmount" type="orders"/>
-					<inp2:m_RenderElement name="separator" colspan="3"/>
-
-					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalCommissionEarned" param="$OrderAffiliateCommission" type="orders"/>
-					<inp2:m_RenderElement name="separator" colspan="3"/>
-				</table>
-			</td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
-<!--## /AFF. INFO ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/affiliates.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/addresses.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/addresses.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/designs/addresses.tpl	(nonexistent)
@@ -1,92 +0,0 @@
-<!--## MY ADDRESS ELEMENT ##-->
-<inp2:m_DefineElement name="my_address_element">
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-	<tr class="listing-row">
-		<td>
-			<strong><inp2:Field field="To"/></strong><br />
-			<inp2:m_if check="Field" name="Company">
-				<inp2:Field field="Company"/><br />
-			</inp2:m_if>
-			<inp2:m_if check="FieldEquals" field="Address1" value="" inverse="inverse">
-				<inp2:Field field="Address1"/><br />
-			</inp2:m_if>
-
-			<inp2:m_if check="FieldEquals" field="Address2" value="" inverse="inverse">
-				<inp2:Field field="Address2"/><br />
-			</inp2:m_if>
-			<inp2:PrintLocation/><br />
-		</td>
-		<td>
-			<inp2:m_if check="Field" name="Email">
-				<inp2:Field field="Email"/><br />
-			</inp2:m_if>
-
-			<inp2:m_if check="Field" name="Phone">
-				<inp2:m_Phrase name="lu_Phone"/>: <inp2:Field field="Phone"/><br />
-			</inp2:m_if>
-
-			<inp2:m_if check="Field" name="Fax">
-				<inp2:m_Phrase name="lu_Fax"/>: <inp2:Field field="Fax"/><br />
-			</inp2:m_if>
-		</td>
-		<td>
-			<inp2:m_if check="Field" field="LastUsedAsShipping" value="1"><inp2:m_Phrase label="lu_LastUsedAsShipping"/><br/></inp2:m_if>
-			<inp2:m_if check="Field" field="LastUsedAsBilling" value="1"><inp2:m_Phrase label="lu_LastUsedAsBilling"/></inp2:m_if>
-			<br />
-		</td>
-		<td>
-			<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block" inverse="1">
-				<inp2:m_if check="IsProfileAddress">
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a href="<inp2:m_Link template="platform/my_account/my_profile"/>" class="item-action"><inp2:m_Phrase label="lu_btn_Edit"/></a>
-				<inp2:m_else />
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a href="<inp2:m_Link template="in-commerce/my_account/edit_address" pass="m,addr"/>" class="item-action"><inp2:m_Phrase label="lu_btn_Edit"/></a> &nbsp;&nbsp;
-					&nbsp;|&nbsp; <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_delete.gif" width="11" height="10" alt="" /> <a href="<inp2:DeleteLink/>" onclick="return confirm('<inp2:m_phrase name="lu_comm_DeleteAddress" js_escape="1"/>');" class="item-action"><inp2:m_Phrase label="lu_btn_Delete"/></a>
-				</inp2:m_if>
-			</inp2:m_if>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /MY ADDRESS ELEMENT ##-->
-
-<!--## ADDRESS SHORT ELEMENT ##-->
-<inp2:m_DefineElement name="address_short_element">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="value"/></option>
-</inp2:m_DefineElement>
-<!--## /ADDRESS SHORT ELEMENT ##-->
-
-<!--## EDIT ADDRESS ELEMENT ##-->
-<inp2:m_DefineElement name="inp_edit_select_address" style="" is_last="0">
-	<tr>
-		<td class="field-name">
-			<inp2:m_phrase label="$title"/>:<br />
-			<span class="field-hint">
-				<inp2:m_phrase label="lu_hint_OrEnterAddress"/>
-			</span>
-		</td>
-		<td class="field-value">
-			<select class="input-select" name="<inp2:m_param name="type"/>_address_id" onchange="document.getElementById('events[ord][OnSelectAddress]').click();" style="<inp2:m_param name="style"/>">
-				<inp2:m_if check="ord_AllowAddAddress">
-					<option value="-1"><inp2:m_phrase name="lu_opt_NewAddress"/></option>
-				</inp2:m_if>
-				<inp2:ord_PrintAddresses render_as="address_short_element" type="$type" />
-			</select>
-				&nbsp;
-			<input class="button" type="submit" id="events[ord][OnSelectAddress]" name="events[ord][OnSelectAddress]" value="<inp2:m_Phrase label="lu_btn_Select"/>"/>
-			<a href="<inp2:m_Link template="in-commerce/my_account/my_addresses"/>"><inp2:m_Phrase name="lu_btn_ManageAddresses"/></a>
-		</td>
-	</tr>
-
-	<inp2:m_if check="ord_IsProfileAddress" type="$type">
-		<tr>
-			<td class="field-name" colspan="2">
-				<inp2:m_Phrase label="lu_hint_ProfileAddressWarning"/><br />
-			</td>
-		</tr>
-	</inp2:m_if>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-<!--## /EDIT ADDRESS ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/addresses.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/product_files.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/product_files.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/designs/product_files.tpl	(nonexistent)
@@ -1,44 +0,0 @@
-<!--## PRODUCTS FILE ELEMENT ##-->
-<inp2:m_DefineElement name="product_file_element">
-	<inp2:m_if check="p_UniqueFileName">
-		<tr>
-			<td><inp2:m_Phrase label="lu_fld_Name"/>:</td>
-			<td><inp2:Field name="Name"/></td>
-		</tr>
-	</inp2:m_if>
-
-	<tr>
-		<td><inp2:m_Phrase label="lu_fld_FileName"/>:</td>
-		<td><a href="<inp2:p_ProductFileLink template="in-commerce/my_account/download"/>"><inp2:Field name="FilePath"/></a></td>
-	</tr>
-
-	<inp2:m_if check="Field" name="Version">
-		<tr>
-			<td><inp2:m_Phrase label="lu_fld_Version"/>:</td>
-			<td><inp2:Field name="Version"/></td>
-		</tr>
-	</inp2:m_if>
-
-	<tr>
-		<td><inp2:m_Phrase label="lu_fld_Size"/>:</td>
-		<td><inp2:Field name="Size" /></td>
-	</tr>
-
-	<tr>
-		<td><inp2:m_Phrase label="lu_fld_AddedOn"/>:</td>
-		<td><inp2:Field name="AddedOn" format="_regional_DateFormat"/></td>
-	</tr>
-
-	<tr>
-		<td><inp2:m_Phrase label="lu_fld_DownloadLink"/>:</td>
-		<td><a href="<inp2:p_ProductFileLink template="in-commerce/my_account/download"/>"><inp2:m_Phrase label="lu_btn_DownloadNow" /></a></td>
-	</tr>
-
-	<tr>
-		<td colspan="2">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /PRODUCTS FILE ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/product_files.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/designs/products.tpl	(nonexistent)
@@ -1,386 +0,0 @@
-<!--## PRODUCT ELEMENT ##-->
-<inp2:m_DefineElement name="product_element">
-	<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<table>
-			<tr>
-				<td class="picture-padding">
-					<inp2:m_if check="m_Param" name="show_relevance">
-						<inp2:RelevanceIndicator on_color="Red" off_color="White" relevance_normal_render_as="search_relevance_normal" relevance_full_render_as="search_relevance_full" /><br/>
-					</inp2:m_if>
-
-					<table>
-					<tr><td align="center">
-					<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
-					</td></tr>
-					<tr><td align="center">
-					<inp2:m_if check="Available">
-						<br/>
-						<input class="button" onclick=" window.location.href='<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_btn_BuyNow"/>" />
-					<inp2:m_else />
-						<inp2:m_phrase label="lu_comm_outofstock"/>
-					</inp2:m_if>
-					</td></tr>
-					</table>
-				</td>
-				<td class="text-padding" valign="top" >
-					<a href="<inp2:ProductLink template="__default__"/>" class="text-title"><inp2:Field name="Name"/></a>
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element"/>
-
-					<inp2:m_if check="Available">
-						<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/buy2.gif" alt="<inp2:m_phrase name=""/>"/></a>
-					</inp2:m_if>
-
-					<br />
-
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<br />
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-
-					<br />
-					<inp2:m_if check="Field" name="MSRP">
-						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
-					</inp2:m_if>
-
-					<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
-					</span> <br />
-
-					<inp2:m_if check="Savings">
-						<span class="listing-field-name">
-						<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
-						</span><br/>
-					</inp2:m_if>
-
-					<inp2:m_if check="Field" name="DescriptionExcerpt">
-						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br/>
-					</inp2:m_if>
-					<br/>
-
-					<inp2:m_if check="IsFavorite">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromWishList"/></a>
-					<inp2:m_else/>
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToWishList"/></a>
-					</inp2:m_if>
-					 &nbsp;|&nbsp;
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/reviews.gif" width="14" height="10" alt="" /> <a class="item-action" href="<inp2:ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a>
-				</td>
-
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-<!--## /PRODUCT ELEMENT ##-->
-
-<!--## RELATED PRODUCT ELEMENT ##-->
-<inp2:m_DefineElement name="related_product_element">
-	<tr>
-		<td width="25"><img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" alt=""/></td>
-		<td><a href="<inp2:ProductLink template="__default__"/>" class="text-title"><inp2:Field name="Name"/></a></td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## //RELATED PRODUCT ELEMENT ##-->
-
-<!--## FEATURED PRODUCT ELEMENT SHORT ##-->
-<inp2:m_DefineElement name="featured_product_element_short">
-	<td valign="top">
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<table>
-			<tr>
-				<td class="picture-padding">
-					<table>
-						<tr>
-							<td align="center">
-								<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
-							</td>
-						</tr>
-
-						<tr>
-							<td align="center">
-								<inp2:m_if check="Available">
-									<br/>
-									<input class="button" onclick=" window.location.href='<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_btn_BuyNow"/>" />
-								<inp2:m_else />
-									<inp2:m_phrase label="lu_comm_outofstock"/>
-								</inp2:m_if>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td class="text-padding" valign="top">
-					<span class="text-title">
-						<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
-					</span>
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element"/>
-
-					<br />
-
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<br />
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-
-					<inp2:m_if check="Field" name="ManufacturerId">
-						<inp2:m_Phrase label="lu_fld_Manufacturer"/>: <inp2:field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
-					</inp2:m_if>
-					<br />
-
-					<inp2:m_if check="Field" name="MSRP">
-						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
-					</inp2:m_if>
-
-					<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
-					</span> <br />
-
-					<inp2:m_if check="Savings">
-						<span class="listing-field-name">
-						<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
-						</span><br/>
-					</inp2:m_if>
-				</td>
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-<!--## /FEATURED PRODUCT ELEMENT SHORT ##-->
-
-<!--## FEATURED PRODUCT ELEMENT ##-->
-<inp2:m_DefineElement name="featured_product_element">
-	<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<table>
-			<tr>
-				<td class="picture-padding">
-					<table>
-					<tr><td align="center">
-					<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
-					</td></tr>
-					<tr><td align="center">
-					<inp2:m_if check="Available">
-						<br/>
-						<input class="button" onclick=" window.location.href='<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_btn_BuyNow"/>" />
-					<inp2:m_else />
-						<inp2:m_phrase label="lu_comm_outofstock"/>
-					</inp2:m_if>
-					</td></tr>
-					</table>
-				</td>
-				<td class="text-padding" valign="top">
-					<span class="text-title">
-						<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
-					</span>
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element"/>
-
-					<br />
-
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<br />
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-
-					<inp2:m_if check="Field" name="ManufacturerId">
-						<inp2:m_Phrase label="lu_fld_Manufacturer"/>: <inp2:field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
-					</inp2:m_if>
-					<br />
-
-					<inp2:m_if check="Field" name="MSRP">
-						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
-					</inp2:m_if>
-
-					<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
-					</span> <br />
-
-					<inp2:m_if check="Savings">
-						<span class="listing-field-name">
-						<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
-						</span><br/>
-					</inp2:m_if>
-
-					<inp2:m_if check="Field" name="DescriptionExcerpt">
-						<br/>
-						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br />
-					</inp2:m_if>
-
-					<br />
-
-					<inp2:m_if check="CustomField" name="Availability">
-						<inp2:CustomFieldLabel field="Availability"/>:
-						<inp2:CustomField name="Availability"/>
-						<br />
-						<br />
-					</inp2:m_if>
-					<inp2:m_if check="CustomField" name="Features">
-						<inp2:CustomFieldLabel field="Features"/>:
-						<inp2:CustomField name="Features"/>
-						<br />
-						<br />
-					</inp2:m_if>
-				</td>
-
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-<!--## /FEATURED PRODUCT ELEMENT ##-->
-
-<!--## EDITORS PICK PRODUCT ELEMENT ##-->
-<inp2:m_DefineElement name="pick_product_element">
-	<td width="16%" align="center" valign="top" class="block-data">
-		<a href="<inp2:ProductLink template="__default__"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="120"/></a><br />
-		<inp2:m_if check="Available">
-			<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>" class="link-product2"><strong><inp2:m_Phrase label="lu_comm_BuyNow"/></strong></a>
-			<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" vspace="4" style="vertical-align:middle" /></a>
-		<inp2:m_else />
-			<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
-		</inp2:m_if>
-	</td>
-	<td width="84%" class="block-data">
-		<a href="<inp2:ProductLink template="__default__"/>" class="link-product2"><strong><inp2:Field field="Name" /></strong></a>
-		<inp2:m_if check="Available">
-			<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="" width="15" height="17" border="0" style="vertical-align:middle" /></a>
-		</inp2:m_if>
-		<br />
-
-		<inp2:m_if check="Field" name="MSRP">
-			<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
-		</inp2:m_if>
-
-		<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
-		</span> <br />
-
-		<inp2:m_if check="Savings">
-			<span class="listing-field-name">
-			<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
-			</span><br/>
-		</inp2:m_if>
-
-		<inp2:m_if check="Field" name="DescriptionExcerpt">
-		<br/><span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br />
-		</inp2:m_if>
-
-	</td>
-</inp2:m_DefineElement>
-<!--## /EDITORS PICK PRODUCT ELEMENT ##-->
-
-<!--## DOWNLOADABLE PRODUCT ELEMENT ##-->
-<inp2:m_DefineElement name="downloadable_product_element">
-	<td>
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<table>
-			<tr>
-				<td class="picture-padding">
-					<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
-				</td>
-				<td class="text-padding" valign="top">
-					<span class="text-title">
-						<inp2:m_if check="p_HasFiles">
-							<a href="<inp2:ProductLink template="in-commerce/my_account/my_downloads_more"/>"><inp2:Field name="Name" /></a>
-						<inp2:m_else />
-							<inp2:Field name="Name" />
-						</inp2:m_if>
-					</span>
-
-					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
-					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
-					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
-					<inp2:VotesIndicator render_as="rating_element"/>
-
-					<br />
-
-					<span class="item-statistics">
-						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
-						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
-						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
-					</span>
-
-					<br />
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-
-					<br />
-					<inp2:m_if check="Field" name="DescriptionExcerpt">
-						<inp2:m_Phrase label="lu_fld_Description"/>: <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br />
-					</inp2:m_if>
-
-					<inp2:m_if check="p_HasFiles">
-						<a href="<inp2:ProductFileLink template="in-commerce/my_account/download"/>"><inp2:m_Phrase label="lu_comm_DownloadNow" /></a><br />
-						<a href="<inp2:ProductLink template="in-commerce/my_account/my_downloads_more"/>"><inp2:m_Phrase label="lu_comm_MoreFiles" />...</a><br />
-					<inp2:m_else />
-						<inp2:m_Phrase label="lu_text_NoFilesForThisProduct" />
-					</inp2:m_if>
-
-					<br /><br />
-
-					<inp2:m_if check="IsFavorite">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromWishList"/></a>
-					<inp2:m_else/>
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToWishList"/></a>
-					</inp2:m_if>
-					 &nbsp;|&nbsp;
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/reviews.gif" width="14" height="10" alt="" /> <a class="item-action" href="<inp2:ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a>
-				</td>
-
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-<!--## /DOWNLOADABLE PRODUCT ELEMENT ##-->
-
-<!--## SHORT PRODUCT ELEMENT ##-->
-<inp2:m_DefineElement name="product_short_element">
-	<tr>
-		<td>
-			<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field field="Name" /></a><br />
-			<inp2:m_if check="Field" name="DescriptionExcerpt">
-		 		<inp2:Field field="DescriptionExcerpt" first_chars="70"/><br />
-		 	</inp2:m_if>
-
-			<inp2:Field name="Price" currency="selected"/></span>
-			<br /><br />
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /SHORT PRODUCT ELEMENT ##-->
-
-<!--## NO PRODUCTS ELEMENT ##-->
-<inp2:m_DefineElement name="no_products">
-	<inp2:m_phrase name="lu_NoProducts"/>
-</inp2:m_DefineElement>
-<!--## /NO PRODUCTS ELEMENT ##-->

Property changes on: branches/RC/themes/default2009/in-commerce/designs/products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/affiliates.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/affiliates.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/designs/affiliates.elm.tpl	(revision 11475)
@@ -0,0 +1,151 @@
+<!--## NO PAYMENTS ELEMENT ##-->
+<inp2:m_DefineElement name="no_payments">
+	<inp2:m_Phrase label="lu_DontHavePayments"/>
+</inp2:m_DefineElement>
+<!--## /NO PAYMENTS ELEMENT ##-->
+
+<!--## NO VISITORS ELEMENT ##-->
+<inp2:m_DefineElement name="no_visitors">
+	<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
+
+	<inp2:m_Phrase label="lu_DontHaveVisitors"/>
+</inp2:m_DefineElement>
+<!--## /NO VISITORS ELEMENT ##-->
+
+<!--## NO ORDERS ELEMENT ##-->
+<inp2:m_DefineElement name="no_orders">
+	<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
+
+	<inp2:m_Phrase label="lu_DontHaveOrders"/>
+</inp2:m_DefineElement>
+<!--## /NO ORDERS ELEMENT ##-->
+
+<!--## PAYMENT ELEMENT ##-->
+<inp2:m_DefineElement name="payment_element">
+	<tr class="listing-row">
+		<td><inp2:Field field="PaymentDate" /></td>
+		<td><inp2:Field field="PaymentReference" /></td>
+		<td>
+			<strong><inp2:Field field="Amount" currency="selected"/></strong>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="separator" colspan="4"/>
+</inp2:m_DefineElement>
+<!--## /PAYMENT ELEMENT ##-->
+
+<!--## AFF. VISITS INFO ELEMENT ##-->
+<inp2:m_DefineElement name="affiliate_visits_info">
+	<tr class="listing-row">
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>
+			<strong><inp2:m_Phrase label="lu_Total"/>:<inp2:m_param name="OrderTotalAmount" /></strong>
+		</td>
+		<td>
+			<strong><inp2:m_Phrase label="lu_Total"/>:<inp2:m_param name="OrderAffiliateCommission" /></strong>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /AFF. VISITS INFO ELEMENT ##-->
+
+<!--## AFF. ORDERS ELEMENT ##-->
+<inp2:m_DefineElement name="affiliate_orders_info">
+	<tr class="listing-row">
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td>
+			<inp2:m_Phrase label="lu_Total"/>:
+			<inp2:m_param name="OrderTotalAmount" />
+		</td>
+		<td>
+			<inp2:m_Phrase label="lu_Total"/>:
+			<inp2:m_param name="OrderAffiliateCommission" />
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /AFF. ORDERS ELEMENT ##-->
+
+<!--## MY VISITOR ELEMENT ##-->
+<inp2:m_DefineElement name="my_visitor_element">
+	<tr class="listing-row">
+		<td><inp2:Field field="VisitDate" format="_regional_DateFormat"/></td>
+		<td>
+			<inp2:m_if check="FieldEquals" field="Referer" value="">
+				<inp2:m_Phrase label="lu_visit_DirectReferer"/>
+			<inp2:m_else/>
+				<div style="overflow: hidden"><a href="<inp2:Field field="Referer"/>"><inp2:m_Phrase label="lu_RefererLink"/></a></div>
+			</inp2:m_if>
+		</td>
+		<td><inp2:Field field="OrderCountByVisit" /></td>
+		<td>
+			<inp2:Field field="OrderTotalAmountSum" currency="selected"/>
+		</td>
+		<td>
+			<inp2:Field field="OrderAffiliateCommissionSum" currency="selected"/>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="separator" colspan="5"/>
+</inp2:m_DefineElement>
+<!--## /MY VISITOR ELEMENT ##-->
+
+<!--## MY ORDER ELEMENT ##-->
+<inp2:m_DefineElement name="my_order_element">
+	<tr class="listing-row">
+		<td><inp2:Field field="VisitDate" format="_regional_DateFormat"/></td>
+		<td><inp2:Field field="OrderNumber"/></td>
+		<td>
+			<strong><inp2:Field field="OrderTotalAmount" currency="selected"/></strong>
+		</td>
+		<td>
+			<strong><inp2:Field field="OrderAffiliateCommission" currency="selected"/></strong>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="separator" colspan="4"/>
+</inp2:m_DefineElement>
+<!--## /MY VISITOR ELEMENT ##-->
+
+<inp2:m_DefineElement name="separator" colspan="0">
+	<tr>
+		<td colspan="<inp2:m_param name="colspan" />">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<!--## AFF. INFO TR ELEMENT ##-->
+<inp2:m_DefineElement name="affiliate_info_tr" type="">
+	<tr class="listing-row">
+		<td width="25%"><inp2:m_phrase label="$title"/></td>
+		<td width="25%"><inp2:m_param name="param" /></td>
+		<td align="left">
+			<a href="<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_statistics_{$type}_list"/>"><inp2:m_Phrase label="lu_details"/></a>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /AFF. INFO TR ELEMENT ##-->
+
+<!--## AFF. INFO ELEMENT ##-->
+<inp2:m_DefineElement name="affiliate_info">
+	<table class="fullwidth">
+		<tr>
+			<td align="center">
+				<table width="400">
+					<inp2:m_RenderElement name="separator" colspan="3"/>
+					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalVisitors" param="$TotalVisitors" type="visits"/>
+					<inp2:m_RenderElement name="separator" colspan="3"/>
+
+					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalOrders" param="$OrderCount" type="orders"/>
+					<inp2:m_RenderElement name="separator" colspan="3"/>
+
+					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalOrderAmount" param="$OrderTotalAmount" type="orders"/>
+					<inp2:m_RenderElement name="separator" colspan="3"/>
+
+					<inp2:m_RenderElement name="affiliate_info_tr" title="lu_TotalCommissionEarned" param="$OrderAffiliateCommission" type="orders"/>
+					<inp2:m_RenderElement name="separator" colspan="3"/>
+				</table>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+<!--## /AFF. INFO ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/affiliates.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/addresses.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/addresses.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/designs/addresses.elm.tpl	(revision 11475)
@@ -0,0 +1,92 @@
+<!--## MY ADDRESS ELEMENT ##-->
+<inp2:m_DefineElement name="my_address_element">
+	<tr>
+		<td colspan="4">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+		</td>
+	</tr>
+	<tr class="listing-row">
+		<td>
+			<strong><inp2:Field field="To"/></strong><br />
+			<inp2:m_if check="Field" name="Company">
+				<inp2:Field field="Company"/><br />
+			</inp2:m_if>
+			<inp2:m_if check="FieldEquals" field="Address1" value="" inverse="inverse">
+				<inp2:Field field="Address1"/><br />
+			</inp2:m_if>
+
+			<inp2:m_if check="FieldEquals" field="Address2" value="" inverse="inverse">
+				<inp2:Field field="Address2"/><br />
+			</inp2:m_if>
+			<inp2:PrintLocation/><br />
+		</td>
+		<td>
+			<inp2:m_if check="Field" name="Email">
+				<inp2:Field field="Email"/><br />
+			</inp2:m_if>
+
+			<inp2:m_if check="Field" name="Phone">
+				<inp2:m_Phrase name="lu_Phone"/>: <inp2:Field field="Phone"/><br />
+			</inp2:m_if>
+
+			<inp2:m_if check="Field" name="Fax">
+				<inp2:m_Phrase name="lu_Fax"/>: <inp2:Field field="Fax"/><br />
+			</inp2:m_if>
+		</td>
+		<td>
+			<inp2:m_if check="Field" field="LastUsedAsShipping" value="1"><inp2:m_Phrase label="lu_LastUsedAsShipping"/><br/></inp2:m_if>
+			<inp2:m_if check="Field" field="LastUsedAsBilling" value="1"><inp2:m_Phrase label="lu_LastUsedAsBilling"/></inp2:m_if>
+			<br />
+		</td>
+		<td>
+			<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block" inverse="1">
+				<inp2:m_if check="IsProfileAddress">
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a href="<inp2:m_Link template="platform/my_account/my_profile"/>" class="item-action"><inp2:m_Phrase label="lu_btn_Edit"/></a>
+				<inp2:m_else />
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a href="<inp2:m_Link template="in-commerce/my_account/edit_address" pass="m,addr"/>" class="item-action"><inp2:m_Phrase label="lu_btn_Edit"/></a> &nbsp;&nbsp;
+					&nbsp;|&nbsp; <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_delete.gif" width="11" height="10" alt="" /> <a href="<inp2:DeleteLink/>" onclick="return confirm('<inp2:m_phrase name="lu_comm_DeleteAddress" js_escape="1"/>');" class="item-action"><inp2:m_Phrase label="lu_btn_Delete"/></a>
+				</inp2:m_if>
+			</inp2:m_if>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /MY ADDRESS ELEMENT ##-->
+
+<!--## ADDRESS SHORT ELEMENT ##-->
+<inp2:m_DefineElement name="address_short_element">
+	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="value"/></option>
+</inp2:m_DefineElement>
+<!--## /ADDRESS SHORT ELEMENT ##-->
+
+<!--## EDIT ADDRESS ELEMENT ##-->
+<inp2:m_DefineElement name="inp_edit_select_address" style="" is_last="0">
+	<tr>
+		<td class="field-name">
+			<inp2:m_phrase label="$title"/>:<br />
+			<span class="field-hint">
+				<inp2:m_phrase label="lu_hint_OrEnterAddress"/>
+			</span>
+		</td>
+		<td class="field-value">
+			<select class="input-select" name="<inp2:m_param name="type"/>_address_id" onchange="document.getElementById('events[ord][OnSelectAddress]').click();" style="<inp2:m_param name="style"/>">
+				<inp2:m_if check="ord_AllowAddAddress">
+					<option value="-1"><inp2:m_phrase name="lu_opt_NewAddress"/></option>
+				</inp2:m_if>
+				<inp2:ord_PrintAddresses render_as="address_short_element" type="$type" />
+			</select>
+				&nbsp;
+			<input class="button" type="submit" id="events[ord][OnSelectAddress]" name="events[ord][OnSelectAddress]" value="<inp2:m_Phrase label="lu_btn_Select"/>"/>
+			<a href="<inp2:m_Link template="in-commerce/my_account/my_addresses"/>"><inp2:m_Phrase name="lu_btn_ManageAddresses"/></a>
+		</td>
+	</tr>
+
+	<inp2:m_if check="ord_IsProfileAddress" type="$type">
+		<tr>
+			<td class="field-name" colspan="2">
+				<inp2:m_Phrase label="lu_hint_ProfileAddressWarning"/><br />
+			</td>
+		</tr>
+	</inp2:m_if>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+<!--## /EDIT ADDRESS ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/addresses.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/orders.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/orders.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/designs/orders.elm.tpl	(revision 11475)
@@ -0,0 +1,23 @@
+<!--## NO ORDERS ELEMENT ##-->
+<inp2:m_DefineElement name="no_orders">
+	<inp2:m_phrase name="lu_NoOrders"/>
+</inp2:m_DefineElement>
+<!--## /NO ORDERS ELEMENT ##-->
+
+<!--## MY ORDER ELEMENT ##-->
+<inp2:m_DefineElement name="my_order_element">
+	<tr>
+		<td colspan="4">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+		</td>
+	</tr>
+	<tr class="listing-row">
+		<td><a href="<inp2:m_Link template="in-commerce/my_account/my_order_details" pass="m,ord"/>"><inp2:Field field="OrderNumber"/></a> <inp2:m_if check="FieldEquals" field="IsRecurringBilling" value="1"><strong>(<inp2:m_Phrase label="lu_Recurring"/>)</strong></inp2:m_if></td>
+		<td ><inp2:Field field="OrderDate" format="_regional_DateFormat"/></td>
+		<td>
+			<strong><inp2:Field field="TotalAmount" currency="selected"/></strong>
+		</td>
+		<td><inp2:Field field="Status"/></td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /MY ORDER ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/orders.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/product_files.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/product_files.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/designs/product_files.elm.tpl	(revision 11475)
@@ -0,0 +1,44 @@
+<!--## PRODUCTS FILE ELEMENT ##-->
+<inp2:m_DefineElement name="product_file_element">
+	<inp2:m_if check="p_UniqueFileName">
+		<tr>
+			<td><inp2:m_Phrase label="lu_fld_Name"/>:</td>
+			<td><inp2:Field name="Name"/></td>
+		</tr>
+	</inp2:m_if>
+
+	<tr>
+		<td><inp2:m_Phrase label="lu_fld_FileName"/>:</td>
+		<td><a href="<inp2:p_ProductFileLink template="in-commerce/my_account/download"/>"><inp2:Field name="FilePath"/></a></td>
+	</tr>
+
+	<inp2:m_if check="Field" name="Version">
+		<tr>
+			<td><inp2:m_Phrase label="lu_fld_Version"/>:</td>
+			<td><inp2:Field name="Version"/></td>
+		</tr>
+	</inp2:m_if>
+
+	<tr>
+		<td><inp2:m_Phrase label="lu_fld_Size"/>:</td>
+		<td><inp2:Field name="Size" /></td>
+	</tr>
+
+	<tr>
+		<td><inp2:m_Phrase label="lu_fld_AddedOn"/>:</td>
+		<td><inp2:Field name="AddedOn" format="_regional_DateFormat"/></td>
+	</tr>
+
+	<tr>
+		<td><inp2:m_Phrase label="lu_fld_DownloadLink"/>:</td>
+		<td><a href="<inp2:p_ProductFileLink template="in-commerce/my_account/download"/>"><inp2:m_Phrase label="lu_btn_DownloadNow" /></a></td>
+	</tr>
+
+	<tr>
+		<td colspan="2">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /PRODUCTS FILE ELEMENT ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/designs/product_files.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/designs/products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/designs/products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/designs/products.elm.tpl	(revision 11475)
@@ -0,0 +1,386 @@
+<!--## PRODUCT ELEMENT ##-->
+<inp2:m_DefineElement name="product_element">
+	<td>
+		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+		<table>
+			<tr>
+				<td class="picture-padding">
+					<inp2:m_if check="m_Param" name="show_relevance">
+						<inp2:RelevanceIndicator on_color="Red" off_color="White" relevance_normal_render_as="search_relevance_normal" relevance_full_render_as="search_relevance_full" /><br/>
+					</inp2:m_if>
+
+					<table>
+					<tr><td align="center">
+					<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
+					</td></tr>
+					<tr><td align="center">
+					<inp2:m_if check="Available">
+						<br/>
+						<input class="button" onclick=" window.location.href='<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_btn_BuyNow"/>" />
+					<inp2:m_else />
+						<inp2:m_phrase label="lu_comm_outofstock"/>
+					</inp2:m_if>
+					</td></tr>
+					</table>
+				</td>
+				<td class="text-padding" valign="top" >
+					<a href="<inp2:ProductLink template="__default__"/>" class="text-title"><inp2:Field name="Name"/></a>
+
+					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
+					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
+					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
+					<inp2:VotesIndicator render_as="rating_element"/>
+
+					<inp2:m_if check="Available">
+						<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/buy2.gif" alt="<inp2:m_phrase name=""/>"/></a>
+					</inp2:m_if>
+
+					<br />
+
+					<span class="item-statistics">
+						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
+						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
+						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
+					</span>
+
+					<br />
+
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
+
+					<br />
+					<inp2:m_if check="Field" name="MSRP">
+						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
+					</inp2:m_if>
+
+					<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
+					</span> <br />
+
+					<inp2:m_if check="Savings">
+						<span class="listing-field-name">
+						<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
+						</span><br/>
+					</inp2:m_if>
+
+					<inp2:m_if check="Field" name="DescriptionExcerpt">
+						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br/>
+					</inp2:m_if>
+					<br/>
+
+					<inp2:m_if check="IsFavorite">
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromWishList"/></a>
+					<inp2:m_else/>
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToWishList"/></a>
+					</inp2:m_if>
+					 &nbsp;|&nbsp;
+
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/reviews.gif" width="14" height="10" alt="" /> <a class="item-action" href="<inp2:ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a>
+				</td>
+
+			</tr>
+		</table>
+	</td>
+</inp2:m_DefineElement>
+<!--## /PRODUCT ELEMENT ##-->
+
+<!--## RELATED PRODUCT ELEMENT ##-->
+<inp2:m_DefineElement name="related_product_element">
+	<tr>
+		<td width="25"><img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" alt=""/></td>
+		<td><a href="<inp2:ProductLink template="__default__"/>" class="text-title"><inp2:Field name="Name"/></a></td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## //RELATED PRODUCT ELEMENT ##-->
+
+<!--## FEATURED PRODUCT ELEMENT SHORT ##-->
+<inp2:m_DefineElement name="featured_product_element_short">
+	<td valign="top">
+		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+		<table>
+			<tr>
+				<td class="picture-padding">
+					<table>
+						<tr>
+							<td align="center">
+								<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
+							</td>
+						</tr>
+
+						<tr>
+							<td align="center">
+								<inp2:m_if check="Available">
+									<br/>
+									<input class="button" onclick=" window.location.href='<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_btn_BuyNow"/>" />
+								<inp2:m_else />
+									<inp2:m_phrase label="lu_comm_outofstock"/>
+								</inp2:m_if>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td class="text-padding" valign="top">
+					<span class="text-title">
+						<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
+					</span>
+
+					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
+					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
+					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
+					<inp2:VotesIndicator render_as="rating_element"/>
+
+					<br />
+
+					<span class="item-statistics">
+						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
+						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
+						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
+					</span>
+
+					<br />
+
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
+
+					<inp2:m_if check="Field" name="ManufacturerId">
+						<inp2:m_Phrase label="lu_fld_Manufacturer"/>: <inp2:field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
+					</inp2:m_if>
+					<br />
+
+					<inp2:m_if check="Field" name="MSRP">
+						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
+					</inp2:m_if>
+
+					<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
+					</span> <br />
+
+					<inp2:m_if check="Savings">
+						<span class="listing-field-name">
+						<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
+						</span><br/>
+					</inp2:m_if>
+				</td>
+			</tr>
+		</table>
+	</td>
+</inp2:m_DefineElement>
+<!--## /FEATURED PRODUCT ELEMENT SHORT ##-->
+
+<!--## FEATURED PRODUCT ELEMENT ##-->
+<inp2:m_DefineElement name="featured_product_element">
+	<td>
+		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+		<table>
+			<tr>
+				<td class="picture-padding">
+					<table>
+					<tr><td align="center">
+					<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
+					</td></tr>
+					<tr><td align="center">
+					<inp2:m_if check="Available">
+						<br/>
+						<input class="button" onclick=" window.location.href='<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_btn_BuyNow"/>" />
+					<inp2:m_else />
+						<inp2:m_phrase label="lu_comm_outofstock"/>
+					</inp2:m_if>
+					</td></tr>
+					</table>
+				</td>
+				<td class="text-padding" valign="top">
+					<span class="text-title">
+						<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
+					</span>
+
+					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
+					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
+					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
+					<inp2:VotesIndicator render_as="rating_element"/>
+
+					<br />
+
+					<span class="item-statistics">
+						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
+						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
+						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
+					</span>
+
+					<br />
+
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
+
+					<inp2:m_if check="Field" name="ManufacturerId">
+						<inp2:m_Phrase label="lu_fld_Manufacturer"/>: <inp2:field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
+					</inp2:m_if>
+					<br />
+
+					<inp2:m_if check="Field" name="MSRP">
+						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
+					</inp2:m_if>
+
+					<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
+					</span> <br />
+
+					<inp2:m_if check="Savings">
+						<span class="listing-field-name">
+						<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
+						</span><br/>
+					</inp2:m_if>
+
+					<inp2:m_if check="Field" name="DescriptionExcerpt">
+						<br/>
+						<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br />
+					</inp2:m_if>
+
+					<br />
+
+					<inp2:m_if check="CustomField" name="Availability">
+						<inp2:CustomFieldLabel field="Availability"/>:
+						<inp2:CustomField name="Availability"/>
+						<br />
+						<br />
+					</inp2:m_if>
+					<inp2:m_if check="CustomField" name="Features">
+						<inp2:CustomFieldLabel field="Features"/>:
+						<inp2:CustomField name="Features"/>
+						<br />
+						<br />
+					</inp2:m_if>
+				</td>
+
+			</tr>
+		</table>
+	</td>
+</inp2:m_DefineElement>
+<!--## /FEATURED PRODUCT ELEMENT ##-->
+
+<!--## EDITORS PICK PRODUCT ELEMENT ##-->
+<inp2:m_DefineElement name="pick_product_element">
+	<td width="16%" align="center" valign="top" class="block-data">
+		<a href="<inp2:ProductLink template="__default__"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="120"/></a><br />
+		<inp2:m_if check="Available">
+			<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>" class="link-product2"><strong><inp2:m_Phrase label="lu_comm_BuyNow"/></strong></a>
+			<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" vspace="4" style="vertical-align:middle" /></a>
+		<inp2:m_else />
+			<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
+		</inp2:m_if>
+	</td>
+	<td width="84%" class="block-data">
+		<a href="<inp2:ProductLink template="__default__"/>" class="link-product2"><strong><inp2:Field field="Name" /></strong></a>
+		<inp2:m_if check="Available">
+			<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="" width="15" height="17" border="0" style="vertical-align:middle" /></a>
+		</inp2:m_if>
+		<br />
+
+		<inp2:m_if check="Field" name="MSRP">
+			<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_MSRP"/>:</span> <span class="product-price-msrp"><inp2:Field name="MSRP" currency="selected"/></span><br />
+		</inp2:m_if>
+
+		<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_OurPrice"/>:</span> <span class="product-price"><inp2:Field name="Price" currency="selected"/>
+		</span> <br />
+
+		<inp2:m_if check="Savings">
+			<span class="listing-field-name">
+			<inp2:m_Phrase label="lu_fld_YouSave"/>: <inp2:Savings currency="selected" />  (<inp2:Savings type="percent"/>%)
+			</span><br/>
+		</inp2:m_if>
+
+		<inp2:m_if check="Field" name="DescriptionExcerpt">
+		<br/><span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br />
+		</inp2:m_if>
+
+	</td>
+</inp2:m_DefineElement>
+<!--## /EDITORS PICK PRODUCT ELEMENT ##-->
+
+<!--## DOWNLOADABLE PRODUCT ELEMENT ##-->
+<inp2:m_DefineElement name="downloadable_product_element">
+	<td>
+		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
+		<table>
+			<tr>
+				<td class="picture-padding">
+					<a href="<inp2:ProductLink template="__default__"/>" title="<inp2:Field name="Name" html_escape="1"/>"><inp2:Image render_as="image_element" primary="1" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" DefaultWidth="150"/></a><br />
+				</td>
+				<td class="text-padding" valign="top">
+					<span class="text-title">
+						<inp2:m_if check="p_HasFiles">
+							<a href="<inp2:ProductLink template="in-commerce/my_account/my_downloads_more"/>"><inp2:Field name="Name" /></a>
+						<inp2:m_else />
+							<inp2:Field name="Name" />
+						</inp2:m_if>
+					</span>
+
+					<inp2:m_if check="Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
+					<inp2:m_if check="Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
+					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
+					<inp2:m_if check="IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
+					<inp2:VotesIndicator render_as="rating_element"/>
+
+					<br />
+
+					<span class="item-statistics">
+						<inp2:m_phrase name="lu_Reviews"/>: <inp2:Field name="CachedReviewsQty"/>,
+						<inp2:m_phrase name="lu_Rating"/>: <inp2:Field name="CachedRating"/>,
+						<inp2:m_phrase name="lu_Votes"/>: <inp2:Field name="CachedVotesQty"/>
+					</span>
+
+					<br />
+
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
+
+					<br />
+					<inp2:m_if check="Field" name="DescriptionExcerpt">
+						<inp2:m_Phrase label="lu_fld_Description"/>: <inp2:Field name="DescriptionExcerpt" nl2br="1"/><br />
+					</inp2:m_if>
+
+					<inp2:m_if check="p_HasFiles">
+						<a href="<inp2:ProductFileLink template="in-commerce/my_account/download"/>"><inp2:m_Phrase label="lu_comm_DownloadNow" /></a><br />
+						<a href="<inp2:ProductLink template="in-commerce/my_account/my_downloads_more"/>"><inp2:m_Phrase label="lu_comm_MoreFiles" />...</a><br />
+					<inp2:m_else />
+						<inp2:m_Phrase label="lu_text_NoFilesForThisProduct" />
+					</inp2:m_if>
+
+					<br /><br />
+
+					<inp2:m_if check="IsFavorite">
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromWishList"/></a>
+					<inp2:m_else/>
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToWishList"/></a>
+					</inp2:m_if>
+					 &nbsp;|&nbsp;
+
+					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/reviews.gif" width="14" height="10" alt="" /> <a class="item-action" href="<inp2:ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a>
+				</td>
+
+			</tr>
+		</table>
+	</td>
+</inp2:m_DefineElement>
+<!--## /DOWNLOADABLE PRODUCT ELEMENT ##-->
+
+<!--## SHORT PRODUCT ELEMENT ##-->
+<inp2:m_DefineElement name="product_short_element">
+	<tr>
+		<td>
+			<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field field="Name" /></a><br />
+			<inp2:m_if check="Field" name="DescriptionExcerpt">
+		 		<inp2:Field field="DescriptionExcerpt" first_chars="70"/><br />
+		 	</inp2:m_if>
+
+			<inp2:Field name="Price" currency="selected"/></span>
+			<br /><br />
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /SHORT PRODUCT ELEMENT ##-->
+
+<!--## NO PRODUCTS ELEMENT ##-->
+<inp2:m_DefineElement name="no_products">
+	<inp2:m_phrase name="lu_NoProducts"/>
+</inp2:m_DefineElement>
+<!--## /NO PRODUCTS ELEMENT ##-->

Property changes on: branches/RC/themes/default2009/in-commerce/designs/products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/order_preview.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/order_preview.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/order_preview.tpl	(nonexistent)
@@ -1,312 +0,0 @@
-<inp2:m_include template="in-commerce/elements/options_blocks"/>
-
-<inp2:m_DefineElement name="orderitem_elem">
-	<tr  class="order-prewiew-padding-cell">
-		<td>
-			<strong><inp2:Field name="ProductName"/></strong><inp2:m_if check="ord_BackorderFlag"> <span><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
-			<inp2:m_if check="HasOptions">
-				<br/>
-				<span>
-				<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
-					<inp2:PrintOptions render_as="option_element" currency="selected"/>
-				<inp2:m_else/> <!-- listed combinations -->
-					<inp2:PrintOptions render_as="option_element_no_price"/>
-				</inp2:m_if>
-				</span>
-				<br/>
-			</inp2:m_if>
-			<inp2:m_if check="HasDiscount">
-				<br />
-				<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
-				<inp2:m_Phrase label="lu_comm_Discount" />: <span><inp2:Field name="ItemDiscount" currency="selected" negative="1"/></span>
-			</inp2:m_if>
-		</td>
-		<td>
-			<strong><inp2:Field name="Price" currency="selected"/></strong>
-		</td>
-		<td><inp2:Field name="Quantity"/></td>
-		<td><strong><inp2:Field name="ExtendedPrice" currency="selected"/></strong></td>
-	</tr>
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form_shipping">
-	<!-- shipping -->
-	<table width="100%">
-		<tr>
-			<td colspan="2">
-				<inp2:m_RenderElement name="subsection" title="lu_section_ShippingInfo"/>
-			</td>
-		</tr>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
-			<td><inp2:Field field="ShippingTo"/></td>
-		</tr>
-		<inp2:m_if check="Field" name="ShippingCompany">
-		<tr  class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="ShippingCompany"/></td>
-		</tr>
-		</inp2:m_if>
-		<inp2:m_if check="Field" name="ShippingEmail">
-		<tr  class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
-			<td><inp2:Field field="ShippingEmail"/></td>
-		</tr>
-		</inp2:m_if>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
-			<td><inp2:Field field="ShippingPhone"/></td>
-		</tr>
-		<tr  class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
-			<td><inp2:Field field="ShippingFax"/></td>
-		</tr>
-		<tr  class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
-			<td>
-				<inp2:m_if check="FieldEquals" field="ShippingAddress1" value="" inverse="inverse">
-					<inp2:Field field="ShippingAddress1"/><br>
-				</inp2:m_if>
-
-				<inp2:m_if check="FieldEquals" field="ShippingAddress2" value="" inverse="inverse">
-					<inp2:Field field="ShippingAddress2"/><br>
-				</inp2:m_if>
-				<inp2:PrintLocation type="Shipping"/>
-			</td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form_billing">
-	<!-- billing -->
-	<table width="100%">
-		<tr>
-			<td colspan="2">
-				<inp2:m_RenderElement name="subsection" title="lu_section_BillingInfo"/>
-			</td>
-		</tr>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
-			<td><inp2:Field field="BillingTo"/></td>
-		</tr>
-		<inp2:m_if check="Field" name="BillingCompany">
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="BillingCompany"/></td>
-		</tr>
-		</inp2:m_if>
-		<inp2:m_if check="Field" name="BillingEmail">
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
-			<td><inp2:Field field="BillingEmail"/></td>
-		</tr>
-		</inp2:m_if>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
-			<td><inp2:Field field="BillingPhone"/></td>
-		</tr>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
-			<td><inp2:Field field="BillingFax"/></td>
-		</tr>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="BillingCompany"/></td>
-		</tr>
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
-			<td>
-				<inp2:m_if check="FieldEquals" field="BillingAddress1" value="" inverse="inverse">
-					<inp2:Field field="BillingAddress1"/><br>
-				</inp2:m_if>
-
-				<inp2:m_if check="FieldEquals" field="BillingAddress2" value="" inverse="inverse">
-					<inp2:Field field="BillingAddress2"/><br>
-				</inp2:m_if>
-				<inp2:PrintLocation type="Billing"/>
-			</td>
-		</tr>
-
-		<tr class="order-prewiew-padding-cell">
-			<td><strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong></td>
-			<td><inp2:Field name="PaymentType" /></td>
-		</tr>
-
-		<inp2:m_if check="UsingCreditCard">
-			<tr class="order-prewiew-padding-cell">
-				<td><strong><inp2:m_Phrase label="lu_comm_NameOnCard"/>:</strong></td>
-				<td><inp2:Field name="PaymentNameOnCard"/></td>
-			</tr>
-			<tr class="order-prewiew-padding-cell">
-				<td><strong><inp2:m_Phrase label="lu_comm_CardType"/>:</strong></td>
-				<td><inp2:Field name="PaymentCardType" /></td>
-			</tr>
-			<tr class="order-prewiew-padding-cell">
-				<td><strong><inp2:m_Phrase label="lu_comm_CardNumber"/>:</strong></td>
-				<td><inp2:Field name="PaymentAccount" masked="masked"/></td>
-			</tr>
-			<tr class="order-prewiew-padding-cell">
-				<td><strong><inp2:m_Phrase label="lu_comm_Exp"/>:</strong></td>
-				<td><inp2:Field name="PaymentCCExpDate"/></td>
-			</tr>
-		</inp2:m_if>
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form">
-	<table>
-		<tr>
-			<td>
-				<strong><inp2:m_Phrase label="lu_comm_OrderNumber"/><inp2:Field name="OrderNumber"/></strong>
-			</td>
-		</tr>
-	</table>
-	<br />
-
-	<inp2:m_if check="OrderHasTangibleItems">
-		<table width="100%">
-			<tr>
-				<td valign="top" width="49%">
-					<inp2:m_RenderElement name="order_form_shipping" PrefixSpecial="ord"/>
-				</td>
-				<td>&nbsp;</td>
-				<td valign="top" width="49%">
-					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
-				</td>
-			</tr>
-		</table>
-	<inp2:m_else />
-		<table width="100%">
-			<tr>
-				<td>
-					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
-				</td>
-			</tr>
-		</table>
-	</inp2:m_if>
-
-	<br /><br />
-
-	<table style="width:100%">
-		<tr>
-			<td colspan="4">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr>
-			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
-			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_YourPrice"/></td>
-			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
-			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_Total"/></td>
-		</tr>
-		<tr>
-			<td colspan="4">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-
-		<inp2:ord_ListOrderItems render_as="orderitem_elem"/>
-
-		<tr class="order-sub-total">
-			<td>
-				<inp2:m_if check="ord_HasDiscount">
-					<inp2:m_Phrase label="lu_comm_TotalSavings" />: <span><inp2:ord_Field name="DiscountTotal" currency="selected" /></span><br />
-				</inp2:m_if>&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-			<td align="left" class="shopping-cart-button-padding">
-				<inp2:m_Phrase label="lu_comm_Subtotal"/>: <inp2:Field name="SubTotal" currency="selected"/>
-			</td>
-		</tr>
-	</table>
-
-
-	<br />
-	<table width="100%">
-		<tr>
-		    <td>
-		    	<inp2:m_RenderElement name="subsection" title="lu_section_OrderTotal"/>
-			</td>
-		</tr>
-	</table>
-
-	<table class="order-prewiew-padding-cell">
-
-		<inp2:m_DefineElement name="shipping_total">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</strong></td>
-				<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
-			</tr>
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong></td>
-				<td><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="processing_total">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </strong></td>
-				<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="sub_total">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_SubTotal"/>: </strong></td>
-				<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="vat_total">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </strong></td>
-				<td><inp2:ord_Field name="VAT" currency="selected"/></td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:ord_PrintTotals
-			shipping_render_as="shipping_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"/>
-
-		<inp2:m_if check="ord_Field" name="GiftCertificateId">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>: </strong></td>
-				<td><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
-			</tr>
-		</inp2:m_if>
-
-		<tr class="order-grand-total">
-		  <td><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
-			<td><span><inp2:Field name="TotalAmount" currency="selected"/></span></td>
-		</tr>
-	</table>
-	<br />
-</inp2:m_DefineElement>
-
-<inp2:ord_ShowOrder render_as="order_form" />
-
-<table>
-	<tr>
-		<td>
-			<form method="POST" action="<inp2:ord_GetFormAction/>">
-				<inp2:ord_GetFormHiddenFields return_template="in-commerce/checkout/checkout_success"
-											  cancel_template="in-commerce/checkout/billing" />
-				<inp2:m_if check="ord_NeedsPlaceButton">
-					<input type="submit" value="<inp2:m_Phrase label="lu_order_CompleteOrder" />" class="button">
-				</inp2:m_if>
-			</form>
-		</td>
-	</tr>
-</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/order_preview.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/registration_fields.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/registration_fields.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/registration_fields.tpl	(nonexistent)
@@ -1,40 +0,0 @@
-	<!--## AFFILIATE REGISTRATION CHECKBOX ##-->
-	<inp2:m_if check="m_ConfigEquals" option="Comm_RegisterAsAffiliate" value="1">
-		
-		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_inc param="tab_index" by="1"/>
-			<td class="field-name">
-				<label for="RegisterAsAffiliate">
-					<inp2:m_phrase label="lu_fld_RegisterAsAffiliate"/>:
-				</label>
-			</td>
-			<td class="field-value">
-				<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="RegisterAsAffiliate" name="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
-				<input class="hidden-element" type="submit" id="events[u][OnRefreshForm]" name="events[u][OnRefreshForm]" />
-			</td>
-		</tr>
-
-		<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
-			<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-		</inp2:m_if>
-		
-	</inp2:m_if>
-	<!--## /AFFILIATE REGISTRATION CHECKBOX ##-->
-
-	<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
-		<inp2:m_include template="in-commerce/elements/forms"/>
-
-		<inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" required="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
-		<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
-
-		<inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
-	</inp2:m_if>
-
-<script type="text/javascript">
-	function toggle_affiliate() {
-		document.getElementById('events[u][OnRefreshForm]').click();
-	}
-</script>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/registration_fields.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.tpl	(nonexistent)
@@ -1,46 +0,0 @@
-<form method="POST" action="<inp2:m_FormAction />">
-<center>
-	<script src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
-	<table align="center">
-		<tr class="listing-row">
-			<inp2:m_inc param="tab_index" by="1"/>
-			<td>
-				<strong><inp2:m_phrase label="la_from_date"/></strong>
-			</td>
-			<td>
-				<inp2:m_if check="{$prefix}_SearchError" field="$field">
-					<span class="field-error"><inp2:{$prefix}_SearchError field="$field"/></span><br />
-				</inp2:m_if>
-				<input type="text" class="input-text" name="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="from" grid="$grid_name"/>" id="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="from" grid="$grid_name"/>" value="<inp2:{$prefix}_SearchField field="$field" filter_type="date_range" type="from" grid="$grid_name"/>" size="<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif"/>
-				<span>(<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
-				<script type="text/javascript">
-					initCalendar("<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="from" grid="$grid_name"/>", "<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1"/>");
-				</script>
-			</td>
-		</tr>
-		<tr class="listing-row">
-			<td>
-				<strong><inp2:m_phrase label="la_to_date"/></strong>
-			</td>
-			<td>
-				<inp2:m_if check="{$prefix}_SearchError" field="$field">
-					<span class="field-error"><inp2:{$prefix}_SearchError field="$field"/></span><br />
-				</inp2:m_if>
-				<input type="text" class="input-text" name="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="to" grid="$grid_name"/>" id="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="to" grid="$grid_name"/>" value="<inp2:{$prefix}_SearchField field="$field" filter_type="date_range" type="to" grid="$grid_name"/>" size="<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif"/>
-				<span>(<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
-				<script type="text/javascript">
-					initCalendar("<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="to" grid="$grid_name"/>", "<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1"/>");
-				</script>
-			</td>
-		</tr>
-		<tr class="listing-row">
-			<td colspan="3" align="center">
-				<input class="button" type="submit" name="events[<inp2:m_param name="prefix"/>][OnSearch]" value="<inp2:m_phrase label="lu_search" />">
-				<input class="button" type="submit" name="events[<inp2:m_param name="prefix"/>][OnSearchReset]" value="<inp2:m_phrase label="lu_reset" />">
-			</td>
-		</tr>
-	</table>
-</center>
-<input type="hidden" name="grid_name" value="<inp2:m_param name="grid_name"/>" />
-</form>
-<br />
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/order_details.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/order_details.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/order_details.tpl	(nonexistent)
@@ -1,362 +0,0 @@
-<inp2:m_include template="in-commerce/elements/options_blocks"/>
-
-<!--## PRODUCT IMAGE ELEMENT ##-->
-<inp2:m_DefineElement name="product_image">
-	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
-</inp2:m_DefineElement>
-<!--## /PRODUCT IMAGE ELEMENT ##-->
-
-<!--## ORDER DETAILS ELEMENTS ##-->
-<!--## THIS SECTION IS USED BY myaccount/my_order_details.tpl ##-->
-<inp2:m_DefineElement name="orderitem_elem">
-	<tr class="order-padding-left">
-		<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
-			<td width="120">
-				<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
-			</td>
-		</inp2:m_if>
-
-		<td valign="top">
-			<inp2:m_if check="ProductExists">
-				<inp2:m_if check="FieldEquals" field="Virtual" value="0">
-					<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="ProductName" /></a>
-				<inp2:m_else/>
-					<inp2:Field name="ProductName" />
-				</inp2:m_if>
-			<inp2:m_else/>
-				<inp2:Field field="ProductName"/>
-			</inp2:m_if>
-			<inp2:m_if check="HasOptions">
-				<br/>
-				<span>
-				<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
-					<inp2:PrintOptions render_as="option_element" currency="selected"/>
-				<inp2:m_else/> <!-- listed combinations -->
-					<inp2:PrintOptions render_as="option_element_no_price"/>
-				</inp2:m_if>
-				</span>
-				<br/>
-			</inp2:m_if>
-			<inp2:m_if check="HasDiscount">
-				<br />
-				<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
-				<inp2:m_Phrase label="lu_comm_Discount" />: <span>- <inp2:Field name="ItemDiscount" currency="selected" negative="1"/></span>
-			</inp2:m_if>
-		</td>
-		<td valign="top"><strong><inp2:Field field="Price" currency="selected"/></strong></td>
-		<td valign="top"><inp2:Field field="Quantity"/></td>
-		<td valign="top"><strong><inp2:Field field="ExtendedPrice" currency="selected"/></strong></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form_shipping">
-	<!-- shipping -->
-	<table width="100%" cellpadding="0" cellspacing="0">
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<td colspan="2"><inp2:m_Phrase label="lu_section_ShippingInfo"/></td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="order-padding-left">
-			<td width="150"><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
-			<td><inp2:Field field="ShippingTo"/></td>
-		</tr>
-		<inp2:m_if check="Field" name="ShippingCompany">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="ShippingCompany"/></td>
-		</tr>
-		</inp2:m_if>
-		<inp2:m_if check="Field" name="ShippingEmail">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
-			<td><inp2:Field field="ShippingEmail"/></td>
-		</tr>
-		</inp2:m_if>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
-			<td><inp2:Field field="ShippingPhone"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
-			<td><inp2:Field field="ShippingFax"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
-			<td>
-				<inp2:m_if check="FieldEquals" field="ShippingAddress1" value="" inverse="inverse">
-					<inp2:Field field="ShippingAddress1"/><br>
-				</inp2:m_if>
-
-				<inp2:m_if check="FieldEquals" field="ShippingAddress2" value="" inverse="inverse">
-					<inp2:Field field="ShippingAddress2"/><br>
-				</inp2:m_if>
-				<inp2:PrintLocation type="Shipping"/>
-			</td>
-		</tr>
-
-		<inp2:m_if check="Field" name="ShippingTracking">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_ShippingTracking"/></strong>:</td>
-			<td><inp2:Field field="ShippingTracking"/></td>
-		</tr>
-		</inp2:m_if>
-
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form_billing">
-	<!-- billing -->
-	<table width="100%" cellpadding="0" cellspacing="0">
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<td colspan="2"><inp2:m_Phrase label="lu_section_BillingInfo"/></td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="order-padding-left">
-			<td width="150"><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
-			<td><inp2:Field field="BillingTo"/></td>
-		</tr>
-		<inp2:m_if check="Field" name="BillingCompany">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="BillingCompany"/></td>
-		</tr>
-		</inp2:m_if>
-		<inp2:m_if check="Field" name="BillingEmail">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
-			<td><inp2:Field field="BillingEmail"/></td>
-		</tr>
-		</inp2:m_if>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
-			<td><inp2:Field field="BillingPhone"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
-			<td><inp2:Field field="BillingFax"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
-			<td>
-				<inp2:m_if check="FieldEquals" field="BillingAddress1" value="" inverse="inverse">
-					<inp2:Field field="BillingAddress1"/><br>
-				</inp2:m_if>
-
-				<inp2:m_if check="FieldEquals" field="BillingAddress2" value="" inverse="inverse">
-					<inp2:Field field="BillingAddress2"/><br>
-				</inp2:m_if>
-				<inp2:PrintLocation type="Billing"/>
-			</td>
-		</tr>
-
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong></td>
-			<td><inp2:Field name="PaymentType" /></td>
-		</tr>
-
-		<inp2:m_if check="UsingCreditCard">
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_NameOnCard"/>:</strong></td>
-				<td><inp2:Field name="PaymentNameOnCard"/></td>
-			</tr>
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_CardType"/>:</strong></td>
-				<td><inp2:Field name="PaymentCardType" /></td>
-			</tr>
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_CardNumber"/>:</strong></td>
-				<td><inp2:Field name="PaymentAccount" masked="masked"/></td>
-			</tr>
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_Exp"/>:</strong></td>
-				<td><inp2:Field name="PaymentCCExpDate"/></td>
-			</tr>
-		</inp2:m_if>
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form">
-	<table>
-		<tr>
-			<td>
-				<strong><inp2:m_Phrase label="lu_comm_OrderNumber"/><inp2:Field field="OrderNumber"/>&nbsp;&nbsp;(<inp2:Field field="Status"/>)</strong>
-			</td>
-		</tr>
-	</table>
-
-	<inp2:m_if check="FieldEquals" field="IsRecurringBilling" value="1">
-		<table>
-			<tr>
-				<td valign="top" align="left">
-					<strong><inp2:m_Phrase label="lu_recurring_notice"/></strong> <inp2:m_Phrase label="lu_recurring_next_charge"/> <inp2:Field name="NextCharge" format="_regional_DateFormat"/> <inp2:m_Phrase label="lu_or"/> <inp2:m_GetConfig var="Comm_RecurringChargeInverval"/> <inp2:m_Phrase label="lu_recurring_charge_advance"/><br>
-					<a href="<inp2:m_link template="in-commerce/my_account/cancel_recurring" pass="ord"/>"><inp2:m_Phrase label="lu_recurring_cancel"/></a>
-				</td>
-			</tr>
-		</table>
-	</inp2:m_if>
-
-	<br />
-
-
-	<inp2:m_if check="OrderHasTangibleItems">
-		<table class="fullwidth">
-			<tr>
-				<td valign="top" width="49%">
-					<inp2:m_RenderElement name="order_form_shipping" PrefixSpecial="ord"/>
-				</td>
-				<td>&nbsp;</td>
-				<td valign="top" width="49%">
-					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
-				</td>
-			</tr>
-		</table>
-	<inp2:m_else />
-		<table class="fullwidth">
-			<tr>
-				<td>
-					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
-				</td>
-			</tr>
-		</table>
-	</inp2:m_if>
-
-
-
-	<br /><br />
-
-
-
-	<table class="fullwidth">
-		<tr>
-			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
-				<td colspan="2"><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
-			<inp2:m_else/>
-				<td><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
-			</inp2:m_if>
-
-			<td><inp2:m_Phrase label="lu_comm_Price"/></td>
-
-			<td><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
-			<td><inp2:m_Phrase label="lu_comm_Total"/></td>
-		</tr>
-		<tr>
-			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-
-		<inp2:ord_ListOrderItems render_as="orderitem_elem"/>
-
-		<tr class="order-padding-left">
-			<tr>
-				<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
-					<br />
-					<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-				</td>
-			</tr>
-			<td>
-				<inp2:m_if check="ord_HasDiscount">
-					<inp2:m_Phrase label="lu_comm_TotalSavings" />: <span><inp2:ord_Field name="DiscountTotal" currency="selected" /></span><br />
-				</inp2:m_if>&nbsp;
-			</td>
-			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>" align="right">
-				<div class="subtotal"><inp2:m_Phrase label="lu_comm_SubTotal"/>: <inp2:Field field="SubTotal" currency="selected"/><div>
-			</td>
-		</tr>
-	</table>
-
-
-	<br /><br />
-
-	<inp2:m_RenderElement name="subsection" title="lu_section_OrderTotal"/>
-
-	<table class="fullwidth">
-		<inp2:ord_PrintTotals
-			shipping_render_as="shipping_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"
-			return_render_as="return_total"/>
-
-		<inp2:m_if check="ord_Field" name="GiftCertificateId">
-			<tr class="order-padding-left">
-				<td align="right"><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>:</td>
-				<td align="right"><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
-			</tr>
-		</inp2:m_if>
-
-		<tr class="order-padding-left grand-total-blue">
-		    <td align="right"><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
-			<td align="right"><inp2:Field name="TotalAmount" currency="selected"/></td>
-		</tr>
-	</table>
-
-	<br />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="shipping_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</td>
-		<td align="right"><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
-	</tr>
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</td>
-		<td align="right"><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="processing_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </td>
-		<td align="right"><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sub_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_SubTotal"/>: </td>
-		<td align="right"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="vat_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </td>
-		<td align="right"><inp2:ord_Field name="VAT" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="return_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_fld_ReturnTotal"/> : </td>
-		<td align="right"><inp2:ord_Field name="ReturnTotal" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /ORDER DETAILS ELEMENTS ##-->
-
-<!--## SHOW ORDER DETAILS TAG! ##-->
-<inp2:ord_ShowOrder render_as="order_form" />
-<!--## /SHOW ORDER DETAILS TAG! ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/order_details.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/forms.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/forms.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/forms.tpl	(nonexistent)
@@ -1,82 +0,0 @@
-<inp2:m_DefineElement name="inp_affiliate_caption" style="" valign="top" title="" required="0">
-	<td class="field-name" valign="<inp2:m_Param name="valign"/>" style="<inp2:m_Param name="style"/>">
-		<inp2:m_phrase label="$title"/><inp2:m_if check="m_ParamEquals" name="required" value="1"><span class="field-required"> *</span></inp2:m_if>:
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_box" is_last="0" style="" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value" nowrap>
-			<inp2:m_if check="m_GetEquals" var="{$field}RequiredError" value="1">
-				<span class="field-error"><inp2:m_Phrase label="la_err_required" /></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:m_Param name="field"/>" value="<inp2:m_Get var="$field" />" tabindex="<inp2:m_get param="tab_index"/>"/>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_textarea" is_last="0" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value">
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:m_param name="field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>"><inp2:m_Get var="$field" /></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="affiliate_payment_type_element">
-	<tr>
-		<td valign="top" nowrap>
-			<input type="radio" name="<inp2:m_Param name="field"/>" id="<inp2:m_Param name="field"/>_<inp2:Field name="PaymentTypeId" />" value="<inp2:Field name="$field" />" <inp2:m_if check="u_AffiliatePaymentTypeChecked">checked</inp2:m_if>/>
-		</td>
-		<td>
-			<label for="<inp2:m_Param name="field"/>_<inp2:Field name="$field" />">
-				<inp2:Field name="Name" /><br />
-				<inp2:m_if check="Field" name="Description">
-					<inp2:Field name="Description" />
-				</inp2:m_if>
-			</label>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value">
-			<table>
-				<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_element" field="$field"/>
-			</table>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<td class="field-name" nowrap>
-			&nbsp;
-		</td>
-		<td class="field-value">
-			<inp2:m_if check="m_GetEquals" var="MustAgreeToTerms" value="1">
-				<span class="field-error"><inp2:m_Phrase label="lu_comm_MustAgreeAffiliateTermsError" /></span><br />
-			</inp2:m_if>
-			<input type="checkbox" name="AgreeToAffiliateTerms"/>
-			<inp2:m_Phrase label="lu_comm_IAgreeTo" />
-			<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
-			<inp2:m_Phrase label="lu_comm_TermsAndConditions" />
-		</td>
-	</tr>
-
-	<script type="text/javascript">
-		function showAffiliateAgreement() {
-			window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
-		}
-	</script>
-</inp2:m_DefineElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/forms.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/options_blocks.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/options_blocks.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/options_blocks.tpl	(nonexistent)
@@ -1,32 +0,0 @@
-<!--## PRODUCT OPTIONS ELEMENTS ##-->
-
-<inp2:m_DefineElement name="option_value_element">
-	<inp2:m_param name="value"/> <inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
-	<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="option_element">
-	<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
-		<strong><inp2:m_param name="option"/>:</strong>
-			<inp2:PrintOptionValues render_as="option_value_element" currency="selected"/>
-	<inp2:m_else/>
-			<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
-				<inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
-	</inp2:m_if><br/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="option_value_element_no_price">
-	<inp2:m_param name="value"/>
-	<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="option_element_no_price">
-	<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
-		<strong><inp2:m_param name="option"/>:</strong>
-			<inp2:PrintOptionValues render_as="option_value_element_no_price"/>
-	<inp2:m_else/>
-			<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
-	</inp2:m_if><br/>
-</inp2:m_DefineElement>
-
-<!--## /PRODUCT OPTIONS ELEMENTS ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/options_blocks.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/sorting.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/sorting.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/sorting.tpl	(nonexistent)
@@ -1,41 +0,0 @@
-<!--## SORTING TEMPLATE FOR IN-COMMERCE ##-->
-
-<table class="fullwidth">
-	<tr>
-		<td class="category-statistics">
-			<inp2:m_phrase name="lu_TotalProducts"/>: <inp2:p_ItemCount/>  &nbsp;|&nbsp;  <inp2:m_phrase name="lu_AddedToday"/>: <inp2:p_ItemCount today="1"/>
-		</td>
-		<td class="category-statistics" align="right">
-			<inp2:m_phrase name="lu_ProductsUpdated"/>: <inp2:p_LastUpdated format="_regional_DateFormat"/>
-		</td>
-	</tr>
-</table>
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt="" /><br />
-<br />
-
-<table class="fullwidth">
-	<tr>
-		<td align="right">
-			<form method="post" action="<inp2:m_FormAction />">
-				<inp2:m_Phrase label="lu_SortProductsBy"/>:
-
-				<select class="input-select" name="<inp2:p_CombinedSortingDropDownName/>">
-					<option value="Name|asc" <inp2:p_SortingSelected sorting="l1_Name|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_NameAZ"/></option>
-					<option value="Name|desc" <inp2:p_SortingSelected sorting="l1_Name|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_NameZA"/></option>
-					<option value="Manufacturer|asc" <inp2:p_SortingSelected sorting="Manufacturer|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_ManufAZ"/></option>
-					<option value="Manufacturer|desc" <inp2:p_SortingSelected sorting="Manufacturer|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_ManufZA"/></option>
-					<option value="Price|asc" <inp2:p_SortingSelected sorting="Price|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_PriceLH"/></option>
-					<option value="Price|desc" <inp2:p_SortingSelected sorting="Price|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_PriceHL"/></option>
-					<option value="CreatedOn|asc" <inp2:p_SortingSelected sorting="CreatedOn|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_RecentToOld"/></option>
-					<option value="CreatedOn|desc" <inp2:p_SortingSelected sorting="CreatedOn|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_OldToRecent"/></option>
-				</select>
-				<input type="submit" class="button" name="<inp2:p_SubmitName event="OnSetSortingDirect"/>" value="<inp2:m_Phrase label="lu_btn_Sort"/>" />
-			</form>
-		</td>
-	</tr>
-</table>
-
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="10" alt="" /><br />
-
-<!--## /SORTING TEMPLATE FOR IN-COMMERCE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/sorting.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/currency_picker.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/currency_picker.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/currency_picker.tpl	(nonexistent)
@@ -1,15 +0,0 @@
-<td width="1">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/languages_separator.gif" width="1" height="22" alt="" />
-</td>
-<td class="top-select-padding">
-<form method="post" name="cur_form"  id="cur_form" action="<inp2:m_FormAction />">
-&nbsp; <inp2:m_Phrase label="lu_YourCurrency"/>:
-	<input type="hidden" name="events[curr][OnChangeCurrency]" value="" />
-	<select name="curr_iso" class="input-select" onchange="document.getElementById('cur_form').submit()">
-	<inp2:m_DefineElement name="currency">
-		<option value="<inp2:Field name="ISO"/>" <inp2:m_if check="SelectedCurrency">selected="selected"</inp2:m_if> ><inp2:Field name="ISO"/></option>
-	</inp2:m_DefineElement>
-	<inp2:curr_ListCurrencies render_as="currency" no_table="1"/>
-	</select>
-</form>
-</td>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/currency_picker.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/sorting.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/sorting.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/sorting.elm.tpl	(revision 11475)
@@ -0,0 +1,41 @@
+<!--## SORTING TEMPLATE FOR IN-COMMERCE ##-->
+
+<table class="fullwidth">
+	<tr>
+		<td class="category-statistics">
+			<inp2:m_phrase name="lu_TotalProducts"/>: <inp2:p_ItemCount/>  &nbsp;|&nbsp;  <inp2:m_phrase name="lu_AddedToday"/>: <inp2:p_ItemCount today="1"/>
+		</td>
+		<td class="category-statistics" align="right">
+			<inp2:m_phrase name="lu_ProductsUpdated"/>: <inp2:p_LastUpdated format="_regional_DateFormat"/>
+		</td>
+	</tr>
+</table>
+<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
+<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt="" /><br />
+<br />
+
+<table class="fullwidth">
+	<tr>
+		<td align="right">
+			<form method="post" action="<inp2:m_FormAction />">
+				<inp2:m_Phrase label="lu_SortProductsBy"/>:
+
+				<select class="input-select" name="<inp2:p_CombinedSortingDropDownName/>">
+					<option value="Name|asc" <inp2:p_SortingSelected sorting="l1_Name|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_NameAZ"/></option>
+					<option value="Name|desc" <inp2:p_SortingSelected sorting="l1_Name|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_NameZA"/></option>
+					<option value="Manufacturer|asc" <inp2:p_SortingSelected sorting="Manufacturer|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_ManufAZ"/></option>
+					<option value="Manufacturer|desc" <inp2:p_SortingSelected sorting="Manufacturer|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_ManufZA"/></option>
+					<option value="Price|asc" <inp2:p_SortingSelected sorting="Price|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_PriceLH"/></option>
+					<option value="Price|desc" <inp2:p_SortingSelected sorting="Price|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_PriceHL"/></option>
+					<option value="CreatedOn|asc" <inp2:p_SortingSelected sorting="CreatedOn|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_RecentToOld"/></option>
+					<option value="CreatedOn|desc" <inp2:p_SortingSelected sorting="CreatedOn|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_OldToRecent"/></option>
+				</select>
+				<input type="submit" class="button" name="<inp2:p_SubmitName event="OnSetSortingDirect"/>" value="<inp2:m_Phrase label="lu_btn_Sort"/>" />
+			</form>
+		</td>
+	</tr>
+</table>
+
+<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="10" alt="" /><br />
+
+<!--## /SORTING TEMPLATE FOR IN-COMMERCE ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/sorting.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.elm.tpl	(revision 11475)
@@ -0,0 +1,46 @@
+<form method="POST" action="<inp2:m_FormAction />">
+<center>
+	<script src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
+	<table align="center">
+		<tr class="listing-row">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td>
+				<strong><inp2:m_phrase label="la_from_date"/></strong>
+			</td>
+			<td>
+				<inp2:m_if check="{$prefix}_SearchError" field="$field">
+					<span class="field-error"><inp2:{$prefix}_SearchError field="$field"/></span><br />
+				</inp2:m_if>
+				<input type="text" class="input-text" name="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="from" grid="$grid_name"/>" id="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="from" grid="$grid_name"/>" value="<inp2:{$prefix}_SearchField field="$field" filter_type="date_range" type="from" grid="$grid_name"/>" size="<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif"/>
+				<span>(<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
+				<script type="text/javascript">
+					initCalendar("<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="from" grid="$grid_name"/>", "<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1"/>");
+				</script>
+			</td>
+		</tr>
+		<tr class="listing-row">
+			<td>
+				<strong><inp2:m_phrase label="la_to_date"/></strong>
+			</td>
+			<td>
+				<inp2:m_if check="{$prefix}_SearchError" field="$field">
+					<span class="field-error"><inp2:{$prefix}_SearchError field="$field"/></span><br />
+				</inp2:m_if>
+				<input type="text" class="input-text" name="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="to" grid="$grid_name"/>" id="<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="to" grid="$grid_name"/>" value="<inp2:{$prefix}_SearchField field="$field" filter_type="date_range" type="to" grid="$grid_name"/>" size="<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" edit_size="1"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif"/>
+				<span>(<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1" human="true"/>)</span>
+				<script type="text/javascript">
+					initCalendar("<inp2:{$prefix}_SearchInputName field="$field" filter_type="date_range" type="to" grid="$grid_name"/>", "<inp2:{$prefix}_SearchFormat field="{$field}_date" input_format="1"/>");
+				</script>
+			</td>
+		</tr>
+		<tr class="listing-row">
+			<td colspan="3" align="center">
+				<input class="button" type="submit" name="events[<inp2:m_param name="prefix"/>][OnSearch]" value="<inp2:m_phrase label="lu_search" />">
+				<input class="button" type="submit" name="events[<inp2:m_param name="prefix"/>][OnSearchReset]" value="<inp2:m_phrase label="lu_reset" />">
+			</td>
+		</tr>
+	</table>
+</center>
+<input type="hidden" name="grid_name" value="<inp2:m_param name="grid_name"/>" />
+</form>
+<br />
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/affiliate_date_filter.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/forms.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/forms.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/forms.elm.tpl	(revision 11475)
@@ -0,0 +1,82 @@
+<inp2:m_DefineElement name="inp_affiliate_caption" style="" valign="top" title="" required="0">
+	<td class="field-name" valign="<inp2:m_Param name="valign"/>" style="<inp2:m_Param name="style"/>">
+		<inp2:m_phrase label="$title"/><inp2:m_if check="m_ParamEquals" name="required" value="1"><span class="field-required"> *</span></inp2:m_if>:
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_affiliate_box" is_last="0" style="" required="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
+		<td class="field-value" nowrap>
+			<inp2:m_if check="m_GetEquals" var="{$field}RequiredError" value="1">
+				<span class="field-error"><inp2:m_Phrase label="la_err_required" /></span><br />
+			</inp2:m_if>
+			<input type="text" class="input-text" name="<inp2:m_Param name="field"/>" value="<inp2:m_Get var="$field" />" tabindex="<inp2:m_get param="tab_index"/>"/>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_affiliate_textarea" is_last="0" required="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
+		<td class="field-value">
+			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:m_param name="field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>"><inp2:m_Get var="$field" /></textarea>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="affiliate_payment_type_element">
+	<tr>
+		<td valign="top" nowrap>
+			<input type="radio" name="<inp2:m_Param name="field"/>" id="<inp2:m_Param name="field"/>_<inp2:Field name="PaymentTypeId" />" value="<inp2:Field name="$field" />" <inp2:m_if check="u_AffiliatePaymentTypeChecked">checked</inp2:m_if>/>
+		</td>
+		<td>
+			<label for="<inp2:m_Param name="field"/>_<inp2:Field name="$field" />">
+				<inp2:Field name="Name" /><br />
+				<inp2:m_if check="Field" name="Description">
+					<inp2:Field name="Description" />
+				</inp2:m_if>
+			</label>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
+		<td class="field-value">
+			<table>
+				<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_element" field="$field"/>
+			</table>
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<td class="field-name" nowrap>
+			&nbsp;
+		</td>
+		<td class="field-value">
+			<inp2:m_if check="m_GetEquals" var="MustAgreeToTerms" value="1">
+				<span class="field-error"><inp2:m_Phrase label="lu_comm_MustAgreeAffiliateTermsError" /></span><br />
+			</inp2:m_if>
+			<input type="checkbox" name="AgreeToAffiliateTerms"/>
+			<inp2:m_Phrase label="lu_comm_IAgreeTo" />
+			<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
+			<inp2:m_Phrase label="lu_comm_TermsAndConditions" />
+		</td>
+	</tr>
+
+	<script type="text/javascript">
+		function showAffiliateAgreement() {
+			window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
+		}
+	</script>
+</inp2:m_DefineElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/forms.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/currency_picker.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/currency_picker.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/currency_picker.elm.tpl	(revision 11475)
@@ -0,0 +1,15 @@
+<td width="1">
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/languages_separator.gif" width="1" height="22" alt="" />
+</td>
+<td class="top-select-padding">
+<form method="post" name="cur_form"  id="cur_form" action="<inp2:m_FormAction />">
+&nbsp; <inp2:m_Phrase label="lu_YourCurrency"/>:
+	<input type="hidden" name="events[curr][OnChangeCurrency]" value="" />
+	<select name="curr_iso" class="input-select" onchange="document.getElementById('cur_form').submit()">
+	<inp2:m_DefineElement name="currency">
+		<option value="<inp2:Field name="ISO"/>" <inp2:m_if check="SelectedCurrency">selected="selected"</inp2:m_if> ><inp2:Field name="ISO"/></option>
+	</inp2:m_DefineElement>
+	<inp2:curr_ListCurrencies render_as="currency" no_table="1"/>
+	</select>
+</form>
+</td>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/currency_picker.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/options_blocks.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/options_blocks.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/options_blocks.elm.tpl	(revision 11475)
@@ -0,0 +1,32 @@
+<!--## PRODUCT OPTIONS ELEMENTS ##-->
+
+<inp2:m_DefineElement name="option_value_element">
+	<inp2:m_param name="value"/> <inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+	<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_element">
+	<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+		<strong><inp2:m_param name="option"/>:</strong>
+			<inp2:PrintOptionValues render_as="option_value_element" currency="selected"/>
+	<inp2:m_else/>
+			<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+				<inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+	</inp2:m_if><br/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_value_element_no_price">
+	<inp2:m_param name="value"/>
+	<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_element_no_price">
+	<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+		<strong><inp2:m_param name="option"/>:</strong>
+			<inp2:PrintOptionValues render_as="option_value_element_no_price"/>
+	<inp2:m_else/>
+			<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+	</inp2:m_if><br/>
+</inp2:m_DefineElement>
+
+<!--## /PRODUCT OPTIONS ELEMENTS ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/options_blocks.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.tpl	(nonexistent)
@@ -1,22 +0,0 @@
-<inp2:p_InitList list_name="recent_products" types="recent" parent_cat_id="any" recursive="true" per_page="short_list" except="in_cart" />
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-commerce/products/recent_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_RecentlyViewedProducts"/></a> (<inp2:p_TotalRecords list_name="recent_products"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-commerce/designs/products"/>
-
-<table>
-	<inp2:p_ListProducts list_name="recent_products" render_as="product_short_element" columns="1" requery="0"/>
-</table>
-
-<inp2:m_DefineElement name="more_link">
-	<a href="<inp2:m_Link template="in-commerce/products/recent_products" />"><inp2:m_Phrase label="lu_More"/>...</a><br />
-</inp2:m_DefineElement>
-
-<inp2:p_MoreLink list_name="recent_products" render_as="more_link" />
-<br />
-
-<form method="post" action="<inp2:m_FormAction />">
-	<input class="button" type="submit" name="events[p][OnClearRecent]" value="<inp2:m_Phrase label="lu_btn_Clear"/>"/>
-</form>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.tpl	(nonexistent)
@@ -1,50 +0,0 @@
-<inp2:m_DefineElement name="more_link_elem">
-	<tr>
-		<td class="sub-category-padding">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-		</td>
-		<td>
-			<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:m_Phrase label="lu_more_products"/>...</a><br />
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="3" border="0" /><br />
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="subcategory_elem">
-	<tr>
-		<td class="sub-category-padding">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-		</td>
-		<td>
-			<inp2:m_if check="IsCurrent">
-				<inp2:Field name="Name"/>
-			<inp2:m_else/>
-				<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name"/></a>
-			</inp2:m_if>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_Capture to_var="header">
-	<inp2:m_Phrase label="lu_title_Categories"/>
-</inp2:m_Capture>
-
-<table width="100%">
-	<inp2:m_DefineElement name="category_elem">
-		<td class="top-category-padding">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-1-level.gif" alt="" width="6" height="5" border="0" /><br />
-		</td>
-		<td valign="top">
-			<inp2:m_if check="IsCurrent">
-				<strong><inp2:Field name="Name"/></strong><br />
-			<inp2:m_else/>
-				<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="top-category"><inp2:Field name="Name"/></a><br />
-			</inp2:m_if>
-			<table>
-			<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="4" no_table="1"/>
-			</table>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
-		</td>
-	</inp2:m_DefineElement>
-	<inp2:c_ListCategories render_as="category_elem" per_page="-1" columns="1" direction="H" parent_cat_id="Root" module="In-Commerce"/>
-</table>

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.tpl	(nonexistent)
@@ -1,15 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_Phrase label="lu_comm_Manufacturers"/>1
-</inp2:m_Capture>
-
-<inp2:m_Get var="manuf_id" result_to_var="curr_manuf_id"/>
-
-<inp2:m_DefineElement name="manuf_elem_dropdown">
-<option value="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />" <inp2:m_if check="FieldEquals" name="ManufacturerId" value="$curr_manuf_id">selected="selected"</inp2:m_if> >
-<inp2:Field field="Name" /></option></inp2:m_DefineElement>
-
-<form id="manufacturers" method="post" action="<inp2:m_FormAction />">
-	<select name="Manufacturer" onchange="window.location.href=this.value">
-	<inp2:manuf.custom_ListManufacturers list_name="manufacturers" render_as="manuf_elem_dropdown" per_page="-1" row_start_render_as="html:" row_end_render_as="html:" empty_cell_render_as="html:" parent_cat_id="any" />
-	</select>
-</form>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.tpl	(nonexistent)
@@ -1,24 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_Phrase label="lu_title_Affiliate"/>
-</inp2:m_Capture>
-
-<table class="fullwidth" style="border-width: 0px;">
-	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_statistics" title="lu_Statistics"/>
-	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_payments" title="lu_Payments"/>
-	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_materials" title="lu_Materials"/>
-	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_payment_type" title="lu_ChangePaymentType"/>
-	<tr>
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-		</td>
-		<td>
-			<a href="<inp2:m_Link t='in-commerce/my_account/affiliate'/>" onclick="showAffiliateAgreement(); return false;"><inp2:m_phrase label="lu_TermsAndConditionsLink"/></a>
-		</td>
-	</tr>
-</table>
-
-<script type="text/javascript">
-function showAffiliateAgreement() {
-	window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
-}
-</script>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.tpl	(nonexistent)
@@ -1,44 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_CheckoutSteps"/>
-</inp2:m_Capture>
-
-<table border="0" cellspacing="0" cellpadding="0" class="block">
-	<tr>
-		<td class="block-data">
-				<inp2:m_DefineElement name="passed_checkout_step">
-					<inp2:m_param name="number"/>. <a href="<inp2:m_param name="template_link"/>"><inp2:m_param name="title"/></a><br/>
-				</inp2:m_DefineElement>
-
-				<inp2:m_DefineElement name="current_checkout_step">
-					<span class="nav-bar-current" style="color:red"><inp2:m_param name="number"/>. <inp2:m_param name="title"/></span><br/>
-				</inp2:m_DefineElement>
-
-				<inp2:m_DefineElement name="checkout_step">
-					<inp2:m_param name="number"/>. <inp2:m_param name="title"/><br/>
-				</inp2:m_DefineElement>
-
-				<inp2:m_if check="ord_OrderHasTangibleItems">
-
-					<inp2:ord_CheckoutSteps render_as="checkout_step" passed_step_render_as="passed_checkout_step"
-							 current_step_render_as="current_checkout_step"
-							 steps="lu_ShoppingCart,lu_comm_ShippingInfo,lu_comm_BillingInfo,lu_comm_OrderPreview,lu_comm_Confirmation"
-							 templates="in-commerce/checkout/shop_cart,
-							 			in-commerce/checkout/shipping,
-							 			in-commerce/checkout/billing,
-							 			in-commerce/checkout/preview,
-							 			in-commerce/checkout/confirmation" />
-
-				<inp2:m_else/>
-
-					<inp2:ord_CheckoutSteps render_as="checkout_step" passed_step_render_as="passed_checkout_step"
-								 current_step_render_as="current_checkout_step"
-								 steps="lu_ShoppingCart,lu_comm_BillingInfo,lu_comm_OrderPreview,lu_comm_Confirmation"
-								 templates="in-commerce/checkout/shop_cart,
-								 			in-commerce/checkout/billing,
-								 			in-commerce/checkout/preview,
-								 			in-commerce/checkout/confirmation" />
-
-				</inp2:m_if>
-		</td>
-	</tr>
-</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.tpl	(nonexistent)
@@ -1,26 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_CreditCards"/>
-</inp2:m_Capture>
-
-<inp2:m_Phrase label="lu_text_WeAcceptCreditCards"/><br />
-<br />
-
-<table class="credit-card-table">
-	<tr>
-		<td>
-			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/visa.gif" /><br />
-		</td>
-		<td>
-			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/american_express.gif" /><br />
-		</td>
-	</tr>
-
-	<tr>
-		<td>
-			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/master_card.gif" /><br />
-		</td>
-		<td>
-			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/novus.gif" /><br />
-		</td>
-	</tr>
-</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.tpl	(nonexistent)
@@ -1,18 +0,0 @@
-<!-- pick products -->
-<inp2:p_InitList list_name="pick_products" types="pick" parent_cat_id="0" recursive="1" per_page="short_list"/>
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-commerce/products/pick_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_PickProducts"/></a> (<inp2:p_TotalRecords list_name="pick_products"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-commerce/designs/products"/>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:p_ListProducts list_name="pick_products" render_as="product_short_element" direction="H"/>
-</table>
-
-<inp2:m_DefineElement name="more_link">
-	<a href="<inp2:m_Link template="in-commerce/products/pick_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="lu_More" /></a>
-</inp2:m_DefineElement>
-<inp2:p_MoreLink list_name="pick_products" render_as="more_link"/>
-<!-- // pick products -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.tpl	(nonexistent)
@@ -1,17 +0,0 @@
-<inp2:p_InitList list_name="top_seller_products" types="hot" recursive="1" per_page="short_list" />
-
-<inp2:m_Capture to_var="header">
-	<a href="<inp2:m_Link template="in-commerce/products/top_seller_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_TopSellerProducts"/></a> (<inp2:p_TotalRecords list_name="top_seller_products"/>)
-</inp2:m_Capture>
-
-<inp2:m_include template="in-commerce/designs/products"/>
-
-<table>
-	<inp2:p_ListProducts list_name="top_seller_products" render_as="product_short_element" no_table="1"/>
-</table>
-
-<inp2:m_DefineElement name="more_link">
-	<a href="<inp2:m_Link template="in-commerce/products/top_seller_products" />"><inp2:m_Phrase label="lu_More"/>...</a>
-</inp2:m_DefineElement>
-
-<inp2:p_MoreLink list_name="top_seller_products" render_as="more_link" />

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.tpl	(nonexistent)
@@ -1,39 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_ActionBox"/>
-</inp2:m_Capture>
-
-<table width="100%" style="border-width: 0px;">
-	<inp2:m_if check="m_Param" name="item_actions">
-		<tr>
-			<td>-</td>
-			<td>
-				<inp2:m_if check="p_IsFavorite">
-					<a href="<inp2:p_FavoriteToggleLink/>">
-						<inp2:m_phrase name="lu_btn_RemoveFromWishList"/>
-					</a>
-				<inp2:m_else/>
-					<a href="<inp2:p_FavoriteToggleLink template="platform/my_account/my_favorites"/>">
-						<inp2:m_phrase name="lu_btn_AddToWishList"/>
-					</a>
-				</inp2:m_if>
-			</td>
-		</tr>
-
-		<tr>
-			<td>-</td>
-			<td>
-				<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_ReviewThisProduct"/></a>
-			</td>
-		</tr>
-
-		<!--##
-		<tr>
-			<td>-</td>
-			<td>
-				<a href="<inp2:p_ProductLink template="in-commerce/products/rate_product"/>"><inp2:m_phrase name="lu_btn_RateThisProduct"/></a>
-			</td>
-		</tr>
-		##-->
-		
-	</inp2:m_if>
-</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.tpl	(nonexistent)
@@ -1,26 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_CartIndicator"/>
-</inp2:m_Capture>
-
-<inp2:m_if check="ord_CartNotEmpty">
-	<table border="0" cellspacing="0" cellpadding="0" class="block">
-		<tr>
-			<td class="block-header"><inp2:m_Phrase label="lu_YourCart"/></td>
-		</tr>
-		<tr>
-			<td class="block-data">
-				<form method="post" action="<inp2:m_FormAction />">
-					<strong><inp2:m_Phrase label="lu_cart_TotalItems" />: </strong><inp2:ord_ItemsInCart/><br />
-
-					<strong><inp2:m_Phrase label="lu_cart_OrderTotal" />: </strong><inp2:ord_Field field="SubTotal" currency="selected"/><br />
-					<img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
-					<input type="hidden" name="viewcart_template" value="in-commerce/checkout/shop_cart">
-					<input class="button" type="submit" name="events[ord][OnViewCart]" value="<inp2:m_Phrase label="lu_cart_ViewCart" />">
-					<input type="hidden" name="next_step_template" value="<inp2:m_if check="ord_OrderHasTangibleItems">in-commerce/checkout/shipping<inp2:m_else/>in-commerce/checkout/billing</inp2:m_if>" />
-					<input class="button" type="submit" name="events[ord][OnCheckout]" value="<inp2:m_Phrase label="lu_cart_Checkout" />">
-
-				</form>
-			</td>
-		</tr>
-	</table>
-</inp2:m_if>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.elm.tpl	(revision 11475)
@@ -0,0 +1,50 @@
+<inp2:m_DefineElement name="more_link_elem">
+	<tr>
+		<td class="sub-category-padding">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
+		</td>
+		<td>
+			<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:m_Phrase label="lu_more_products"/>...</a><br />
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="3" border="0" /><br />
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="subcategory_elem">
+	<tr>
+		<td class="sub-category-padding">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
+		</td>
+		<td>
+			<inp2:m_if check="IsCurrent">
+				<inp2:Field name="Name"/>
+			<inp2:m_else/>
+				<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name"/></a>
+			</inp2:m_if>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_Capture to_var="header">
+	<inp2:m_Phrase label="lu_title_Categories"/>
+</inp2:m_Capture>
+
+<table width="100%">
+	<inp2:m_DefineElement name="category_elem">
+		<td class="top-category-padding">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-1-level.gif" alt="" width="6" height="5" border="0" /><br />
+		</td>
+		<td valign="top">
+			<inp2:m_if check="IsCurrent">
+				<strong><inp2:Field name="Name"/></strong><br />
+			<inp2:m_else/>
+				<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="top-category"><inp2:Field name="Name"/></a><br />
+			</inp2:m_if>
+			<table>
+			<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="4" no_table="1"/>
+			</table>
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
+		</td>
+	</inp2:m_DefineElement>
+	<inp2:c_ListCategories render_as="category_elem" per_page="-1" columns="1" direction="H" parent_cat_id="Root" module="In-Commerce"/>
+</table>

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/categories.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.elm.tpl	(revision 11475)
@@ -0,0 +1,26 @@
+<inp2:m_Capture to_var="header">
+	<inp2:m_phrase name="lu_title_CartIndicator"/>
+</inp2:m_Capture>
+
+<inp2:m_if check="ord_CartNotEmpty">
+	<table border="0" cellspacing="0" cellpadding="0" class="block">
+		<tr>
+			<td class="block-header"><inp2:m_Phrase label="lu_YourCart"/></td>
+		</tr>
+		<tr>
+			<td class="block-data">
+				<form method="post" action="<inp2:m_FormAction />">
+					<strong><inp2:m_Phrase label="lu_cart_TotalItems" />: </strong><inp2:ord_ItemsInCart/><br />
+
+					<strong><inp2:m_Phrase label="lu_cart_OrderTotal" />: </strong><inp2:ord_Field field="SubTotal" currency="selected"/><br />
+					<img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
+					<input type="hidden" name="viewcart_template" value="in-commerce/checkout/shop_cart">
+					<input class="button" type="submit" name="events[ord][OnViewCart]" value="<inp2:m_Phrase label="lu_cart_ViewCart" />">
+					<input type="hidden" name="next_step_template" value="<inp2:m_if check="ord_OrderHasTangibleItems">in-commerce/checkout/shipping<inp2:m_else/>in-commerce/checkout/billing</inp2:m_if>" />
+					<input class="button" type="submit" name="events[ord][OnCheckout]" value="<inp2:m_Phrase label="lu_cart_Checkout" />">
+
+				</form>
+			</td>
+		</tr>
+	</table>
+</inp2:m_if>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/cart_indicator.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl	(revision 11475)
@@ -0,0 +1,39 @@
+<inp2:m_Capture to_var="header">
+	<inp2:m_phrase name="lu_title_ActionBox"/>
+</inp2:m_Capture>
+
+<table width="100%" style="border-width: 0px;">
+	<inp2:m_if check="m_Param" name="item_actions">
+		<tr>
+			<td>-</td>
+			<td>
+				<inp2:m_if check="p_IsFavorite">
+					<a href="<inp2:p_FavoriteToggleLink/>">
+						<inp2:m_phrase name="lu_btn_RemoveFromWishList"/>
+					</a>
+				<inp2:m_else/>
+					<a href="<inp2:p_FavoriteToggleLink template="platform/my_account/my_favorites"/>">
+						<inp2:m_phrase name="lu_btn_AddToWishList"/>
+					</a>
+				</inp2:m_if>
+			</td>
+		</tr>
+
+		<tr>
+			<td>-</td>
+			<td>
+				<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_ReviewThisProduct"/></a>
+			</td>
+		</tr>
+
+		<!--##
+		<tr>
+			<td>-</td>
+			<td>
+				<a href="<inp2:p_ProductLink template="in-commerce/products/rate_product"/>"><inp2:m_phrase name="lu_btn_RateThisProduct"/></a>
+			</td>
+		</tr>
+		##-->
+		
+	</inp2:m_if>
+</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.elm.tpl	(revision 11475)
@@ -0,0 +1,26 @@
+<inp2:m_Capture to_var="header">
+	<inp2:m_phrase name="lu_title_CreditCards"/>
+</inp2:m_Capture>
+
+<inp2:m_Phrase label="lu_text_WeAcceptCreditCards"/><br />
+<br />
+
+<table class="credit-card-table">
+	<tr>
+		<td>
+			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/visa.gif" /><br />
+		</td>
+		<td>
+			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/american_express.gif" /><br />
+		</td>
+	</tr>
+
+	<tr>
+		<td>
+			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/master_card.gif" /><br />
+		</td>
+		<td>
+			<img alt="" src="<inp2:m_TemplatesBase module="In-Commerce"/>img/credit_cards/novus.gif" /><br />
+		</td>
+	</tr>
+</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/credit_cards.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.elm.tpl	(revision 11475)
@@ -0,0 +1,15 @@
+<inp2:m_Capture to_var="header">
+	<inp2:m_Phrase label="lu_comm_Manufacturers"/>1
+</inp2:m_Capture>
+
+<inp2:m_Get var="manuf_id" result_to_var="curr_manuf_id"/>
+
+<inp2:m_DefineElement name="manuf_elem_dropdown">
+<option value="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />" <inp2:m_if check="FieldEquals" name="ManufacturerId" value="$curr_manuf_id">selected="selected"</inp2:m_if> >
+<inp2:Field field="Name" /></option></inp2:m_DefineElement>
+
+<form id="manufacturers" method="post" action="<inp2:m_FormAction />">
+	<select name="Manufacturer" onchange="window.location.href=this.value">
+	<inp2:manuf.custom_ListManufacturers list_name="manufacturers" render_as="manuf_elem_dropdown" per_page="-1" row_start_render_as="html:" row_end_render_as="html:" empty_cell_render_as="html:" parent_cat_id="any" />
+	</select>
+</form>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/manufacturer_dropdown.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.elm.tpl	(revision 11475)
@@ -0,0 +1,18 @@
+<!-- pick products -->
+<inp2:p_InitList list_name="pick_products" types="pick" parent_cat_id="0" recursive="1" per_page="short_list"/>
+
+<inp2:m_Capture to_var="header">
+	<a href="<inp2:m_Link template="in-commerce/products/pick_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_PickProducts"/></a> (<inp2:p_TotalRecords list_name="pick_products"/>)
+</inp2:m_Capture>
+
+<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+<table width="100%" style="border-width: 0px;">
+	<inp2:p_ListProducts list_name="pick_products" render_as="product_short_element" direction="H"/>
+</table>
+
+<inp2:m_DefineElement name="more_link">
+	<a href="<inp2:m_Link template="in-commerce/products/pick_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="lu_More" /></a>
+</inp2:m_DefineElement>
+<inp2:p_MoreLink list_name="pick_products" render_as="more_link"/>
+<!-- // pick products -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/pick_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.elm.tpl	(revision 11475)
@@ -0,0 +1,17 @@
+<inp2:p_InitList list_name="top_seller_products" types="hot" recursive="1" per_page="short_list" />
+
+<inp2:m_Capture to_var="header">
+	<a href="<inp2:m_Link template="in-commerce/products/top_seller_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_TopSellerProducts"/></a> (<inp2:p_TotalRecords list_name="top_seller_products"/>)
+</inp2:m_Capture>
+
+<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+<table>
+	<inp2:p_ListProducts list_name="top_seller_products" render_as="product_short_element" no_table="1"/>
+</table>
+
+<inp2:m_DefineElement name="more_link">
+	<a href="<inp2:m_Link template="in-commerce/products/top_seller_products" />"><inp2:m_Phrase label="lu_More"/>...</a>
+</inp2:m_DefineElement>
+
+<inp2:p_MoreLink list_name="top_seller_products" render_as="more_link" />

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/top_seller_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.elm.tpl	(revision 11475)
@@ -0,0 +1,44 @@
+<inp2:m_Capture to_var="header">
+	<inp2:m_phrase name="lu_title_CheckoutSteps"/>
+</inp2:m_Capture>
+
+<table border="0" cellspacing="0" cellpadding="0" class="block">
+	<tr>
+		<td class="block-data">
+				<inp2:m_DefineElement name="passed_checkout_step">
+					<inp2:m_param name="number"/>. <a href="<inp2:m_param name="template_link"/>"><inp2:m_param name="title"/></a><br/>
+				</inp2:m_DefineElement>
+
+				<inp2:m_DefineElement name="current_checkout_step">
+					<span class="nav-bar-current" style="color:red"><inp2:m_param name="number"/>. <inp2:m_param name="title"/></span><br/>
+				</inp2:m_DefineElement>
+
+				<inp2:m_DefineElement name="checkout_step">
+					<inp2:m_param name="number"/>. <inp2:m_param name="title"/><br/>
+				</inp2:m_DefineElement>
+
+				<inp2:m_if check="ord_OrderHasTangibleItems">
+
+					<inp2:ord_CheckoutSteps render_as="checkout_step" passed_step_render_as="passed_checkout_step"
+							 current_step_render_as="current_checkout_step"
+							 steps="lu_ShoppingCart,lu_comm_ShippingInfo,lu_comm_BillingInfo,lu_comm_OrderPreview,lu_comm_Confirmation"
+							 templates="in-commerce/checkout/shop_cart,
+							 			in-commerce/checkout/shipping,
+							 			in-commerce/checkout/billing,
+							 			in-commerce/checkout/preview,
+							 			in-commerce/checkout/confirmation" />
+
+				<inp2:m_else/>
+
+					<inp2:ord_CheckoutSteps render_as="checkout_step" passed_step_render_as="passed_checkout_step"
+								 current_step_render_as="current_checkout_step"
+								 steps="lu_ShoppingCart,lu_comm_BillingInfo,lu_comm_OrderPreview,lu_comm_Confirmation"
+								 templates="in-commerce/checkout/shop_cart,
+								 			in-commerce/checkout/billing,
+								 			in-commerce/checkout/preview,
+								 			in-commerce/checkout/confirmation" />
+
+				</inp2:m_if>
+		</td>
+	</tr>
+</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/checkout_steps.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl	(revision 11475)
@@ -0,0 +1,24 @@
+<inp2:m_Capture to_var="header">
+	<inp2:m_Phrase label="lu_title_Affiliate"/>
+</inp2:m_Capture>
+
+<table class="fullwidth" style="border-width: 0px;">
+	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_statistics" title="lu_Statistics"/>
+	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_payments" title="lu_Payments"/>
+	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_materials" title="lu_Materials"/>
+	<inp2:m_RenderElement name="box_element" template="in-commerce/my_account/affiliate/affiliate_payment_type" title="lu_ChangePaymentType"/>
+	<tr>
+		<td>
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
+		</td>
+		<td>
+			<a href="<inp2:m_Link t='in-commerce/my_account/affiliate'/>" onclick="showAffiliateAgreement(); return false;"><inp2:m_phrase label="lu_TermsAndConditionsLink"/></a>
+		</td>
+	</tr>
+</table>
+
+<script type="text/javascript">
+function showAffiliateAgreement() {
+	window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
+}
+</script>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/affiliate_navigation.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.elm.tpl	(revision 11475)
@@ -0,0 +1,22 @@
+<inp2:p_InitList list_name="recent_products" types="recent" parent_cat_id="any" recursive="true" per_page="short_list" except="in_cart" />
+
+<inp2:m_Capture to_var="header">
+	<a href="<inp2:m_Link template="in-commerce/products/recent_products" m_cat_id="0" m_cat_page="1" />"><inp2:m_phrase name="lu_title_RecentlyViewedProducts"/></a> (<inp2:p_TotalRecords list_name="recent_products"/>)
+</inp2:m_Capture>
+
+<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+<table>
+	<inp2:p_ListProducts list_name="recent_products" render_as="product_short_element" columns="1" requery="0"/>
+</table>
+
+<inp2:m_DefineElement name="more_link">
+	<a href="<inp2:m_Link template="in-commerce/products/recent_products" />"><inp2:m_Phrase label="lu_More"/>...</a><br />
+</inp2:m_DefineElement>
+
+<inp2:p_MoreLink list_name="recent_products" render_as="more_link" />
+<br />
+
+<form method="post" action="<inp2:m_FormAction />">
+	<input class="button" type="submit" name="events[p][OnClearRecent]" value="<inp2:m_Phrase label="lu_btn_Clear"/>"/>
+</form>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/recent_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/order_preview.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/order_preview.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/order_preview.elm.tpl	(revision 11475)
@@ -0,0 +1,312 @@
+<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
+
+<inp2:m_DefineElement name="orderitem_elem">
+	<tr  class="order-prewiew-padding-cell">
+		<td>
+			<strong><inp2:Field name="ProductName"/></strong><inp2:m_if check="ord_BackorderFlag"> <span><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
+			<inp2:m_if check="HasOptions">
+				<br/>
+				<span>
+				<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
+					<inp2:PrintOptions render_as="option_element" currency="selected"/>
+				<inp2:m_else/> <!-- listed combinations -->
+					<inp2:PrintOptions render_as="option_element_no_price"/>
+				</inp2:m_if>
+				</span>
+				<br/>
+			</inp2:m_if>
+			<inp2:m_if check="HasDiscount">
+				<br />
+				<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
+				<inp2:m_Phrase label="lu_comm_Discount" />: <span><inp2:Field name="ItemDiscount" currency="selected" negative="1"/></span>
+			</inp2:m_if>
+		</td>
+		<td>
+			<strong><inp2:Field name="Price" currency="selected"/></strong>
+		</td>
+		<td><inp2:Field name="Quantity"/></td>
+		<td><strong><inp2:Field name="ExtendedPrice" currency="selected"/></strong></td>
+	</tr>
+	<tr>
+		<td colspan="4">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_form_shipping">
+	<!-- shipping -->
+	<table width="100%">
+		<tr>
+			<td colspan="2">
+				<inp2:m_RenderElement name="subsection" title="lu_section_ShippingInfo"/>
+			</td>
+		</tr>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
+			<td><inp2:Field field="ShippingTo"/></td>
+		</tr>
+		<inp2:m_if check="Field" name="ShippingCompany">
+		<tr  class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
+			<td><inp2:Field field="ShippingCompany"/></td>
+		</tr>
+		</inp2:m_if>
+		<inp2:m_if check="Field" name="ShippingEmail">
+		<tr  class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
+			<td><inp2:Field field="ShippingEmail"/></td>
+		</tr>
+		</inp2:m_if>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
+			<td><inp2:Field field="ShippingPhone"/></td>
+		</tr>
+		<tr  class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
+			<td><inp2:Field field="ShippingFax"/></td>
+		</tr>
+		<tr  class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
+			<td>
+				<inp2:m_if check="FieldEquals" field="ShippingAddress1" value="" inverse="inverse">
+					<inp2:Field field="ShippingAddress1"/><br>
+				</inp2:m_if>
+
+				<inp2:m_if check="FieldEquals" field="ShippingAddress2" value="" inverse="inverse">
+					<inp2:Field field="ShippingAddress2"/><br>
+				</inp2:m_if>
+				<inp2:PrintLocation type="Shipping"/>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_form_billing">
+	<!-- billing -->
+	<table width="100%">
+		<tr>
+			<td colspan="2">
+				<inp2:m_RenderElement name="subsection" title="lu_section_BillingInfo"/>
+			</td>
+		</tr>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
+			<td><inp2:Field field="BillingTo"/></td>
+		</tr>
+		<inp2:m_if check="Field" name="BillingCompany">
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
+			<td><inp2:Field field="BillingCompany"/></td>
+		</tr>
+		</inp2:m_if>
+		<inp2:m_if check="Field" name="BillingEmail">
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
+			<td><inp2:Field field="BillingEmail"/></td>
+		</tr>
+		</inp2:m_if>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
+			<td><inp2:Field field="BillingPhone"/></td>
+		</tr>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
+			<td><inp2:Field field="BillingFax"/></td>
+		</tr>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
+			<td><inp2:Field field="BillingCompany"/></td>
+		</tr>
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
+			<td>
+				<inp2:m_if check="FieldEquals" field="BillingAddress1" value="" inverse="inverse">
+					<inp2:Field field="BillingAddress1"/><br>
+				</inp2:m_if>
+
+				<inp2:m_if check="FieldEquals" field="BillingAddress2" value="" inverse="inverse">
+					<inp2:Field field="BillingAddress2"/><br>
+				</inp2:m_if>
+				<inp2:PrintLocation type="Billing"/>
+			</td>
+		</tr>
+
+		<tr class="order-prewiew-padding-cell">
+			<td><strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong></td>
+			<td><inp2:Field name="PaymentType" /></td>
+		</tr>
+
+		<inp2:m_if check="UsingCreditCard">
+			<tr class="order-prewiew-padding-cell">
+				<td><strong><inp2:m_Phrase label="lu_comm_NameOnCard"/>:</strong></td>
+				<td><inp2:Field name="PaymentNameOnCard"/></td>
+			</tr>
+			<tr class="order-prewiew-padding-cell">
+				<td><strong><inp2:m_Phrase label="lu_comm_CardType"/>:</strong></td>
+				<td><inp2:Field name="PaymentCardType" /></td>
+			</tr>
+			<tr class="order-prewiew-padding-cell">
+				<td><strong><inp2:m_Phrase label="lu_comm_CardNumber"/>:</strong></td>
+				<td><inp2:Field name="PaymentAccount" masked="masked"/></td>
+			</tr>
+			<tr class="order-prewiew-padding-cell">
+				<td><strong><inp2:m_Phrase label="lu_comm_Exp"/>:</strong></td>
+				<td><inp2:Field name="PaymentCCExpDate"/></td>
+			</tr>
+		</inp2:m_if>
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_form">
+	<table>
+		<tr>
+			<td>
+				<strong><inp2:m_Phrase label="lu_comm_OrderNumber"/><inp2:Field name="OrderNumber"/></strong>
+			</td>
+		</tr>
+	</table>
+	<br />
+
+	<inp2:m_if check="OrderHasTangibleItems">
+		<table width="100%">
+			<tr>
+				<td valign="top" width="49%">
+					<inp2:m_RenderElement name="order_form_shipping" PrefixSpecial="ord"/>
+				</td>
+				<td>&nbsp;</td>
+				<td valign="top" width="49%">
+					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
+				</td>
+			</tr>
+		</table>
+	<inp2:m_else />
+		<table width="100%">
+			<tr>
+				<td>
+					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
+				</td>
+			</tr>
+		</table>
+	</inp2:m_if>
+
+	<br /><br />
+
+	<table style="width:100%">
+		<tr>
+			<td colspan="4">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr>
+			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
+			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_YourPrice"/></td>
+			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
+			<td class="sub-section-header"><inp2:m_Phrase label="lu_comm_Total"/></td>
+		</tr>
+		<tr>
+			<td colspan="4">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+
+		<inp2:ord_ListOrderItems render_as="orderitem_elem"/>
+
+		<tr class="order-sub-total">
+			<td>
+				<inp2:m_if check="ord_HasDiscount">
+					<inp2:m_Phrase label="lu_comm_TotalSavings" />: <span><inp2:ord_Field name="DiscountTotal" currency="selected" /></span><br />
+				</inp2:m_if>&nbsp;
+			</td>
+			<td>
+				&nbsp;
+			</td>
+			<td>
+				&nbsp;
+			</td>
+			<td align="left" class="shopping-cart-button-padding">
+				<inp2:m_Phrase label="lu_comm_Subtotal"/>: <inp2:Field name="SubTotal" currency="selected"/>
+			</td>
+		</tr>
+	</table>
+
+
+	<br />
+	<table width="100%">
+		<tr>
+		    <td>
+		    	<inp2:m_RenderElement name="subsection" title="lu_section_OrderTotal"/>
+			</td>
+		</tr>
+	</table>
+
+	<table class="order-prewiew-padding-cell">
+
+		<inp2:m_DefineElement name="shipping_total">
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</strong></td>
+				<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
+			</tr>
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong></td>
+				<td><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="processing_total">
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </strong></td>
+				<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="sub_total">
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_SubTotal"/>: </strong></td>
+				<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="vat_total">
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </strong></td>
+				<td><inp2:ord_Field name="VAT" currency="selected"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:ord_PrintTotals
+			shipping_render_as="shipping_total"
+			processing_render_as="processing_total"
+			sub_total_render_as="sub_total"
+			vat_render_as="vat_total"/>
+
+		<inp2:m_if check="ord_Field" name="GiftCertificateId">
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>: </strong></td>
+				<td><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
+			</tr>
+		</inp2:m_if>
+
+		<tr class="order-grand-total">
+		  <td><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
+			<td><span><inp2:Field name="TotalAmount" currency="selected"/></span></td>
+		</tr>
+	</table>
+	<br />
+</inp2:m_DefineElement>
+
+<inp2:ord_ShowOrder render_as="order_form" />
+
+<table>
+	<tr>
+		<td>
+			<form method="POST" action="<inp2:ord_GetFormAction/>">
+				<inp2:ord_GetFormHiddenFields return_template="in-commerce/checkout/checkout_success"
+											  cancel_template="in-commerce/checkout/billing" />
+				<inp2:m_if check="ord_NeedsPlaceButton">
+					<input type="submit" value="<inp2:m_Phrase label="lu_order_CompleteOrder" />" class="button">
+				</inp2:m_if>
+			</form>
+		</td>
+	</tr>
+</table>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/order_preview.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/order_details.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/order_details.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/order_details.elm.tpl	(revision 11475)
@@ -0,0 +1,362 @@
+<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
+
+<!--## PRODUCT IMAGE ELEMENT ##-->
+<inp2:m_DefineElement name="product_image">
+	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
+</inp2:m_DefineElement>
+<!--## /PRODUCT IMAGE ELEMENT ##-->
+
+<!--## ORDER DETAILS ELEMENTS ##-->
+<!--## THIS SECTION IS USED BY myaccount/my_order_details.tpl ##-->
+<inp2:m_DefineElement name="orderitem_elem">
+	<tr class="order-padding-left">
+		<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
+			<td width="120">
+				<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
+			</td>
+		</inp2:m_if>
+
+		<td valign="top">
+			<inp2:m_if check="ProductExists">
+				<inp2:m_if check="FieldEquals" field="Virtual" value="0">
+					<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="ProductName" /></a>
+				<inp2:m_else/>
+					<inp2:Field name="ProductName" />
+				</inp2:m_if>
+			<inp2:m_else/>
+				<inp2:Field field="ProductName"/>
+			</inp2:m_if>
+			<inp2:m_if check="HasOptions">
+				<br/>
+				<span>
+				<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
+					<inp2:PrintOptions render_as="option_element" currency="selected"/>
+				<inp2:m_else/> <!-- listed combinations -->
+					<inp2:PrintOptions render_as="option_element_no_price"/>
+				</inp2:m_if>
+				</span>
+				<br/>
+			</inp2:m_if>
+			<inp2:m_if check="HasDiscount">
+				<br />
+				<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
+				<inp2:m_Phrase label="lu_comm_Discount" />: <span>- <inp2:Field name="ItemDiscount" currency="selected" negative="1"/></span>
+			</inp2:m_if>
+		</td>
+		<td valign="top"><strong><inp2:Field field="Price" currency="selected"/></strong></td>
+		<td valign="top"><inp2:Field field="Quantity"/></td>
+		<td valign="top"><strong><inp2:Field field="ExtendedPrice" currency="selected"/></strong></td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_form_shipping">
+	<!-- shipping -->
+	<table width="100%" cellpadding="0" cellspacing="0">
+		<tr>
+			<td colspan="2">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr class="sub-section-header">
+			<td colspan="2"><inp2:m_Phrase label="lu_section_ShippingInfo"/></td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr class="order-padding-left">
+			<td width="150"><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
+			<td><inp2:Field field="ShippingTo"/></td>
+		</tr>
+		<inp2:m_if check="Field" name="ShippingCompany">
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
+			<td><inp2:Field field="ShippingCompany"/></td>
+		</tr>
+		</inp2:m_if>
+		<inp2:m_if check="Field" name="ShippingEmail">
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
+			<td><inp2:Field field="ShippingEmail"/></td>
+		</tr>
+		</inp2:m_if>
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
+			<td><inp2:Field field="ShippingPhone"/></td>
+		</tr>
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
+			<td><inp2:Field field="ShippingFax"/></td>
+		</tr>
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
+			<td>
+				<inp2:m_if check="FieldEquals" field="ShippingAddress1" value="" inverse="inverse">
+					<inp2:Field field="ShippingAddress1"/><br>
+				</inp2:m_if>
+
+				<inp2:m_if check="FieldEquals" field="ShippingAddress2" value="" inverse="inverse">
+					<inp2:Field field="ShippingAddress2"/><br>
+				</inp2:m_if>
+				<inp2:PrintLocation type="Shipping"/>
+			</td>
+		</tr>
+
+		<inp2:m_if check="Field" name="ShippingTracking">
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_ShippingTracking"/></strong>:</td>
+			<td><inp2:Field field="ShippingTracking"/></td>
+		</tr>
+		</inp2:m_if>
+
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_form_billing">
+	<!-- billing -->
+	<table width="100%" cellpadding="0" cellspacing="0">
+		<tr>
+			<td colspan="2">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr class="sub-section-header">
+			<td colspan="2"><inp2:m_Phrase label="lu_section_BillingInfo"/></td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr class="order-padding-left">
+			<td width="150"><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
+			<td><inp2:Field field="BillingTo"/></td>
+		</tr>
+		<inp2:m_if check="Field" name="BillingCompany">
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
+			<td><inp2:Field field="BillingCompany"/></td>
+		</tr>
+		</inp2:m_if>
+		<inp2:m_if check="Field" name="BillingEmail">
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
+			<td><inp2:Field field="BillingEmail"/></td>
+		</tr>
+		</inp2:m_if>
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
+			<td><inp2:Field field="BillingPhone"/></td>
+		</tr>
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
+			<td><inp2:Field field="BillingFax"/></td>
+		</tr>
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
+			<td>
+				<inp2:m_if check="FieldEquals" field="BillingAddress1" value="" inverse="inverse">
+					<inp2:Field field="BillingAddress1"/><br>
+				</inp2:m_if>
+
+				<inp2:m_if check="FieldEquals" field="BillingAddress2" value="" inverse="inverse">
+					<inp2:Field field="BillingAddress2"/><br>
+				</inp2:m_if>
+				<inp2:PrintLocation type="Billing"/>
+			</td>
+		</tr>
+
+		<tr class="order-padding-left">
+			<td><strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong></td>
+			<td><inp2:Field name="PaymentType" /></td>
+		</tr>
+
+		<inp2:m_if check="UsingCreditCard">
+			<tr class="order-padding-left">
+				<td><strong><inp2:m_Phrase label="lu_comm_NameOnCard"/>:</strong></td>
+				<td><inp2:Field name="PaymentNameOnCard"/></td>
+			</tr>
+			<tr class="order-padding-left">
+				<td><strong><inp2:m_Phrase label="lu_comm_CardType"/>:</strong></td>
+				<td><inp2:Field name="PaymentCardType" /></td>
+			</tr>
+			<tr class="order-padding-left">
+				<td><strong><inp2:m_Phrase label="lu_comm_CardNumber"/>:</strong></td>
+				<td><inp2:Field name="PaymentAccount" masked="masked"/></td>
+			</tr>
+			<tr class="order-padding-left">
+				<td><strong><inp2:m_Phrase label="lu_comm_Exp"/>:</strong></td>
+				<td><inp2:Field name="PaymentCCExpDate"/></td>
+			</tr>
+		</inp2:m_if>
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_form">
+	<table>
+		<tr>
+			<td>
+				<strong><inp2:m_Phrase label="lu_comm_OrderNumber"/><inp2:Field field="OrderNumber"/>&nbsp;&nbsp;(<inp2:Field field="Status"/>)</strong>
+			</td>
+		</tr>
+	</table>
+
+	<inp2:m_if check="FieldEquals" field="IsRecurringBilling" value="1">
+		<table>
+			<tr>
+				<td valign="top" align="left">
+					<strong><inp2:m_Phrase label="lu_recurring_notice"/></strong> <inp2:m_Phrase label="lu_recurring_next_charge"/> <inp2:Field name="NextCharge" format="_regional_DateFormat"/> <inp2:m_Phrase label="lu_or"/> <inp2:m_GetConfig var="Comm_RecurringChargeInverval"/> <inp2:m_Phrase label="lu_recurring_charge_advance"/><br>
+					<a href="<inp2:m_link template="in-commerce/my_account/cancel_recurring" pass="ord"/>"><inp2:m_Phrase label="lu_recurring_cancel"/></a>
+				</td>
+			</tr>
+		</table>
+	</inp2:m_if>
+
+	<br />
+
+
+	<inp2:m_if check="OrderHasTangibleItems">
+		<table class="fullwidth">
+			<tr>
+				<td valign="top" width="49%">
+					<inp2:m_RenderElement name="order_form_shipping" PrefixSpecial="ord"/>
+				</td>
+				<td>&nbsp;</td>
+				<td valign="top" width="49%">
+					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
+				</td>
+			</tr>
+		</table>
+	<inp2:m_else />
+		<table class="fullwidth">
+			<tr>
+				<td>
+					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
+				</td>
+			</tr>
+		</table>
+	</inp2:m_if>
+
+
+
+	<br /><br />
+
+
+
+	<table class="fullwidth">
+		<tr>
+			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr class="sub-section-header">
+			<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
+				<td colspan="2"><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
+			<inp2:m_else/>
+				<td><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
+			</inp2:m_if>
+
+			<td><inp2:m_Phrase label="lu_comm_Price"/></td>
+
+			<td><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
+			<td><inp2:m_Phrase label="lu_comm_Total"/></td>
+		</tr>
+		<tr>
+			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+
+		<inp2:ord_ListOrderItems render_as="orderitem_elem"/>
+
+		<tr class="order-padding-left">
+			<tr>
+				<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
+					<br />
+					<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+				</td>
+			</tr>
+			<td>
+				<inp2:m_if check="ord_HasDiscount">
+					<inp2:m_Phrase label="lu_comm_TotalSavings" />: <span><inp2:ord_Field name="DiscountTotal" currency="selected" /></span><br />
+				</inp2:m_if>&nbsp;
+			</td>
+			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>" align="right">
+				<div class="subtotal"><inp2:m_Phrase label="lu_comm_SubTotal"/>: <inp2:Field field="SubTotal" currency="selected"/><div>
+			</td>
+		</tr>
+	</table>
+
+
+	<br /><br />
+
+	<inp2:m_RenderElement name="subsection" title="lu_section_OrderTotal"/>
+
+	<table class="fullwidth">
+		<inp2:ord_PrintTotals
+			shipping_render_as="shipping_total"
+			processing_render_as="processing_total"
+			sub_total_render_as="sub_total"
+			vat_render_as="vat_total"
+			return_render_as="return_total"/>
+
+		<inp2:m_if check="ord_Field" name="GiftCertificateId">
+			<tr class="order-padding-left">
+				<td align="right"><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>:</td>
+				<td align="right"><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
+			</tr>
+		</inp2:m_if>
+
+		<tr class="order-padding-left grand-total-blue">
+		    <td align="right"><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
+			<td align="right"><inp2:Field name="TotalAmount" currency="selected"/></td>
+		</tr>
+	</table>
+
+	<br />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="shipping_total">
+	<tr class="order-padding-left">
+		<td align="right"><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</td>
+		<td align="right"><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
+	</tr>
+	<tr class="order-padding-left">
+		<td align="right"><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</td>
+		<td align="right"><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="processing_total">
+	<tr class="order-padding-left">
+		<td align="right"><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </td>
+		<td align="right"><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="sub_total">
+	<tr class="order-padding-left">
+		<td align="right"><inp2:m_Phrase label="lu_comm_SubTotal"/>: </td>
+		<td align="right"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="vat_total">
+	<tr class="order-padding-left">
+		<td align="right"><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </td>
+		<td align="right"><inp2:ord_Field name="VAT" currency="selected"/></td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="return_total">
+	<tr class="order-padding-left">
+		<td align="right"><inp2:m_Phrase label="lu_fld_ReturnTotal"/> : </td>
+		<td align="right"><inp2:ord_Field name="ReturnTotal" currency="selected"/></td>
+	</tr>
+</inp2:m_DefineElement>
+<!--## /ORDER DETAILS ELEMENTS ##-->
+
+<!--## SHOW ORDER DETAILS TAG! ##-->
+<inp2:ord_ShowOrder render_as="order_form" />
+<!--## /SHOW ORDER DETAILS TAG! ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/order_details.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.tpl	(nonexistent)
@@ -1,23 +0,0 @@
-<!-- FEATURED PRODUCTS -->
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:p_InitList list_name="featured_products" types="featured" recursive="1" per_page="1" sort_by="random"/>
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_phrase name="lu_title_FeaturedProducts"/>
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-commerce/designs/products"/>
-
-	<table class="fullwidth item-listing-featured table-border">
-		<inp2:p_ListProducts list_name="featured_products" render_as="featured_product_element"/>
-	</table>	
-
-	<inp2:m_DefineElement name="more_link">
-	<div style="text-align: right;">
-		<a href="<inp2:m_Link template="in-commerce/products/featured_products" />"><inp2:m_Phrase label="lu_More"/>...</a><br />
-	</div>
-	</inp2:m_DefineElement>
-	
-	<inp2:p_MoreLink list_name="featured_products" render_as="more_link"/>
-</inp2:m_RenderElement>
-<!-- /FEATURED PRODUCTS -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.tpl	(nonexistent)
@@ -1,23 +0,0 @@
-<!-- editors pick -->
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:p_InitList list_name="new_products" types="new" recursive="true" per_page="short_list" />
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_phrase name="lu_title_NewProducts"/>
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-commerce/designs/products"/>
-
-	<table class="fullwidth item-listing table-border">
-		<inp2:p_ListProducts list_name="new_products" render_as="product_element"/>
-	</table>
-
-	<inp2:m_DefineElement name="more_link">
-	<div style="text-align: right;">
-		<a href="<inp2:m_Link template="in-commerce/products/new_products" />"><inp2:m_Phrase label="lu_More"/>...</a>
-	</div>
-	</inp2:m_DefineElement>
-	
-	<inp2:p_MoreLink list_name="new_products" render_as="more_link"/>
-</inp2:m_RenderElement>
-<!-- //editors pick	-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.tpl	(nonexistent)
@@ -1,22 +0,0 @@
-<!-- editors pick -->
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:p_InitList list_name="pick_products" types="pick" recursive="true" per_page="short_list" />
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_phrase name="lu_title_PickProducts"/>
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-commerce/designs/products"/>
-
-	<table class="fullwidth item-listing table-border">
-		<inp2:p_ListProducts list_name="pick_products" render_as="product_element"/>
-	</table>
-
-	<inp2:m_DefineElement name="more_link">
-	<div style="text-align: right;">
-		<a href="<inp2:m_Link template="in-commerce/products/pick_products"/>"><inp2:m_Phrase label="lu_More"/>...</a>
-	</div>
-	</inp2:m_DefineElement>
-	<inp2:p_MoreLink list_name="pick_products" render_as="more_link"/>
-</inp2:m_RenderElement>
-<!-- //editors pick	-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.tpl	(nonexistent)
@@ -1,19 +0,0 @@
-<!-- related products -->
-<inp2:m_RenderElement design="content_box" data_exists="1">
-	<inp2:p_InitList list_name="related_products" types="related" recursive="1" parent_cat_id="any" />
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_title_RelatedProducts"/> (<inp2:p_TotalRecords list_name="related_products"/>)
-	</inp2:m_Capture>
-
-	<inp2:m_include template="in-commerce/elements/sorting" list_name="related_products"/>
-
-	<inp2:m_include template="in-commerce/designs/products"/>
-
-	<table class="fullwidth item-listing">
-		<inp2:p_ListProducts list_name="related_products" render_as="product_element"/>
-	</table>
-
-	<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="related_products"/>
-</inp2:m_RenderElement>
-<!-- // related products -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/home_page_items.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/home_page_items.elm.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/home_page_items.elm.tpl	(revision 11475)
@@ -1,21 +1,21 @@
 <!-- FEATURED PRODUCTS DISPLAIED ON HOME PAGE-->
 <inp2:m_RenderElement design="content_box" data_exists="1">
 	<inp2:p_InitList list_name="featured_products" types="featured" recursive="1" per_page="2" sort_by="random" m_cat_id="0"/>
 
 	<inp2:m_Capture to_var="header">
 		<inp2:m_phrase name="lu_title_FeaturedProducts"/>
 	</inp2:m_Capture>
 
-	<inp2:m_include template="in-commerce/designs/products"/>
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 	<table class="fullwidth item-listing-featured table-border">
 		<inp2:p_ListProducts list_name="featured_products" render_as="featured_product_element_short" columns="2" direction="H"/>
 	</table>	
 
 	<inp2:m_DefineElement name="more_link">
 		<a href="<inp2:m_Link template="in-commerce/products/featured_products" />"><inp2:m_Phrase label="lu_More"/>...</a><br />
 	</inp2:m_DefineElement>
 	
 	<inp2:p_MoreLink list_name="featured_products" render_as="more_link"/>
 </inp2:m_RenderElement>
 <!-- /FEATURED PRODUCTS DISPLAIED ON HOME PAGE -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/home_page_items.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/search_results.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/search_results.elm.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/search_results.elm.tpl	(revision 11475)
@@ -1,26 +1,26 @@
 <inp2:m_RenderElement design="content_box" data_exists="1">
 	<inp2:p_InitList list_name="product_search_results" types="search" parent_cat_id="any" recursive="1" per_page="short_list"/>
 
 	<inp2:m_Capture to_var="header">
 		<inp2:m_phrase name="lu_title_ProductSearchResults"/> (<inp2:p_TotalRecords list_name="product_search_results" />)
 	</inp2:m_Capture>
 
-	<inp2:m_include template="in-commerce/designs/products"/>
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
 	<inp2:m_include template="platform/designs/search_results.elm"/>
 
 	<table class="fullwidth item-listing">
 		<inp2:p_ListProducts list_name="product_search_results" render_as="product_short_element" show_relevance="1"/>
 	</table>
 
 	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
 
 	<inp2:m_if check="p_TotalRecords" list_name="product_search_results">
 		<inp2:m_Set items_found="1"/>
 	</inp2:m_if>
 
 	<inp2:m_DefineElement name="more_link">
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt="" /><br />
 		<a href="<inp2:m_Link template="in-commerce/products/search_results" />"><inp2:m_Phrase label="lu_More"/>...</a>
 	</inp2:m_DefineElement>
 	<inp2:p_MoreLink list_name="product_search_results" render_as="more_link" />
 </inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/search_results.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.2
\ No newline at end of property
+1.1.2.3
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/my_favorites.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/my_favorites.elm.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/my_favorites.elm.tpl	(revision 11475)
@@ -1,21 +1,21 @@
 <!-- products in wishlist -->
 <inp2:m_RenderElement design="content_box" data_exists="1">
 	<inp2:p_InitList list_name="wishlist_products" types="wish_list" parent_cat_id="0" recursive="1"/>
 
 	<inp2:m_Capture to_var="header">
 		<inp2:m_phrase name="lu_title_WishList"/> (<inp2:p_TotalRecords list_name="wishlist_products"/>)
 	</inp2:m_Capture>
 
-	<inp2:m_include template="in-commerce/designs/products"/>
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
 
 	<table class="fullwidth item-listing table-border">
 		<inp2:p_ListProducts list_name="wishlist_products" render_as="product_element" direction="H"/>
 	</table>
 
 	<inp2:m_if check="p_TotalRecords" list_name="wishlist_products">
 		<inp2:m_Set favorites_found="1"/>
 	</inp2:m_if>
 
 	<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="wishlist_products"/>
 </inp2:m_RenderElement>
 <!-- // products in wishlist -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/my_favorites.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.elm.tpl	(revision 11475)
@@ -0,0 +1,22 @@
+<!-- editors pick -->
+<inp2:m_RenderElement design="content_box" data_exists="1">
+	<inp2:p_InitList list_name="pick_products" types="pick" recursive="true" per_page="short_list" />
+
+	<inp2:m_Capture to_var="header">
+		<inp2:m_phrase name="lu_title_PickProducts"/>
+	</inp2:m_Capture>
+
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+	<table class="fullwidth item-listing table-border">
+		<inp2:p_ListProducts list_name="pick_products" render_as="product_element"/>
+	</table>
+
+	<inp2:m_DefineElement name="more_link">
+	<div style="text-align: right;">
+		<a href="<inp2:m_Link template="in-commerce/products/pick_products"/>"><inp2:m_Phrase label="lu_More"/>...</a>
+	</div>
+	</inp2:m_DefineElement>
+	<inp2:p_MoreLink list_name="pick_products" render_as="more_link"/>
+</inp2:m_RenderElement>
+<!-- //editors pick	-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/pick_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.tpl	(nonexistent)
@@ -1,53 +0,0 @@
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_title_ShippingInformation"/>
-	</inp2:m_Capture>
-
-	<inp2:ord_ShowDefaultAddress type="shipping"/>
-
-	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-	<inp2:m_Phrase label="lu_EnterShippingAddress"/><br /><br />
-
-	<inp2:m_if check="ord_HasError" field="any">
-		<inp2:m_RenderElement name="error_message" />
-	</inp2:m_if>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
-	<table class="form-data fullwidth">
-		<inp2:m_include template="in-commerce/designs/addresses"/>
-
-		<inp2:m_if check="m_LoggedIn">
-			<inp2:m_RenderElement name="inp_edit_select_address" type="shipping" title="lu_fld_SelectAddress"/>
-		</inp2:m_if>
-
-		<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingTo" title="lu_fld_FullName"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCompany" title="lu_fld_Company"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingAddress1" title="lu_fld_AddressLine1"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingAddress2" title="lu_fld_AddressLine2"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingState" title="lu_fld_State"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingZip" title="lu_fld_Zip"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCountry" title="lu_fld_Country"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingPhone" title="lu_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingEmail" title="lu_fld_Email" is_last="1"/>
-		<inp2:m_else/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City" style="width: 200px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="lu_fld_State" style="width: 200px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
-		</inp2:m_if>
-
-		<inp2:m_RenderElement design="inp_edit_buttons" width="200">
-			<input type="hidden" name="check_shipping_address" value="true"/>
-			<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress"/>"/>
-		</inp2:m_RenderElement>
-	</table>
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.tpl	(nonexistent)
@@ -1,64 +0,0 @@
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_comm_BillingInfo"/>
-	</inp2:m_Capture>
-
-	<inp2:ord_ShowDefaultAddress type="billing"/>
-
-	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-	<inp2:m_Phrase label="lu_EnterBillingAddress"/><br /><br />
-
-	<inp2:m_if check="ord_HasError" field="any">
-		<inp2:m_RenderElement name="error_message" />
-	</inp2:m_if>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
-	<table class="form-data fullwidth">
-		<inp2:m_include template="in-commerce/designs/addresses"/>
-
-		<inp2:m_if check="ord_OrderHasTangibleItems">
-			<inp2:m_if check="m_LoggedIn"><inp2:m_else/>
-				<tr>
-					<td class="field-name"><inp2:m_Phrase label="lu_SameAsShipping"/>:</td>
-					<td class="field-value">
-						<input type="checkbox" name="same_address" onclick="document.getElementById('events[ord][OnUpdate]').click();" value="1"<inp2:m_if check="m_GetEquals" name="same_address" value="1"> checked</inp2:m_if>" />
-					</td>
-				</tr>
-			</inp2:m_if>
-		</inp2:m_if>
-
-		<inp2:m_if check="m_LoggedIn">
-			<inp2:m_RenderElement name="inp_edit_select_address" type="billing" title="lu_fld_SelectAddress"/>
-		</inp2:m_if>
-
-		<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingTo" title="lu_fld_FullName"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCompany" title="lu_fld_Company"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCity" title="lu_fld_City"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingState" title="lu_fld_State"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingZip" title="lu_fld_Zip"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCountry" title="lu_fld_Country"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingEmail" title="lu_fld_Email" is_last="1"/>
-		<inp2:m_else/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="lu_fld_FullName" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="lu_fld_Company" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City" style="width: 200px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="lu_fld_State" style="width: 200px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" style="width: 100px;" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone" style="width: 150px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
-		</inp2:m_if>
-
-		<inp2:m_RenderElement design="inp_edit_buttons" width="200">
-			<input type="hidden" name="check_billing_address" value="true"/>
-			<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress"/>"/>
-		</inp2:m_RenderElement>
-	</table>
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.tpl	(nonexistent)
@@ -1,194 +0,0 @@
-<inp2:m_DefineElement name="order_payment_credit_card">
-	<table width="100%" class="block-no-border">
-		<tr class="cart-header">
-			<td>
-
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-				<div class="sub-section-header"><inp2:ord_PaymentTypeDescription/></div>
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-				<br />
-
-			</td>
-		</tr>
-		<tr class="block-data">
-			<td>
-				<inp2:m_if check="ord_HasGatewayError">
-					<inp2:m_RenderElement name="error_message" />
-					<strong><inp2:ord_ShowGatewayError/></strong>
-				</inp2:m_if>
-				<br />
-				<strong><inp2:ord_PaymentTypeInstructions/></strong>
-				<br /><br />
-
-			</td>
-		</tr>
-	</table>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
-	<table class="form-data fullwidth">
-		<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="lu_billing_CardType"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_billing_CreditCardNumber" style="width: 200px;"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="lu_billing_NameOnCard" style="width: 260px;"/>
-
-		<!-- credit card expiration -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCCExpDate">
-					<span class="field-error"><inp2:ord_Error field="PaymentCCExpDate"/></span><br />
-				</inp2:m_if>
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>">
-					<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
-				</select>
-				/
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpYear"/>">
-					<option value=''></option>
-					<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
-				</select>
-			</td>
-		</tr>
-		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-		<!-- // credit card expiration -->
-
-		<!-- credit card CVV2 -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCVV2">
-					<span class="field-error"><inp2:ord_Error field="PaymentCVV2"/></span><br />
-				</inp2:m_if>
-				<input type="text" class="input-text" name="<inp2:ord_InputName field="PaymentCVV2"/>" value="<inp2:ord_Field field="PaymentCVV2"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 50px;">
-				&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
-			</td>
-		</tr>
-		<!-- // credit card CVV2 -->
-
-		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="hidden" name="check_credit_card" value="true"/>
-			<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
-
-			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_phrase label="lu_btn_ProceedToPreview"/>">
-		</inp2:m_RenderElement>
-	</table>
-	<br />
-
-	<script language="JavaScript">
-	function showCVV2Help(){
-		window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" />', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
-	}
-	</script>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_payment_type_default">
-	<table>
-		<tr class="cart-header">
-			<td>
-				<inp2:ord_PaymentTypeDescription/>
-			</td>
-		</tr>
-		<tr class="form-data">
-			<td>
-				<inp2:m_if check="ord_HasGatewayError">
-					<table class="warning">
-						<tr>
-							<td valign="top" align="left" class="block-data">
-								<img src="img/message.gif" alt="" width="19" height="19" />
-								<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
-								<inp2:ord_ShowGatewayError/>
-							</td>
-						</tr>
-					</table>
-				</inp2:m_if>
-				<br/>
-				<inp2:ord_PaymentTypeInstructions/>
-			</td>
-		</tr>
-	</table>
-	<br/>
-	<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
-
-	<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_phrase label="lu_btn_ProceedToPreview"/>">
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="products_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong></td>
-			<td><inp2:ord_Field name="SubTotal" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="shipping_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</strong></td>
-			<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
-		</tr>
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong></td>
-			<td><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="processing_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </strong></td>
-			<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sub_total">
-	<tr>
-		<td><strong><inp2:m_Phrase label="lu_comm_SubTotal"/>: </strong></td>
-		<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="vat_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </strong></td>
-			<td><inp2:ord_Field name="VAT" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_comm_BillingOptions"/>
-	</inp2:m_Capture>
-
-	<inp2:m_RenderElement name="subsection" title="lu_section_CostSummary"/>
-
-	<table class="order-totals">
-		<inp2:ord_PrintTotals
-			products_render_as="products_total"
-			shipping_render_as="shipping_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"/>
-
-			<inp2:m_if check="ord_Field" name="GiftCertificateId">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>: </strong></td>
-				<td><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
-			</tr>
-			</inp2:m_if>
-
-		<tr class="order-grand-total">
-		  <td><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
-			<td><span class="price1"><inp2:ord_Field name="TotalAmount" currency="selected"/></span></td>
-		</tr>
-	</table>
-
-	<br />
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1"  alt="" /><br /><br />
-	<br />
-
-
-	<br />
-	<strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong>
-	<select class="input-select" name="<inp2:ord_InputName field="PaymentType"/>" onchange="document.getElementById('events[ord][OnUpdate]').click();">
-		<inp2:ord_PredefinedOptions render_as="inp_option_item" field="PaymentType" selected="selected"/>
-	</select>
-	&nbsp;<input class="button" type="submit" value="<inp2:m_Phrase label="lu_btn_Select"/>" name="events[ord][OnUpdate]" id="events[ord][OnUpdate]">
-	<br/><br/>
-
-	<inp2:ord_PaymentTypeForm cc_render_as="order_payment_credit_card" default_render_as="order_payment_type_default"/>
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.tpl	(nonexistent)
@@ -1,54 +0,0 @@
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_title_SuggestUserRegistration"/>
-	</inp2:m_Capture>
-
-	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-	<inp2:ord_PrefillRegistrationFields type="billing"/>
-	<inp2:m_if check="u_HasError" field="any">
-		<inp2:m_RenderElement name="error_message" />
-	</inp2:m_if>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-	<form method="post" action="<inp2:m_FormAction/>">
-		<table class="form-data fullwidth">
-			<inp2:m_if check="u_UseUsernames">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-
-			<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
-				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
-				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" is_last="1"/>
-
-			<inp2:m_RenderElement design="inp_edit_buttons">
-				<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
-				<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">
-				<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending">
-
-				<input type="hidden" name="fields_prefilled" value="1" />
-
-				<input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_phrase label="lu_btn_Register"/>"/>
-				<input type="hidden" name="cancel_template" value="in-commerce/checkout/shop_cart" />
-				<input type="submit" class="button" name="events[ls][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />"/>
-			</inp2:m_RenderElement>
-		</table>
-	</form>
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.tpl	(nonexistent)
@@ -1,235 +0,0 @@
-<inp2:m_DefineElement name="order_shipping_type">
-	<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_if check="m_param" name="ShippingFree" value="1"><inp2:m_Phrase label="lu_comm_FreeShipping" /><inp2:m_else/><inp2:m_param name="TotalCost"/></inp2:m_if>)</option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="shippings_table_header">
-	<table width="100%">
-		<tr>
-			<td colspan="4">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<td><inp2:m_Phrase label="lu_ship_Shipment" /></td>
-			<td><inp2:m_Phrase label="lu_ship_ItemsNumber" /></td>
-			<td><inp2:m_Phrase label="lu_ship_ShippingWeight" /></td>
-			<td><inp2:m_Phrase label="lu_ship_ShippingType" /></td>
-		</tr>
-		<tr>
-			<td colspan="4">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-
-		<inp2:m_if check="ord_CartHasBackorders">
-			<strong><inp2:m_Phrase label="lu_comm_Note"/>:</strong>
-			<inp2:m_Phrase label="lu_comm_YouHaveBackorderedItems"/>
-
-			<br />
-			<inp2:m_DefineElement name="order_option">
-				<input onclick="document.getElementById('events[ord][OnUpdate]').click();" type="radio"
-					<inp2:m_param name="checked"/>
-					name="<inp2:m_param name="field_name"/>"
-					id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>">
-					<label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>">
-						<inp2:m_phrase label="$option"/>
-					</label>&nbsp;<br />
-			</inp2:m_DefineElement>
-			<inp2:ord_PredefinedOptions field="ShippingOption" render_as="order_option" selected_param="checked" selected="checked=\"checked\""/>
-			<br />
-		</inp2:m_if>
-
-		<inp2:m_if check="m_GetEquals" var="shipping_limitations_apply" value="0"><inp2:m_else/>
-			<strong><inp2:m_Phrase label="lu_comm_Note"/>:</strong>
-			<inp2:m_if check="m_GetEquals" var="shipping_limitations_apply" value="1">
-				<inp2:m_Phrase label="lu_comm_ShippingTypesLimitationApply"/><br/>
-				<input type="hidden" name="<inp2:ord_InputName field="ShippingGroupOption"/>" id="<inp2:ord_InputName field="ShippingGroupOption"/>" value="<inp2:ord_Field name="ShippingGroupOption" db="1"/>" />
-				<input onclick="document.getElementById('<inp2:ord_InputName field="ShippingGroupOption"/>').value = this.checked ? 1:0; document.getElementById('events[ord][OnUpdate]').click();" type="checkbox"
-						<inp2:m_param name="checked"/>
-						name="cb_<inp2:ord_InputName field="ShippingGroupOption"/>"
-						id="cb_<inp2:ord_InputName field="ShippingGroupOption"/>" value="1" <inp2:ord_Field name="ShippingGroupOption" db="1" checked="checked"/> />
-						<label for="cb_<inp2:ord_InputName field="ShippingGroupOption"/>">
-							<inp2:m_phrase label="lu_AdjustShippingManually"/>
-						</label>&nbsp;<br />
-			<inp2:m_else/> <!-- Order canNOT be shipped with single shipping type -->
-				<inp2:m_Phrase label="lu_comm_ShippingTypesLimitationApply_CantSingleShip"/><br/>
-				<input type="hidden" name="<inp2:ord_InputName field="ShippingGroupOption"/>" value="1" />
-			</inp2:m_if>
-		</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="shippings_table_footer">
-		<tr>
-			<td class="shopping-cart-cell-item-padding">
-				<input class="button" type="submit" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_UpdateShipping"/>"/><br/>
-			</td>
-			<td>&nbsp;</td>
-			<td class="shopping-cart-cell-item-padding" style="text-align: right">
-				<strong><inp2:m_Phrase label="lu_comm_ShippingTotal" />:</strong>
-			</td>
-			<td class="shopping-cart-cell-item-padding">
-				<inp2:ord_Field name="ShippingCost" currency="selected"/>
-			</td>
-		</tr>
-
-		<tr class="cart-subtotal">
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td style="text-align: right">
-				<strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong>
-			</td>
-			<td class="shopping-cart-cell-item-padding">
-				<inp2:ord_Field name="InsuranceFee" currency="selected"/>
-			</td>
-		</tr>
-
-		<inp2:m_DefineElement name="products_total">
-			<tr class="cart-subtotal">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td style="text-align: right">
-					<strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong>
-				</td>
-				<td>
-					<inp2:ord_Field name="SubTotal" currency="selected"/>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="processing_total">
-			<tr class="cart-subtotal">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td style="text-align: right">
-					<strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>:</strong>
-				</td>
-				<td>
-					<inp2:ord_Field name="ProcessingFee" currency="selected"/>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="sub_total">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td align="right" class="shopping-cart-cell-item-padding">
-					<strong><inp2:m_Phrase label="lu_comm_SubTotal"/>:</strong>
-				</td>
-				<td class="shopping-cart-cell-item-padding">
-					<span class="price1"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></span>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="vat_total">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="shopping-cart-cell-item-padding" align="right">
-					<strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%:</strong>
-				</td>
-				<td class="shopping-cart-cell-item-padding">
-					<span class="price1"><inp2:ord_Field name="VAT" currency="selected"/></span>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:ord_PrintTotals
-			products_render_as="products_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"/>
-
-		<inp2:m_if check="ord_Field" name="GiftCertificateId">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="shopping-cart-cell-item-padding" align="right">
-					<strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>:</strong>
-				</td>
-				<td class="shopping-cart-cell-item-padding">
-					<span class="price1"><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></span>
-				</td>
-			</tr>
-		</inp2:m_if>
-
-		<tr class="cart-subtotal order-grand-total">
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td class="shopping-cart-cell-item-padding" align="right">
-				<inp2:m_Phrase label="lu_comm_GrandTotal"/>:
-			</td>
-			<td class="shopping-cart-cell-item-padding">
-				<inp2:ord_Field name="TotalAmount" currency="selected"/>
-			</td>
-		</tr>
-
-		<tr>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-			<td class="shopping-cart-cell-item-padding">
-				<input type="hidden" name="next_step_template" value="in-commerce/checkout/billing">
-				<input type="submit" name="events[ord][OnProceedToBilling]" value="<inp2:m_Phrase label="lu_comm_ProceedToBilling"/>" class="button">
-			</td>
-		</tr>
-
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="in-commerce/elements/options_blocks"/>
-
-<inp2:m_DefineElement name="shipping_group_item">
-	<inp2:Field name="Name"/><inp2:m_if check="ord_BackorderFlag"> <span class="backordered-product"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if><br />
-	<inp2:m_if check="HasOptions">
-		<br/>
-		<span style="font-size: 8pt">
-		<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
-			<inp2:PrintOptions render_as="option_element" currency="selected"/>
-		<inp2:m_else/> <!-- listed combinations -->
-			<inp2:PrintOptions render_as="option_element_no_price"/>
-		</inp2:m_if>
-		<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0"> <!-- selectable options -->
-			<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a><br />
-		</inp2:m_if>
-		</span>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_shipment">
-	<tr class="cart-item">
-		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="shipment"/><br/>
-			<b><inp2:m_Phrase label="lu_Items"/>:</b><br />
-			<inp2:ord_PrintCart item_render_as="shipping_group_item" requery="1" package_num="$package_num" product_type="1" header_render_as="html:" footer_render_as="html:"/>
-		</td>
-		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="items"/></td>
-		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="weight"/></td>
-		<td class="shopping-cart-cell-item-padding">
-			<select class="input-select" name="<inp2:m_param name="field_name"/>">
-				<inp2:ord_PrintShippingTypes render_as="order_shipping_type" currency="selected" />
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="no_shipments">
-	<inp2:m_Phrase label="lu_comm_ErrorNoShippingTypes"/> (<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>).
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="invalid_address">
-	<inp2:m_Phrase label="lu_comm_ErrorInvalidShippingAddress"/>.
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_title_ShippingOptions"/>
-	</inp2:m_Capture>
-
-	<inp2:ord_PrintShippings render_as="order_shipment" currency="selected" no_shipments_render_as="no_shipments" invalid_address_render_as="invalid_address" table_header_render_as="shippings_table_header" table_footer_render_as="shippings_table_footer" />
-</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl	(revision 11475)
@@ -0,0 +1,64 @@
+<inp2:m_RenderElement design="content_box">
+	<inp2:m_Capture to_var="header">
+		<inp2:m_Phrase label="lu_comm_BillingInfo"/>
+	</inp2:m_Capture>
+
+	<inp2:ord_ShowDefaultAddress type="billing"/>
+
+	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
+
+	<inp2:m_Phrase label="lu_EnterBillingAddress"/><br /><br />
+
+	<inp2:m_if check="ord_HasError" field="any">
+		<inp2:m_RenderElement name="error_message" />
+	</inp2:m_if>
+
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
+	<table class="form-data fullwidth">
+		<inp2:m_include template="in-commerce/designs/addresses.elm"/>
+
+		<inp2:m_if check="ord_OrderHasTangibleItems">
+			<inp2:m_if check="m_LoggedIn"><inp2:m_else/>
+				<tr>
+					<td class="field-name"><inp2:m_Phrase label="lu_SameAsShipping"/>:</td>
+					<td class="field-value">
+						<input type="checkbox" name="same_address" onclick="document.getElementById('events[ord][OnUpdate]').click();" value="1"<inp2:m_if check="m_GetEquals" name="same_address" value="1"> checked</inp2:m_if>" />
+					</td>
+				</tr>
+			</inp2:m_if>
+		</inp2:m_if>
+
+		<inp2:m_if check="m_LoggedIn">
+			<inp2:m_RenderElement name="inp_edit_select_address" type="billing" title="lu_fld_SelectAddress"/>
+		</inp2:m_if>
+
+		<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingTo" title="lu_fld_FullName"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCompany" title="lu_fld_Company"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCity" title="lu_fld_City"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingState" title="lu_fld_State"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingZip" title="lu_fld_Zip"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCountry" title="lu_fld_Country"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingEmail" title="lu_fld_Email" is_last="1"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="lu_fld_FullName" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="lu_fld_Company" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City" style="width: 200px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="lu_fld_State" style="width: 200px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" style="width: 100px;" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone" style="width: 150px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
+		</inp2:m_if>
+
+		<inp2:m_RenderElement design="inp_edit_buttons" width="200">
+			<input type="hidden" name="check_billing_address" value="true"/>
+			<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress"/>"/>
+		</inp2:m_RenderElement>
+	</table>
+</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(revision 11475)
@@ -0,0 +1,53 @@
+<inp2:m_RenderElement design="content_box">
+	<inp2:m_Capture to_var="header">
+		<inp2:m_Phrase label="lu_title_ShippingInformation"/>
+	</inp2:m_Capture>
+
+	<inp2:ord_ShowDefaultAddress type="shipping"/>
+
+	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
+
+	<inp2:m_Phrase label="lu_EnterShippingAddress"/><br /><br />
+
+	<inp2:m_if check="ord_HasError" field="any">
+		<inp2:m_RenderElement name="error_message" />
+	</inp2:m_if>
+
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
+	<table class="form-data fullwidth">
+		<inp2:m_include template="in-commerce/designs/addresses.elm"/>
+
+		<inp2:m_if check="m_LoggedIn">
+			<inp2:m_RenderElement name="inp_edit_select_address" type="shipping" title="lu_fld_SelectAddress"/>
+		</inp2:m_if>
+
+		<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingTo" title="lu_fld_FullName"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCompany" title="lu_fld_Company"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingAddress1" title="lu_fld_AddressLine1"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingAddress2" title="lu_fld_AddressLine2"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingState" title="lu_fld_State"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingZip" title="lu_fld_Zip"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCountry" title="lu_fld_Country"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingPhone" title="lu_fld_Phone"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingEmail" title="lu_fld_Email" is_last="1"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City" style="width: 200px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="lu_fld_State" style="width: 200px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
+		</inp2:m_if>
+
+		<inp2:m_RenderElement design="inp_edit_buttons" width="200">
+			<input type="hidden" name="check_shipping_address" value="true"/>
+			<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress"/>"/>
+		</inp2:m_RenderElement>
+	</table>
+</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(revision 11475)
@@ -0,0 +1,54 @@
+<inp2:m_RenderElement design="content_box">
+	<inp2:m_Capture to_var="header">
+		<inp2:m_Phrase label="lu_title_SuggestUserRegistration"/>
+	</inp2:m_Capture>
+
+	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
+
+	<inp2:ord_PrefillRegistrationFields type="billing"/>
+	<inp2:m_if check="u_HasError" field="any">
+		<inp2:m_RenderElement name="error_message" />
+	</inp2:m_if>
+
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+
+	<form method="post" action="<inp2:m_FormAction/>">
+		<table class="form-data fullwidth">
+			<inp2:m_if check="u_UseUsernames">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
+
+			<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
+				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" is_last="1"/>
+
+			<inp2:m_RenderElement design="inp_edit_buttons">
+				<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
+				<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">
+				<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending">
+
+				<input type="hidden" name="fields_prefilled" value="1" />
+
+				<input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_phrase label="lu_btn_Register"/>"/>
+				<input type="hidden" name="cancel_template" value="in-commerce/checkout/shop_cart" />
+				<input type="submit" class="button" name="events[ls][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />"/>
+			</inp2:m_RenderElement>
+		</table>
+	</form>
+</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(revision 11475)
@@ -0,0 +1,194 @@
+<inp2:m_DefineElement name="order_payment_credit_card">
+	<table width="100%" class="block-no-border">
+		<tr class="cart-header">
+			<td>
+
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+				<div class="sub-section-header"><inp2:ord_PaymentTypeDescription/></div>
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+				<br />
+
+			</td>
+		</tr>
+		<tr class="block-data">
+			<td>
+				<inp2:m_if check="ord_HasGatewayError">
+					<inp2:m_RenderElement name="error_message" />
+					<strong><inp2:ord_ShowGatewayError/></strong>
+				</inp2:m_if>
+				<br />
+				<strong><inp2:ord_PaymentTypeInstructions/></strong>
+				<br /><br />
+
+			</td>
+		</tr>
+	</table>
+
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
+	<table class="form-data fullwidth">
+		<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="lu_billing_CardType"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_billing_CreditCardNumber" style="width: 200px;"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="lu_billing_NameOnCard" style="width: 260px;"/>
+
+		<!-- credit card expiration -->
+		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration"/>
+			<td class="field-value">
+				<inp2:m_if check="ord_HasError" field="PaymentCCExpDate">
+					<span class="field-error"><inp2:ord_Error field="PaymentCCExpDate"/></span><br />
+				</inp2:m_if>
+				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>">
+					<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
+				</select>
+				/
+				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpYear"/>">
+					<option value=''></option>
+					<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
+				</select>
+			</td>
+		</tr>
+		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+		<!-- // credit card expiration -->
+
+		<!-- credit card CVV2 -->
+		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2"/>
+			<td class="field-value">
+				<inp2:m_if check="ord_HasError" field="PaymentCVV2">
+					<span class="field-error"><inp2:ord_Error field="PaymentCVV2"/></span><br />
+				</inp2:m_if>
+				<input type="text" class="input-text" name="<inp2:ord_InputName field="PaymentCVV2"/>" value="<inp2:ord_Field field="PaymentCVV2"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 50px;">
+				&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
+			</td>
+		</tr>
+		<!-- // credit card CVV2 -->
+
+		<inp2:m_RenderElement design="inp_edit_buttons">
+			<input type="hidden" name="check_credit_card" value="true"/>
+			<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
+
+			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_phrase label="lu_btn_ProceedToPreview"/>">
+		</inp2:m_RenderElement>
+	</table>
+	<br />
+
+	<script language="JavaScript">
+	function showCVV2Help(){
+		window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" />', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
+	}
+	</script>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_payment_type_default">
+	<table>
+		<tr class="cart-header">
+			<td>
+				<inp2:ord_PaymentTypeDescription/>
+			</td>
+		</tr>
+		<tr class="form-data">
+			<td>
+				<inp2:m_if check="ord_HasGatewayError">
+					<table class="warning">
+						<tr>
+							<td valign="top" align="left" class="block-data">
+								<img src="img/message.gif" alt="" width="19" height="19" />
+								<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
+								<inp2:ord_ShowGatewayError/>
+							</td>
+						</tr>
+					</table>
+				</inp2:m_if>
+				<br/>
+				<inp2:ord_PaymentTypeInstructions/>
+			</td>
+		</tr>
+	</table>
+	<br/>
+	<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
+
+	<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_phrase label="lu_btn_ProceedToPreview"/>">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="products_total">
+		<tr>
+			<td><strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong></td>
+			<td><inp2:ord_Field name="SubTotal" currency="selected"/></td>
+		</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="shipping_total">
+		<tr>
+			<td><strong><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</strong></td>
+			<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
+		</tr>
+		<tr>
+			<td><strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong></td>
+			<td><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
+		</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="processing_total">
+		<tr>
+			<td><strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </strong></td>
+			<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
+		</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="sub_total">
+	<tr>
+		<td><strong><inp2:m_Phrase label="lu_comm_SubTotal"/>: </strong></td>
+		<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="vat_total">
+		<tr>
+			<td><strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </strong></td>
+			<td><inp2:ord_Field name="VAT" currency="selected"/></td>
+		</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement design="content_box">
+	<inp2:m_Capture to_var="header">
+		<inp2:m_Phrase label="lu_comm_BillingOptions"/>
+	</inp2:m_Capture>
+
+	<inp2:m_RenderElement name="subsection" title="lu_section_CostSummary"/>
+
+	<table class="order-totals">
+		<inp2:ord_PrintTotals
+			products_render_as="products_total"
+			shipping_render_as="shipping_total"
+			processing_render_as="processing_total"
+			sub_total_render_as="sub_total"
+			vat_render_as="vat_total"/>
+
+			<inp2:m_if check="ord_Field" name="GiftCertificateId">
+			<tr>
+				<td><strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>: </strong></td>
+				<td><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
+			</tr>
+			</inp2:m_if>
+
+		<tr class="order-grand-total">
+		  <td><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
+			<td><span class="price1"><inp2:ord_Field name="TotalAmount" currency="selected"/></span></td>
+		</tr>
+	</table>
+
+	<br />
+	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1"  alt="" /><br /><br />
+	<br />
+
+
+	<br />
+	<strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong>
+	<select class="input-select" name="<inp2:ord_InputName field="PaymentType"/>" onchange="document.getElementById('events[ord][OnUpdate]').click();">
+		<inp2:ord_PredefinedOptions render_as="inp_option_item" field="PaymentType" selected="selected"/>
+	</select>
+	&nbsp;<input class="button" type="submit" value="<inp2:m_Phrase label="lu_btn_Select"/>" name="events[ord][OnUpdate]" id="events[ord][OnUpdate]">
+	<br/><br/>
+
+	<inp2:ord_PaymentTypeForm cc_render_as="order_payment_credit_card" default_render_as="order_payment_type_default"/>
+</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl	(revision 11475)
@@ -0,0 +1,235 @@
+<inp2:m_DefineElement name="order_shipping_type">
+	<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_if check="m_param" name="ShippingFree" value="1"><inp2:m_Phrase label="lu_comm_FreeShipping" /><inp2:m_else/><inp2:m_param name="TotalCost"/></inp2:m_if>)</option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="shippings_table_header">
+	<table width="100%">
+		<tr>
+			<td colspan="4">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+		<tr class="sub-section-header">
+			<td><inp2:m_Phrase label="lu_ship_Shipment" /></td>
+			<td><inp2:m_Phrase label="lu_ship_ItemsNumber" /></td>
+			<td><inp2:m_Phrase label="lu_ship_ShippingWeight" /></td>
+			<td><inp2:m_Phrase label="lu_ship_ShippingType" /></td>
+		</tr>
+		<tr>
+			<td colspan="4">
+				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+			</td>
+		</tr>
+
+		<inp2:m_if check="ord_CartHasBackorders">
+			<strong><inp2:m_Phrase label="lu_comm_Note"/>:</strong>
+			<inp2:m_Phrase label="lu_comm_YouHaveBackorderedItems"/>
+
+			<br />
+			<inp2:m_DefineElement name="order_option">
+				<input onclick="document.getElementById('events[ord][OnUpdate]').click();" type="radio"
+					<inp2:m_param name="checked"/>
+					name="<inp2:m_param name="field_name"/>"
+					id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>">
+					<label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>">
+						<inp2:m_phrase label="$option"/>
+					</label>&nbsp;<br />
+			</inp2:m_DefineElement>
+			<inp2:ord_PredefinedOptions field="ShippingOption" render_as="order_option" selected_param="checked" selected="checked=\"checked\""/>
+			<br />
+		</inp2:m_if>
+
+		<inp2:m_if check="m_GetEquals" var="shipping_limitations_apply" value="0"><inp2:m_else/>
+			<strong><inp2:m_Phrase label="lu_comm_Note"/>:</strong>
+			<inp2:m_if check="m_GetEquals" var="shipping_limitations_apply" value="1">
+				<inp2:m_Phrase label="lu_comm_ShippingTypesLimitationApply"/><br/>
+				<input type="hidden" name="<inp2:ord_InputName field="ShippingGroupOption"/>" id="<inp2:ord_InputName field="ShippingGroupOption"/>" value="<inp2:ord_Field name="ShippingGroupOption" db="1"/>" />
+				<input onclick="document.getElementById('<inp2:ord_InputName field="ShippingGroupOption"/>').value = this.checked ? 1:0; document.getElementById('events[ord][OnUpdate]').click();" type="checkbox"
+						<inp2:m_param name="checked"/>
+						name="cb_<inp2:ord_InputName field="ShippingGroupOption"/>"
+						id="cb_<inp2:ord_InputName field="ShippingGroupOption"/>" value="1" <inp2:ord_Field name="ShippingGroupOption" db="1" checked="checked"/> />
+						<label for="cb_<inp2:ord_InputName field="ShippingGroupOption"/>">
+							<inp2:m_phrase label="lu_AdjustShippingManually"/>
+						</label>&nbsp;<br />
+			<inp2:m_else/> <!-- Order canNOT be shipped with single shipping type -->
+				<inp2:m_Phrase label="lu_comm_ShippingTypesLimitationApply_CantSingleShip"/><br/>
+				<input type="hidden" name="<inp2:ord_InputName field="ShippingGroupOption"/>" value="1" />
+			</inp2:m_if>
+		</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="shippings_table_footer">
+		<tr>
+			<td class="shopping-cart-cell-item-padding">
+				<input class="button" type="submit" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_UpdateShipping"/>"/><br/>
+			</td>
+			<td>&nbsp;</td>
+			<td class="shopping-cart-cell-item-padding" style="text-align: right">
+				<strong><inp2:m_Phrase label="lu_comm_ShippingTotal" />:</strong>
+			</td>
+			<td class="shopping-cart-cell-item-padding">
+				<inp2:ord_Field name="ShippingCost" currency="selected"/>
+			</td>
+		</tr>
+
+		<tr class="cart-subtotal">
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td style="text-align: right">
+				<strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong>
+			</td>
+			<td class="shopping-cart-cell-item-padding">
+				<inp2:ord_Field name="InsuranceFee" currency="selected"/>
+			</td>
+		</tr>
+
+		<inp2:m_DefineElement name="products_total">
+			<tr class="cart-subtotal">
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td style="text-align: right">
+					<strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong>
+				</td>
+				<td>
+					<inp2:ord_Field name="SubTotal" currency="selected"/>
+				</td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="processing_total">
+			<tr class="cart-subtotal">
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td style="text-align: right">
+					<strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>:</strong>
+				</td>
+				<td>
+					<inp2:ord_Field name="ProcessingFee" currency="selected"/>
+				</td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="sub_total">
+			<tr>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td align="right" class="shopping-cart-cell-item-padding">
+					<strong><inp2:m_Phrase label="lu_comm_SubTotal"/>:</strong>
+				</td>
+				<td class="shopping-cart-cell-item-padding">
+					<span class="price1"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></span>
+				</td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="vat_total">
+			<tr>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td class="shopping-cart-cell-item-padding" align="right">
+					<strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%:</strong>
+				</td>
+				<td class="shopping-cart-cell-item-padding">
+					<span class="price1"><inp2:ord_Field name="VAT" currency="selected"/></span>
+				</td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:ord_PrintTotals
+			products_render_as="products_total"
+			processing_render_as="processing_total"
+			sub_total_render_as="sub_total"
+			vat_render_as="vat_total"/>
+
+		<inp2:m_if check="ord_Field" name="GiftCertificateId">
+			<tr>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td class="shopping-cart-cell-item-padding" align="right">
+					<strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>:</strong>
+				</td>
+				<td class="shopping-cart-cell-item-padding">
+					<span class="price1"><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></span>
+				</td>
+			</tr>
+		</inp2:m_if>
+
+		<tr class="cart-subtotal order-grand-total">
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td class="shopping-cart-cell-item-padding" align="right">
+				<inp2:m_Phrase label="lu_comm_GrandTotal"/>:
+			</td>
+			<td class="shopping-cart-cell-item-padding">
+				<inp2:ord_Field name="TotalAmount" currency="selected"/>
+			</td>
+		</tr>
+
+		<tr>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+			<td class="shopping-cart-cell-item-padding">
+				<input type="hidden" name="next_step_template" value="in-commerce/checkout/billing">
+				<input type="submit" name="events[ord][OnProceedToBilling]" value="<inp2:m_Phrase label="lu_comm_ProceedToBilling"/>" class="button">
+			</td>
+		</tr>
+
+	</table>
+</inp2:m_DefineElement>
+
+<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
+
+<inp2:m_DefineElement name="shipping_group_item">
+	<inp2:Field name="Name"/><inp2:m_if check="ord_BackorderFlag"> <span class="backordered-product"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if><br />
+	<inp2:m_if check="HasOptions">
+		<br/>
+		<span style="font-size: 8pt">
+		<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
+			<inp2:PrintOptions render_as="option_element" currency="selected"/>
+		<inp2:m_else/> <!-- listed combinations -->
+			<inp2:PrintOptions render_as="option_element_no_price"/>
+		</inp2:m_if>
+		<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0"> <!-- selectable options -->
+			<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a><br />
+		</inp2:m_if>
+		</span>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_shipment">
+	<tr class="cart-item">
+		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="shipment"/><br/>
+			<b><inp2:m_Phrase label="lu_Items"/>:</b><br />
+			<inp2:ord_PrintCart item_render_as="shipping_group_item" requery="1" package_num="$package_num" product_type="1" header_render_as="html:" footer_render_as="html:"/>
+		</td>
+		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="items"/></td>
+		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="weight"/></td>
+		<td class="shopping-cart-cell-item-padding">
+			<select class="input-select" name="<inp2:m_param name="field_name"/>">
+				<inp2:ord_PrintShippingTypes render_as="order_shipping_type" currency="selected" />
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="4">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="no_shipments">
+	<inp2:m_Phrase label="lu_comm_ErrorNoShippingTypes"/> (<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>).
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="invalid_address">
+	<inp2:m_Phrase label="lu_comm_ErrorInvalidShippingAddress"/>.
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement design="content_box">
+	<inp2:m_Capture to_var="header">
+		<inp2:m_Phrase label="lu_title_ShippingOptions"/>
+	</inp2:m_Capture>
+
+	<inp2:ord_PrintShippings render_as="order_shipment" currency="selected" no_shipments_render_as="no_shipments" invalid_address_render_as="invalid_address" table_header_render_as="shippings_table_header" table_footer_render_as="shippings_table_footer" />
+</inp2:m_RenderElement>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.elm.tpl	(revision 11475)
@@ -0,0 +1,23 @@
+<!-- editors pick -->
+<inp2:m_RenderElement design="content_box" data_exists="1">
+	<inp2:p_InitList list_name="new_products" types="new" recursive="true" per_page="short_list" />
+
+	<inp2:m_Capture to_var="header">
+		<inp2:m_phrase name="lu_title_NewProducts"/>
+	</inp2:m_Capture>
+
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+	<table class="fullwidth item-listing table-border">
+		<inp2:p_ListProducts list_name="new_products" render_as="product_element"/>
+	</table>
+
+	<inp2:m_DefineElement name="more_link">
+	<div style="text-align: right;">
+		<a href="<inp2:m_Link template="in-commerce/products/new_products" />"><inp2:m_Phrase label="lu_More"/>...</a>
+	</div>
+	</inp2:m_DefineElement>
+	
+	<inp2:p_MoreLink list_name="new_products" render_as="more_link"/>
+</inp2:m_RenderElement>
+<!-- //editors pick	-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/new_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_items.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_items.elm.tpl	(revision 11474)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_items.elm.tpl	(revision 11475)
@@ -1,6 +1,6 @@
 <!--## RELATED PRODUCTS ##-->
-	<inp2:m_include template="in-commerce/designs/products"/>	
+	<inp2:m_include template="in-commerce/designs/products.elm"/>	
 	<table>
 		<inp2:p_PrintList2 render_as="related_product_element" types="related" related_to="$related_to" parent_cat_id="any" no_table="1"/>
 	</table>
 <!--## // RELATED PRODUCTS ##-->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_items.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.elm.tpl	(revision 11475)
@@ -0,0 +1,23 @@
+<!-- FEATURED PRODUCTS -->
+<inp2:m_RenderElement design="content_box" data_exists="1">
+	<inp2:p_InitList list_name="featured_products" types="featured" recursive="1" per_page="1" sort_by="random"/>
+
+	<inp2:m_Capture to_var="header">
+		<inp2:m_phrase name="lu_title_FeaturedProducts"/>
+	</inp2:m_Capture>
+
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+	<table class="fullwidth item-listing-featured table-border">
+		<inp2:p_ListProducts list_name="featured_products" render_as="featured_product_element"/>
+	</table>	
+
+	<inp2:m_DefineElement name="more_link">
+	<div style="text-align: right;">
+		<a href="<inp2:m_Link template="in-commerce/products/featured_products" />"><inp2:m_Phrase label="lu_More"/>...</a><br />
+	</div>
+	</inp2:m_DefineElement>
+	
+	<inp2:p_MoreLink list_name="featured_products" render_as="more_link"/>
+</inp2:m_RenderElement>
+<!-- /FEATURED PRODUCTS -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/featured_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.elm.tpl	(revision 11475)
@@ -0,0 +1,19 @@
+<!-- related products -->
+<inp2:m_RenderElement design="content_box" data_exists="1">
+	<inp2:p_InitList list_name="related_products" types="related" recursive="1" parent_cat_id="any" />
+
+	<inp2:m_Capture to_var="header">
+		<inp2:m_Phrase label="lu_title_RelatedProducts"/> (<inp2:p_TotalRecords list_name="related_products"/>)
+	</inp2:m_Capture>
+
+	<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="related_products"/>
+
+	<inp2:m_include template="in-commerce/designs/products.elm"/>
+
+	<table class="fullwidth item-listing">
+		<inp2:p_ListProducts list_name="related_products" render_as="product_element"/>
+	</table>
+
+	<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="related_products"/>
+</inp2:m_RenderElement>
+<!-- // related products -->
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/content_boxes/related_products.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/registration_fields.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/registration_fields.elm.tpl	(nonexistent)
+++ branches/RC/themes/default2009/in-commerce/elements/registration_fields.elm.tpl	(revision 11475)
@@ -0,0 +1,40 @@
+	<!--## AFFILIATE REGISTRATION CHECKBOX ##-->
+	<inp2:m_if check="m_ConfigEquals" option="Comm_RegisterAsAffiliate" value="1">
+
+		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+
+		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="field-name">
+				<label for="RegisterAsAffiliate">
+					<inp2:m_phrase label="lu_fld_RegisterAsAffiliate"/>:
+				</label>
+			</td>
+			<td class="field-value">
+				<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="RegisterAsAffiliate" name="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
+				<input class="hidden-element" type="submit" id="events[u][OnRefreshForm]" name="events[u][OnRefreshForm]" />
+			</td>
+		</tr>
+
+		<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
+			<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+		</inp2:m_if>
+
+	</inp2:m_if>
+	<!--## /AFFILIATE REGISTRATION CHECKBOX ##-->
+
+	<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
+		<inp2:m_include template="in-commerce/elements/forms.elm"/>
+
+		<inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" required="1"/>
+		<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
+		<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
+
+		<inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
+	</inp2:m_if>
+
+<script type="text/javascript">
+	function toggle_affiliate() {
+		document.getElementById('events[u][OnRefreshForm]').click();
+	}
+</script>
\ No newline at end of file

Property changes on: branches/RC/themes/default2009/in-commerce/elements/registration_fields.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property