Use ipl web widgets

Icinga · Aug 9, 2023 · 0cefbaf · 0cefbaf
1 parent 6f57497
commit 0cefbaf
Show file tree

Hide file tree

Showing 62 changed files with 98 additions and 316 deletions.
diff --git a/application/controllers/CommentsController.php b/application/controllers/CommentsController.php
@@ -11,12 +11,12 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
 use ipl\Web\Url;
+use ipl\Web\Widget\ShowMore;
 
 class CommentsController extends Controller
 {

diff --git a/application/controllers/DowntimesController.php b/application/controllers/DowntimesController.php
@@ -11,12 +11,12 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemList\DowntimeList;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
 use ipl\Web\Url;
+use ipl\Web\Widget\ShowMore;
 
 class DowntimesController extends Controller
 {

diff --git a/application/controllers/HostgroupsController.php b/application/controllers/HostgroupsController.php
@@ -10,12 +10,11 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemTable\HostgroupTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
-use ipl\Orm\Query;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Url;
+use ipl\Web\Widget\ShowMore;
 
 class HostgroupsController extends Controller
 {

diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -18,14 +18,14 @@
 use Icinga\Module\Icingadb\Widget\ItemList\HostList;
 use Icinga\Module\Icingadb\Widget\HostStatusBar;
 use Icinga\Module\Icingadb\Widget\ItemTable\HostItemTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use ipl\Orm\Query;
 use ipl\Stdlib\Filter;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
 use ipl\Web\Url;
+use ipl\Web\Widget\ShowMore;
 
 class HostsController extends Controller
 {

diff --git a/application/controllers/ServicegroupsController.php b/application/controllers/ServicegroupsController.php
@@ -10,11 +10,11 @@
 use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Icingadb\Web\Controller;
 use Icinga\Module\Icingadb\Widget\ItemTable\ServicegroupTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
 use ipl\Web\Url;
+use ipl\Web\Widget\ShowMore;
 
 class ServicegroupsController extends Controller
 {

diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
@@ -20,7 +20,6 @@
 use Icinga\Module\Icingadb\Widget\ItemList\ServiceList;
 use Icinga\Module\Icingadb\Widget\ItemTable\ServiceItemTable;
 use Icinga\Module\Icingadb\Widget\ServiceStatusBar;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
 use Icinga\Util\Environment;
 use ipl\Html\HtmlString;
@@ -30,6 +29,7 @@
 use ipl\Web\Control\SortControl;
 use ipl\Web\Filter\QueryString;
 use ipl\Web\Url;
+use ipl\Web\Widget\ShowMore;
 
 class ServicesController extends Controller
 {

diff --git a/library/Icingadb/Common/ListItemMinimalLayout.php b/library/Icingadb/Common/ListItemMinimalLayout.php
@@ -5,6 +5,7 @@
 namespace Icinga\Module\Icingadb\Common;
 
 use ipl\Html\BaseHtmlElement;
+use ipl\Web\Common\CaptionDisabled;
 
 trait ListItemMinimalLayout
 {

diff --git a/library/Icingadb/Common/ObjectInspectionDetail.php b/library/Icingadb/Common/ObjectInspectionDetail.php
@@ -12,7 +12,6 @@
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Module\Icingadb\Model\Service;
 use Icinga\Module\Icingadb\Widget\Detail\CustomVarTable;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Util\Format;
 use Icinga\Util\Json;
 use ipl\Html\BaseHtmlElement;
@@ -22,6 +21,7 @@
 use ipl\Html\Text;
 use ipl\Orm\Model;
 use ipl\Web\Widget\CopyToClipboard;
+use ipl\Web\Widget\EmptyState;
 
 abstract class ObjectInspectionDetail extends BaseHtmlElement
 {

diff --git a/library/Icingadb/Hook/Common/TotalSlaReportUtils.php b/library/Icingadb/Hook/Common/TotalSlaReportUtils.php
@@ -5,9 +5,9 @@
 namespace Icinga\Module\Icingadb\Hook\Common;
 
 use Icinga\Module\Icingadb\ProvidedHook\Reporting\HostSlaReport;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Module\Reporting\Timerange;
 use ipl\Html\Html;
+use ipl\Web\Widget\EmptyState;
 
 use function ipl\I18n\t;
 

diff --git a/library/Icingadb/ProvidedHook/Reporting/SlaReport.php b/library/Icingadb/ProvidedHook/Reporting/SlaReport.php
@@ -8,7 +8,6 @@
 use DatePeriod;
 use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Common\Database;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Module\Reporting\Hook\ReportHook;
 use Icinga\Module\Reporting\ReportData;
 use Icinga\Module\Reporting\ReportRow;
@@ -19,6 +18,8 @@
 use ipl\Stdlib\Filter\Rule;
 use ipl\Web\Filter\QueryString;
 
+use ipl\Web\Widget\EmptyState;
+
 use function ipl\I18n\t;
 
 /**

diff --git a/library/Icingadb/Web/Controller.php b/library/Icingadb/Web/Controller.php
@@ -16,9 +16,7 @@
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\Json\JsonDecodeException;
 use Icinga\Module\Icingadb\Common\Auth;
-use Icinga\Module\Icingadb\Common\BaseItemTable;
 use Icinga\Module\Icingadb\Common\Database;
-use Icinga\Module\Icingadb\Common\BaseItemList;
 use Icinga\Module\Icingadb\Common\SearchControls;
 use Icinga\Module\Icingadb\Data\CsvResultSet;
 use Icinga\Module\Icingadb\Data\JsonResultSet;
@@ -37,6 +35,8 @@
 use ipl\Orm\Query;
 use ipl\Orm\UnionQuery;
 use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseItemList;
+use ipl\Web\Common\BaseItemTable;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\PaginationControl;

diff --git a/library/Icingadb/Widget/Detail/CheckStatistics.php b/library/Icingadb/Widget/Detail/CheckStatistics.php
@@ -6,7 +6,6 @@
 
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Icingadb\Widget\CheckAttempt;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Util\Format;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
@@ -15,6 +14,7 @@
 use ipl\Html\HtmlString;
 use ipl\Html\Text;
 use ipl\Web\Common\Card;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\StateBall;
 use ipl\Web\Widget\TimeAgo;
 use ipl\Web\Widget\TimeSince;

diff --git a/library/Icingadb/Widget/Detail/CustomVarTable.php b/library/Icingadb/Widget/Detail/CustomVarTable.php
@@ -5,14 +5,14 @@
 namespace Icinga\Module\Icingadb\Widget\Detail;
 
 use Icinga\Module\Icingadb\Hook\CustomVarRendererHook;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\HtmlDocument;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
 use ipl\Orm\Model;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\Icon;
 
 class CustomVarTable extends BaseHtmlElement

diff --git a/library/Icingadb/Widget/Detail/DowntimeDetail.php b/library/Icingadb/Widget/Detail/DowntimeDetail.php
@@ -10,14 +10,13 @@
 use Icinga\Module\Icingadb\Common\Database;
 use Icinga\Module\Icingadb\Common\HostLink;
 use Icinga\Module\Icingadb\Common\Links;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Module\Icingadb\Widget\MarkdownText;
 use Icinga\Module\Icingadb\Common\ServiceLink;
 use Icinga\Module\Icingadb\Forms\Command\Object\DeleteDowntimeForm;
 use Icinga\Module\Icingadb\Model\Downtime;
 use Icinga\Module\Icingadb\Widget\ItemList\DowntimeList;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\HorizontalKeyValue;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\HtmlElement;
@@ -27,6 +26,7 @@
 use ipl\Web\Filter\QueryString;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
+use ipl\Web\Widget\ShowMore;
 use ipl\Web\Widget\StateBall;
 
 class DowntimeDetail extends BaseHtmlElement

diff --git a/library/Icingadb/Widget/Detail/EventDetail.php b/library/Icingadb/Widget/Detail/EventDetail.php
@@ -25,12 +25,11 @@
 use Icinga\Module\Icingadb\Model\NotificationHistory;
 use Icinga\Module\Icingadb\Model\StateHistory;
 use Icinga\Module\Icingadb\Util\PluginOutput;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use ipl\Web\Widget\CopyToClipboard;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\HorizontalKeyValue;
 use Icinga\Module\Icingadb\Widget\ItemTable\UserTable;
 use Icinga\Module\Icingadb\Widget\PluginOutputContainer;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\FormattedString;
 use ipl\Html\HtmlElement;
@@ -41,6 +40,7 @@
 use ipl\Stdlib\Str;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;
+use ipl\Web\Widget\ShowMore;
 use ipl\Web\Widget\StateBall;
 
 class EventDetail extends BaseHtmlElement

diff --git a/library/Icingadb/Widget/Detail/HostDetail.php b/library/Icingadb/Widget/Detail/HostDetail.php
@@ -7,9 +7,9 @@
 use Icinga\Module\Icingadb\Hook\ExtensionHook\ObjectDetailExtensionHook;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Module\Icingadb\Model\ServicestateSummary;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use ipl\Html\Html;
 use ipl\Stdlib\Filter;
+use ipl\Web\Widget\EmptyState;
 
 class HostDetail extends ObjectDetail
 {

diff --git a/library/Icingadb/Widget/Detail/HostMetaInfo.php b/library/Icingadb/Widget/Detail/HostMetaInfo.php
@@ -6,7 +6,7 @@
 
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Icingadb\Model\Host;
-use Icinga\Module\Icingadb\Widget\EmptyState;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\HorizontalKeyValue;
 use ipl\Web\Widget\VerticalKeyValue;
 use ipl\Html\Attributes;

diff --git a/library/Icingadb/Widget/Detail/ObjectDetail.php b/library/Icingadb/Widget/Detail/ObjectDetail.php
@@ -31,13 +31,11 @@
 use Icinga\Module\Icingadb\Model\Usergroup;
 use Icinga\Module\Icingadb\Util\PluginOutput;
 use Icinga\Module\Icingadb\Widget\ItemList\DowntimeList;
-use Icinga\Module\Icingadb\Widget\EmptyState;
-use Icinga\Module\Icingadb\Widget\StateChange;
 use ipl\Web\Widget\CopyToClipboard;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\HorizontalKeyValue;
 use Icinga\Module\Icingadb\Widget\ItemList\CommentList;
 use Icinga\Module\Icingadb\Widget\PluginOutputContainer;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use Icinga\Module\Icingadb\Widget\TagList;
 use Icinga\Module\Monitoring\Hook\DetailviewExtensionHook;
 use Icinga\Web\Navigation\Navigation;
@@ -50,6 +48,7 @@
 use ipl\Orm\ResultSet;
 use ipl\Stdlib\Filter;
 use ipl\Web\Widget\Icon;
+use ipl\Web\Widget\ShowMore;
 use ipl\Web\Widget\StateBall;
 
 class ObjectDetail extends BaseHtmlElement

diff --git a/library/Icingadb/Widget/Detail/ObjectsDetail.php b/library/Icingadb/Widget/Detail/ObjectsDetail.php
@@ -11,12 +11,11 @@
 use Icinga\Module\Icingadb\Model\HoststateSummary;
 use Icinga\Module\Icingadb\Model\ServicestateSummary;
 use Icinga\Module\Icingadb\Util\FeatureStatus;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Module\Icingadb\Widget\HostStateBadges;
 use Icinga\Module\Icingadb\Widget\ServiceStateBadges;
-use ipl\Html\HtmlElement;
 use ipl\Orm\Query;
 use ipl\Stdlib\BaseFilter;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\VerticalKeyValue;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;

diff --git a/library/Icingadb/Widget/Detail/PerfDataTable.php b/library/Icingadb/Widget/Detail/PerfDataTable.php
@@ -6,12 +6,12 @@
 
 use Icinga\Module\Icingadb\Util\PerfData;
 use Icinga\Module\Icingadb\Util\PerfDataSet;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use ipl\Html\Attributes;
 use ipl\Html\HtmlElement;
 use ipl\Html\HtmlString;
 use ipl\Html\Table;
 use ipl\Html\Text;
+use ipl\Web\Widget\EmptyState;
 
 class PerfDataTable extends Table
 {

diff --git a/library/Icingadb/Widget/Detail/UserDetail.php b/library/Icingadb/Widget/Detail/UserDetail.php
@@ -9,14 +9,14 @@
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Hook\ExtensionHook\ObjectDetailExtensionHook;
 use Icinga\Module\Icingadb\Model\User;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use ipl\Html\Attributes;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\HorizontalKeyValue;
 use Icinga\Module\Icingadb\Widget\ItemTable\UsergroupTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
+use ipl\Web\Widget\ShowMore;
 
 class UserDetail extends BaseHtmlElement
 {

diff --git a/library/Icingadb/Widget/Detail/UsergroupDetail.php b/library/Icingadb/Widget/Detail/UsergroupDetail.php
@@ -9,14 +9,14 @@
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Hook\ExtensionHook\ObjectDetailExtensionHook;
 use Icinga\Module\Icingadb\Model\Usergroup;
-use Icinga\Module\Icingadb\Widget\EmptyState;
 use Icinga\Module\Icingadb\Widget\ItemTable\UserTable;
-use Icinga\Module\Icingadb\Widget\ShowMore;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
+use ipl\Web\Widget\EmptyState;
 use ipl\Web\Widget\HorizontalKeyValue;
+use ipl\Web\Widget\ShowMore;
 
 class UsergroupDetail extends BaseHtmlElement
 {

diff --git a/library/Icingadb/Widget/HostStatusBar.php b/library/Icingadb/Widget/HostStatusBar.php
@@ -4,8 +4,8 @@
 
 namespace Icinga\Module\Icingadb\Widget;
 
-use Icinga\Module\Icingadb\Common\BaseStatusBar;
 use ipl\Html\BaseHtmlElement;
+use ipl\Web\Common\BaseStatusBar;
 
 class HostStatusBar extends BaseStatusBar
 {

diff --git a/library/Icingadb/Widget/ItemList/BaseCommentListItem.php b/library/Icingadb/Widget/ItemList/BaseCommentListItem.php
@@ -10,12 +10,12 @@
 use Icinga\Module\Icingadb\Common\Icons;
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Widget\MarkdownLine;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
-use Icinga\Module\Icingadb\Common\ObjectLinkDisabled;
 use Icinga\Module\Icingadb\Common\ServiceLink;
 use Icinga\Module\Icingadb\Model\Comment;
-use Icinga\Module\Icingadb\Common\BaseListItem;
 use ipl\Html\FormattedString;
+use ipl\Web\Common\BaseListItem;
+use ipl\Web\Common\NoSubjectLink;
+use ipl\Web\Common\ObjectLinkDisabled;
 use ipl\Web\Widget\TimeAgo;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;

diff --git a/library/Icingadb/Widget/ItemList/BaseDowntimeListItem.php b/library/Icingadb/Widget/ItemList/BaseDowntimeListItem.php
@@ -5,12 +5,9 @@
 namespace Icinga\Module\Icingadb\Widget\ItemList;
 
 use Icinga\Date\DateFormatter;
-use Icinga\Module\Icingadb\Common\BaseListItem;
 use Icinga\Module\Icingadb\Common\HostLink;
 use Icinga\Module\Icingadb\Common\Icons;
 use Icinga\Module\Icingadb\Common\Links;
-use Icinga\Module\Icingadb\Common\NoSubjectLink;
-use Icinga\Module\Icingadb\Common\ObjectLinkDisabled;
 use Icinga\Module\Icingadb\Common\ServiceLink;
 use Icinga\Module\Icingadb\Common\TicketLinks;
 use Icinga\Module\Icingadb\Model\Downtime;
@@ -22,6 +19,9 @@
 use ipl\Html\TemplateString;
 use ipl\Html\Text;
 use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseListItem;
+use ipl\Web\Common\NoSubjectLink;
+use ipl\Web\Common\ObjectLinkDisabled;
 use ipl\Web\Widget\Icon;
 use ipl\Web\Widget\Link;