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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-01 14:12:39 +02:00
parent 0898a63060 82a912e3f1
commit c6c4fd03e8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/theme/views/footer.phtml
+1
View File
@@ -36,6 +36,7 @@
errors.push($(this).text().trim()); errors.push($(this).text().trim());
}); });
psuser_assistance.setStep('install_<?php echo addslashes($this->step) ?>', {'error':errors}); psuser_assistance.setStep('install_<?php echo addslashes($this->step) ?>', {'error':errors});
$('#iframe_help').attr('src', $('#iframe_help').attr('src') + '&errors=' + encodeURI(errors.join(', ')));
} }
</script> </script>
</body> </body>
install-dev/theme/views/header.phtml
+1 -1
View File
@@ -72,7 +72,7 @@
<?php endforeach; ?> <?php endforeach; ?>
</ol> </ol>
<?php if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)): ?> <?php if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)): ?>
<iframe scrolling="no" style="height:160px;width:160px;border:none;margin-top:20px" <iframe scrolling="no" style="height:210px;width:200px;border:none;margin-top:20px" id="iframe_help"
src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?>&country=<?php echo $this->session->shop_country ?>"> src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?>&country=<?php echo $this->session->shop_country ?>">
<p><?php echo $this->l('Contact us!') ?><br /><?php echo $this->getPhone() ?></p> <p><?php echo $this->l('Contact us!') ?><br /><?php echo $this->getPhone() ?></p>
</iframe> </iframe>