Use BaseHtmlElement and more

This commit is contained in:
Thomas Gelf 2018-05-05 01:11:55 +02:00
parent f1480359da
commit 955695682d
22 changed files with 54 additions and 54 deletions

View File

@ -6,7 +6,7 @@ use Icinga\Exception\AuthenticationException;
use Icinga\Module\Director\Repository\IcingaTemplateRepository;
use Icinga\Module\Director\Restriction\HostgroupRestriction;
use Icinga\Module\Director\Web\Form\DirectorObjectForm;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\Link;
@ -218,11 +218,11 @@ class IcingaHostForm extends DirectorObjectForm
$inherited = $this->getInheritedGroups();
if (! empty($inherited)) {
/** @var BaseElement $links */
/** @var BaseHtmlElement $links */
$links = $this->createHostgroupLinks($inherited);
if (count($this->object()->getGroups())) {
$links->addAttributes(['class' => 'strike-links']);
/** @var BaseElement $link */
/** @var BaseHtmlElement $link */
foreach ($links->getContent() as $link) {
$link->addAttributes([
'title' => $this->translate(
@ -242,9 +242,9 @@ class IcingaHostForm extends DirectorObjectForm
return $this;
}
protected function strikeGroupLinks(BaseElement $links)
protected function strikeGroupLinks(BaseHtmlElement $links)
{
/** @var BaseElement $link */
/** @var BaseHtmlElement $link */
foreach ($links->getContent() as $link) {
$link->getAttributes()->add('style', 'text-decoration: strike');
}

View File

@ -6,13 +6,13 @@ use DirectoryIterator;
use Icinga\Exception\ProgrammingError;
use Icinga\Module\Director\Acl;
use Icinga\Module\Director\Dashboard\Dashboard;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\Icon;
use dipl\Html\Link;
use dipl\Translation\TranslationHelper;
abstract class Dashlet extends BaseElement
abstract class Dashlet extends BaseHtmlElement
{
use TranslationHelper;

View File

@ -153,13 +153,13 @@ abstract class TemplateController extends CompatController
}
$typeName = $this->getTranslatedType();
$this->content()->addPrintf(
$this->content()->add(Html::sprintf(
$this->translate(
'This is the "%s" %s Template. Based on this, you might want to:'
),
$typeName,
$templateName
)->add(
))->add(
$list
)->add(
Html::tag('h2', null, $this->translate('Current Template Usage'))

View File

@ -5,11 +5,11 @@ namespace Icinga\Module\Director\Web\Form\IplElement;
use Icinga\Exception\ProgrammingError;
use Icinga\Module\Director\IcingaConfig\ExtensibleSet as Set;
use Icinga\Module\Director\Web\Form\IconHelper;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Translation\TranslationHelper;
class ExtensibleSetElement extends BaseElement
class ExtensibleSetElement extends BaseHtmlElement
{
use TranslationHelper;
@ -201,7 +201,7 @@ class ExtensibleSetElement extends BaseElement
}
}
private function eventuallyAddAutosuggestion(BaseElement $element)
private function eventuallyAddAutosuggestion(BaseHtmlElement $element)
{
if ($this->suggestionContext !== null) {
$attrs = $element->getAttributes();
@ -340,7 +340,7 @@ class ExtensibleSetElement extends BaseElement
}
}
private function addRemainingAttributes(BaseElement $element)
private function addRemainingAttributes(BaseHtmlElement $element)
{
if ($this->remainingAttribs !== null) {
$element->getAttributes()->add($this->remainingAttribs);
@ -349,7 +349,7 @@ class ExtensibleSetElement extends BaseElement
return $element;
}
private function eventuallyDisable(BaseElement $element)
private function eventuallyDisable(BaseHtmlElement $element)
{
if ($this->isDisabled()) {
$this->disableElement($element);
@ -358,13 +358,13 @@ class ExtensibleSetElement extends BaseElement
return $element;
}
private function disableElement(BaseElement $element)
private function disableElement(BaseHtmlElement $element)
{
$element->getAttributes()->set('disabled', 'disabled');
return $element;
}
private function disableIf(BaseElement $element, $condition)
private function disableIf(BaseHtmlElement $element, $condition)
{
if ($condition) {
$this->disableElement($element);

View File

@ -165,7 +165,7 @@ class SelfService
$docBaseUrl = 'https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/distributed-monitoring';
$sectionSetup = 'distributed-monitoring-setup-satellite-client';
$sectionTopDown = 'distributed-monitoring-top-down';
$c->add(Html::p()->addPrintf(
$c->add(Html::tag('p')->add(Html::sprintf(
'Please check the %s for more related information.'
. ' The Director-assisted setup corresponds to configuring a %s environment.',
Html::a(
@ -176,7 +176,7 @@ class SelfService
['href' => $docBaseUrl . '#' . $sectionTopDown],
$this->translate('Top Down')
)
));
)));
$cc->addTitle('Agent deployment instructions');
$certname = $host->getObjectName();

View File

@ -3,7 +3,7 @@
namespace Icinga\Module\Director\Web\Table;
use Icinga\Module\Director\Util;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Link;
use dipl\Web\Table\ZfQueryBasedTable;
@ -19,10 +19,10 @@ class ActivityLogTable extends ZfQueryBasedTable
protected $hasObjectFilter = false;
/** @var BaseElement */
/** @var BaseHtmlElement */
protected $currentHead;
/** @var BaseElement */
/** @var BaseHtmlElement */
protected $currentBody;
protected $searchColumns = array(

View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Director\Web\Table;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Link;
use dipl\Html\Table;
use dipl\Translation\TranslationHelper;
@ -48,7 +48,7 @@ class CoreApiFieldsTable extends Table
}
}
protected function addAttributeColumns(BaseElement $tr, $attrs)
protected function addAttributeColumns(BaseHtmlElement $tr, $attrs)
{
$tr->add([
$this->makeBooleanColumn($attrs->state),

View File

@ -3,12 +3,12 @@
namespace Icinga\Module\Director\Web\Tree;
use Icinga\Module\Director\Objects\IcingaEndpoint;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\Link;
use dipl\Translation\TranslationHelper;
class InspectTreeRenderer extends BaseElement
class InspectTreeRenderer extends BaseHtmlElement
{
use TranslationHelper;

View File

@ -4,13 +4,13 @@ namespace Icinga\Module\Director\Web\Tree;
use Icinga\Module\Director\Db;
use Icinga\Module\Director\Resolver\TemplateTree;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\Link;
use dipl\Translation\TranslationHelper;
use dipl\Web\Widget\ControlsAndContent;
class TemplateTreeRenderer extends BaseElement
class TemplateTreeRenderer extends BaseHtmlElement
{
use TranslationHelper;

View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Director\Web\Widget;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\Link;
use dipl\Translation\TranslationHelper;
@ -13,7 +13,7 @@ use Icinga\Module\Director\PlainObjectRenderer;
use Icinga\Module\Director\Web\Table\DbHelper;
use stdClass;
class IcingaObjectInspection extends BaseElement
class IcingaObjectInspection extends BaseHtmlElement
{
use DbHelper;
use TranslationHelper;

View File

@ -2,7 +2,7 @@
namespace dipl\Html;
class Container extends BaseElement
class Container extends BaseHtmlElement
{
/** @var string */
protected $contentSeparator = "\n";

View File

@ -2,7 +2,7 @@
namespace dipl\Html;
class Icon extends BaseElement
class Icon extends BaseHtmlElement
{
protected $tag = 'i';

View File

@ -5,7 +5,7 @@ namespace dipl\Html;
use dipl\Web\Url;
use Icinga\Web\Url as WebUrl;
class Img extends BaseElement
class Img extends BaseHtmlElement
{
protected $tag = 'img';

View File

@ -5,7 +5,7 @@ namespace dipl\Html;
use dipl\Web\Url;
use Icinga\Web\Url as WebUrl;
class Link extends BaseElement
class Link extends BaseHtmlElement
{
protected $tag = 'a';

View File

@ -4,7 +4,7 @@ namespace dipl\Html;
use Traversable;
class Table extends BaseElement
class Table extends BaseHtmlElement
{
protected $contentSeparator = ' ';

View File

@ -2,31 +2,31 @@
namespace dipl\Web\Table\Extension;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Web\Url;
use dipl\Web\Widget\Controls;
trait QuickSearch
{
/** @var BaseElement */
/** @var BaseHtmlElement */
private $quickSearchForm;
public function getQuickSearch(BaseElement $parent, Url $url)
public function getQuickSearch(BaseHtmlElement $parent, Url $url)
{
$this->requireQuickSearchForm($parent, $url);
$search = $url->getParam('q');
return $search;
}
private function requireQuickSearchForm(BaseElement $parent, Url $url)
private function requireQuickSearchForm(BaseHtmlElement $parent, Url $url)
{
if ($this->quickSearchForm === null) {
$this->quickSearchForm = $this->buildQuickSearchForm($parent, $url);
}
}
private function buildQuickSearchForm(BaseElement $parent, Url $url)
private function buildQuickSearchForm(BaseHtmlElement $parent, Url $url)
{
$search = $url->getParam('q');
@ -52,7 +52,7 @@ trait QuickSearch
return $form;
}
protected function addQuickSearchToControls(Controls $parent, BaseElement $form)
protected function addQuickSearchToControls(Controls $parent, BaseHtmlElement $form)
{
$title = $parent->getTitleElement();
if ($title === null) {

View File

@ -5,7 +5,7 @@ namespace dipl\Web\Table\Extension;
use Icinga\Module\Director\Web\Form\IconHelper;
use Icinga\Web\Request;
use Icinga\Web\Response;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\HtmlString;
use Zend_Db_Select as ZfSelect;
@ -50,7 +50,7 @@ trait ZfSortablePriority
return $request->getPost('__FORM_NAME') === $this->getUniqueFormName();
}
protected function addSortPriorityButtons(BaseElement $tr, $row)
protected function addSortPriorityButtons(BaseHtmlElement $tr, $row)
{
$tr->add(
Html::tag(

View File

@ -3,11 +3,11 @@
namespace dipl\Web\Widget;
use dipl\Html\Attributes;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Element;
use dipl\Html\Html;
class AbstractList extends BaseElement
class AbstractList extends BaseHtmlElement
{
protected $contentSeparator = "\n";

View File

@ -2,9 +2,9 @@
namespace dipl\Web\Widget;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
class ActionBar extends BaseElement
class ActionBar extends BaseHtmlElement
{
protected $contentSeparator = ' ';

View File

@ -2,7 +2,7 @@
namespace dipl\Web\Widget;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Container;
use dipl\Html\Html;
@ -24,7 +24,7 @@ class Controls extends Container
/** @var string */
private $subTitle;
/** @var BaseElement */
/** @var BaseHtmlElement */
private $titleElement;
/**
@ -42,7 +42,7 @@ class Controls extends Container
return $this->setTitleElement($this->renderTitleElement());
}
public function setTitleElement(BaseElement $element)
public function setTitleElement(BaseHtmlElement $element)
{
if ($this->titleElement !== null) {
$this->remove($this->titleElement);
@ -125,7 +125,7 @@ class Controls extends Container
}
/**
* @return BaseElement
* @return BaseHtmlElement
*/
protected function renderTitleElement()
{

View File

@ -3,11 +3,11 @@
namespace dipl\Web\Widget;
use dipl\Html\Attributes;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Element;
use dipl\Html\Html;
class ListItem extends BaseElement
class ListItem extends BaseHtmlElement
{
protected $contentSeparator = "\n";

View File

@ -4,14 +4,14 @@ namespace dipl\Web\Widget;
use Icinga\Exception\ProgrammingError;
use dipl\Data\Paginatable;
use dipl\Html\BaseElement;
use dipl\Html\BaseHtmlElement;
use dipl\Html\Html;
use dipl\Html\Icon;
use dipl\Html\Link;
use dipl\Translation\TranslationHelper;
use dipl\Web\Url;
class Paginator extends BaseElement
class Paginator extends BaseHtmlElement
{
use TranslationHelper;