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

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

Browse Source
This commit is contained in:
Kevin Granger
2013-09-19 16:58:12 +02:00
parent 650001024a 2b2b502ba2
commit f222bb7b7f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/module/Module.php
+2 -2
View File
@@ -1509,7 +1509,7 @@ abstract class ModuleCore
public function displayError($error) public function displayError($error)
{ {
$output = ' $output = '
<div class="module_error alert error"> <div class="module_error alert alert-danger">
'.$error.' '.$error.'
</div>'; </div>';
$this->error = true; $this->error = true;
@@ -1519,7 +1519,7 @@ abstract class ModuleCore
public function displayConfirmation($string) public function displayConfirmation($string)
{ {
$output = ' $output = '
<div class="module_confirmation conf confirm"> <div class="module_confirmation conf confirm alert alert-success">
'.$string.' '.$string.'
</div>'; </div>';
return $output; return $output;
modules/bankwire/bankwire.php
+2 -2
View File
@@ -107,7 +107,7 @@ class BankWire extends PaymentModule
Configuration::updateValue('BANK_WIRE_OWNER', Tools::getValue('BANK_WIRE_OWNER')); Configuration::updateValue('BANK_WIRE_OWNER', Tools::getValue('BANK_WIRE_OWNER'));
Configuration::updateValue('BANK_WIRE_ADDRESS', Tools::getValue('BANK_WIRE_ADDRESS')); Configuration::updateValue('BANK_WIRE_ADDRESS', Tools::getValue('BANK_WIRE_ADDRESS'));
} }
$this->_html .= '<div class="alert alert-success"> '.$this->l('Settings updated').'</div>'; $this->_html .= $this->displayConfirmation($this->l('Settings updated'));
} }
private function _displayBankWire() private function _displayBankWire()
@@ -124,7 +124,7 @@ class BankWire extends PaymentModule
$this->_postProcess(); $this->_postProcess();
else else
foreach ($this->_postErrors as $err) foreach ($this->_postErrors as $err)
$this->_html .= '<div class="alert alert-danger">'.$err.'</div>'; $this->_html .= $this->displayError($err);
} }
else else
$this->_html .= '<br />'; $this->_html .= '<br />';
modules/blockbestsellers/blockbestsellers.php
+1 -1
View File
@@ -108,7 +108,7 @@ class BlockBestSellers extends Module
if (Tools::isSubmit('submitBestSellers')) if (Tools::isSubmit('submitBestSellers'))
{ {
Configuration::updateValue('PS_BLOCK_BESTSELLERS_DISPLAY', (int)Tools::getValue('PS_BLOCK_BESTSELLERS_DISPLAY')); Configuration::updateValue('PS_BLOCK_BESTSELLERS_DISPLAY', (int)Tools::getValue('PS_BLOCK_BESTSELLERS_DISPLAY'));
$output .= '<div class="alert alert-success">'.$this->l('Settings updated').'</div>'; $output .= $this->displayConfirmation($this->l('Settings updated'));
} }
return $output.$this->renderForm(); return $output.$this->renderForm();
} }