diff --git a/src/Form/SimplesitemapCustomLinksForm.php b/src/Form/SimplesitemapCustomLinksForm.php
index 82b0599952947715d039237cb31637503e0b367c..6b8c9c4b47a7f8645b8341bb9ad4f787d2674162 100644
--- a/src/Form/SimplesitemapCustomLinksForm.php
+++ b/src/Form/SimplesitemapCustomLinksForm.php
@@ -25,7 +25,7 @@ class SimplesitemapCustomLinksForm extends SimplesitemapFormBase {
$form['simple_sitemap_custom'] = [
'#title' => $this->t('Custom links'),
'#type' => 'fieldset',
- '#markup' => '
' . $this->t('Add custom internal drupal paths to the XML sitemap.') . '
',
+ '#markup' => '' . $this->t('Add custom internal drupal paths to the XML sitemap.') . '
',
'#prefix' => $this->getDonationText(),
];
diff --git a/src/Form/SimplesitemapEntitiesForm.php b/src/Form/SimplesitemapEntitiesForm.php
index 800a2f2beb82b5f669d81af7cc6fc59a728ccde8..8a7bd79f0062ab642d98cb7caef59053cfc962d5 100644
--- a/src/Form/SimplesitemapEntitiesForm.php
+++ b/src/Form/SimplesitemapEntitiesForm.php
@@ -27,7 +27,7 @@ class SimplesitemapEntitiesForm extends SimplesitemapFormBase {
$form['simple_sitemap_entities']['entities'] = [
'#title' => $this->t('Sitemap entities'),
'#type' => 'fieldset',
- '#markup' => '' . $this->t('Simple XML sitemap settings will be added only to entity forms of entity types enabled here. For all entity types featuring bundles (e.g. node) sitemap settings have to be set on their bundle pages (e.g. page).') . '
',
+ '#markup' => '' . $this->t('Simple XML sitemap settings will be added only to entity forms of entity types enabled here. For all entity types featuring bundles (e.g. node) sitemap settings have to be set on their bundle pages (e.g. page).') . '
',
];
$form['#attached']['library'][] = 'simple_sitemap/sitemapEntities';
diff --git a/src/Form/SimplesitemapSettingsForm.php b/src/Form/SimplesitemapSettingsForm.php
index 06b002eb554bfc0743577e63d341d14d27cd14c1..332f9c0d6df9fb2d289b9c2d2ae7c6639103d286 100644
--- a/src/Form/SimplesitemapSettingsForm.php
+++ b/src/Form/SimplesitemapSettingsForm.php
@@ -4,7 +4,6 @@ namespace Drupal\simple_sitemap\Form;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Component\Utility\UrlHelper;
-use Drupal\simple_sitemap\Plugin\simple_sitemap\SitemapGenerator\SitemapGeneratorBase;
/**
* Class SimplesitemapSettingsForm
@@ -29,25 +28,30 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
$form['simple_sitemap_settings']['status'] = [
'#type' => 'fieldset',
'#title' => $this->t('Sitemap status'),
- '#markup' => '' . $this->t('Sitemaps can be regenerated on demand here.') . '
',
+ '#markup' => '' . $this->t('Sitemaps can be regenerated on demand here.') . '
',
'#description' => $this->t('Variants can be configured here.', ['@url' => $GLOBALS['base_url'] . '/admin/config/search/simplesitemap/variants']),
];
- $form['simple_sitemap_settings']['status']['regenerate_submit'] = [
+ $form['simple_sitemap_settings']['status']['actions'] = [
+ '#prefix' => '',
+ ];
+
+ $form['simple_sitemap_settings']['status']['actions']['regenerate_submit'] = [
'#type' => 'submit',
'#value' => $this->t('Generate from queue'),
'#submit' => ['::generateSitemap'],
'#validate' => [],
];
-// $form['simple_sitemap_settings']['status']['regenerate_backend_submit'] = [
+// $form['simple_sitemap_settings']['status']['actions']['regenerate_backend_submit'] = [
// '#type' => 'submit',
// '#value' => $this->t('Generate from queue (background)'),
// '#submit' => ['::generateSitemapBackend'],
// '#validate' => [],
// ];
- $form['simple_sitemap_settings']['status']['rebuild_queue_submit'] = [
+ $form['simple_sitemap_settings']['status']['actions']['rebuild_queue_submit'] = [
'#type' => 'submit',
'#value' => $this->t('Rebuild queue'),
'#submit' => ['::rebuildQueue'],
@@ -55,7 +59,7 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
];
$form['simple_sitemap_settings']['status']['progress'] = [
- '#prefix' => '