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

[-] MO : #PSTEST-303 - Fixed problems using deprecated methods

Browse Source 
// Change baseDir vars to use the current domain
// Change css rules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12153 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-04 16:31:47 +00:00
parent a2eb4fc64d
commit da301372b9
17 changed files with 302 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/address.tpl
-6
View File
@@ -23,12 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
{*
** Compatibility code for Prestashop older than 1.4.2 using a recent theme
** Ignore list isn't require here
themes/default/addresses.tpl
-1
View File
@@ -78,7 +78,6 @@
<script type="text/javascript">
//<![CDATA[
var baseDir = '{$base_dir_ssl}';
{literal}
$(document).ready(function()
{
themes/default/css/global.css
+6 -5
View File
@@ -1000,6 +1000,7 @@ margin: 10px 0 0 0;*/
#order .delivery_option.alternate_item, #orderopc .delivery_option.alternate_item {
border-top: 1px solid #bdc2c9;
background: #f1f2f4;
border-bottom: 1px solid #bdc2c9;
}
#order .delivery_option label > table.resume td, #orderopc .delivery_option label > table.resume td {
padding: 0 8px;
@@ -1018,7 +1019,7 @@ margin: 10px 0 0 0;*/
padding-left:10px;
width: 160px;
}
#order .delivery_options_address .delivery_option_logo img, #orderopc .delivery_options_address .delivery_option_logo img { height: 40px; }
#order .delivery_options_address .delivery_option_logo img, #orderopc .delivery_options_address .delivery_option_logo img { /*height: 40px;*/ }
#orderopc .delivery_option_carrier {
margin: 0 0 0 45px;
padding: 5px;
@@ -1032,10 +1033,10 @@ margin: 10px 0 0 0;*/
.order_carrier_content {
padding:15px;
border:1px solid #ccc;
border:1px solid #ccc;
font-size:12px;
color:#000;
background:#f8f8f8
background:#f8f8f8
}
.order_carrier_content h3 {
padding:15px 0 10px 0;
@@ -1609,8 +1610,8 @@ ul#suppliers_list li .right_side {float:right;}
/* ************************************************************************************************
addons paypal
************************************************************************************************ */
#module-paypal-payment-submit #left_column {display:none}
#module-paypal-payment-submit #center_column{width:757px}
#module-payment-submit #left_column {display:none}
#module-payment-submit #center_column{width:757px}
/* ************************************************************************************************
themes/default/discount.tpl
-7
View File
@@ -23,13 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* 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.php', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My Vouchers'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
themes/default/history.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"}
themes/default/identity.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"}
themes/default/my-account.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"}
themes/default/order-confirmation.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='Order confirmation'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
themes/default/order-follow.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='Return Merchandise Authorization (RMA)'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
themes/default/order-opc.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)}';
themes/default/order-payment.tpl
-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}';
themes/default/order-slip.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='Credit slips'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}