Index: branches/1.0.x/elements/html_head.elm.tpl
===================================================================
diff -u -N -r14792 -r14907
--- branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14792)
+++ branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14907)
@@ -14,7 +14,7 @@
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 
-<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css|inc/category.css|inc/flexslider.css|inc/modal.css|inc/details.css|inc/jquery.gzoom.css|inc/pikachoose.css|inc/qtip.css|inc/profile.css|inc/cart.css'/>" media="all" charset="<inp2:lang.current_Field name='Charset'/>"/>
+<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css|inc/category.css|inc/flexslider.css|inc/modal.css|inc/details.css|inc/jquery.gzoom.css|inc/pikachoose.css|inc/qtip.css|inc/profile.css|inc/cart.css|inc/compare.css'/>" media="all" charset="<inp2:lang.current_Field name='Charset'/>"/>
 
 <!-- including "inc/profile.css" will break logged-in user's menu -->
 
Index: branches/1.0.x/elements/side_boxes/subscribe.elm.tpl
===================================================================
diff -u -N -r14733 -r14907
--- branches/1.0.x/elements/side_boxes/subscribe.elm.tpl	(.../subscribe.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/side_boxes/subscribe.elm.tpl	(.../subscribe.elm.tpl)	(revision 14907)
@@ -2,20 +2,20 @@
 
 <div class="subscribe-block">
 	<h4>Get Promotions & Discounts:</h4>
-	<form method="post" action="<inp2:m_FormAction />" class="form" name="mailing_list_form">	
+	<form method="post" action="<inp2:m_FormAction />" class="form" name="mailing_list_form">
 		<fieldset>
 			<inp2:if check="u.subscribe-sidebox_Field" name="SubscriberEmail">
 				<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="<inp2:u.subscribe-sidebox_Field name='SubscriberEmail'/>" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"/>
 			<inp2:m_else/>
 				<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="Your Email" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"  />
 			</inp2:if>
-			
+
 			<inp2:m_if check="u.subscribe-sidebox_HasError" field="any">
 				<span class="field-error"><inp2:u.subscribe-sidebox_Error field="SubscriberEmail"/></span><br />
 			</inp2:m_if>
-			
+
 			<a href="#" class="grey-but"><span><inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/></span></a>
-			
+
 			<input type="hidden" name="events[u.subscribe-sidebox][OnSubscribeQuery]" value="1"/>
 			<input type="hidden" name="subscribe_template" value="mailing/subscribe"/>
 			<input type="hidden" name="unsubscribe_template" value="mailing/unsubscribe"/>
Index: branches/1.0.x/inc/js/jquery.scripts.js
===================================================================
diff -u -N -r14890 -r14907
--- branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14890)
+++ branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14907)
@@ -86,6 +86,36 @@
 	return $sorted_object;
 }
 
+function compare_product($product_id, $compare_event, $callback) {
+	if ( $compare_event === undefined || $compare_event === true ) {
+		$compare_event = 'OnAddToCompare';
+	}
+	else if ( $compare_event === false ) {
+		$compare_event = 'OnRemoveFromCompare';
+	}
+
+	var $url = FormManager.getURL('p', 'elements/side_boxes/compare.elm', $compare_event);
+
+	$.get(
+		$url,
+		{'p_id': $product_id},
+		function ($data) {
+			$('#compare-products-sidebox').replaceWith($data);
+
+			if ( $callback !== undefined && $.isFunction($callback) ) {
+				$callback($data);
+			}
+		}
+	);
+
+	return false;
+}
+
+function redirect($url)
+{
+	window.location.href = $url;
+}
+
 /* === DBlocks class === */
 function DBlocks() {
 	var $me = this;
@@ -171,63 +201,62 @@
 	)
 }
 
-/* === Startup === */
-$(document).ready(
-	function() {
-		watch_anchor();
+function add_to_cart_handler() {
+	var $me = $(this),
+		$qty = $me.attr('qty_id') !== undefined ? parseInt($('#' + $me.attr('qty_id')).val()) : 1;
 
-		$('#change-password').click(
-			function($e) {
-				$('#password-show').hide();
-				$('#password-block').fadeIn();
 
-				return false;
-			}
-		);
+	if ( $me.hasClass('addedtocart') ) {
+		// disabled button
+		return false;
+	}
 
+	if ( isNaN($qty) ) {
+		$qty = 1;
+	}
 
-		$('.addtocart, .button-addtocart').click(
-			function () {
-				var $me = $(this),
-					$qty = $me.attr('qty_id') !== undefined ? parseInt($('#' + $me.attr('qty_id')).val()) : 1;
+	var $bubble = $('.basketStatus'),
+		$timer_id = $bubble.data('hide_timer');
 
+	clearTimeout($timer_id);
 
-				if ( $me.hasClass('addedtocart') ) {
-					// disabled button
-					return false;
+	$.get(
+		$me.attr('href') + '&qty=' + $qty,
+		function ($bubble_content) {
+			$('.basketContent', $bubble).html( $bubble_content.replace(/#QTY#/g, $qty) );
+			$bubble
+			.stop(true, true)
+			.fadeIn(
+				'slow',
+				function () {
+					var $timer = setTimeout(function(){ $bubble.fadeOut('slow'); }, 2000);
+					$bubble.data('hide_timer', $timer);
 				}
+			);
 
-				if ( isNaN($qty) ) {
-					$qty = 1;
-				}
+			if ( $me.hasClass('addtocart') ) {
+				$me.removeClass('addtocart').addClass('addedtocart').html('Added to Cart');
+			}
+		}
+	);
 
-				var $bubble = $('.basketStatus'),
-					$timer_id = $bubble.data('hide_timer');
+	return false;
+}
 
-				clearTimeout($timer_id);
+/* === Startup === */
+$(document).ready(
+	function() {
+		watch_anchor();
 
-				$.get(
-					$me.attr('href') + '&qty=' + $qty,
-					function ($bubble_content) {
-						$('.basketContent', $bubble).html( $bubble_content.replace(/#QTY#/g, $qty) );
-						$bubble
-						.stop(true, true)
-						.fadeIn(
-							'slow',
-							function () {
-								var $timer = setTimeout(function(){ $bubble.fadeOut('slow'); }, 2000);
-								$bubble.data('hide_timer', $timer);
-							}
-						);
+		$('#change-password').click(
+			function($e) {
+				$('#password-show').hide();
+				$('#password-block').fadeIn();
 
-						if ( $me.hasClass('addtocart') ) {
-							$me.removeClass('addtocart').addClass('addedtocart').html('Added to Cart');
-						}
-					}
-				);
-
 				return false;
 			}
 		);
+
+		$('.addtocart, .button-addtocart').click(add_to_cart_handler);
 	}
 );
\ No newline at end of file
Index: branches/1.0.x/products/compare.tpl
===================================================================
diff -u -N
--- branches/1.0.x/products/compare.tpl	(revision 0)
+++ branches/1.0.x/products/compare.tpl	(revision 14907)
@@ -0,0 +1,159 @@
+<!--##
+<NAME>Compare Products</NAME>
+<DESC>Product comparison page</DESC>
+<SECTION>Pages||Compare Products</SECTION>
+##-->
+<inp2:m_DefineElement name="page_title"><inp2:st_PageInfo type="htmlhead_title" html_escape="1"/></inp2:m_DefineElement>
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+	<div class="block no-border-bottom">
+		<h2><em>Comparing Products (4)</em><span></span></h2>
+		<div class="compare border-radius">
+
+			<div class="good-item">
+				<div class="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></div>
+				<dl>
+					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase/>img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+						<p class="price">$759.<span>95</span></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+				<div class="rating">
+					<p><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /></p>
+					<p><a href="">Reviews</a> (<a href="">12</a>)</p>
+				</div>
+				<dl class="har">
+					<dt>Model:</dt>
+					<dd>XT2324</dd>
+					<dt>Manufacturer:</dt>
+					<dd>Apple</dd>
+					<dt>SKU:</dt>
+					<dd>23423424</dd>
+					<dt>Size:</dt>
+					<dd>22''</dd>
+				</dl>
+			</div>
+			<div class="good-item">
+				<div class="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></div>
+				<dl>
+					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase/>img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+						<p class="price">$759.<span>95</span></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+				<div class="rating">
+					<p><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /></p>
+					<p><a href="">Reviews</a> (<a href="">12</a>)</p>
+				</div>
+				<dl class="har">
+					<dt>Model:</dt>
+					<dd>XT2324</dd>
+					<dt>Manufacturer:</dt>
+					<dd>Apple</dd>
+					<dt>SKU:</dt>
+					<dd>23423424</dd>
+					<dt>Size:</dt>
+					<dd>22''</dd>
+				</dl>
+			</div>
+			<div class="good-item">
+				<div class="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></div>
+				<dl>
+					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase/>img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+						<p class="price">$759.<span>95</span></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+				<div class="rating">
+					<p><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /><img src="<inp2:m_TemplatesBase/>img/star-small.jpg" width="18" height="18" alt="" /></p>
+					<p><a href="">Reviews</a> (<a href="">12</a>)</p>
+				</div>
+				<dl class="har">
+					<dt>Model:</dt>
+					<dd>XT2324</dd>
+					<dt>Manufacturer:</dt>
+					<dd>Apple</dd>
+					<dt>SKU:</dt>
+					<dd>23423424</dd>
+					<dt>Size:</dt>
+					<dd>22''</dd>
+				</dl>
+			</div>
+			<div class="good-item last-child">
+				<p class="buttons-block"><a href="#" 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>
+					<div class="good-item-cell">
+						<div class="description">
+							<p>Vestibulum eu ipsum est. Morbi risus magna, aliquam eu consequat in, ultricies quis lorem. Maecenas rutrum pulvinar lectus, vel aliquam lorem porttitor nec. Phasellus non orci sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec massa massa. Proin ac leo mauris.</p><p>Mauris ut felis Phasellus non orci sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec massa massa. Proin ac leo mauris.</p>
+						</div>
+					</div>
+					<div class="good-item-cell">
+						<div class="description">
+							<p>Vestibulum eu ipsum est. Morbi risus magna, aliquam eu consequat in, ultricies quis lorem. Maecenas rutrum pulvinar lectus, vel aliquam lorem porttitor nec. Phasellus non orci sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec massa massa. Proin ac leo mauris.</p><p>Mauris ut felis Phasellus non orci sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec massa massa. Proin ac leo mauris.</p>
+						</div>
+					</div>
+					<div class="good-item-cell">
+						<div class="description">
+							<p>Vestibulum eu ipsum est. Morbi risus magna, aliquam eu consequat in, ultricies quis lorem. Maecenas rutrum pulvinar lectus, vel aliquam lorem porttitor nec. Phasellus non orci sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec massa massa. Proin ac leo mauris.</p><p>Mauris ut felis Phasellus non orci sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec massa massa. Proin ac leo mauris.</p>
+						</div>
+					</div>
+					<div class="clear"></div>
+				</div>
+				<h3><a href="#">Features</a></h3>
+				<div>
+
+				</div>
+				<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>
+				<h3><a href="#">Reviews</a></h3>
+				<div>
+
+				</div>
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<inp2:m_DefineElement name="add_to_head">
+	<script type= "text/javascript">
+		$(function() {
+			var icons = {
+				header: "ui-icon-circle-arrow-e",
+				headerSelected: "ui-icon-circle-arrow-s"
+			};
+			$( "#compare-menu" ).accordion({
+				icons: icons,
+				autoHeight: false,
+				navigation: true
+			});
+		});
+	</script>
+</inp2:m_DefineElement>
+
+<!--## 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/content_boxes/products.elm.tpl
===================================================================
diff -u -N -r14900 -r14907
--- branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 14900)
+++ branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 14907)
@@ -23,6 +23,22 @@
 
 		<inp2:m_Include template="elements/pagination.elm" list_name="$list_name" prefix="$prefix" ajax="1"/>
 	</div>
+
+	<script type="text/javascript">
+		$(document).ready(
+			function () {
+				$('.compare-checkbox').click(
+					function ($e) {
+						var $me = $(this);
+
+						compare_product($me.val(), $me.is(':checked'));
+					}
+				);
+
+				$('.addtocart', '#products').click(add_to_cart_handler);
+			}
+		);
+	</script>
 <inp2:m_else/>
 	No Products
 </inp2:m_if>
Index: branches/1.0.x/inc/js/form_manager.js
===================================================================
diff -u -N -r14806 -r14907
--- branches/1.0.x/inc/js/form_manager.js	(.../form_manager.js)	(revision 14806)
+++ branches/1.0.x/inc/js/form_manager.js	(.../form_manager.js)	(revision 14907)
@@ -363,6 +363,10 @@
 };
 
 FormManager.form_param = function ($prefix, $param, $value) {
+	if ( this.forms[$prefix] === undefined ) {
+		return '';
+	}
+
 	if ($value === undefined) {
 		return this.forms[$prefix][$param];
 	}
Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -N -r14770 -r14907
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14907)
@@ -1,32 +1,60 @@
-<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="0" recursive="1" max="4"/>
+<inp2:m_if check="m_Get" name="ajax" equals_to="yes">
+	<inp2:m_NoDebug/>
+</inp2:m_if>
 
-<div class="block no-border-bottom">
-	<h2><em>Comparing Products (3)</em><span class="bullet"></span></h2>
+<inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>
+<inp2:m_Include template="elements/product_elements.elm" strip_nl="2"/>
+
+<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="any" per_page="4"/>
+
+<div class="block no-border-bottom" id="compare-products-sidebox"<inp2:m_ifnot check="p_TotalRecords" list_name="compare_products"> style="display: none;"</inp2:m_ifnot>>
+	<h2>
+		<em>Comparing Products (<inp2:p_TotalRecords list_name="compare_products"/>)</em>
+		<span class="bullet"></span>
+	</h2>
 	<div class="good-item border-radius-bottom comparing-items">
-		<dl>
-			<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-			<dd>
-				<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase/>img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-				<p class="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></p>
-			</dd>
-		</dl>
-		<dl>
-			<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-			<dd>
-				<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase/>img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-				<p class="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></p>
-			</dd>
-		</dl>
-		<dl>
-			<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
-			<dd>
-				<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase/>img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
-				<p class="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></p>
-			</dd>
-		</dl>
+		<inp2:m_DefineElement name="compare_product_element">
+			<dl>
+				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field name="Name"/></a></dt>
+				<dd>
+					<p class="img">
+						<a href="<inp2:ProductLink template='__default__'/>">
+							<inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/>
+						</a>
+					</p>
+
+					<p class="button-delete">
+						<a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a>
+					</p>
+				</dd>
+			</dl>
+		</inp2:m_DefineElement>
+
+		<inp2:p_ListProducts list_name="compare_products" render_as="sidebox_product_element" no_table="1"/>
+
 		<p class="form buttons">
-			<input type="submit" value="Compare" id="submit" class="green-button" />&nbsp;&nbsp;&nbsp;
-			<input type="reset" value="Clear" id="cancel" class="grey-button" />
+			<input type="button" value="Compare" id="compare-products-btn" class="green-button" />&nbsp;&nbsp;&nbsp;
+			<input type="button" value="Clear" id="cancel-compare-btn" class="grey-button" />
 		</p>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+	$(document).ready(
+		function () {
+			$('.addtocart', '#compare-products-sidebox').click(add_to_cart_handler);
+
+			$('#compare-products-btn').click(
+				function () {
+					redirect('<inp2:m_Link template="products/compare" js_escape="1"/>');
+				}
+			);
+
+			$('#cancel-compare-btn').click(
+				function () {
+					compare_product(0, 'OnCancelCompare');
+				}
+			);
+		}
+	);
+</script>
\ No newline at end of file
Index: branches/1.0.x/elements/product_elements.elm.tpl
===================================================================
diff -u -N -r14793 -r14907
--- branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 14793)
+++ branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 14907)
@@ -23,7 +23,7 @@
 					<a href="<inp2:ProductLink template='__default__'/>">Reviews</a> (<a href="<inp2:ProductLink template='__default__'/>"><inp2:Field name="CachedReviewsQty"/></a>)&nbsp;&nbsp;&nbsp;
 				</span>
 				<span class="comp">
-					<label><input type="checkbox" name="compare-1" value="1" /><em>Compare</em></label>
+					<label><input type="checkbox" class="compare-checkbox" value="<inp2:Field name='ProductId'/>"<inp2:m_if check="InCompare"> checked</inp2:m_if>/><em>Compare</em></label>
 				</span>
 			</div>
 		</div>