Index: branches/1.0.x/products/compare.tpl
===================================================================
diff -u -N -r14912 -r14919
--- branches/1.0.x/products/compare.tpl	(.../compare.tpl)	(revision 14912)
+++ branches/1.0.x/products/compare.tpl	(.../compare.tpl)	(revision 14919)
@@ -9,6 +9,10 @@
 <inp2:m_DefineElement name="content">
 	<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="any" per_page="3"/>
 
+	<inp2:m_ifnot check="p_TotalRecords" list_name="compare_products">
+		<inp2:p_ContinueLink redirect="1"/>
+	</inp2:m_ifnot>
+
 	<div class="block no-border-bottom">
 		<h2><em>Comparing Products (<abbr id="product-count"><inp2:p_TotalRecords list_name="compare_products"/></abbr>)</em><span></span></h2>
 		<div class="compare border-radius">
@@ -55,56 +59,82 @@
 
 			<inp2:p_PrintList render_as="product_compare_header" list_name="compare_products"/>
 
-			<inp2:m_if check="p_TotalRecords" list_name="compare_products" equals_to="0|1|2">
-				<div class="good-item last-child">
-					<p class="buttons-block"><a href="<inp2:m_Link template='index'/>" class="compare-button"><span><img src="<inp2:m_TemplatesBase/>img/bg-button-compare-add.png" width="24" height="24" alt="" /><br />Select Product<br />to Compare</span></a></p>
-				</div>
-			</inp2:m_if>
+			<div id="add-product" class="good-item last-child" <inp2:m_ifnot check="p_TotalRecords" list_name="compare_products" equals_to="0|1|2"> style="display: none;"</inp2:m_ifnot>>
+				<p class="buttons-block"><a href="<inp2:p_ContinueLink/>" class="compare-button"><span><img src="<inp2:m_TemplatesBase/>img/bg-button-compare-add.png" width="24" height="24" alt="" /><br />Select Product<br />to Compare</span></a></p>
+			</div>
 
 			<div class="clear"></div>
 
 			<div id="compare-menu" style="width: 678px;">
-				<h3><a href="#">Description</a></h3>
-				<div>
-					<inp2:m_DefineElement name="product_compare_description">
-						<div class="good-item-cell">
-							<div class="description">
-								<p><inp2:Field name="Description"/></p>
+				<inp2:m_if check="p_HasCompareField" name="Description" list_name="compare_products">
+					<h3><a href="#">Description</a></h3>
+					<div>
+						<inp2:m_DefineElement name="product_compare_description">
+							<div class="good-item-cell">
+								<div class="description">
+									<p><inp2:Field name="Description"/></p>
+								</div>
 							</div>
-						</div>
-					</inp2:m_DefineElement>
+						</inp2:m_DefineElement>
 
-					<inp2:p_PrintList render_as="product_compare_description" list_name="compare_products"/>
+						<inp2:p_PrintList render_as="product_compare_description" list_name="compare_products"/>
 
-					<div class="clear"></div>
-				</div>
+						<div class="clear"></div>
+					</div>
+				</inp2:m_if>
 
-				<h3><a href="#">Features</a></h3>
-				<div>
-					<inp2:m_DefineElement name="product_compare_features">
-						<div class="good-item-cell">
-							<div class="description">
-								<p><inp2:Field name="cust_Features"/></p>
+				<inp2:m_if check="p_HasCompareField" name="cust_Features" list_name="compare_products">
+					<h3><a href="#">Features</a></h3>
+					<div>
+						<inp2:m_DefineElement name="product_compare_features">
+							<div class="good-item-cell">
+								<div class="description">
+									<p><inp2:Field name="cust_Features"/></p>
+								</div>
 							</div>
-						</div>
-					</inp2:m_DefineElement>
+						</inp2:m_DefineElement>
 
-					<inp2:p_PrintList render_as="product_compare_features" list_name="compare_products"/>
+						<inp2:p_PrintList render_as="product_compare_features" list_name="compare_products"/>
 
-					<div class="clear"></div>
-				</div>
+						<div class="clear"></div>
+					</div>
+				</inp2:m_if>
 
-				<h3><a href="#">Details</a></h3>
+
+				<!--<h3><a href="#">Details</a></h3>
 				<div></div>
 
 				<h3><a href="#">Specifications</a></h3>
 				<div></div>
 
 				<h3><a href="#">Overall Rating</a></h3>
-				<div></div>
+				<div></div>-->
 
-				<h3><a href="#">Reviews</a></h3>
-				<div></div>
+				<inp2:m_if check="p_HasCompareField" name="CachedReviewsQty" list_name="compare_products">
+					<h3><a href="#">Reviews</a></h3>
+					<div>
+						<inp2:m_DefineElement name="product_compare_reviews">
+							<div class="good-item-cell">
+								<div class="description">
+									<p class="reviews">
+										<inp2:m_DefineElement name="short_review_element">
+											<div class="row-review">
+												<p class="user"><inp2:Field name="ReviewedBy"/></p>
+												<div class="text-review"><inp2:Field name="ReviewText"/></div>
+											</div>
+										</inp2:m_DefineElement>
+
+										<inp2:rev_PrintList render_as="short_review_element" per_page="-1" requery="1"/>
+									</p>
+								</div>
+							</div>
+						</inp2:m_DefineElement>
+
+						<inp2:p_PrintList render_as="product_compare_reviews" list_name="compare_products"/>
+
+						<div class="clear"></div>
+					</div>
+				</inp2:m_if>
 			</div>
 			<div class="clear"></div>
 		</div>
@@ -151,6 +181,8 @@
 							}
 						);
 
+						$('#add-product').show();
+
 						return false;
 					}
 				);
Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -N -r14913 -r14919
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14913)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14919)
@@ -29,7 +29,7 @@
 
 			$('#compare-products-btn').click(
 				function () {
-					redirect('<inp2:m_Link template="products/compare" js_escape="1"/>');
+					redirect('<inp2:p_CompareLink template="products/compare" js_escape="1"/>');
 				}
 			);