tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NavigationItemRenderer: provide more human-readable aliases for internal link targets 

refs #10330
This commit is contained in:
Alexander A. Klimov 2015-12-17 16:13:12 +01:00
parent 7d5c15469e
commit 2473c4bbef
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php
View File

@ -54,7 +54,11 @@ class NavigationItemRenderer
$this->setOptions($options); $this->setOptions($options);
} }
$this->internalLinkTargets = array('_main', '_self', '_next'); $this->internalLinkTargets = array(
'single_column' => '_main',
'current_column' => '_self',
'next_column' => '_next'
);
$this->init(); $this->init();
} }
@ -185,7 +189,7 @@ class NavigationItemRenderer
$url->overwriteParams($item->getUrlParameters()); $url->overwriteParams($item->getUrlParameters());
$target = $item->getTarget(); $target = $item->getTarget();
if ($url->isExternal() && (!$target || in_array($target, $this->internalLinkTargets, true))) { if ($url->isExternal() && ! ($target && $this->actualLinkTarget($target) === null)) {
$url = Url::fromPath('iframe', array('url' => $url)); $url = Url::fromPath('iframe', array('url' => $url));
} }
@ -222,10 +226,28 @@ class NavigationItemRenderer
return ''; return '';
} }
if (! in_array($target, $this->internalLinkTargets, true)) { $actualTarget = $this->actualLinkTarget($target);
if ($actualTarget === null) {
return ' target="' . $this->view()->escape($target) . '"'; return ' target="' . $this->view()->escape($target) . '"';
} }
return ' data-base-target="' . $target . '"'; return ' data-base-target="' . $actualTarget . '"';
}
/**
* If $target is an internal linktarget, return its HTML version. Otherwise, return null.
*
* @param string $target
*
* @return string|null
*/
protected function actualLinkTarget($target)
{
if (isset($this->internalLinkTargets[$target])) {
return $this->internalLinkTargets[$target];
}
if (in_array($target, $this->internalLinkTargets, true)) {
return $target;
}
} }
} }