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

ipl-related: use HtmlDocument instead of Html

This commit is contained in:
Thomas Gelf 2018-05-05 01:25:24 +02:00
parent 955695682d
commit 988319dcf6
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Director/Dashboard/Dashboard.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Director\Dashboard; namespace Icinga\Module\Director\Dashboard;
use Countable; use dipl\Html\HtmlDocument;
use Exception; use Exception;
use Icinga\Authentication\Auth; use Icinga\Authentication\Auth;
use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaObject;
@ -16,7 +16,7 @@ use dipl\Translation\TranslationHelper;
use dipl\Web\Widget\Tabs; use dipl\Web\Widget\Tabs;
use Zend_Db_Select as ZfSelect; use Zend_Db_Select as ZfSelect;
abstract class Dashboard extends Html implements Countable abstract class Dashboard extends HtmlDocument
{ {
use TranslationHelper; use TranslationHelper;

3
library/Director/Web/Widget/AdditionalTableActions.php
View File

@ -3,6 +3,7 @@
namespace Icinga\Module\Director\Web\Widget; namespace Icinga\Module\Director\Web\Widget;
use dipl\Html\Html; use dipl\Html\Html;
use dipl\Html\HtmlDocument;
use dipl\Html\Icon; use dipl\Html\Icon;
use dipl\Html\Link; use dipl\Html\Link;
use dipl\Translation\TranslationHelper; use dipl\Translation\TranslationHelper;
@ -31,7 +32,7 @@ class AdditionalTableActions
$this->table = $table; $this->table = $table;
} }
public function appendTo(Html $parent) public function appendTo(HtmlDocument $parent)
{ {
$links = []; $links = [];
if ($this->hasPermission('director/admin')) { if ($this->hasPermission('director/admin')) {

8
library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php vendored
View File

@ -2,7 +2,7 @@
namespace dipl\Web\Controller\Extension; namespace dipl\Web\Controller\Extension;
use dipl\Html\Html; use dipl\Html\HtmlDocument;
use dipl\Web\Widget\Content; use dipl\Web\Widget\Content;
use dipl\Web\Widget\Controls; use dipl\Web\Widget\Controls;
use dipl\Web\Widget\Tabs; use dipl\Web\Widget\Tabs;
@ -53,10 +53,10 @@ trait ControlsAndContentHelper
} }
/** /**
* @param Html|null $actionBar * @param HtmlDocument|null $actionBar
* @return Html * @return HtmlDocument
*/ */
public function actions(Html $actionBar = null) public function actions(HtmlDocument $actionBar = null)
{ {
if ($actionBar === null) { if ($actionBar === null) {
return $this->controls()->getActionBar(); return $this->controls()->getActionBar();

3
library/vendor/ipl/Web/Widget/Controls.php vendored
View File

@ -5,6 +5,7 @@ namespace dipl\Web\Widget;
use dipl\Html\BaseHtmlElement; use dipl\Html\BaseHtmlElement;
use dipl\Html\Container; use dipl\Html\Container;
use dipl\Html\Html; use dipl\Html\Html;
use dipl\Html\HtmlDocument;
class Controls extends Container class Controls extends Container
{ {
@ -112,7 +113,7 @@ class Controls extends Container
return $this->actions; return $this->actions;
} }
public function setActionBar(Html $actionBar) public function setActionBar(HtmlDocument $actionBar)
{ {
if ($this->actions !== null) { if ($this->actions !== null) {
$this->remove($this->actions); $this->remove($this->actions);

6
library/vendor/ipl/Web/Widget/ControlsAndContent.php vendored
View File

@ -2,7 +2,7 @@
namespace dipl\Web\Widget; namespace dipl\Web\Widget;
use dipl\Html\Html; use dipl\Html\HtmlDocument;
use dipl\Web\Url; use dipl\Web\Url;
interface ControlsAndContent interface ControlsAndContent
@ -18,9 +18,9 @@ interface ControlsAndContent
public function tabs(); public function tabs();
/** /**
* @return Html * @return HtmlDocument
*/ */
public function actions(Html $actionBar = null); public function actions(HtmlDocument $actionBar = null);
/** /**
* @return Content * @return Content