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

Dashlet: Add titles to iframe title attribute 

resolves #8459
This commit is contained in:
Marius Hein 2015-02-23 16:20:08 +01:00
parent ea2a17a76c
commit 4cdc1313cf
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Web/Widget/Dashboard/Dashlet.php
View File

@ -6,7 +6,6 @@ namespace Icinga\Web\Widget\Dashboard;
use Zend_Form_Element_Button; use Zend_Form_Element_Button;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Web\Url; use Icinga\Web\Url;
use Icinga\Web\Widget\AbstractWidget;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
@ -54,7 +53,12 @@ class Dashlet extends UserWidget
<div class="container" data-icinga-url="{URL}"> <div class="container" data-icinga-url="{URL}">
<h1><a href="{FULL_URL}" data-base-target="col1">{TITLE}</a></h1> <h1><a href="{FULL_URL}" data-base-target="col1">{TITLE}</a></h1>
<noscript> <noscript>
<iframe src="{IFRAME_URL}" style="height:100%; width:99%" frameborder="no"></iframe> <iframe
src="{IFRAME_URL}"
style="height:100%; width:99%"
frameborder="no"
title="{TITLE_PREFIX}{TITLE}">
</iframe>
</noscript> </noscript>
</div> </div>
EOD; EOD;
@ -184,7 +188,8 @@ EOD;
'{IFRAME_URL}', '{IFRAME_URL}',
'{FULL_URL}', '{FULL_URL}',
'{TITLE}', '{TITLE}',
'{REMOVE}' '{REMOVE}',
'{TITLE_PREFIX}'
); );
$replaceTokens = array( $replaceTokens = array(
@ -192,7 +197,9 @@ EOD;
$iframeUrl, $iframeUrl,
$url->getUrlWithout(array('view', 'limit')), $url->getUrlWithout(array('view', 'limit')),
$view->escape($this->getTitle()), $view->escape($this->getTitle()),
$this->getRemoveLink() $this->getRemoveLink(),
t('Dashlet') . ': '
); );
return str_replace($searchTokens, $replaceTokens, $this->template); return str_replace($searchTokens, $replaceTokens, $this->template);