Index: branches/1.0.x/products/details.tpl
===================================================================
diff -u -N -r14909 -r15019
--- branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14909)
+++ branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 15019)
@@ -12,11 +12,29 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="before_content">
-<div class="block-fixed">
-	<div>
-		<a href="<inp2:p_AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="button-addtocart" qty_id="product-qty" rel="nofollow"><span><img src="<inp2:m_TemplatesBase/>img/bg-button-cart-add.png" width="24" height="24" alt="" /><i>Add to Cart</i></span></a>
-	</div>
-</div>
+	<inp2:m_ifnot check="p_OptionsUpdateMode">
+		<inp2:m_ifnot check="p_FieldEquals" field="OptionsSelectionMode" value="1">
+			<div class="block-fixed">
+				<div>
+					<a href="<inp2:p_AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="button-addtocart" qty_id="product-qty" rel="nofollow"><span><img src="<inp2:m_TemplatesBase/>img/bg-button-cart-add.png" width="24" height="24" alt="" /><i>Add to Cart</i></span></a>
+				</div>
+			</div>
+
+			<script type="text/javascript">
+				$(document).ready(
+					function () {
+						$('.button-addtocart').click(
+							function ($e) {
+								$('#add-to-cart-btn').click();
+
+								return false;
+							}
+						);
+					}
+				);
+			</script>
+		</inp2:m_ifnot>
+	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
 <!--## MAIN CONTENT ##-->
@@ -95,36 +113,20 @@
 					</div>
 				</div>
 				<div class="description">
-					<div class="options-har">
-						<div class="sel-options">
-							<label><strong>Select Size:</strong>
-							<select name="select" class="field-alt">
-								<option value="" selected="selected">22"</option>
-								<option value="">23"</option>
-							</select>
-							</label>
+					<inp2:m_if check="p_ShouldListOptions">
+						<inp2:m_Include template="elements/ajax/product_options"/>
+					<inp2:m_else/>
+						<div class="price-block">
+							<p><s class="under"><inp2:p_Field name="MSRP" currency="selected" decimal_tag="span"/></s></p>
+							<p class="redprice"><em class="price"><inp2:p_Field name="Price" currency="selected" decimal_tag="span"/></em></p>
 						</div>
-						<div class="sel-options">
-							<label><strong>Select Color:</strong>
-							<select name="select" class="field-alt">
-								<option value="" selected="selected">Gray Metallic</option>
-								<option value="">White Metallic</option>
-								<option value="">Black Metallic</option>
-							</select>
-							</label>
+						<div class="order-block">
+							<p class="qty form"><strong>Qty.</strong>&nbsp;&nbsp;<input type="text" name="qty" id="product-qty" value="1" class="field" /></p>
+							<p class="but"><a href="<inp2:p_AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="addtocart" id="add-to-cart-btn" qty_id="product-qty" rel="nofollow"><span><i>Add to Cart</i></span></a></p>
+							<p class="avail">Availability: <em><inp2:m_if check="p_Available">In Stock<inp2:m_else/>Not In Stock</inp2:m_if></em></p>
 						</div>
-						<div class="clear"></div>
-					</div>
+					</inp2:m_if>
 
-					<div class="price-block">
-						<p><s class="under"><inp2:p_Field name="MSRP" currency="selected" decimal_tag="span"/></s></p>
-						<p class="redprice"><em class="price"><inp2:p_Field name="Price" currency="selected" decimal_tag="span"/></em></p>
-					</div>
-					<div class="order-block">
-						<p class="qty form"><strong>Qty.</strong>&nbsp;&nbsp;<input type="text" name="qty" id="product-qty" value="1" class="field" /></p>
-						<p class="but"><a href="<inp2:p_AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="addtocart" qty_id="product-qty" rel="nofollow"><span><i>Add to Cart</i></span></a></p>
-						<p class="avail">Availability: <em>In Stock</em></p>
-					</div>
 					<div class="clear"></div>
 
 					<dl class="har">