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

replace new css files location to modules/themeconfigurator/css

Browse Source
This commit is contained in:
Alexander Grosul
2013-11-18 20:07:24 +02:00
parent 36baadad1a
commit b6c5cd7c63
18 changed files with 1619 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/css/product_list.css
+14 -13
View File
@@ -192,7 +192,7 @@ ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:
content: "";
margin-right: 3px;
}
ul.product_list.grid > li .product-container .functional-buttons div.wishlist a.ckecked:before {
ul.product_list.grid > li .product-container .functional-buttons div.wishlist a.checked:before {
content: "";
}
@media (min-width: 992px) and (max-width: 1199px) {
@@ -211,28 +211,29 @@ ul.product_list.grid > li .product-container .functional-buttons div.wishlist a.
display: none;
}
}
ul.product_list.grid > li .product-container .functional-buttons div.compare label:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare a:before {
content: "";
display: inline-block;
font-family: "FontAwesome";
margin-right: 3px;
}
@media (min-width: 992px) and (max-width: 1199px) {
ul.product_list.grid > li .product-container .functional-buttons div.compare label:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare a:before {
display: none;
}
}
@media (min-width: 480px) and (max-width: 767px) {
ul.product_list.grid > li .product-container .functional-buttons div.compare label:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare a:before {
display: none;
}
}
ul.product_list.grid > li .product-container .functional-buttons div.compare label.checked:before {
ul.product_list.grid > li .product-container .functional-buttons div.compare a.checked:before {
content: "";
}
@media (min-width: 1200px) {
ul.product_list.grid > li.hovered {
margin-bottom: -300px;
padding-bottom: 250px;
padding-bottom: 226px;
}
ul.product_list.grid > li.hovered .product-container {
-webkit-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
@@ -415,7 +416,7 @@ ul.product_list.list > li .right-block .right-block-content .button-container .b
display: none !important;
}
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons a, ul.product_list.list > li .right-block .right-block-content .functional-buttons label {
ul.product_list.list > li .right-block .right-block-content .functional-buttons a {
font-weight: bold;
color: #777676;
cursor: pointer;
@@ -446,13 +447,13 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:hover:before {
background: #333333;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a.ckecked:before {
ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a.checked:before {
content: "";
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare {
padding-top: 10px;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:before {
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a:before {
content: "";
display: inline-block;
font-family: "FontAwesome";
@@ -470,13 +471,13 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
padding: 6px 0 0 0;
color: white;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:hover {
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a:hover {
color: #333333;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label:hover:before {
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a:hover:before {
background: #333333;
}
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare label.checked:before {
ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a.checked:before {
background: white;
border: 1px solid #929292;
color: #929292;
@@ -522,7 +523,7 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
}
#index ul.product_list.tab-pane > li.last-line.hovered {
margin-bottom: -300px;
padding-bottom: 230px;
padding-bottom: 235px;
}
}
@media (min-width: 480px) and (max-width: 767px) {
themes/default-bootstrap/img/footer-bg1.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

themes/default-bootstrap/index.tpl
+5
View File
@@ -29,6 +29,11 @@
<ul id="home-page-tabs" class="nav nav-tabs">{/if}{$HOOK_HOME_TAB}{if isset($HOOK_HOME_TAB)}</ul>
{/if}
<script type="text/javascript">
var min_item = '{l s='Please select at least one product' js=1}';
var max_item = "{l s='You cannot add more than %d product(s) to the product comparison' sprintf=$comparator_max_item js=1}";
var comparator_max_item = {$comparator_max_item};
var comparedProductsIds = [];
{foreach from=$compared_products item=product name=products}comparedProductsIds.push({$product.id_product});{/foreach};
$('document').ready(function(){
blockHover();
if (typeof reloadProductComparison != 'undefined')
themes/default-bootstrap/js/modules/blockwishlist/js/ajax-wishlist.js
+7 -7
View File
@@ -257,13 +257,13 @@ function wishlistProductsIdsRemove(id){
wishlistProductsIds.splice($.inArray(parseInt(id),wishlistProductsIds), 1)
}
function wishlistRefreshStatus(){
$('.addToWishlist').each(function() {
if ($.inArray(parseInt($(this).prop('rel')),wishlistProductsIds)!= -1){
$(this).addClass('ckecked');
}
else
$(this).removeClass('ckecked');
});
$('.addToWishlist').each(function() {
if ($.inArray(parseInt($(this).prop('rel')),wishlistProductsIds)!= -1){
$(this).addClass('checked');
}
else
$(this).removeClass('checked');
});
}
$(document).ready(function() {
if (typeof wishlistProductsIds == 'undefined') {
themes/default-bootstrap/js/products-comparison.js
+52 -58
View File
@@ -23,12 +23,55 @@
* International Registered Trademark & Property of PrestaShop SA
*/
function addToCompare(productId){
var totalValueNow = parseInt($('.bt_compare').next('.compare_product_count').val());
$.inArray(parseInt(productId),comparedProductsIds) == -1?action = 'add':action = 'remove';
$.ajax({
url: 'index.php?controller=products-comparison&ajax=1&action='+action+'&id_product=' + productId,
async: true,
cache: false,
success: function(data){
if (action == 'add' && comparedProductsIds.length < comparator_max_item) {
comparedProductsIds.push(parseInt(productId)),
compareButtonsStatusRefresh(),
totalVal = totalValueNow +1,
$('.bt_compare').next('.compare_product_count').val(totalVal),
totalValue(totalVal)
}
else if (action == 'remove') {
comparedProductsIds.splice($.inArray(parseInt(productId),comparedProductsIds), 1),
compareButtonsStatusRefresh(),
totalVal = totalValueNow -1,
$('.bt_compare').next('.compare_product_count').val(totalVal),
totalValue(totalVal)
}
else {
alert(max_item)
}
},
error: function(){}
});
}
function compareButtonsStatusRefresh(){
$('.addToCompare').each(function() {
if ($.inArray(parseInt($(this).prop('rel')),comparedProductsIds)!= -1){
$(this).addClass('checked');
}
else {
$(this).removeClass('checked');
}
})
}
function totalValue(value) {
$('.bt_compare').find('.total-compare-val').html(value);
}
reloadProductComparison = function() {
$('input:checkbox.comparator').each(function() {
var checkedCheckbox = $(this);
if (checkedCheckbox.is(':checked'))
checkedCheckbox.parent().addClass('checked');
});
$('a.cmp_remove').click(function(){
var idProduct = $(this).prop('rel').replace('ajax_id_product_', '');
@@ -42,57 +85,8 @@ reloadProductComparison = function() {
}
});
});
$('input:checkbox.comparator').click(function(){
var totalValueNow = parseInt($('.bt_compare').next('.compare_product_count').val());
var idProduct = $(this).prop('value').replace('comparator_item_', '');
var checkbox = $(this);
if(checkbox.is(':checked'))
{
$.ajax({
url: 'index.php?controller=products-comparison&ajax=1&action=add&id_product=' + idProduct,
async: true,
cache: false,
success: function(data){
if (data === '0')
{
checkbox.prop('checked', false);
alert(max_item);
}
else {
checkbox.prop('checked', true),
checkbox.parent().addClass('checked'),
totalVal = totalValueNow +1,
$('.bt_compare').next('.compare_product_count').val(totalVal),
totalValue(totalVal)
}
},
error: function(){
checkbox.prop('checked', false);
}
});
}
else
{
$.ajax({
url: 'index.php?controller=products-comparison&ajax=1&action=remove&id_product=' + idProduct,
async: true,
cache: false,
success: function(data){
if (data === '0')
checkbox.prop('checked', true);
checkbox.parent().removeClass('checked');
totalVal = totalValueNow -1;
$('.bt_compare').next('.compare_product_count').val(totalVal),
totalValue(totalVal)
},
error: function(){
checkbox.prop('checked', true);
}
});
}
});
}
function totalValue(value) {
$('.bt_compare').find('.total-compare-val').html(value);
}
$(document).ready(function() {
compareButtonsStatusRefresh();
});
themes/default-bootstrap/modules/blockwishlist/blockwishlist_button.tpl
+1 -1
View File
@@ -24,5 +24,5 @@
*}
<div class="wishlist">
<a href="#" id="wishlist_button_{$product.id_product|intval}" rel="{$product.id_product|intval}" onclick="WishlistCart('wishlist_block_list', 'add', '{$product.id_product|intval}', false, 1); return false;" class="addToWishlist wishlistProd_{$product.id_product|intval}">{l s="Add to Wishlist"}</a>
<a href="#" rel="{$product.id_product|intval}" onclick="WishlistCart('wishlist_block_list', 'add', '{$product.id_product|intval}', false, 1); return false;" class="addToWishlist wishlistProd_{$product.id_product|intval}">{l s="Add to Wishlist"}</a>
</div>
themes/default-bootstrap/modules/productcomments/productcomments_reviews.tpl
+1 -1
View File
@@ -34,6 +34,6 @@
{/if}
{/section}
</div>
<span class="nb-comments">{l s='%s Review(s)'|sprintf:$nbComments mod='productcomments'}&nbsp</span>
<span class="nb-comments">{l s='%s Review(s)'|sprintf:$nbComments mod='productcomments'}</span>
</div>
{/if}
themes/default-bootstrap/product-compare.tpl
+3
View File
@@ -29,6 +29,9 @@
// <![CDATA[
var min_item = '{l s='Please select at least one product' js=1}';
var max_item = "{l s='You cannot add more than %d product(s) to the product comparison' sprintf=$comparator_max_item js=1}";
var comparator_max_item = {$comparator_max_item};
var comparedProductsIds = [];
{foreach from=$compared_products item=product name=products}comparedProductsIds.push({$product.id_product});{/foreach};
//]]>
</script>
{/if}
themes/default-bootstrap/product-list.tpl
+7 -13
View File
@@ -52,8 +52,8 @@
<div class="product-image-container">
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}">
<img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
{if isset($quick_view) && $quick_view}<a href="#" rel="{$product.link|escape:'htmlall':'UTF-8'}" class="quick-view"><span>Quick view</span></a>{/if}
</a>
{if isset($quick_view) && $quick_view}<a href="#" rel="{$product.link|escape:'htmlall':'UTF-8'}" class="quick-view"><span>Quick view</span></a>{/if}
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
<div class="content_price">
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
@@ -112,12 +112,10 @@
{/if}
</div>
<div class="functional-buttons clearfix">
{hook h='displayProductListFunctionalButtons' product=$product}
{hook h='displayProductListFunctionalButtons' product=$product}
{if isset($comparator_max_item) && $comparator_max_item}
<div class="compare">
<label for="comparator_item_{$product.id_product}">
<input type="checkbox" class="comparator hidden" id="comparator_item_{$product.id_product}" value="comparator_item_{$product.id_product}" {if isset($compared_products) && in_array($product.id_product, $compared_products)}checked="checked"{/if} autocomplete="off"/>
{l s='Add to Compare'}</label>
<a href="#" rel="{$product.id_product}" class="addToCompare" onClick="addToCompare('{$product.id_product|intval}'); return false;">{l s='Add to Compare'}</a>
</div>
{/if}
</div>
@@ -125,14 +123,14 @@
</li>
{/foreach}
</ul>
<!-- Script for transformation Grid/List layouts -->
{if $page_name == 'product'}
<script type="text/javascript">
var comparator_max_item = {$comparator_max_item};
var comparedProductsIds = [];
{foreach from=$compared_products item=product name=products}comparedProductsIds.push({$product.id_product});{/foreach};
$('document').ready(function(){
blockHover();
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison();
});
</script>
{/if}
@@ -192,8 +190,6 @@
$('.display').find('li#list').addClass('selected');
$('.display').find('li#grid').removeAttr('class');
$.totalStorage('display', 'list');
if (typeof reloadProductComparison != 'undefined') // compare button reload
reloadProductComparison();
if (typeof ajaxCart != 'undefined') // cart button reload
ajaxCart.overrideButtonsInThePage();
if (typeof quick_view != 'undefined') // qick view button reload
@@ -233,9 +229,7 @@
});
$('.display').find('li#grid').addClass('selected');
$('.display').find('li#list').removeAttr('class');
$.totalStorage('display', 'grid');
if (typeof reloadProductComparison != 'undefined')// compare button reload
reloadProductComparison();
$.totalStorage('display', 'grid');
if (typeof ajaxCart != 'undefined') // cart button reload
ajaxCart.overrideButtonsInThePage();
if (typeof quick_view != 'undefined') // qick view button reload
themes/default-bootstrap/sass/product_list.scss
+15 -14
View File
@@ -194,7 +194,7 @@ ul.product_list.grid {
margin-right:3px;
}
a.ckecked:before {
a.checked:before {
content:"";
}
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
@@ -211,11 +211,12 @@ ul.product_list.grid {
}
&.compare {
label {
a {
&:before {
content:"";
display:inline-block;
font-family:$font-icon;
margin-right:3px;
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
display:none;
}
@@ -238,7 +239,7 @@ ul.product_list.grid {
@media (min-width: $screen-lg) { // min 1200px
&.hovered {
margin-bottom:-300px;
padding-bottom:250px;
padding-bottom:226px;
.product-container {
@include box-shadow(rgba(black, 0.17) 0 0 13px);
@@ -412,7 +413,7 @@ ul.product_list.list {
i, &:before {display:none !important;}
}
}
a, label {
a {
font-weight:bold;
color:#777676;
cursor:pointer;
@@ -441,7 +442,7 @@ ul.product_list.list {
background:$dark-background;
}
}
a.ckecked {
a.checked {
&:before {
content:"";
}
@@ -451,7 +452,7 @@ ul.product_list.list {
.compare {
padding-top:10px;
label {
a {
&:before {
content:"";
@@ -475,13 +476,13 @@ ul.product_list.list {
background:$dark-background;
}
}
&.checked {
&:before {
background:$light-background;
border:1px solid #929292;
color:#929292;
padding-top:5px;
}
}
a.checked {
&:before {
background:$light-background;
border:1px solid #929292;
color:#929292;
padding-top:5px;
}
}
}
@@ -537,7 +538,7 @@ ul.product_list.list {
&.hovered {
margin-bottom:-300px;
padding-bottom:230px;
padding-bottom:235px;
}
}
}