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:
Vincent Augagneur
2013-11-13 10:09:07 +01:00
parent 5d0117c5ed 2cbf8af2b2
commit 746d8de9c7
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCmsContentController.php
+9 -1
View File
@@ -120,7 +120,13 @@ class AdminCmsContentControllerCore extends AdminController
if (!$id_cms_category) if (!$id_cms_category)
$id_cms_category = 1; $id_cms_category = 1;
$this->page_header_toolbar_title = 'CMS'; $cms_category = new CMSCategory($id_cms_category);
$this->toolbar_title[] = 'CMS';
if ($this->display == 'edit_category')
$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
else
$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];
if ($this->display == 'list') if ($this->display == 'list')
{ {
@@ -143,6 +149,8 @@ class AdminCmsContentControllerCore extends AdminController
); );
} }
$this->page_header_toolbar_title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);
if (is_array($this->page_header_toolbar_btn) if (is_array($this->page_header_toolbar_btn)
&& $this->page_header_toolbar_btn instanceof Traversable && $this->page_header_toolbar_btn instanceof Traversable
|| trim($this->page_header_toolbar_title) != '') || trim($this->page_header_toolbar_title) != '')