From 3ecf390a4b35ec5d3eedefb37f7ea1ede0c032d2 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 1 Apr 2016 12:04:49 +0200 Subject: [PATCH] doc: Use module name for tab and window title --- modules/doc/application/controllers/ModuleController.php | 5 +++-- modules/doc/library/Doc/DocController.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php index 5544dbce4..fafd94656 100644 --- a/modules/doc/application/controllers/ModuleController.php +++ b/modules/doc/application/controllers/ModuleController.php @@ -90,11 +90,12 @@ class ModuleController extends DocController { $module = $this->params->getRequired('moduleName'); $this->assertModuleInstalled($module); - $this->view->moduleName = $module; + $moduleManager = Icinga::app()->getModuleManager(); + $name = $moduleManager->getModule($module)->getTitle(); try { $this->renderToc( $this->getPath($module, Icinga::app()->getModuleManager()->getModuleDir($module, '/doc')), - $module, + $name, 'doc/module/chapter', array('moduleName' => $module) ); diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php index 5f5438ed8..21c2173ce 100644 --- a/modules/doc/library/Doc/DocController.php +++ b/modules/doc/library/Doc/DocController.php @@ -71,10 +71,10 @@ class DocController extends Controller ->setUrl($url) ->setUrlParams($urlParams); $name = ucfirst($name); - $this->view->title = sprintf($this->translate('%s Documentation'), $name); + $title = sprintf($this->translate('%s Documentation'), $name); $this->getTabs()->add('toc', array( 'active' => true, - 'title' => $name, + 'title' => $title, 'url' => Url::fromRequest() )); $this->render('toc', null, true);