mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-09-25 10:57:40 +02:00
Use sendMultipartUpdate() for drag&drop actions & adjust some css styles
This commit is contained in:
parent
936079b7c5
commit
49267d6fa3
@ -20,7 +20,6 @@ use Icinga\Web\Dashboard\Settings;
|
||||
use Icinga\Web\Dashboard\Setup\SetupNewDashboard;
|
||||
use Icinga\Web\Notification;
|
||||
use Icinga\Web\Widget\Tabextension\DashboardSettings;
|
||||
use ipl\Html\HtmlElement;
|
||||
use ipl\Web\Compat\CompatController;
|
||||
use ipl\Web\Url;
|
||||
use ipl\Web\Widget\ActionLink;
|
||||
@ -58,6 +57,7 @@ class DashboardsController extends CompatController
|
||||
$this->redirectNow($welcomeForm->getRedirectUrl());
|
||||
})->handleRequest(ServerRequest::fromGlobals());
|
||||
|
||||
$this->content->getAttributes()->add('class', 'welcome-view');
|
||||
$this->dashboard->setWelcomeForm($welcomeForm);
|
||||
} else {
|
||||
$pane = $this->getParam('pane');
|
||||
@ -131,8 +131,6 @@ class DashboardsController extends CompatController
|
||||
|
||||
$homeForm = (new HomePaneForm($this->dashboard))
|
||||
->on(HomePaneForm::ON_SUCCESS, function () {
|
||||
$this->getResponse()->setAutoRefreshInterval(1);
|
||||
|
||||
$this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
|
||||
})
|
||||
->handleRequest(ServerRequest::fromGlobals());
|
||||
@ -288,8 +286,6 @@ class DashboardsController extends CompatController
|
||||
|
||||
$dashboards = Json::decode($dashboards['dashboardData'], true);
|
||||
$originals = $dashboards['originals'];
|
||||
$widgetType = $dashboards['Type'];
|
||||
unset($dashboards['Type']);
|
||||
unset($dashboards['originals']);
|
||||
|
||||
$orgHome = null;
|
||||
@ -305,9 +301,6 @@ class DashboardsController extends CompatController
|
||||
}
|
||||
}
|
||||
|
||||
$reroutePath = $dashboards['redirectPath'];
|
||||
unset($dashboards['redirectPath']);
|
||||
|
||||
foreach ($dashboards as $home => $value) {
|
||||
if (! $this->dashboard->hasEntry($home)) {
|
||||
Notification::error(sprintf(t('Dashboard home "%s" not found'), $home));
|
||||
@ -384,13 +377,9 @@ class DashboardsController extends CompatController
|
||||
}
|
||||
}
|
||||
|
||||
if ($widgetType !== 'Dashlets' || ($orgHome && $orgPane)) {
|
||||
$this->redirectNow($reroutePath);
|
||||
}
|
||||
|
||||
// Just create a dummy content and ignore it, as we don't have any view scripts and aren't redirecting
|
||||
$this->getResponse()->setHeader('X-Icinga-Container', 'ignore');
|
||||
$this->addContent(new HtmlElement('p'));
|
||||
$this->createTabs();
|
||||
$this->dashboard->activate('dashboard_settings');
|
||||
$this->sendMultipartUpdate();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -442,6 +431,7 @@ class DashboardsController extends CompatController
|
||||
]
|
||||
));
|
||||
|
||||
$this->content->getAttributes()->add('class', 'dashboard-manager');
|
||||
$this->addContent(new Settings($this->dashboard));
|
||||
}
|
||||
|
||||
|
@ -235,7 +235,7 @@ class Dashboard extends BaseHtmlElement implements DashboardEntry
|
||||
{
|
||||
$activeHome = $this->getActiveHome();
|
||||
if (! $activeHome || (! $activeHome->hasEntries() && $activeHome->getName() === DashboardHome::DEFAULT_HOME)) {
|
||||
$this->setAttribute('class', 'dashboard-introduction welcome-view');
|
||||
$this->setAttribute('class', 'dashboard-introduction');
|
||||
|
||||
$this->addHtml(HtmlElement::create('h1', null, t('Welcome to Icinga Web 2!')));
|
||||
$this->addHtml(HtmlElement::create(
|
||||
|
@ -137,7 +137,7 @@
|
||||
}
|
||||
|
||||
// Dashboard manager
|
||||
:not(.dashboard) > .container > .content {
|
||||
:not(.dashboard) > .container > .content.dashboard-manager {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
@ -332,10 +332,6 @@ form.icinga-form .control-group.form-controls .remove-button {
|
||||
width: calc(85% + 1.4em);
|
||||
}
|
||||
|
||||
.drag-active * {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.draggable-element {
|
||||
opacity: .4;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user