From 036fa7cba630f7e12ff40315b329a4788a64f74c Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 31 Oct 2013 10:18:28 +0100
Subject: [PATCH] [-] FO : Fix bug #PSCFV-10889 wrong color when oos product

---
 themes/default/css/product_list.css | 259 ++++++++++++++--------------
 themes/default/product-list.tpl     |   2 +-
 2 files changed, 130 insertions(+), 131 deletions(-)

diff --git a/themes/default/css/product_list.css b/themes/default/css/product_list.css
index d1d52bce1..e5fb9dec3 100644
--- a/themes/default/css/product_list.css
+++ b/themes/default/css/product_list.css
@@ -1,149 +1,148 @@
 ul#product_list {
 	list-style-type: none
 }
-	#product_list li {
-		margin-bottom: 14px;
-		padding: 12px 8px;
-		border: 1px solid #eee;
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-		border-radius: 3px
-	}
-		#product_list li a {
-			color: #374853;
-			text-decoration: none
-		}
-
+#product_list li {
+	margin-bottom: 14px;
+	padding: 12px 8px;
+	border: 1px solid #eee;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px
+}
+#product_list li a {
+	color: #374853;
+	text-decoration: none
+}
 #product_list li .left_block {
 	float:left;
 	padding-top:58px;
 	width:15px
 }
-	#product_list li .left_block  .compare label {display:none;}
-
-		#product_list li p.compare input {
-			vertical-align: text-bottom
-		}
+#product_list li .left_block  .compare label {display:none;}
 
+#product_list li p.compare input {
+	vertical-align: text-bottom
+}
 #product_list li .center_block {
    float: left;
 	padding:0 7px;
    width: 342px;/* 356 */
 	border-right:1px dotted #ccc
 }
-	#product_list a.product_img_link {
-		overflow:hidden;
-		position:relative;
-		float: left;
-		display:block;
-		margin-right: 14px;
-		border: 1px solid #ccc
-	}
-		#product_list a.product_img_link img {
-			display: block;
-			vertical-align: bottom
-		}
-		#product_list li span.new {
-			display: block;
-			position: absolute;
-			top: 15px;
-			right:-30px;
-			padding: 1px 4px;
-			width: 101px;
-			font-size:10px;
-			color: #fff;
-			text-align: center;
-			text-transform: uppercase;
-			-moz-transform: rotate(45deg);
-			-webkit-transform: rotate(45deg);
-			-o-transform:rotate(45deg);
-			background-color: #990000;
-			transform: rotate(45deg); 
-			-ms-transform: rotate(45deg);			/* Newer browsers */
-		}
-		
-		.ie8 #product_list li span.new{top:111px;right:0;width:94%}
-		.ie7 #product_list li span.new {top:111px;right:0;width:94%}
-	#product_list li h3 {
-		padding:0 0 10px 0;
-		font-size:13px;
-		color:#000
-	}
-		#product_list li a {
-			color: #000;
-			text-decoration: none;
-		}
+#product_list a.product_img_link {
+	overflow:hidden;
+	position:relative;
+	float: left;
+	display:block;
+	margin-right: 14px;
+	border: 1px solid #ccc
+}
+#product_list a.product_img_link img {
+	display: block;
+	vertical-align: bottom
+}
+#product_list li span.new {
+	display: block;
+	position: absolute;
+	top: 15px;
+	right:-30px;
+	padding: 1px 4px;
+	width: 101px;
+	font-size:10px;
+	color: #fff;
+	text-align: center;
+	text-transform: uppercase;
+	-moz-transform: rotate(45deg);
+	-webkit-transform: rotate(45deg);
+	-o-transform:rotate(45deg);
+	background-color: #990000;
+	transform: rotate(45deg); 
+	-ms-transform: rotate(45deg);			/* Newer browsers */
+}
 
-	#product_list li p.product_desc {
-		overflow: hidden;
-		padding:0;
-		line-height:16px;
-	}
-	#product_list li p.product_desc,
-	#product_list li p.product_desc a {
-		color:#666;
-	}
+.ie8 #product_list li span.new{top:111px;right:0;width:94%}
+.ie7 #product_list li span.new {top:111px;right:0;width:94%}
+#product_list li h3 {
+	padding:0 0 10px 0;
+	font-size:13px;
+	color:#000
+}
+#product_list li a {
+	color: #000;
+	text-decoration: none;
+}
+#product_list li p.product_desc {
+	overflow: hidden;
+	padding:0;
+	line-height:16px;
+}
+#product_list li p.product_desc,
+#product_list li p.product_desc a {
+	color:#666;
+}
 
 #product_list li .right_block {
-	position:relative;
-   float: left;
-   width: 145px;
-   text-align: right
+position:relative;
+float: left;
+width: 145px;
+text-align: right
 }
-	#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
-		display: block;
-		font-weight: bold;
-		color: #990000;
-		text-transform: uppercase
-	}
-	#product_list li .discount {
-		position:absolute;
-		top:0;
-		right:0;
-		display: inline-block;
-		font-weight: bold;
-		padding: 1px 5px;
-		font-size: 10px;
-		color: #fff;
-		text-transform: uppercase;
-		background: none repeat scroll 0 0 #9B0000
-	}
-	#product_list li .online_only {
-		margin:0 0 10px 0
-	}
-	#product_list li .content_price {
-		margin:26px 0 15px 0;
-	}
-	#product_list li .price {
-		display: block;
-		margin-bottom: 15px;
-		font-weight:bold;
-		font-size: 18px;
-		color:#990000
-	}
-	#product_list li span.availability {
-			color: #488C40
-	}
-	#product_list li .ajax_add_to_cart_button {
-		padding-left: 20px
-	}
-	#product_list li .ajax_add_to_cart_button span {
-		display: block;
-		position: absolute;
-		top: -1px;
-		left: -12px;
-		height: 26px;
-		width: 26px;
-		background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
-	}
-	#product_list li .lnk_view {
-		display: block;
-		margin-top:15px;
-		padding:0 10px;
-		border:none;
-		font-weight:bold;
-		color:#0088CC;
-		background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
-	}
-	#product_list li .lnk_view:hover {text-decoration:underline}
-	
+#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
+	display: block;
+	font-weight: bold;
+	color: #990000;
+	text-transform: uppercase
+}
+#product_list li .discount {
+	position:absolute;
+	top:0;
+	right:0;
+	display: inline-block;
+	font-weight: bold;
+	padding: 1px 5px;
+	font-size: 10px;
+	color: #fff;
+	text-transform: uppercase;
+	background: none repeat scroll 0 0 #9B0000
+}
+#product_list li .online_only {
+	margin:0 0 10px 0
+}
+#product_list li .content_price {
+	margin:26px 0 15px 0;
+}
+#product_list li .price {
+	display: block;
+	margin-bottom: 15px;
+	font-weight:bold;
+	font-size: 18px;
+	color:#990000
+}
+#product_list li span.availability {
+	color: #488C40
+}
+#product_list li span.warning_inline {
+	color: red
+}
+#product_list li .ajax_add_to_cart_button {
+	padding-left: 20px
+}
+#product_list li .ajax_add_to_cart_button span {
+	display: block;
+	position: absolute;
+	top: -1px;
+	left: -12px;
+	height: 26px;
+	width: 26px;
+	background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
+}
+#product_list li .lnk_view {
+	display: block;
+	margin-top:15px;
+	padding:0 10px;
+	border:none;
+	font-weight:bold;
+	color:#0088CC;
+	background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
+}
+#product_list li .lnk_view:hover {text-decoration:underline}
\ No newline at end of file
diff --git a/themes/default/product-list.tpl b/themes/default/product-list.tpl
index 1d5a38a59..d117398e7 100644
--- a/themes/default/product-list.tpl
+++ b/themes/default/product-list.tpl
@@ -50,7 +50,7 @@
 				{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
 				<div class="content_price">
 					{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if}
-					{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>{/if}
+					{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}<span class="warning_inline">{l s='Out of stock'}</span>{/if}</span>{/if}
 				</div>
 				{if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only'}</span>{/if}
 				{/if}