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

Merge Pull request #67 - Thanks @Ha99y

Browse Source
This commit is contained in:
vAugagneur committed 2013-04-23 10:02:29 +02:00
1 parent 18ed37127d
commit da96eb6651
4 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/carriercompare/template/carriercompare.tpl
+1 -1
View File
@@ -67,7 +67,7 @@ PS_SE_HandleEvent();
<ul id="carriercompare_errors_list"></ul><br /> <ul id="carriercompare_errors_list"></ul><br />
</div> </div>
<div id="SE_AjaxDisplay"> <div id="SE_AjaxDisplay">
<img src="{$new_base_dir}loader.gif" /><br /> <img src="{$new_base_dir}loader.gif" alt="Loading data" /><br />
<p></p> <p></p>
</div> </div>
<div id="availableCarriers" style="display: none;"> <div id="availableCarriers" style="display: none;">
themes/default/header.tpl
+2 -2
View File
@@ -64,7 +64,7 @@
{$HOOK_HEADER} {$HOOK_HEADER}
</head> </head>
<body {if isset($page_name)}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if} class="{if $hide_left_column}hide-left-column{/if} {if $hide_right_column}hide-right-column{/if} {if $content_only} content_only {/if}"> <body {if isset($page_name)}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if} class="{if $hide_left_column}hide-left-column {/if} {if $hide_right_column}hide-right-column {/if} {if $content_only} content_only {/if}">
{if !$content_only} {if !$content_only}
{if isset($restricted_country_mode) && $restricted_country_mode} {if isset($restricted_country_mode) && $restricted_country_mode}
<div id="restricted-country"> <div id="restricted-country">
@@ -76,7 +76,7 @@
<!-- Header --> <!-- Header -->
<div id="header" class="grid_9 alpha omega"> <div id="header" class="grid_9 alpha omega">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}"> <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
<img class="logo" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if} /> <img class="logo" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
</a> </a>
<div id="header_right" class="grid_9 omega"> <div id="header_right" class="grid_9 omega">
{$HOOK_TOP} {$HOOK_TOP}
themes/default/product.tpl
+1 -1
View File
@@ -327,7 +327,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
</div> </div>
{/if} {/if}
<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}> <p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}>
<label for="product_reference">{l s='Reference:'} </label> <label>{l s='Reference:'} </label>
<span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span> <span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span>
</p> </p>
themes/default/sitemap.tpl
+1 -1
View File
@@ -51,7 +51,7 @@
<li><a href="{$link->getPageLink('history', true)}" title="{l s='View a list of my orders'}" rel="nofollow">{l s='Order history'}</a></li> <li><a href="{$link->getPageLink('history', true)}" title="{l s='View a list of my orders'}" rel="nofollow">{l s='Order history'}</a></li>
{else} {else}
<li><a href="{$link->getPageLink('authentication', true)}" title="{l s='Authentication'}" rel="nofollow">{l s='Authentication'}</a></li> <li><a href="{$link->getPageLink('authentication', true)}" title="{l s='Authentication'}" rel="nofollow">{l s='Authentication'}</a></li>
<li><a href="{$link->getPageLink('authentication', true)}" title="{l s='Create new account'}"rel="nofollow">{l s='Create new account'}</a></li> <li><a href="{$link->getPageLink('authentication', true)}" title="{l s='Create new account'}" rel="nofollow">{l s='Create new account'}</a></li>
{/if} {/if}
{if $logged} {if $logged}
<li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Log out'}" rel="nofollow">{l s='Log out'}</a></li> <li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Log out'}" rel="nofollow">{l s='Log out'}</a></li>