From 04d2ff59ee6bff6a71c50c8fefcd27e586ab1913 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Wed, 4 Dec 2013 19:31:02 +0100
Subject: [PATCH] // fix product list + facebook block HTML5 version WIP

---
 modules/blockfacebook/blockfacebook.tpl   | 32 +++++++++++++++++------
 themes/default-bootstrap/product-list.tpl |  5 ++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/modules/blockfacebook/blockfacebook.tpl b/modules/blockfacebook/blockfacebook.tpl
index 17cb392ea..e69da60ee 100644
--- a/modules/blockfacebook/blockfacebook.tpl
+++ b/modules/blockfacebook/blockfacebook.tpl
@@ -1,10 +1,26 @@
 {if $facebookurl != ''}
-	<div id="facebook_block" class="col-xs-4">
-		<h4 >{l s='Follow us on facebook' mod='blockfacebook'}</h4>
-            <div class="facebook-fanbox">
-           		 <iframe src="//www.facebook.com/plugins/likebox.php?href=https%3A%2F%2Fwww.facebook.com%2F{$facebookurl|escape:'html':'UTF-8'}&amp;width=235&amp;height=290&amp;colorscheme=light&amp;show_faces=true&amp;header=false&amp;stream=false&amp;show_border=false" scrolling="no" frameborder="0" style="border:none;  width:100%; height:200px;" allowTransparency="true"></iframe>
-            </div>
+<div id="fb-root"></div>
+<script>
+	(function(d, s, id) {
+		var js, fjs = d.getElementsByTagName(s)[0];
+		if (d.getElementById(id)) return;
+		js = d.createElement(s); js.id = id;
+		js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=334341610034299";
+		fjs.parentNode.insertBefore(js, fjs);
+	}(document, 'script', 'facebook-jssdk'));
+</script>
+<div id="facebook_block" class="col-xs-4">
+	<h4 >{l s='Follow us on facebook' mod='blockfacebook'}</h4>
+	<div class="facebook-fanbox">
+		<div
+			class="fb-like-box"
+			data-href="http://www.facebook.com/{$facebookurl|escape:'html':'UTF-8'}"
+			data-colorscheme="light"
+			data-show-faces="true"
+			data-header="false"
+			data-stream="false"
+			data-show-border="false">
+		</div>
 	</div>
-{/if}
-
-
+</div>
+{/if}
\ No newline at end of file
diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl
index e248b68bb..fa1a114aa 100644
--- a/themes/default-bootstrap/product-list.tpl
+++ b/themes/default-bootstrap/product-list.tpl
@@ -151,14 +151,13 @@
 										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;token={$static_token}", false)|escape:'html'}"
 										rel="nofollow"
 										title="{l s='Add to cart'}"
-										data-id-product="{$product.id_product|intval}"
-										token={$static_token}", false)|escape:'html'}">
+										data-id-product="{$product.id_product|intval}">
 										<span>{l s='Add to cart'}</span>
 									</a>
 								{else}
 									<a
 										class="button ajax_add_to_cart_button btn btn-default"
-										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}", false)|escape:'html'}"
+										href="{$link->getPageLink('cart',false, NULL, 'add=1&amp;id_product={$product.id_product|intval}', false)|escape:'html'}"
 										rel="nofollow"
 										title="{l s='Add to cart'}"
 										data-id-product="{$product.id_product|intval}">