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-10-18 19:07:15 +02:00
parent 067eecdc70 cdab5ed6c9
commit 1f02bcaa75
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+4 -13
View File
@@ -2419,14 +2419,9 @@ class AdminProductsControllerCore extends AdminController
protected function _displayDraftWarning($active) protected function _displayDraftWarning($active)
{ {
$content = '<div class="warn draft" style="'.($active ? 'display:none' : '').'"> $content = '<div class="warn draft" style="'.($active ? 'display:none' : '').'">
<p> <span>'.$this->l('Your product will be saved as a draft.').'</span>
<span style="float: left"> <a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> '.$this->l('Save and preview').'</a>
'.$this->l('Your product will be saved as a draft.').'
</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" /> <input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
<br class="clear" />
</p>
</div>'; </div>';
$this->tpl_form_vars['draft_warning'] = $content; $this->tpl_form_vars['draft_warning'] = $content;
} }
@@ -4376,13 +4371,9 @@ class AdminProductsControllerCore extends AdminController
protected function _displayUnavailableProductWarning() protected function _displayUnavailableProductWarning()
{ {
$content = '<div class="alert"> $content = '<div class="alert">
<p> <span>'.$this->l('Your product will be saved as a draft.').'</span>
<span> <a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> '.$this->l('Save and preview').'</a>
'.$this->l('Your product will be saved as a draft.').'
</span>
<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" /> <input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
</p>
</div>'; </div>';
$this->tpl_form_vars['warning_unavailable_product'] = $content; $this->tpl_form_vars['warning_unavailable_product'] = $content;
} }