Index: branches/1.0.x/cart.tpl
===================================================================
diff -u -N -r14825 -r15019
--- branches/1.0.x/cart.tpl	(.../cart.tpl)	(revision 14825)
+++ branches/1.0.x/cart.tpl	(.../cart.tpl)	(revision 15019)
@@ -12,6 +12,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
+	<inp2:m_Include template="elements/options.elm" strip_nl="2"/>
 
 	<ul class="steps">
 		<li class="step1 active"><a href="<inp2:m_Link pass='m,all'/>"><i></i>Shopping Cart</a></li>
@@ -108,7 +109,17 @@
 				<inp2:m_if check="HasOptions">
 					<tr>
 						<td class="options-td" colspan="5">
-							<div class="sel-options">
+							<inp2:m_if check="DisplayOptionsPricing">
+								<inp2:PrintOptions render_as="ro_option_element" currency="selected"/>
+							<inp2:m_else/>
+								<inp2:PrintOptions render_as="ro_option_element_no_price" currency="selected"/>
+							</inp2:m_if>
+
+							<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0">
+								<a href="<inp2:p_ProductLink template='__default__' pass='m,p,orditems'/>">Edit Options</a>
+							</inp2:m_if>
+
+							<!--<div class="sel-options">
 								<label><strong>Select Size:</strong>
 								<select name="select">
 									<option value="" selected="selected">22"</option>
@@ -124,7 +135,7 @@
 									<option value="">Black Metallic</option>
 								</select>
 								</label>
-							</div>
+							</div>-->
 						</td>
 					</tr>
 				</inp2:m_if>