// Merge -> revision 8097

This commit is contained in:
rMalie
2011-08-17 16:10:20 +00:00
parent 5b26bb28b8
commit 66d4533e68
41 changed files with 107 additions and 135 deletions
-1
View File
@@ -37,7 +37,6 @@
var unableToUnregisterHook = '{l s='Unable to unregister hook'}';
var unableToSaveModulePosition = '{l s='Unable to save module position'}';
var loadFail = '{l s='Failed to load module list'}';
var baseDir = '{$base_dir}';
</script>
<div style="width:100%;height:30px;padding-top:10px;background-color:#D0D3D8;border:solid 1px gray;position:fixed;bottom:0;left:0;opacity:0.7" onmouseover="$(this).css('opacity', 1);" onmouseout="$(this).css('opacity', 0.7);">
-6
View File
@@ -52,12 +52,6 @@
{/if}
{/if}
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
<script type="text/javascript">
// <![CDATA[
idSelectedCountry = {if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address->id_state)}{$address->id_state|intval}{else}false{/if}{/if};
-1
View File
@@ -78,7 +78,6 @@
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
{literal}
$(document).ready(function()
{
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My Vouchers'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Order history'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
{include file="$tpl_dir./errors.tpl"}
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Your personal information'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}{l s='My account'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
-1
View File
@@ -61,7 +61,6 @@
<script type="text/javascript">
// <![CDATA[
{if !$opc}
var baseDir = '{$base_dir_ssl}';
var orderProcess = 'order';
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
-1
View File
@@ -27,7 +27,6 @@
{if !$opc}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
var orderProcess = 'order';
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}{l s='Order confirmation'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
-5
View File
@@ -24,11 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{if !isset($smarty.get.ajax)}
<div class="block-center" id="block-history">
<div id="block-order-detail">
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Return Merchandise Authorization (RMA)'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
-1
View File
@@ -32,7 +32,6 @@
{else}
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
var imgDir = '{$img_dir}';
var authenticationUrl = '{$link->getPageLink("authentication", true)}';
var orderOpcUrl = '{$link->getPageLink("order-opc", true)}';
-1
View File
@@ -27,7 +27,6 @@
{if !$opc}
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}';
-6
View File
@@ -24,12 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Credit slips'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
-1
View File
@@ -40,7 +40,6 @@
{else}
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}';