// Merge -> revision 7979

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd

themes/prestashop/css/global.css

@@ -1222,7 +1222,6 @@ span.view_scroll_spacer {
 	border: solid 1px #d0d3d8;
 	padding: 0.6em;
 	margin-bottom: 1.5em;
-	height: 84px;
 }
 #suppliers_list li a, #manufacturers_list li a {
 	text-decoration: none;

themes/prestashop/manufacturer-list.tpl

@@ -46,7 +46,7 @@
 	{if $nbManufacturers > 0}
 		<ul id="manufacturers_list">
 		{foreach from=$manufacturers item=manufacturer name=manufacturers}
-			<li class="{if $smarty.foreach.manufacturers.first}first_item{elseif $smarty.foreach.manufacturers.last}last_item{else}item{/if}"> 
+			<li class="clearfix {if $smarty.foreach.manufacturers.first}first_item{elseif $smarty.foreach.manufacturers.last}last_item{else}item{/if}"> 
 				<div class="left_side">
 					<!-- logo -->
 					<div class="logo">

themes/prestashop/product.tpl

@@ -351,9 +351,11 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 			</p>
      		{/if}
 			<!-- Out of stock hook -->
+			{if !$allow_oosp}
 			<p id="oosHook"{if $product->quantity > 0} style="display: none;"{/if}>
 				{$HOOK_PRODUCT_OOS}
 			</p>
+			{/if}
 
 			<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>