From 445c981d01b50a66a2135b4a854fd6bdabd52252 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 18 Feb 2014 17:47:29 +0000 Subject: [PATCH] Tab extensions use imgs instead of icons --- .../Web/Widget/Tabextension/BasketAction.php | 2 -- .../Web/Widget/Tabextension/DashboardAction.php | 4 +--- .../Web/Widget/Tabextension/OutputFormat.php | 17 +++++++++-------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/library/Icinga/Web/Widget/Tabextension/BasketAction.php b/library/Icinga/Web/Widget/Tabextension/BasketAction.php index 8e776e68f..36ff4278a 100644 --- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php +++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php @@ -43,8 +43,6 @@ class BasketAction implements Tabextension * Applies the dashboard actions to the provided tabset * * @param Tabs $tabs The tabs object to extend with - * - * @see \Icinga\Web\Widget\Tabextension::apply() */ public function apply(Tabs $tabs) { diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php index fc5aa55a5..e845bef5f 100644 --- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php +++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php @@ -45,15 +45,13 @@ class DashboardAction implements Tabextension * Applies the dashboard actions to the provided tabset * * @param Tabs $tabs The tabs object to extend with - * - * @see \Icinga\Web\Widget\Tabextension::apply() */ public function apply(Tabs $tabs) { $tabs->addAsDropdown( 'dashboard', array( - 'iconCls' => 'icinga-icon-dashboard', + 'icon' => 'img/icons/dashboard.png', 'title' => 'Add To Dashboard', 'url' => Url::fromPath('dashboard/addurl'), 'urlParams' => array( diff --git a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php index 595bf6c07..a5375702c 100644 --- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php +++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php @@ -65,21 +65,22 @@ class OutputFormat implements Tabextension private $supportedTypes = array( self::TYPE_PDF => array( 'name' => 'pdf', - 'title' => ' PDF', - 'urlParams' => array('format' => 'pdf') + 'title' => 'PDF', + 'icon' => 'img/icons/pdf.png', + 'urlParams' => array('filetype' => 'pdf') ), - /* self::TYPE_CSV => array( 'name' => 'csv', - 'title' => ' CSV', - 'urlParams' => array('format' => 'csv') + 'title' => 'CSV', + 'icon' => 'img/icons/csv.png', + 'urlParams' => array('filetype' => 'csv') ), self::TYPE_JSON => array( 'name' => 'json', - 'title' => ' JSON', - 'urlParams' => array('format' => 'json') + 'title' => 'JSON', + 'icon' => 'img/icons/json.png', + 'urlParams' => array('filetype' => 'json') ) - */ ); /**