dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// maj

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11196 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
sThiebaut
2011-12-14 09:17:50 +00:00
parent e3d0661240
commit 668f117382
5 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/crossselling/crossselling.css
+12 -11
View File
@@ -15,7 +15,19 @@
#crossselling li a img {border:1px solid #ccc} #crossselling li a img {border:1px solid #ccc}
#crossselling li p.product_name {text-align:center} #crossselling li p.product_name {text-align:center}
#crossselling_list {overflow: hidden;}
#crossselling_scroll_left,
#crossselling_scroll_right {
background: url('../../../img/thumbs_left.gif') no-repeat center;
text-indent: -3000px;
display: block;
width: 9px;
height: 18px;
float: left;
margin-top: 30px
}
#crossselling_scroll_right { background-image: url('../../../img/thumbs_right.gif') }
/* /*
div#crossselling { div#crossselling {
padding-top: 10px; padding-top: 10px;
@@ -50,15 +62,4 @@ div#crossselling {
overflow: hidden overflow: hidden
} }
#crossselling_list li a { margin: auto } #crossselling_list li a { margin: auto }
#crossselling_scroll_left,
#crossselling_scroll_right {
background: url('../../../img/thumbs_left.gif') no-repeat center;
text-indent: -3000px;
display: block;
width: 9px;
height: 18px;
float: left;
margin-top: 30px
}
#crossselling_scroll_right { background-image: url('../../../img/thumbs_right.gif') }
*/ */
modules/favoriteproducts/my-account.tpl
+1 -1
View File
@@ -24,4 +24,4 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<li class="favoriteproducts"><a href="{$base_dir_ssl}modules/favoriteproducts/favoriteproducts-account.php" title="{l s='My favorite products' mod='favoriteproducts'}">{l s='My favorite products' mod='favoriteproducts'}</a></li> <li class="favoriteproducts"><a href="{$base_dir_ssl}modules/favoriteproducts/favoriteproducts-account.php" title="{l s='My favorite products' mod='favoriteproducts'}"><img src="{$module_template_dir}img/favorites.png" class="icon" /> {l s='My favorite products' mod='favoriteproducts'}</a></li>
modules/productcomments/productcomments-extra.tpl
+29 -23
View File
@@ -23,22 +23,28 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{literal}
<script type="text/javascript"> <script type="text/javascript">
$(function(){literal}{{/literal} $('input[@type=radio].star').rating(); {literal}}{/literal}); /*$(function(){ $('input[@type=radio].star').rating(); });
$(function(){literal}{{/literal} $(function(){
$('.auto-submit-star').rating({literal}{{/literal} $('.auto-submit-star').rating({
callback: function(value, link){literal}{{/literal} callback: function(value, link){
{literal}}{/literal} }
{literal}}{/literal}); });
{literal}}{/literal}); });*/
$(function(){
$('input[@type=radio].star').rating();
$('.auto-submit-star').rating(callback: function(value, link));
});
//close comment form //close comment form
function closeCommentForm(){ldelim} function closeCommentForm(){
$('#sendComment').slideUp('fast'); $('#sendComment').slideUp('fast');
$('input#addCommentButton').fadeIn('slow'); $('input#addCommentButton').fadeIn('slow');
{rdelim} }
$('document').ready(function(){literal}{{/literal} $('document').ready(function(){
var limitInputText = { var limitInputText = {
'maxCharacterSize': 200, 'maxCharacterSize': 200,
@@ -50,20 +56,20 @@
$('#commentContent').textareaCount(limitInputText); $('#commentContent').textareaCount(limitInputText);
$('#new_comment_btn').fancybox({literal}{{/literal} $('#new_comment_btn').fancybox({
'hideOnContentClick': false, 'hideOnContentClick': false,
'onClosed': function(){literal}{{/literal} 'onClosed': function(){
{literal}}{/literal}, },
{literal}}{/literal}); });
$('a[href=#idTab5]').click(function(){literal}{{/literal} $('a[href=#idTab5]').click(function(){
$('*[id^="idTab"]').addClass('block_hidden_only_for_screen'); $('*[id^="idTab"]').addClass('block_hidden_only_for_screen');
$('div#idTab5').removeClass('block_hidden_only_for_screen'); $('div#idTab5').removeClass('block_hidden_only_for_screen');
$('ul#more_info_tabs a[href^="#idTab"]').removeClass('selected'); $('ul#more_info_tabs a[href^="#idTab"]').removeClass('selected');
$('a[href="#idTab5"]').addClass('selected'); $('a[href="#idTab5"]').addClass('selected');
{literal}}{/literal}); });
{literal}
$('#submitMessage').click(function(){ $('#submitMessage').click(function(){
var datas = []; var datas = [];
$('#fancybox-content').find('input, textarea, select').each(function(index){ $('#fancybox-content').find('input, textarea, select').each(function(index){
@@ -73,7 +79,7 @@
datas.push(o); datas.push(o);
}); });
$.ajax({ $.ajax({
{/literal}url: "{$module_dir}productcomments-ajax.php",{literal} url: "{/literal}{$module_dir}{literal}productcomments-ajax.php",
post: "POST", post: "POST",
data: {action: 'sendComment', secure_key: '{/literal}{$secure_key}{literal}', review: JSON.stringify(datas)}, data: {action: 'sendComment', secure_key: '{/literal}{$secure_key}{literal}', review: JSON.stringify(datas)},
dataType: "json", dataType: "json",
@@ -92,7 +98,7 @@
datas.push(o); datas.push(o);
}); });
$.ajax({ $.ajax({
{/literal}url: "{$module_dir}productcomments-ajax.php",{literal} url: "{/literal}{$module_dir}{literal}productcomments-ajax.php",
post: "POST", post: "POST",
data: {action: 'sendComment', secure_key: '{/literal}{$secure_key}{literal}', review: JSON.stringify(datas)}, data: {action: 'sendComment', secure_key: '{/literal}{$secure_key}{literal}', review: JSON.stringify(datas)},
dataType: "json", dataType: "json",
@@ -101,9 +107,9 @@
} }
}); });
}); });
{/literal} });
{literal}}{/literal});
</script> </script>
{/literal}
<div id="product_comments_block_extra"> <div id="product_comments_block_extra">
{if $nbComments != 0} {if $nbComments != 0}
@@ -125,9 +131,9 @@
{if $nbComments != 0} {if $nbComments != 0}
<a href="#idTab5">{l s='Read user reviews' mod='productcomments'} ({$nbComments})</a><br/> <a href="#idTab5">{l s='Read user reviews' mod='productcomments'} ({$nbComments})</a><br/>
{/if} {/if}
{if ($too_early == false AND ($logged OR $allow_guests))} {if ($too_early == false AND ($logged OR $allow_guests))}
<a id="new_comment_btn" href="#new_comment_form">{l s='Write your review' mod='productcomments'}</a> <a id="new_comment_btn" href="#new_comment_form">{l s='Write your review' mod='productcomments'}</a>
{/if} {/if}
</div> </div>
<div style="display: none;"> <div style="display: none;">
<div id="new_comment_form"> <div id="new_comment_form">
modules/productscategory/productscategory.css
+6 -4
View File
@@ -6,14 +6,16 @@ h2.productscategory_h2 {
color:#333 color:#333
} }
#productscategory_list ul {list-style-type:none} #productscategory {overflow:auto}
#productscategory_list ul {
list-style-type:none;
margin: 0 0 0 14px;
}
#productscategory_list li { #productscategory_list li {
float:left; float:left;
margin-right:25px margin-right:30px
} }
#productscategory_list li a.lnk_img {display:block} #productscategory_list li a.lnk_img {display:block}
#productscategory_list li a img {border:1px solid #ccc} #productscategory_list li a img {border:1px solid #ccc}
#productscategory_list li p.product_name {text-align:center} #productscategory_list li p.product_name {text-align:center}
modules/productscategory/productscategory.tpl
+2 -2
View File
@@ -28,7 +28,7 @@
<div class="clearfix blockproductscategory"> <div class="clearfix blockproductscategory">
<h2 class="productscategory_h2">{$categoryProducts|@count} {l s='other products in the same category:' mod='productscategory'}</h2> <h2 class="productscategory_h2">{$categoryProducts|@count} {l s='other products in the same category:' mod='productscategory'}</h2>
<div id="{if count($categoryProducts) > 5}productscategory{else}productscategory_noscroll{/if}"> <div id="{if count($categoryProducts) > 5}productscategory{else}productscategory_noscroll{/if}">
{if count($categoryProducts) > 5}<a id="productscategory_scroll_left" title="{l s='Previous' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Previous' mod='productscategory'}</a>{/if} <!--{if count($categoryProducts) > 5}<a id="productscategory_scroll_left" title="{l s='Previous' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Previous' mod='productscategory'}</a>{/if}-->
<div id="productscategory_list"> <div id="productscategory_list">
<ul {if count($categoryProducts) > 5}style="width: {math equation="width * nbImages" width=107 nbImages=$categoryProducts|@count}px"{/if}> <ul {if count($categoryProducts) > 5}style="width: {math equation="width * nbImages" width=107 nbImages=$categoryProducts|@count}px"{/if}>
{foreach from=$categoryProducts item='categoryProduct' name=categoryProduct}<!--{if count($categoryProducts) < 6}style="width: {math equation="width / nbImages" width=94 nbImages=$categoryProducts|@count}%"{/if}--> {foreach from=$categoryProducts item='categoryProduct' name=categoryProduct}<!--{if count($categoryProducts) < 6}style="width: {math equation="width / nbImages" width=94 nbImages=$categoryProducts|@count}%"{/if}-->
@@ -48,7 +48,7 @@
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
{if count($categoryProducts) > 5}<a id="productscategory_scroll_right" title="{l s='Next' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Next' mod='productscategory'}</a>{/if} <!--{if count($categoryProducts) > 5}<a id="productscategory_scroll_right" title="{l s='Next' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Next' mod='productscategory'}</a>{/if}-->
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('#productscategory_list').trigger('goto', [{$middlePosition}-3]); $('#productscategory_list').trigger('goto', [{$middlePosition}-3]);