Merge branch 'mobile'

themes/site_mobile/css/style.css

@@ -980,16 +980,23 @@ div#page #header .content .top {
 	   -moz-box-shadow: 0 5px 3px -3px #ccc;
 	        box-shadow: 0 5px 3px -3px #ccc;*/
 }
+body.logged div#page #header .content {
 
-body div#page #header .content .top .logo_block {
-	max-width:100%;
-	height:55px;
-	line-height:55px;
-	display:inline-block;
-	overflow:hidden;
-	float:left;
-	margin-left: 70px;
 }
+div#page #header .content {
+	text-align: center;
+}
+body div#page #header .content .top .logo_block {
+	max-width: 100%;
+	height: 55px;
+	line-height: 55px;
+	display: inline-block;
+	overflow: hidden;
+}
+/*body.logged div#page #header .content .top .logo_block {
+	margin-left: 70px;
+	float: left;
+}*/
 
 body div#page #header .content .top .logo_block a {
 	display:inline-block;
@@ -1150,11 +1157,15 @@ div#page #header .content .top #cart_block{
 	display:inline-block;
 	float:right;
 	border-bottom: 2px solid #413e6b;
-	width:23%;
 	height:60px;
 	max-height:60px;
+	padding-right: 15px;
+	position: absolute;
+	right: 15px;
+	z-index: 100;
+	top: 0px;
 }
-div#page #header .content .top #cart_block a{
+div#page #header .content .top #cart_block a {
 	display: inline;
 }
 
@@ -1396,6 +1407,8 @@ body#index #columns #privatesales_block .delivery_delay{
 	top: 5px;
 	right:5px;
 	text-align: right;
+	max-width: 42px;
+	height: auto;
 }
 	body#index #columns #privatesales_block .delivery_delay img{
 		width: 100%;
@@ -3851,15 +3864,17 @@ h2.title{
 body#product #img_wrap{
 	background:#fff;
 	padding: 5px;
-
+	text-align: center;
 	-webkit-box-shadow: 0 5px 3px -3px #ccc;
 	   -moz-box-shadow: 0 5px 3px -3px #ccc;
 	        box-shadow: 0 5px 3px -3px #ccc;
 }
-body#product #img_wrap #image-block{
+body#product #img_wrap #image-block {
 	display:inline-block;
 	width:78%;
 	border: 1px solid #e6e6e6;
+	max-width: 78%;
+	margin: auto;
 }
 body#product #img_wrap #image-block.full{
 	display:inline-block;

themes/site_mobile/js/global.js

@@ -13,4 +13,14 @@ $(document).ready(function() {
 		e.preventDefault();
 		$(this).parent().parent().removeClass('open');
 	});
-});
+
+	$('#privatesales_block ul .extra_info .small_title').each(function() {
+		if(window.matchMedia("(max-width:1199px)").matches) {
+			var nameProduct = $(this).text();
+			if(nameProduct.length > 20) {
+				nameProduct = nameProduct.substring(0,22)+"...";
+				$(this).text(nameProduct);
+			}
+		}
+	});
+});

themes/site_mobile/js/product.js

@@ -465,9 +465,15 @@ $(document).ready(function()
 
 	//add a link on the span 'view full size' and on the big image
 	$('span#view_full_size, div#image-block img').click(function(){
-		$('#views_block li a.shown').click();
+		$('#views_block li a.shown').click().fancybox({
+			'hideOnContentClick': true,
+			'transitionIn'	: 'elastic',
+			'transitionOut'	: 'elastic',
+			'onComplete' : function(){$('#views_block li a.shown').unbind('click.fb');}
+		});
 	});
 
+
 	//catch the click on the "more infos" button at the top of the page
 	$('div#short_description_block p a.button').click(function(){
 		$('#more_info_tab_more_info').click();
@@ -494,13 +500,11 @@ $(document).ready(function()
 		});
 	}
 
-	if($('.thickbox').length > 0) {
-		$('.thickbox').fancybox({
-			'hideOnContentClick': true,
-			'transitionIn'	: 'elastic',
-			'transitionOut'	: 'elastic'
-		});
-	}
+
+
+	$('#product #thumbs_list_frame a').click(function(e) {
+		return false;
+	});
 
 	$('.tailles').click(function(e) {
 		$('.box_info_size').css({

themes/site_mobile/product.tpl

@@ -99,13 +99,14 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
 {/if}
 
 <div class="product_title">
-<h1 class="title sale_title">
-	{if isset($smarty.server.HTTP_REFERER) && preg_replace('#^https?://[^/]+/#', '/', $smarty.server.HTTP_REFERER) != $request_uri}
-		<span class="gradient">
-			<a href="{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}" class="button_small back" title="{l s='Back'}">{l s='Back'}</a>
-		</span>
-	{/if}
-	<span>{$product->name|escape:'htmlall':'UTF-8'|truncate:24}</span></h1>
+	<h1 class="title sale_title">
+		{if isset($smarty.server.HTTP_REFERER) && preg_replace('#^https?://[^/]+/#', '/', $smarty.server.HTTP_REFERER) != $request_uri}
+			<span class="gradient">
+				<a href="{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}" class="button_small back" title="{l s='Back'}">{l s='Back'}</a>
+			</span>
+		{/if}
+		<span>{$product->name|escape:'htmlall':'UTF-8'|truncate:28:'...':true:false}</span>
+	</h1>
 </div>
 
 
@@ -165,7 +166,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
 				</div>
 			{/if}
 		</div>
-		{if isset($images) && count($images) > 1}<p class="align_center clear"><span id="wrapResetImages" style="display: none;"><img src="{$img_dir}icon/cancel.png" alt="{l s='Cancel'}" /> <a id="resetImages" href="{$link->getProductLink($product)}" onclick="$('span#wrapResetImages').hide('slow');return (false);">{l s='Display all pictures'}</a></span></p>{/if}
+		{*{if isset($images) && count($images) > 1}<p class="align_center clear"><span id="wrapResetImages" style="display: none;"><img src="{$img_dir}icon/cancel.png" alt="{l s='Cancel'}" /> <a id="resetImages" href="{$link->getProductLink($product)}" onclick="$('span#wrapResetImages').hide('slow');return (false);">{l s='Display all pictures'}</a></span></p>{/if}*}
 		<!-- usefull links-->
 		{*<ul id="usefull_link_block">
 			{if $HOOK_EXTRA_LEFT}{$HOOK_EXTRA_LEFT}{/if}