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

// revert

Browse Source
This commit is contained in:
aFolletete
2011-09-12 15:25:21 +00:00
parent e1a9e08049
commit a6a2df97ef
10 changed files with 18 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/authorizeaim/authorizeaim.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
{/if}
<form id="aut" name="authorizeaim_form" action="{$module_dir}validation.php" method="post">
<span style="display: block;text-decoration: none;">
<span style="border: 1px solid #595A5E;display: block;padding: 0.6em;text-decoration: none;margin-left: 0.7em;">
<a id="click_authorizeaim" href="#" title="{l s='Pay with authorizeaim' mod='authorizeaim'}" style="display: block;text-decoration: none;">
{if $cards.visa == 1}
<img src="{$module_dir}cards/visa.gif" alt="{l s='visa logo' mod='authorizeaim'}" />
modules/bankwire/bankwire.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

modules/bankwire/payment.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
<p class="payment_module">
<a href="{$this_path_ssl}payment.php" title="{l s='Pay by bank wire' mod='bankwire'}">
<img src="{$this_path}bankwire.jpg" alt="{l s='Pay by bank wire' mod='bankwire'}" width="130" height="108"/>
<span>{l s='Pay by bank wire (order process will be longer)' mod='bankwire'}</span>
<img src="{$this_path}bankwire.jpg" alt="{l s='Pay by bank wire' mod='bankwire'}" width="86" height="49"/>
{l s='Pay by bank wire (order process will be longer)' mod='bankwire'}
</a>
</p>
modules/blockbestsellers/blockbestsellers.php
+1 -1
View File
@@ -114,7 +114,7 @@ class BlockBestSellers extends Module
$this->context->smarty->assign(array(
'best_sellers' => $best_sellers,
'smallSize' => Image::getSize('small'),
'mediumSize' => Image::getSize('medium'),
));
return $this->display(__FILE__, 'blockbestsellers.tpl');
}
modules/blockbestsellers/blockbestsellers.tpl
+10 -15
View File
@@ -19,31 +19,26 @@
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 6594 $
* @version Release: $Revision: 7077 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<!-- MODULE Block best sellers -->
<div id="best-sellers_block_right" class="block products_block">
<h4><a href="{$link->getPageLink('best-sales.php')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
<h4><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
<div class="block_content">
{if $best_sellers|@count > 0}
<ul class="product_images">
{foreach from=$best_sellers item=product name=myLoop}
<li class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} clearfix">
<a href="{$product.link}" title="{$product.legend|escape:'htmlall':'UTF-8'}" class="content_img clearfix">
<span class="number">{$smarty.foreach.myLoop.iteration}</span>
<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small')}" height="{$smallSize.height}" width="{$smallSize.width}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" />
</a>
<p><a href="{$product.link}" title="{$product.legend|escape:'htmlall':'UTF-8'}">
{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}<br />
<span class="price">{$product.price}</span>
</a></p>
</li>
{/foreach}
<li><a href="{$best_sellers.0.link}" title="{$best_sellers.0.legend|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($best_sellers.0.link_rewrite, $best_sellers.0.id_image, 'medium')}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$best_sellers.0.legend|escape:'htmlall':'UTF-8'}" /></a></li>
{if $best_sellers|@count > 1}<li><a href="{$best_sellers.1.link}" title="{$best_sellers.1.legend|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($best_sellers.1.link_rewrite, $best_sellers.1.id_image, 'medium')}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$best_sellers.1.legend|escape:'htmlall':'UTF-8'}" /></a></li>{/if}
</ul>
<p class="lnk"><a href="{$link->getPageLink('best-sales.php')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">&raquo;{l s='All best sellers' mod='blockbestsellers'}</a></p>
<dl>
{foreach from=$best_sellers item=product name=myLoop}
<dt class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$product.link}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}</a></dt>
{/foreach}
</dl>
<p><a href="{$link->getPageLink('best-sales')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">{l s='All best sellers' mod='blockbestsellers'}</a></p>
{else}
<p>{l s='No best sellers at this time' mod='blockbestsellers'}</p>
{/if}
modules/blockcart/ajax-cart.js
-21
View File
@@ -626,26 +626,5 @@ $(document).ready(function(){
});
ajaxCart.overrideButtonsInThePage();
ajaxCart.refresh();
/* roll over cart */
$("#shopping_cart").mouseover(function(){
$("#cart_block").slideDown(450).addClass("cart_block_hover");
});
$("#cart_block").mouseleave(function(){
$("#cart_block").removeClass("cart_block_hover");
if(!$("#cart_block").hasClass("cart_block_hover"))
$("#cart_block").slideUp(450);
});
$("#header_logo").mouseover(function(){
$("#cart_block").removeClass("cart_block_hover");
if(!$("#cart_block").hasClass("cart_block_hover"))
$("#cart_block").slideUp(450);
});
$("#messWelcome").mouseover(function(){
$("#cart_block").removeClass("cart_block_hover");
if(!$("#cart_block").hasClass("cart_block_hover"))
$("#cart_block").slideUp(450);
});
});
modules/blockcart/blockcart.php
+2 -7
View File
@@ -83,8 +83,8 @@ class BlockCart extends Module
$smarty->assign(array(
'products' => $products,
'customizedDatas' => Product::getAllCustomizedDatas((int)($params['cart']->id)),
'CUSTOMIZE_FILE' => Product::CUSTOMIZE_FILE,
'CUSTOMIZE_TEXTFIELD' => Product::CUSTOMIZE_TEXTFIELD,
'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_,
'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_,
'discounts' => $params['cart']->getDiscounts(false, Tools::isSubmit('id_product')),
'nb_total_products' => (int)($nbTotalProducts),
'shipping_cost' => Tools::displayPrice($params['cart']->getOrderTotal($useTax, Cart::ONLY_SHIPPING), $currency),
@@ -187,10 +187,5 @@ class BlockCart extends Module
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')))
$this->context->controller->addJS(($this->_path).'ajax-cart.js');
}
public function hookTop($params)
{
return $this->hookRightColumn($params);
}
}
modules/blockmyaccount/blockmyaccount.php
-11
View File
@@ -86,17 +86,6 @@ class BlockMyAccount extends Module
{
$this->context->controller->addCSS(($this->_path).'blockmyaccount.css', 'all');
}
public function hookFooter($params)
{
global $smarty;
$smarty->assign(array(
'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')),
'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')),
'HOOK_BLOCK_MY_ACCOUNT' => Module::hookExec('myAccountBlock')
));
return $this->display(__FILE__, $this->name.'.tpl');
}
}
modules/cheque/cheque.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

modules/cheque/payment.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
<p class="payment_module">
<a href="{$this_path_ssl}payment.php" title="{l s='Pay by cheque' mod='cheque'}">
<img src="{$this_path}cheque.jpg" alt="{l s='Pay by cheque' mod='cheque'}" width="130" height="108" />
<span>{l s='Pay by cheque (order process will be longer)' mod='cheque'}</span>
<img src="{$this_path}cheque.jpg" alt="{l s='Pay by cheque' mod='cheque'}" width="86" height="49" />
{l s='Pay by cheque (order process will be longer)' mod='cheque'}
</a>
</p>