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

// fix displaying subtabs link,

Browse Source 
// fix adminHome links


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8892 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-09-29 16:02:26 +00:00
parent 117583a0d0
commit e8ff5b025f
4 changed files with 73 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/adminHome.tpl
+47 -49
View File
@@ -53,54 +53,52 @@ $(document).ready(function() {
<div id="column_right">
{$tips_optimization}
<script type="text/javascript">
$(document).ready(function() {
$.ajax({
url: "ajax-tab.php",
type: "POST",
data:{
token: "{$token}",
ajax: "1",
controller : "AdminHome",
action: "getAdminHomeElement"
},
dataType: "json",
success: function(json) {
if (json.screencast != 'NOK')
$('#adminpresentation').fadeIn('slow');
else
$('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow', function() {
if (json.partner_preactivation != 'NOK')
$('#partner_preactivation').html(json.partner_preactivation);
else
$('#partner_preactivation').html('');
$('#partner_preactivation').fadeIn('slow');
});
$('#discover_prestashop').fadeOut('slow', function() {
if (json.discover_prestashop != 'NOK')
$('#discover_prestashop').html(json.discover_prestashop);
else
$('#discover_prestashop').html('');
$('#discover_prestashop').fadeIn('slow');
});
},
error: function(XMLHttpRequest, textStatus, errorThrown)
{
$('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow');
$('#discover_prestashop').fadeOut('slow');
}
});
});
</script>
<div id="partner_preactivation">
<p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p>
<div id="partner_preactivation"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
<div id="discover_prestashop"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
</div>
{$discover_prestashop}
<div class="clear"></div>
{$HOOK_BACKOFFICEHOME}
</div>
<div class="clear">&nbsp;</div>
<script type="text/javascript">
$(document).ready(function() {
$.ajax({
url: "ajax-tab.php",
type: "POST",
data:{
token: "{$token}",
ajax: "1",
controller : "AdminHome",
action: "getAdminHomeElement"
},
dataType: "json",
success: function(json) {
if (json.screencast != 'NOK')
$('#adminpresentation').fadeIn('slow');
else
$('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow', function() {
if (json.partner_preactivation != 'NOK')
$('#partner_preactivation').html(json.partner_preactivation);
else
$('#partner_preactivation').html('');
$('#partner_preactivation').fadeIn('slow');
});
$('#discover_prestashop').fadeOut('slow', function() {
if (json.discover_prestashop != 'NOK')
$('#discover_prestashop').html(json.discover_prestashop);
else
$('#discover_prestashop').html('');
$('#discover_prestashop').fadeIn('slow');
});
},
error: function(XMLHttpRequest, textStatus, errorThrown)
{
$('#adminpresentation').fadeOut('slow');
$('#partner_preactivation').fadeOut('slow');
$('#discover_prestashop').fadeOut('slow');
}
});
});
</script>
admin-dev/themes/template/header.tpl
+1 -1
View File
@@ -255,7 +255,7 @@
{/foreach}
</div>
{/if}
{if $is_multishop}
{if $is_multishop && $shop_context != 'all'}
<div class="multishop_info">
{if $shop_context == 'group'}
{l s='You are configuring your store for group shop '}<b>{$shop_name}</b>