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

// Release branch merged

Browse Source
This commit is contained in:
François Gaillard
2013-04-25 17:00:56 +02:00
parent f0da3fa2ae 056709f2dd
commit 6106066ef1
53 changed files with 1086 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/theme/views/configure.phtml
+1 -1
View File
@@ -158,7 +158,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
<!-- Newsletter -->
<div class="field clearfix" id="contentInfosNotification">
<div class="contentinput">
<input type="checkbox" name="send_informations" id="infosNotification" class="aligned" style="vertical-align:middle" <?php if ($this->session->send_informations): ?>checked="checked"<?php endif; ?> />
<input type="checkbox" name="send_informations" id="infosNotification" class="aligned" style="vertical-align:middle" <?php if ($this->session->send_informations === null || $this->session->send_informations): ?>checked="checked"<?php endif; ?> />
<label for="infosNotification"><?php echo $this->l('Sign-up to the newsletter') ?></label>
<br/>
<span id="resultInfosNotification" class="result aligned"></span>
install-dev/theme/views/database.phtml
+1 -1
View File
@@ -4,7 +4,7 @@
<div id="dbPart">
<h2><?php echo $this->l('Configure your database by filling out the following fields:') ?></h2>
<p>
<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
<br />
<?php echo $this->l('Please complete the fields below in order for PrestaShop to connect to your database. ') ?>
</p>
install-dev/theme/views/footer.phtml
+1 -1
View File
@@ -16,7 +16,7 @@
</div>
</form>
<div id="phone_help">
<?php echo $this->l('If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.', $this->getPhone()) ?>
<?php echo $this->l('If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.', $this->getPhone()) ?>
</div>
</div><!-- div id="container" -->
install-dev/theme/views/process.phtml
+2 -2
View File
@@ -75,9 +75,9 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
</div>
<?php if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>
<iframe src="http://addons.prestashop.com/psinstall1541.php?version=2&lang=<?php echo $this->language->getLanguageIso() ?>&email=<?php echo $this->session->admin_email ?>&activity=<?php echo $this->session->shop_activity ?>&country=<?php echo $this->session->shop_country ?>" scrolling="no" id="prestastore">
<iframe src="https://addons.prestashop.com/psinstall1541.php?version=2&lang=<?php echo $this->language->getLanguageIso() ?>&email=<?php echo $this->session->admin_email ?>&activity=<?php echo $this->session->shop_activity ?>&country=<?php echo $this->session->shop_country ?>" scrolling="no" id="prestastore">
<p>Your browser does not support iframes.</p>
</iframe>
<?php endif; ?>
<?php $this->displayTemplate('footer') ?>
<?php $this->displayTemplate('footer') ?>