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

// fix added toolbar in AdminInformationController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10445 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-22 16:05:08 +00:00
parent 62696d85f9
commit 40d2a6282b
3 changed files with 160 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/information/content.tpl
-118
View File
@@ -1,118 +0,0 @@
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Information'}</legend>
<p>{l s='This information must be indicated when you report a bug on our bug tracker or if you report a problem on our forum.'}</p>
</fieldset>
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
<h3>{l s='Server information'}</h3>
<p>
<b>{l s='Prestashop Version'}:</b> {$version.ps}
</p>
{if count($uname)}
<p>
<b>{l s='Server information'}:</b> {$uname}
</p>
{/if}
<p>
<b>{l s='Server software Version'}:</b> {$version.server}
</p>
<p>
<b>{l s='PHP Version'}:</b> {$version.php}
</p>
<p>
<b>{l s='MySQL Version'}:</b> {$version.mysql}
</p>
{if $apache_instaweb}
<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
<hr />
<h3>{l s='Store information'}</h3>
<p>
<b>{l s='URL of your website'}:</b> {$shop.url}
</p>
<p>
<b>{l s='Theme name used'}:</b> {$shop.theme}
</p>
<hr />
<h3>{l s='Mail information'}</h3>
<p>
<b>{l s='Mail method'}:</b>
{if $mail}
{l s='You use PHP mail() function.'}</p>
{else}
{l s='You use your own SMTP parameters'}</p>
<p>
<b>{l s='SMTP server'}:</b> {$smtp.server}
</p>
<p>
<b>{l s='SMTP user'}:</b>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<b>{l s='SMTP password'}:</b>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<b>{l s='Encryption'}:</b> {$smtp.encryption}
</p>
<p>
<b>{l s='Port'}:</b> {$smtp.port}
</p>
{/if}
<hr />
<h3>{l s='Your information'}</h3>
<p>
<b>{l s='Information from you'}:</b> {$user_agent}
</p>
</fieldset>
<br />
<fieldset id="checkConfiguration">
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Check your configuration'}</legend>
<p>
<b>{l s='Required parameters'}:</b>
{if !$failRequired}
<span style="color:green;font-weight:bold;">OK</span>
</p>
{else}
<span style="color:red">{l s='Please consult the following error(s)'}</span>
</p>
<ul>
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
<p>
<b>{l s='Optional parameters'}:</b>
{if !$failOptional}
<span style="color:green;font-weight:bold;">OK</span>
</p>
{else}
<span style="color:red">{l s='Please consult the following error(s)'}</span>
</p>
<ul>
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
</fieldset>
admin-dev/themes/template/information/view.tpl
+150
View File
@@ -0,0 +1,150 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 8897 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{extends file="helper/view/view.tpl"}
{block name="override_tpl"}
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Information'}</legend>
<p>{l s='This information must be indicated when you report a bug on our bug tracker or if you report a problem on our forum.'}</p>
</fieldset>
<br />
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
<h3>{l s='Server information'}</h3>
<p>
<b>{l s='Prestashop Version'}:</b> {$version.ps}
</p>
{if count($uname)}
<p>
<b>{l s='Server information'}:</b> {$uname}
</p>
{/if}
<p>
<b>{l s='Server software Version'}:</b> {$version.server}
</p>
<p>
<b>{l s='PHP Version'}:</b> {$version.php}
</p>
<p>
<b>{l s='MySQL Version'}:</b> {$version.mysql}
</p>
{if $apache_instaweb}
<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if}
<hr />
<h3>{l s='Store information'}</h3>
<p>
<b>{l s='URL of your website'}:</b> {$shop.url}
</p>
<p>
<b>{l s='Theme name used'}:</b> {$shop.theme}
</p>
<hr />
<h3>{l s='Mail information'}</h3>
<p>
<b>{l s='Mail method'}:</b>
{if $mail}
{l s='You use PHP mail() function.'}</p>
{else}
{l s='You use your own SMTP parameters'}</p>
<p>
<b>{l s='SMTP server'}:</b> {$smtp.server}
</p>
<p>
<b>{l s='SMTP user'}:</b>
{if $smtp.user neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<b>{l s='SMTP password'}:</b>
{if $smtp.password neq ''}
{l s='Defined'}
{else}
<span style="color:red;">{l s='Not defined'}</span>
{/if}
</p>
<p>
<b>{l s='Encryption'}:</b> {$smtp.encryption}
</p>
<p>
<b>{l s='Port'}:</b> {$smtp.port}
</p>
{/if}
<hr />
<h3>{l s='Your information'}</h3>
<p>
<b>{l s='Information from you'}:</b> {$user_agent}
</p>
</fieldset>
<br />
<fieldset id="checkConfiguration">
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Check your configuration'}</legend>
<p>
<b>{l s='Required parameters'}:</b>
{if !$failRequired}
<span style="color:green;font-weight:bold;">OK</span>
</p>
{else}
<span style="color:red">{l s='Please consult the following error(s)'}</span>
</p>
<ul>
{foreach from=$testsRequired item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
<p>
<b>{l s='Optional parameters'}:</b>
{if !$failOptional}
<span style="color:green;font-weight:bold;">OK</span>
</p>
{else}
<span style="color:red">{l s='Please consult the following error(s)'}</span>
</p>
<ul>
{foreach from=$testsOptional item='value' key='key'}
{if $value eq 'fail'}
<li>{$testsErrors[$key]}</li>
{/if}
{/foreach}
</ul>
{/if}
</fieldset>
{/block}
controllers/admin/AdminInformationController.php
+10 -5
View File
@@ -27,13 +27,15 @@
class AdminInformationControllerCore extends AdminController
{
public function initContent()
{
$this->display = 'view';
parent::initContent();
}
$this->context->smarty->assign(array(
public function initView()
{
$this->tpl_view_vars = array(
'version' => array(
'mysql' => Db::getInstance()->getVersion(),
'php' => phpversion(),
@@ -55,9 +57,12 @@ class AdminInformationControllerCore extends AdminController
'port' => Configuration::get('PS_MAIL_SMTP_PORT'),
),
'user_agent' => $_SERVER['HTTP_USER_AGENT'],
));
);
$this->tpl_view_vars = array_merge($this->getTestResult(), $this->tpl_view_vars);
$this->context->smarty->assign($this->getTestResult());
$this->toolbar_title = $this->l('Tools : Informations');
unset($this->toolbar_btn['cancel']);
return parent::initView();
}
/**