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

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Browse Source
This commit is contained in:
Jerome Nadaud
2013-12-09 17:26:05 +01:00
parent ed92603472 dc7bf76b24
commit cf77deeba2
5 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/layout.tpl
+7 -17
View File
@@ -70,24 +70,14 @@
<div class="alert alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($warnings) > 1}
{l s='There are %d warnings.' sprintf=count($warnings)}
<span id="labelSeeMore">
<a id="linkSeeMore" href="#" class="btn btn-default"><i class="icon-plus-sign-alt"></i> {l s='Click here to see more'}</a>
<a id="linkHide" href="#" class="btn btn-default" style="display:none"><i class="icon-minus-sign-alt"></i> {l s='Hide warning'}</a>
</span>
<ul {if count($warnings) > 1}style="display:none;"{/if} id="seeMore" class="list-unstyled">
{foreach $warnings as $warning}
<li>{$warning}</li>
{/foreach}
</ul>
{else}
<ul class="list-unstyled">
{foreach $warnings as $warning}
<li>{$warning}</li>
{/foreach}
</ul>
<strong>{l s='There are %d warnings:' sprintf=count($warnings)}</strong>
{/if}
<ul class="list-unstyled">
{foreach $warnings as $warning}
<li>{$warning}</li>
{/foreach}
</ul>
</div>
{/if}
{$page}
{$footer}
{$footer}
themes/default-bootstrap/js/product.js
+3 -3
View File
@@ -730,7 +730,7 @@ function checkUrl()
$('#color_' + attributesCombinations[a]['id_attribute']).addClass('selected');
$('#color_' + attributesCombinations[a]['id_attribute']).parent().addClass('selected');
$('input:radio[value=' + attributesCombinations[a]['id_attribute'] + ']').attr('checked', true);
$('input:hidden[name=group_' + attributesCombinations[a]['id_attribute_group'] + ']').val(attributesCombinations[a]['id_attribute']);
$('input[type=hidden][name=group_' + attributesCombinations[a]['id_attribute_group'] + ']').val(attributesCombinations[a]['id_attribute']);
$('select[name=group_' + attributesCombinations[a]['id_attribute_group'] + ']').val(attributesCombinations[a]['id_attribute']);
}
// find combination
@@ -750,7 +750,7 @@ $(document).ready(function(){
// The button to increment the product value
$('.product_quantity_up').click(function(e){
e.preventDefault();
fieldName = $(this).attr('rel');
fieldName = $(this).data('field-qty');
var currentVal = parseInt($('input[name='+fieldName+']').val());
if (quantityAvailable > 0) {
quantityAvailableT = quantityAvailable;
@@ -767,7 +767,7 @@ $(document).ready(function(){
// The button to decrement the product value
$(".product_quantity_down").click(function(e) {
e.preventDefault();
fieldName = $(this).attr('rel');
fieldName = $(this).data('field-qty');
var currentVal = parseInt($('input[name='+fieldName+']').val());
if (!isNaN(currentVal) && currentVal > 1) {
$('input[name='+fieldName+']').val(currentVal - 1).trigger('keyup');
themes/default-bootstrap/modules/blocknewproducts/tab.tpl
+1 -1
View File
@@ -22,4 +22,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<li class="active"><a data-toggle="tab" href="{$link->getPageLink('new-products')|escape:'html'} class="blocknewproducts">{l s='New arrivals' mod='blocknewproducts'}</a></li>
<li class="active"><a data-toggle="tab" href="{$link->getPageLink('new-products')|escape:'html'}" class="blocknewproducts">{l s='New arrivals' mod='blocknewproducts'}</a></li>
themes/default-bootstrap/product-list.tpl
+2 -2
View File
@@ -206,14 +206,14 @@
{/if}
{/if}
</div>
<div class="functional-buttons clearfix">
<!-- <div class="functional-buttons clearfix">
{hook h='displayProductListFunctionalButtons' product=$product}
{if isset($comparator_max_item) && $comparator_max_item}
<div class="compare">
<a class="addToCompare" href="#" data-id-product="{$product.id_product}" onClick="addToCompare('{$product.id_product|intval}'); return false;">{l s='Add to Compare'}</a>
</div>
{/if}
</div>
</div> -->
</div><!-- .product-container> -->
</li>
{/foreach}
themes/default-bootstrap/product.tpl
+14 -14
View File
@@ -265,7 +265,7 @@
rel="{literal}{{/literal}gallery: 'gal1', smallimage: '{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html'}',largeimage: '{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}'{literal}}{/literal}"
{else}
href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}"
rel="other-views"
data-fancybox-group="other-views"
class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}"
{/if}
title="{$imageTitlte}">
@@ -482,10 +482,10 @@
value="{if isset($quantityBackup)}{$quantityBackup|intval}{else}{if $product->minimal_quantity > 1}{$product->minimal_quantity}{else}1{/if}{/if}"
maxlength="3"
{if $product->minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} />
<a href="#" rel="qty" class="btn btn-default button-minus product_quantity_down">
<a href="#" data-field-qty="qty" class="btn btn-default button-minus product_quantity_down">
<span><i class="icon-minus"></i></span>
</a>
<a href="#" rel="qty" class="btn btn-default button-plus product_quantity_up ">
<a href="#" data-field-qty="qty" class="btn btn-default button-plus product_quantity_up ">
<span><i class="icon-plus"></i></span>
</a>
<span class="clearfix"></span>
@@ -507,7 +507,7 @@
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<fieldset class="attribute_fieldset">
<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'html':'UTF-8'} :&nbsp;</label>
<label class="attribute_label" {if $group.group_type != 'color' and $group.group_type != 'radio'}for="group_{$id_attribute_group|intval}"{/if}>{$group.name|escape:'html':'UTF-8'} :&nbsp;</label>
{assign var="groupName" value="group_$id_attribute_group"}
<div class="attribute_list">
{if ($group.group_type == 'select')}
@@ -520,16 +520,16 @@
<ul id="color_to_pick_list" class="clearfix">
{assign var="default_colorpicker" value=""}
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<li{if $group.default == $id_attribute} class="selected"{/if}>
<a id="color_{$id_attribute|intval}" class="color_pick{if ($group.default == $id_attribute)} selected{/if}" style="background: {$colors.$id_attribute.value};" title="{$colors.$id_attribute.name}" onclick="colorPickerClick(this);getProductAttribute();">
{if file_exists($col_img_dir|cat:$id_attribute|cat:'.jpg')}
<img src="{$img_col_dir}{$id_attribute}.jpg" alt="{$colors.$id_attribute.name}" width="20" height="20" /><br />
{/if}
</a>
</li>
{if ($group.default == $id_attribute)}
{$default_colorpicker = $id_attribute}
{/if}
<li{if $group.default == $id_attribute} class="selected"{/if}>
<a id="color_{$id_attribute|intval}" class="color_pick{if ($group.default == $id_attribute)} selected{/if}" style="background: {$colors.$id_attribute.value};" title="{$colors.$id_attribute.name}" onclick="colorPickerClick(this);getProductAttribute();">
{if file_exists($col_img_dir|cat:$id_attribute|cat:'.jpg')}
<img src="{$img_col_dir}{$id_attribute}.jpg" alt="{$colors.$id_attribute.name}" width="20" height="20" />
{/if}
</a>
</li>
{if ($group.default == $id_attribute)}
{$default_colorpicker = $id_attribute}
{/if}
{/foreach}
</ul>
<input type="hidden" class="color_pick_hidden" name="{$groupName}" value="{$default_colorpicker}" />