tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-26 03:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

dashboards/settings: Don't disguise action links as button links

Browse Source
This commit is contained in:
Johannes Meyer 2022-04-29 15:56:06 +02:00 committed by Yonas Habteab
parent 8bd82ff97c
commit d91795d815
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/DashboardsController.php
View File

@ -20,7 +20,8 @@ use Icinga\Web\Notification;
use Icinga\Web\Widget\Tabextension\DashboardSettings; use Icinga\Web\Widget\Tabextension\DashboardSettings;
use ipl\Web\Compat\CompatController; use ipl\Web\Compat\CompatController;
use ipl\Web\Url; use ipl\Web\Url;
use ipl\Web\Widget\ActionLink; use ipl\Web\Widget\Icon;
use ipl\Web\Widget\Link;
class DashboardsController extends CompatController class DashboardsController extends CompatController
{ {
@ -419,19 +420,18 @@ class DashboardsController extends CompatController
$this->dashboard->activate('dashboard_settings'); $this->dashboard->activate('dashboard_settings');
$this->addControl(new ActionLink( $this->addControl(new Link(
t('Add new Home'), [new Icon('plus'), t('Add new Home')],
Url::fromPath(Dashboard::BASE_ROUTE . '/new-home'), Url::fromPath(Dashboard::BASE_ROUTE . '/new-home'),
'plus',
[ [
'class' => 'add-home', 'class' => ['button-link', 'add-home'],
'data-icinga-modal' => true, 'data-icinga-modal' => true,
'data-no-icinga-ajax' => true 'data-no-icinga-ajax' => true
] ]
)); ));
$this->content->getAttributes()->add('class', 'dashboard-manager'); $this->content->getAttributes()->add('class', 'dashboard-manager');
$this->controls->getAttributes()->add('class', 'dashboard-manager-controls'); $this->controls->getAttributes()->add('class', ['separated', 'dashboard-manager-controls']);
$this->addContent(new Settings($this->dashboard)); $this->addContent(new Settings($this->dashboard));
} }

4
library/Icinga/Web/Dashboard/Common/ItemListControl.php
View File

@ -8,8 +8,8 @@ use ipl\Html\BaseHtmlElement;
use ipl\Html\HtmlElement; use ipl\Html\HtmlElement;
use ipl\Html\ValidHtml; use ipl\Html\ValidHtml;
use ipl\Web\Url; use ipl\Web\Url;
use ipl\Web\Widget\ActionLink;
use ipl\Web\Widget\Icon; use ipl\Web\Widget\Icon;
use ipl\Web\Widget\Link;
abstract class ItemListControl extends BaseHtmlElement abstract class ItemListControl extends BaseHtmlElement
{ {
@ -64,7 +64,7 @@ abstract class ItemListControl extends BaseHtmlElement
protected function assembleHeader(Url $url, string $title) protected function assembleHeader(Url $url, string $title)
{ {
$header = HtmlElement::create('h1', ['class' => 'collapsible-header'], $title); $header = HtmlElement::create('h1', ['class' => 'collapsible-header'], $title);
$header->addHtml(new Link(t('Edit'), $url, [ $header->addHtml(new ActionLink(t('Edit'), $url, null, [
'data-icinga-modal' => true, 'data-icinga-modal' => true,
'data-no-icinga-ajax' => true 'data-no-icinga-ajax' => true
])); ]));

9
library/Icinga/Web/Dashboard/ItemList/DashboardHomeList.php
View File

@ -10,7 +10,8 @@ use Icinga\Web\Dashboard\DashboardHome;
use ipl\Html\BaseHtmlElement; use ipl\Html\BaseHtmlElement;
use ipl\Html\HtmlElement; use ipl\Html\HtmlElement;
use ipl\Web\Url; use ipl\Web\Url;
use ipl\Web\Widget\ActionLink; use ipl\Web\Widget\Icon;
use ipl\Web\Widget\Link;
class DashboardHomeList extends ItemListControl class DashboardHomeList extends ItemListControl
{ {
@ -63,6 +64,10 @@ class DashboardHomeList extends ItemListControl
$url = Url::fromPath(Dashboard::BASE_ROUTE . '/new-pane'); $url = Url::fromPath(Dashboard::BASE_ROUTE . '/new-pane');
$url->setParams(['home' => $this->home->getName()]); $url->setParams(['home' => $this->home->getName()]);
return new ActionLink(t('Add Dashboard'), $url, 'plus', ['class' => 'add-dashboard']); return new Link(
[new Icon('plus'), t('Add Dashboard')],
$url,
['class' => ['button-link', 'add-dashboard']]
);
} }
} }

9
library/Icinga/Web/Dashboard/ItemList/DashboardList.php
View File

@ -10,7 +10,8 @@ use Icinga\Web\Dashboard\Pane;
use ipl\Html\BaseHtmlElement; use ipl\Html\BaseHtmlElement;
use ipl\Html\HtmlElement; use ipl\Html\HtmlElement;
use ipl\Web\Url; use ipl\Web\Url;
use ipl\Web\Widget\ActionLink; use ipl\Web\Widget\Icon;
use ipl\Web\Widget\Link;
class DashboardList extends ItemListControl class DashboardList extends ItemListControl
{ {
@ -70,6 +71,10 @@ class DashboardList extends ItemListControl
'pane' => $this->pane->getName() 'pane' => $this->pane->getName()
]); ]);
return new ActionLink(t('Add Dashlet'), $url, 'plus', ['class' => 'add-dashlet']); return new Link(
[new Icon('plus'), t('Add Dashlet')],
$url,
['class' => ['button-link', 'add-dashlet']]
);
} }
} }

3
library/Icinga/Web/Dashboard/ItemList/DashletListItem.php
View File

@ -11,6 +11,7 @@ use ipl\Html\BaseHtmlElement;
use ipl\Html\HtmlElement; use ipl\Html\HtmlElement;
use ipl\Html\ValidHtml; use ipl\Html\ValidHtml;
use ipl\Web\Url; use ipl\Web\Url;
use ipl\Web\Widget\ActionLink;
use ipl\Web\Widget\Link; use ipl\Web\Widget\Link;
class DashletListItem extends BaseHtmlElement class DashletListItem extends BaseHtmlElement
@ -84,7 +85,7 @@ class DashletListItem extends BaseHtmlElement
'dashlet' => $this->dashlet->getName() 'dashlet' => $this->dashlet->getName()
]); ]);
$header->addHtml(new Link(t('Edit'), $url, [ $header->addHtml(new ActionLink(t('Edit'), $url, null, [
'data-icinga-modal' => true, 'data-icinga-modal' => true,
'data-no-icinga-ajax' => true 'data-no-icinga-ajax' => true
])); ]));