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

// Add a warning in welcome page for installer if use has already a previous version of PrestaShop installed #PSCFV-2161

Browse Source
This commit is contained in:
rMalie
2012-06-04 09:45:52 +00:00
parent c93d0896ce
commit 41f03792d6
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/classes/controllerHttp.php
+5
View File
@@ -354,6 +354,11 @@ abstract class InstallControllerHttp
return $this->language->getInformation('support');
}
public function getDocumentationUpgradeLink()
{
return $this->language->getInformation('documentation_upgrade', true);
}
/**
* Send AJAX response in JSON format {success: bool, message: string}
*
install-dev/controllers/http/welcome.php
+11
View File
@@ -68,6 +68,17 @@ class InstallControllerHttpWelcome extends InstallControllerHttp
*/
public function display()
{
$this->can_upgrade = false;
if (file_exists(_PS_ROOT_DIR_.'/config/settings.inc.php'))
{
@include_once(_PS_ROOT_DIR_.'/config/settings.inc.php');
if (version_compare(_PS_VERSION_, _PS_INSTALL_VERSION_, '<'))
{
$this->can_upgrade = true;
$this->ps_version = _PS_VERSION_;
}
}
$this->displayTemplate('welcome');
}
}
install-dev/langs/en/install.php
+1
View File
@@ -3,6 +3,7 @@ return array(
'informations' => array(
'phone' => '+1 (888) 947-6543',
'documentation' => 'http://doc.prestashop.com/display/PS14/English+documentation',
'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
'forum' => 'http://www.prestashop.com/forums/',
'blog' => 'http://www.prestashop.com/blog/',
'support' => 'http://support.prestashop.com/en/',
install-dev/theme/views/welcome.phtml
+5 -1
View File
@@ -4,6 +4,10 @@
<div class="warnBlock"><?php echo $this->l('PrestaShop requires at least 16M of memory to run, please check the memory_limit directive in php.ini or contact your host provider'); ?></div>
<?php endif; ?>
<?php if ($this->can_upgrade): ?>
<div class="warnBlock"><?php echo $this->l('You already have PrestaShop version %1$s installed. If you want to upgrade to the latest version please read our documentation : <a href="%2$s">%2$s</a>', $this->ps_version, $this->getDocumentationUpgradeLink()) ?></div>
<?php endif; ?>
<h2><?php echo $this->l('Welcome to the PrestaShop %s Installer.', _PS_INSTALL_VERSION_) ?></h2>
<p><?php echo $this->l('The installation process should take only few minutes!') ?></p>
<p><?php echo $this->l('If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s', $this->getDocumentationLink(), $this->getPhone()) ?></p>
@@ -15,7 +19,7 @@
<?php foreach ($this->language->getIsoList() as $iso): ?>
<li>
<label>
<input type="radio" value="<?php echo $iso ?>" <?php echo ($iso == $this->language->getLanguageIso()) ? "checked=\"checked\"" : '' ?> name="language" style="vertical-align: middle; margin-right: 0;" />
<input type="radio" value="<?php echo $iso ?>" <?php echo ($iso == $this->language->getLanguageIso()) ? 'checked="checked"' : '' ?> name="language" style="vertical-align: middle; margin-right: 0;" />
<?php if (file_exists(_PS_INSTALL_LANGS_PATH_.$iso.'/flag.jpg')): ?>
<img src="langs/<?php echo $iso ?>/flag.jpg" alt="<?php echo $iso ?>" style="vertical-align: middle;" />
<?php else: ?>