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

//fixed bug #PSCFV-55

Browse Source
This commit is contained in:
vAugagneur
2012-04-26 08:00:06 +00:00
parent 3b1f5dca9c
commit be23e93c6e
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminModulesPositionsController.php
+1 -1
View File
@@ -281,7 +281,7 @@ class AdminModulesPositionsControllerCore extends AdminController
'url_show_invisible' => self::$currentIndex.'&token='.$this->token.'&show_modules='.(int)Tools::getValue('show_modules').'&hook_position=', 'url_show_invisible' => self::$currentIndex.'&token='.$this->token.'&show_modules='.(int)Tools::getValue('show_modules').'&hook_position=',
'hook_position' => Tools::getValue('hook_position'), 'hook_position' => Tools::getValue('hook_position'),
'live_edit' => Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP, 'live_edit' => Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP,
'url_live_edit' => $this->context->shop->getBaseUrl().'?live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_), 'url_live_edit' => $this->context->shop->getBaseUrl().'index.php?live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_),
'display_key' => $this->display_key, 'display_key' => $this->display_key,
'hooks' => $hooks, 'hooks' => $hooks,
'url_submit' => self::$currentIndex.'&token='.$this->token, 'url_submit' => self::$currentIndex.'&token='.$this->token,
js/hookLiveEdit.js
+7 -10
View File
@@ -4,7 +4,7 @@ var hookable_list = new Array();
var timer; var timer;
$(document).ready(function() { $(document).ready(function() {
// do some place for submit button // do some place for submit button
$('body').css('margin-bottom', '45px'); $('body').css('margin-top', '45px');
// this is the result box, which will "pop up" the succeed or fail result // this is the result box, which will "pop up" the succeed or fail result
$('#fancy').fancybox({ $('#fancy').fancybox({
autoDimensions: true, autoDimensions: true,
@@ -20,18 +20,15 @@ $(document).ready(function() {
$('#live_edit_feedback_str').html(''); $('#live_edit_feedback_str').html('');
// add liveToken in each link to navigate into the shop and keeping the liveedit mode // add liveToken in each link to navigate into the shop and keeping the liveedit mode
$('a').each(function() { $('a').each(function() {
var href = $(this).attr('href'); var href = this.href;
var search = $(this).attr('search'); var search = this.search;
var hrefAdd = 'live_edit&liveToken=' + get('liveToken') + '&ad=' + get('ad') + '&id_shop=' + get('id_shop'); var hrefAdd = 'live_edit&liveToken=' + get('liveToken') + '&ad=' + get('ad') + '&id_shop=' + get('id_shop');
if (href != undefined && href != '#' && href.substr(0, baseDir.length) == baseDir) { if (href != undefined && href != '#' && href.substr(0, baseDir.length) == baseDir)
{
if (search.length == 0) if (search.length == 0)
{ this.search = hrefAdd;
$(this).attr('search', hrefAdd);
}
else else
{ this.search += '&' + hrefAdd;
$(this).attr('search', search + '&' + hrefAdd);
}
} }
}); });
// populate // populate