Index: branches/1.0.x/checkout/cart.tpl
===================================================================
diff -u -N
--- branches/1.0.x/checkout/cart.tpl	(revision 14800)
+++ branches/1.0.x/checkout/cart.tpl	(revision 0)
@@ -1,295 +0,0 @@
-<!--##
-<NAME>Shopping Cart</NAME>
-<DESC></DESC>
-<SECTION>Pages||Checkout</SECTION>
-##-->
-
-<inp2:m_DefineElement name="page_title">Shopping Cart</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="add_to_head">
-	<script src="<inp2:m_TemplatesBase />inc/js/cart_manager.js" type="text/javascript"></script>
-</inp2:m_DefineElement>
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-
-	<ul class="steps">
-		<li class="step1 active"><a href="<inp2:m_Link pass='m,all'/>"><i></i>Shopping Cart</a></li>
-		<li class="step2"><span><i></i>One-step Checkout</span></li>
-		<li class="step3"><span><i></i>Receipt</span></li>
-	</ul>
-
-	<div class="clear"></div>
-
-	<form method="post" id="shopping-cart-form" action="<inp2:m_FormAction />">
-		<div class="cart-detail receipt shoppingcart">
-			<!--<div style="border: 1px dashed blue; padding: 3px; margin-bottom: 5px; font-size: 14px; font-family: 'Courier New', monospace;">
-				<inp2:ord_CheckoutErrorNew/>
-			</div>-->
-
-			<inp2:m_DefineElement name="cart_header_element">
-				<h1>Shopping Cart</h1>
-
-				<div class="buttons-right">
-					<a href="<inp2:ord_ContinueShoppingLink template='__default__'/>" class="continue-button"><span>Continue Shopping</span></a>
-					<a href="<inp2:m_Link template='checkout'/>" class="checkout-button"><span>Checkout</span></a>
-				</div>
-				<div class="clear"></div>
-
-				<table class="items">
-					<thead>
-						<tr>
-							<th colspan="2" style="text-align: left;">Items in your order (<span id="item-count"><inp2:orditems_TotalRecords/></span>)</th>
-							<th>Qty.</th>
-							<th>Price</th>
-							<th>Total</th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody id="shop-cart-table">
-			</inp2:m_DefineElement>
-
-			<inp2:m_DefineElement name="cart_item_element">
-				<tr class="shop-cart-row" row_index="<inp2:RowIndex/>" order_item_id="<inp2:Field name='OrderItemId'/>">
-					<td class="item-img"<inp2:m_if check="HasOptions"> rowspan="2"</inp2:m_if>>
-						<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="58" DefaultWidth="58" DefaultImage="img/no_picture.gif"/>
-					</td>
-					<td class="item-title">
-						<div style="font-size: 14px; font-family: 'Courier New', monospace;">
-							[ProductId: <strong><inp2:Field name="ProductId"/></strong>; OptionsSalt: <strong><inp2:Field name="OptionsSalt"/></strong>; BackOrderFlag: <strong><inp2:Field name="BackOrderFlag"/></strong>]
-						</div>
-
-						<inp2:m_if check="Field" field="Virtual" equals_to="0" db="db">
-							<a href="<inp2:ProductLink template='__default__'/>"><inp2:Field name="Name" /></a>
-							<inp2:m_if check="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="p_Field" name="cust_Availability" db="db">
-							<br />
-							<inp2:p_CustomField name="Availability"/>
-						</inp2:m_if>
-
-						<div class="product-discount"<inp2:m_ifnot check="HasDiscount"> style="display: none;"</inp2:m_ifnot>>
-							<inp2:m_Phrase label="lu_comm_RegularPrice" />: <span class="item-price"><inp2:Field name="FlatPrice" currency="selected"/></span><br />
-							<inp2:m_Phrase label="lu_comm_Discount" />: <span class="item-discount"><inp2:Field name="ItemDiscount" currency="selected" negative="1" /></span>
-						</div>
-					</td>
-					<td>
-						<div class="item-quantity">
-							<inp2:m_if check="IsTangible">
-								<input value="<inp2:Field field='Quantity'/>" class="field product-qty" name="<inp2:InputName field='Quantity'/>" id="<inp2:InputName field='Quantity'/>" />
-							<inp2:m_else />
-								<span class="product-qty read-only"><inp2:Field field="Quantity"/></span>
-							</inp2:m_if>
-						</div>
-					</td>
-
-					<td class="price-cell">
-						<inp2:Field name="Price" currency="selected" decimal_tag="span"/>
-					</td>
-
-					<td class="item-total extended-price-cell">
-						<inp2:Field name="ExtendedPrice" currency="selected" decimal_tag="span"/>
-					</td>
-
-					<td>
-						<a href="<inp2:LinkRemoveFromCart/>" class="delete-cart-link"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="Delete" /></a>
-					</td>
-				</tr>
-
-				<inp2:m_if check="HasOptions">
-					<tr>
-						<td class="options-td" colspan="5">
-							<div class="sel-options">
-								<label><strong>Select Size:</strong>
-								<select name="select">
-									<option value="" selected="selected">22"</option>
-									<option value="">23"</option>
-								</select>
-								</label>
-							</div>
-							<div class="sel-options">
-								<label><strong>Select Color:</strong>
-								<select name="select">
-									<option value="" selected="selected">Gray Metallic</option>
-									<option value="">White Metallic</option>
-									<option value="">Black Metallic</option>
-								</select>
-								</label>
-							</div>
-						</td>
-					</tr>
-				</inp2:m_if>
-			</inp2:m_DefineElement>
-
-			<inp2:m_DefineElement name="cart_footer_element">
-					</tbody>
-				</table>
-
-				<div class="discount-block">
-					<p><strong>Discounts & Promotional Offers</strong></p>
-
-					<div id="coupon-row">
-						<div class="used"<inp2:m_ifnot check="ord_Field" name="CouponId" db="db"> style="display: none;"</inp2:m_ifnot>>
-							<inp2:m_Phrase label="lu_comm_CouponHasBeenApplied" />:&nbsp;
-
-							<div class="num-discount">
-								<span class="coupon-name"><inp2:ord_Field field="CouponName" /></span>&nbsp;&nbsp;
-								<a id="remove-coupon" href="<inp2:ord_RemoveCouponLink type='coupon'/>"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" title="<inp2:m_Phrase label='lu_comm_RemoveCoupon' no_editing='1'/>" alt="<inp2:m_Phrase label='lu_comm_RemoveCoupon' no_editing='1'/>" width="13" height="13" border="0" /></a>
-							</div>
-						</div>
-
-						<div class="not-used"<inp2:m_if check="ord_Field" name="CouponId" db="db"> style="display: none;"</inp2:m_if>>
-							<p>If you have a discount or promotional offer code please enter it and click Apply button.</p>
-							<div class="num-discount form">
-								<input class="field coupon-code" name="coupon_code" value=""/>
-								<input type="button" class="grey-button" id="apply-coupon" value="Apply"/>
-							</div>
-						</div>
-					</div>
-
-					<!-- hide gift certificate row by design, but it's fully functional -->
-					<div id="gift-certificate-row" style="display: none;">
-						<div class="used"<inp2:m_ifnot check="ord_Field" name="GiftCertificateId" db="db"> style="display: none;"</inp2:m_ifnot>>
-							<inp2:m_Phrase label="lu_comm_GiftCertificateHasBeenApplied" />:&nbsp;
-
-							<div class="num-discount">
-								<span class="gift-certificate-discount"><inp2:ord_Field field="GiftCertificateDiscount" currency="selected" /></span>&nbsp;&nbsp;
-								<a id="remove-gift-certificate" href="<inp2:ord_RemoveCouponLink type='gift_certificate'/>"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" title="<inp2:m_Phrase label="lu_comm_RemoveGiftCertificate" no_editing="1"/>" alt="<inp2:m_Phrase label="lu_comm_RemoveGiftCertificate" no_editing="1"/>" width="13" height="13" border="0" /></a>
-							</div>
-						</div>
-
-						<div class="not-used"<inp2:m_if check="ord_Field" name="GiftCertificateId" db="db"> style="display: none;"</inp2:m_if>>
-							<p>If you have a gift certificate code please enter it and click Apply button.</p>
-							<div class="num-discount form">
-								<input class="field gift-certificate-code" name="giftcert_code" />
-								<input type="button" class="grey-button" id="apply-gift-certificate" value="Apply"/>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<div class="buttons-right">
-					<dl class="total">
-						<div id="discount-row"<inp2:m_ifnot check="ord_HasDiscount"> style="display: none;"</inp2:m_ifnot>>
-							<dt class="discount">Discount:</dt>
-							<dd class="price2">- <inp2:ord_Field name="DiscountTotal" currency="selected" decimal_tag="span"/></dd>
-						</div>
-
-						<div>
-							<dt>Total</dt>
-							<dd class="price1" id="sub-total"><inp2:ord_Field field="SubTotal" currency="selected" decimal_tag="span"/></dd>
-						</div>
-					</dl>
-					<p>(before shipping & taxes)</p>
-					<a href="<inp2:m_Link template='checkout'/>" class="checkout-grey-button"><span>Checkout</span></a>
-				</div>
-				<div class="clear"></div>
-
-				<script type="text/javascript">
-					var $aShopCartManager = new ShopCartManager(
-						{
-							updateUrl: '<inp2:m_Link ord_event="OnUpdateCartJSON" currency="selected" pass="m,ord" js_escape="1" no_amp="1"/>',
-							constants: {
-								'OrderCheckoutErrorType::PRODUCT': <inp2:m_GetConst name="OrderCheckoutErrorType::PRODUCT"/>,
-									'OrderCheckoutError::FIELD_UPDATE_SUCCESS': <inp2:m_GetConst name="OrderCheckoutError::FIELD_UPDATE_SUCCESS"/>,
-									'OrderCheckoutError::FIELD_UPDATE_ERROR': <inp2:m_GetConst name="OrderCheckoutError::FIELD_UPDATE_ERROR"/>,
-									'OrderCheckoutError::QTY_UNAVAILABLE': <inp2:m_GetConst name="OrderCheckoutError::QTY_UNAVAILABLE"/>,
-									'OrderCheckoutError::QTY_OUT_OF_STOCK': <inp2:m_GetConst name="OrderCheckoutError::QTY_OUT_OF_STOCK"/>,
-									'OrderCheckoutError::QTY_CHANGED_TO_MINIMAL': <inp2:m_GetConst name="OrderCheckoutError::QTY_CHANGED_TO_MINIMAL"/>,
-
-								'OrderCheckoutErrorType::COUPON': <inp2:m_GetConst name="OrderCheckoutErrorType::COUPON"/>,
-									'OrderCheckoutError::COUPON_APPLIED': <inp2:m_GetConst name="OrderCheckoutError::COUPON_APPLIED"/>,
-									'OrderCheckoutError::COUPON_REMOVED': <inp2:m_GetConst name="OrderCheckoutError::COUPON_REMOVED"/>,
-									'OrderCheckoutError::COUPON_REMOVED_AUTOMATICALLY': <inp2:m_GetConst name="OrderCheckoutError::COUPON_REMOVED_AUTOMATICALLY"/>,
-									'OrderCheckoutError::COUPON_CODE_INVALID': <inp2:m_GetConst name="OrderCheckoutError::COUPON_CODE_INVALID"/>,
-									'OrderCheckoutError::COUPON_CODE_EXPIRED': <inp2:m_GetConst name="OrderCheckoutError::COUPON_CODE_EXPIRED"/>,
-
-
-								'OrderCheckoutErrorType::GIFT_CERTIFICATE': <inp2:m_GetConst name="OrderCheckoutErrorType::GIFT_CERTIFICATE"/>,
-									'OrderCheckoutError::GC_APPLIED': <inp2:m_GetConst name="OrderCheckoutError::GC_APPLIED"/>,
-									'OrderCheckoutError::GC_REMOVED': <inp2:m_GetConst name="OrderCheckoutError::GC_REMOVED"/>,
-									'OrderCheckoutError::GC_REMOVED_AUTOMATICALLY': <inp2:m_GetConst name="OrderCheckoutError::GC_REMOVED_AUTOMATICALLY"/>,
-									'OrderCheckoutError::GC_CODE_INVALID': <inp2:m_GetConst name="OrderCheckoutError::GC_CODE_INVALID"/>,
-									'OrderCheckoutError::GC_CODE_EXPIRED': <inp2:m_GetConst name="OrderCheckoutError::GC_CODE_EXPIRED"/>,
-
-								'OrderCheckoutErrorType::DISCOUNT': <inp2:m_GetConst name="OrderCheckoutErrorType::DISCOUNT"/>,
-									'OrderCheckoutError::DISCOUNT_APPLIED': <inp2:m_GetConst name="OrderCheckoutError::DISCOUNT_APPLIED"/>,
-									'OrderCheckoutError::DISCOUNT_REMOVED': <inp2:m_GetConst name="OrderCheckoutError::DISCOUNT_REMOVED"/>,
-
-								'PRODUCT_TYPE_TANGIBLE': <inp2:m_GetConst name="PRODUCT_TYPE_TANGIBLE"/>
-							},
-//							debugMode: true,
-							currencyMask: '<inp2:ord_CurrencyMask currency="selected" js_escape="1"/>',
-							orderInfo: <inp2:ord_PrintOrderInfo currency="selected"/>
-						}
-					);
-				</script>
-			</inp2:m_DefineElement>
-
-			<inp2:m_DefineElement name="cart_empty_element">
-				<h1>Shopping Cart</h1>
-				<div class="clear"></div>
-
-				<strong><inp2:m_Phrase label="lu_comm_YourCartIsEmpty"/></strong>
-			</inp2:m_DefineElement>
-
-			<inp2:ord_PrintCart item_render_as="cart_item_element" header_render_as="cart_header_element" footer_render_as="cart_footer_element" empty_cart_render_as="cart_empty_element" per_page="-1"/>
-		</div>
-	</form>
-
-	<textarea id="product-row-mask" style="display: none;">
-		<tr class="shop-cart-row" row_index="{ROW_INDEX}" order_item_id="{field:OrderItemId}">
-			<td class="item-img">
-				<img src="{field:PrimaryImage}" alt=""/>
-			</td>
-			<td class="item-title">
-				<span class="product-with-link" style="display: none;">
-					<a href="#"></a>
-				</span>
-
-				<span class="product-without-link" style="display: none;"></span>
-
-				<span class="free-shipping">
-					&nbsp;<sup><inp2:m_phrase label="lu_cart_FreeShippingAvailable" /></sup>
-				</span>
-
-				<span class="back-order-mark error"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span>
-
-				<span class="product-availability" style="display: none;"></span>
-
-				<div class="product-discount" style="display: none;">
-					<inp2:m_Phrase label="lu_comm_RegularPrice" />: <span class="item-price"></span><br />
-					<inp2:m_Phrase label="lu_comm_Discount" />: <span class="item-discount"></span>
-				</div>
-			</td>
-			<td>
-				<div class="item-quantity">
-					<input value="{field:Quantity}" style="width:20px" class="field product-qty" name="<inp2:orditems_InputName field='Quantity' force_id="{field:OrderItemId}"/>" id="<inp2:orditems_InputName field='Quantity' force_id="{field:OrderItemId}"/>" />
-					<span class="product-qty read-only">{field:Quantity}</span>
-				</div>
-			</td>
-
-			<td class="price-cell"></td>
-
-			<td class="item-total extended-price-cell"></td>
-
-			<td>
-				<a href="#" class="delete-cart-link"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="Delete" /></a>
-			</td>
-		</tr>
-	</textarea>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r14793 -r14801
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14793)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14801)
@@ -58,7 +58,7 @@
 			<span class="phone">1-855-WWW-PROS</span>
 				<span class="items"><inp2:ord_ItemsInCart/> Items: <inp2:ord_Field name="TotalAmount" currency="selected" decimal_tag="i"/></span>
 				<span class="delim">|</span>
-				<a href="<inp2:m_Link template='checkout/cart' m_cat_id='0' m_cat_page='1'/>">Checkout</a>
+				<a href="<inp2:m_Link template='cart' m_cat_id='0' m_cat_page='1'/>">Checkout</a>
 		</div>
 
 		<!-- Show recently added Product by loading content with Ajax -->
Index: branches/1.0.x/.smsignore
===================================================================
diff -u -N -r14600 -r14801
--- branches/1.0.x/.smsignore	(.../.smsignore)	(revision 14600)
+++ branches/1.0.x/.smsignore	(.../.smsignore)	(revision 14801)
@@ -1 +1,3 @@
+cart\.tpl
+checkout\.tpl
+receipt\.tpl
\ No newline at end of file
Index: branches/1.0.x/checkout/.smsignore
===================================================================
diff -u -N
--- branches/1.0.x/checkout/.smsignore	(revision 14747)
+++ branches/1.0.x/checkout/.smsignore	(revision 0)
@@ -1 +0,0 @@
-.*\.tpl
\ No newline at end of file