Index: branches/1.0.x/img/validate/con-success-arrow-bottom.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/styles.css
===================================================================
diff -u -N -r15015 -r15043
--- branches/1.0.x/inc/styles.css	(.../styles.css)	(revision 15015)
+++ branches/1.0.x/inc/styles.css	(.../styles.css)	(revision 15043)
@@ -21,6 +21,9 @@
 .clear { clear: both !important; }
 .fix { border: 1px solid #f00; }
 
+.left { float:left }
+.right { float: right }
+
 /* Header
 *******************************************************************************/
 #header {
@@ -1333,8 +1336,23 @@
 	font-weight: bold;
 	padding-bottom: 5px;
 }
-.items .item .descr .optional { padding: 5px 0; }
-.items .item .descr .optional .stars { padding: 0 20px 0 0; }
+
+.items .item .descr .optional {
+	padding: 15px 0 5px 0;
+}
+
+.items .item .descr .optional .stars {
+	padding: 0 20px 0 0;
+	display: block;
+	float: left
+}
+
+.items .item .descr .optional .reviews {
+	width: auto;
+	padding-top: 0px;
+	padding-right: 20px;
+	border: 0px;
+}
 .items .item .descr .optional .comp label em {
 	font-style: normal;
 	text-decoration: underline;
@@ -2334,6 +2352,28 @@
 .formStatus.formError .formContent { background: #990000 url(@templates_base@/img/validate/con-error.png) repeat-x 0 0; }
 .formStatus.formError .formArrow { background: url(@templates_base@/img/validate/con-error-arrow.png) no-repeat 0 0; }
 
+.compare-bubble {
+	position: relative;
+}
+
+.compare-bubble .formStatus {
+	top: -25px;
+	left: -94px;
+}
+
+.compare-bubble .formStatus .formContent { width: auto }
+
+.compare-bubble .formStatus .formArrow {
+	margin: 0px 0 0 20px;
+	position: relative;
+}
+
+.compare-bubble .formStatus.formSuccess .formArrow { background: url(@templates_base@/img/validate/con-success-arrow-bottom.png) no-repeat 0 0; }
+.compare-bubble .formStatus.formError .formArrow { background: url(@templates_base@/img/validate/con-error-arrow-bottom.png) no-repeat 0 0; }
+
+.compare-bubble .formStatus.formNeutral .formContent { background: #990000 url(@templates_base@/img/validate/con-neutral.png) repeat-x 0 0; }
+.compare-bubble .formStatus.formNeutral .formArrow { background: url(@templates_base@/img/validate/con-neutral-arrow-bottom.png) no-repeat 0 0; }
+
 .cart-detail.receipt .items .item-quantity .formStatus { left: 0; }
 
 .cart-detail.receipt dl.total { float: right; padding-right: 30px; }
Index: branches/1.0.x/inc/js/jquery.scripts.js
===================================================================
diff -u -N -r15019 -r15043
--- branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 15019)
+++ branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 15043)
@@ -147,6 +147,42 @@
 	);
 }
 
+function create_tooltip($input, $text, $css_class, $remove_function) {
+	var	$tooltip = $input.next('.formStatus'),
+		$timer = $input.data('timer');
+
+	clearTimeout($timer);
+
+	if ( $tooltip.length == 1 ) {
+		$tooltip.hide().remove();
+	}
+
+	var $tooltip = $('<div class="formStatus ' + $css_class + '" style="display: none;">\
+						<div class="formContent">' + $text + '</div>\
+						<div class="formArrow"></div>\
+					</div>');
+
+	$input.after($tooltip);
+
+	if ($remove_function === undefined) {
+		$remove_function = remove_tooltip;
+	}
+
+	$tooltip.fadeIn(
+		'slow',
+		function () {
+			$timer = setTimeout( function() { $remove_function($input); }, 2000);
+			$input.data('timer', $timer);
+		}
+	);
+}
+
+function remove_tooltip ($input) {
+	var $tooltip = $input.next('.formStatus');
+
+	$tooltip.fadeOut('slow', function() { $tooltip.remove(); });
+}
+
 /* === DBlocks class === */
 function DBlocks() {
 	var $me = this;
Index: branches/1.0.x/img/validate/con-neutral.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/products/compare.tpl
===================================================================
diff -u -N -r15019 -r15043
--- branches/1.0.x/products/compare.tpl	(.../compare.tpl)	(revision 15019)
+++ branches/1.0.x/products/compare.tpl	(.../compare.tpl)	(revision 15043)
@@ -7,7 +7,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
-	<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="any" per_page="3"/>
+	<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="any"/>
 
 	<inp2:m_ifnot check="p_TotalRecords" list_name="compare_products">
 		<inp2:p_ContinueLink redirect="1"/>
Index: branches/1.0.x/elements/content_boxes/products.elm.tpl
===================================================================
diff -u -N -r15026 -r15043
--- branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 15026)
+++ branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 15043)
@@ -29,7 +29,7 @@
 	<script type="text/javascript">
 		$(document).ready(
 			function () {
-				$('.compare-checkbox').click(
+				$('.compare-checkbox', '#products').click(
 					function ($e) {
 						var $me = $(this);
 
Index: branches/1.0.x/img/validate/con-error-arrow-bottom.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/validate/con-neutral-arrow-bottom.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -N -r14922 -r15043
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14922)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 15043)
@@ -5,7 +5,7 @@
 <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="3"/>
+<inp2:p_InitList list_name="compare_products" types="compare" parent_cat_id="any"/>
 
 <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>
@@ -46,6 +46,23 @@
 					return false;
 				}
 			);
+
+			<inp2:m_if check="m_Get" name="result">
+				var $compare_checkbox = $(".compare-checkbox[value='<inp2:m_Get name="p_id"/>']", '#products');
+
+				<inp2:m_if check="m_Get" name="result" equals_to="added">
+					create_tooltip($compare_checkbox, 'Added to Comparison', 'formSuccess');
+				</inp2:m_if>
+
+				<inp2:m_if check="m_Get" name="result" equals_to="removed">
+					create_tooltip($compare_checkbox, 'Removed from Comparison', 'formNeutral');
+				</inp2:m_if>
+
+				<inp2:m_if check="m_Get" name="result" equals_to="error">
+					create_tooltip($compare_checkbox, 'Up to <inp2:m_GetConfig name="MaxCompareProducts"/> products can be compared', 'formError');
+					$compare_checkbox.attr('checked', false);
+				</inp2:m_if>
+			</inp2:m_if>
 		}
 	);
 </script>
\ No newline at end of file
Index: branches/1.0.x/elements/product_elements.elm.tpl
===================================================================
diff -u -N -r15036 -r15043
--- branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 15036)
+++ branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 15043)
@@ -23,7 +23,9 @@
 					<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" class="compare-checkbox" value="<inp2:Field name='ProductId'/>"<inp2:m_if check="InCompare"> checked</inp2:m_if>/><em>Compare</em></label>
+					<label class="compare-bubble">
+						<input type="checkbox" class="left compare-checkbox" value="<inp2:Field name='ProductId'/>"<inp2:m_if check="InCompare"> checked</inp2:m_if>/><em style="display:block" class="left">Compare</em>
+					</label>
 				</span>
 				</div>
 			</div>
Index: branches/1.0.x/inc/js/cart_manager.js
===================================================================
diff -u -N -r15019 -r15043
--- branches/1.0.x/inc/js/cart_manager.js	(.../cart_manager.js)	(revision 15019)
+++ branches/1.0.x/inc/js/cart_manager.js	(.../cart_manager.js)	(revision 15043)
@@ -563,41 +563,27 @@
 
 ShopCartManager.prototype.createTooltip = function ($input, $tooltip_options) {
 	var $me = this,
-		$tooltip = $input.next('.formStatus'),
-		$is_error = $tooltip_options.classes == 'ui-tooltip-red',
-		$timer = $input.data('timer');
+		$is_error = $tooltip_options.classes == 'ui-tooltip-red';
 
-	clearTimeout($timer);
-
-	if ( $tooltip.length == 1 ) {
-		$tooltip.hide().remove();
-	}
-
-	$tooltip = $('<div class="formStatus ' + ($is_error ? 'formError' : 'formSuccess') + '" style="display: none;">\
-					<div class="formContent">' + $tooltip_options.text + '</div>\
-					<div class="formArrow"></div>\
-				</div>');
-
-	$input
-	.after($tooltip)
-	.removeClass('statusSuccess statusError')
-	.addClass($is_error ? 'statusError' : 'statusSuccess');
-
-	$tooltip.fadeIn(
-		'slow',
-		function () {
-			$timer = setTimeout( function() { $me.removeTooltip($input); }, 2000);
-			$input.data('timer', $timer);
+	create_tooltip(
+		$input,
+		$tooltip_options.text,
+		$is_error ? 'formError' : 'formSuccess',
+		function ($input) {
+			$me.removeTooltip($input);
 		}
 	);
 
-	$input.focus( function() { $me.removeTooltip($input); } );
+	$input
+	.removeClass('statusSuccess statusError')
+	.addClass($is_error ? 'statusError' : 'statusSuccess')
+	.focus( function() { $me.removeTooltip($input); } );
 }
 
 ShopCartManager.prototype.removeTooltip = function ($input) {
-	var $tooltip = $input.next('.formStatus');
+	remove_tooltip($input);
+
 	$input.removeClass('statusError').removeClass('statusSuccess');
-	$tooltip.fadeOut('slow', function() { $tooltip.remove(); });
 }
 
 ShopCartManager.prototype.getTooltipOptions = function ($text, $css_classes) {