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

Adjusted tab extensions to fit new URLs

This commit is contained in:
Thomas Gelf 2014-02-19 15:29:56 +00:00
parent 8f4d062cbc
commit 1b4f055bfa
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Widget/Tab.php
View File

@ -223,7 +223,7 @@ class Tab implements Widget
public function render(Zend_View_Abstract $view) public function render(Zend_View_Abstract $view)
{ {
$class = $this->active ? ' class="active" ' : ''; $class = $this->active ? ' class="active" ' : '';
$caption = $this->title; $caption = $view->escape($this->title);
if ($this->icon !== null) { if ($this->icon !== null) {
$caption = '<img src="' . $this->icon->getAbsoluteUrl() $caption = '<img src="' . $this->icon->getAbsoluteUrl()

11
library/Icinga/Web/Widget/Tabextension/OutputFormat.php
View File

@ -67,19 +67,19 @@ class OutputFormat implements Tabextension
'name' => 'pdf', 'name' => 'pdf',
'title' => 'PDF', 'title' => 'PDF',
'icon' => 'img/icons/pdf.png', 'icon' => 'img/icons/pdf.png',
'urlParams' => array('filetype' => 'pdf') 'urlParams' => array('format' => 'pdf'),
), ),
self::TYPE_CSV => array( self::TYPE_CSV => array(
'name' => 'csv', 'name' => 'csv',
'title' => 'CSV', 'title' => 'CSV',
'icon' => 'img/icons/csv.png', 'icon' => 'img/icons/csv.png',
'urlParams' => array('filetype' => 'csv') 'urlParams' => array('format' => 'csv')
), ),
self::TYPE_JSON => array( self::TYPE_JSON => array(
'name' => 'json', 'name' => 'json',
'title' => 'JSON', 'title' => 'JSON',
'icon' => 'img/icons/json.png', 'icon' => 'img/icons/json.png',
'urlParams' => array('filetype' => 'json') 'urlParams' => array('format' => 'json')
) )
); );
@ -110,7 +110,10 @@ class OutputFormat implements Tabextension
continue; continue;
} }
$tabConfig = $this->supportedTypes[$type]; $tabConfig = $this->supportedTypes[$type];
$tabConfig["url"] = Url::fromRequest(); $tabConfig['url'] = Url::fromRequest();
$tabConfig['tagParams'] = array(
'target' => '_blank'
);
$this->tabs[] = new Tab($tabConfig); $this->tabs[] = new Tab($tabConfig);
} }
} }