diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 24c9d7e..ce01288 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1045,23 +1045,6 @@ function template_preprocess_item_list(&$variables) {
}
/**
- * Returns HTML for an indentation div; used for drag and drop tables.
- *
- * @param $variables
- * An associative array containing:
- * - size: Optional. The number of indentations to create.
- *
- * @ingroup themeable
- */
-function theme_indentation($variables) {
- $output = '';
- for ($n = 0; $n < $variables['size']; $n++) {
- $output .= '
' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('You have unsaved changes.') + '
';
}
diff --git a/core/misc/tree-bottom.png b/core/misc/tree-bottom.png
deleted file mode 100644
index a558045..0000000
--- a/core/misc/tree-bottom.png
+++ /dev/null
@@ -1,3 +0,0 @@
-PNG
-
-
IHDR P Q 8#ɛ PLTEU6 tRNS @f &IDAT8cX040` QQQASC1@(b 1'6x IENDB`
\ No newline at end of file
diff --git a/core/misc/tree-child-last.svg b/core/misc/tree-child-last.svg
new file mode 100644
index 0000000..2616087
--- /dev/null
+++ b/core/misc/tree-child-last.svg
@@ -0,0 +1,3 @@
+ tags are used for drag and drop tables.
- *
- * Available variables:
- * - size: Optional. The number of indentations to create.
- *
- * @ingroup themeable
- */
-#}
-
-{% for i in 1..size if size > 0 %}
{% endfor %}
diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php
index dffbe34..d28fa34 100644
--- a/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -215,15 +215,10 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular
foreach ($current_page as $key => $term) {
/** @var $term \Drupal\Core\Entity\EntityInterface */
$form['terms'][$key]['#term'] = $term;
- $indentation = array();
- if (isset($term->depth) && $term->depth > 0) {
- $indentation = array(
- '#theme' => 'indentation',
- '#size' => $term->depth,
- );
+ if (isset($term->depth)) {
+ $form['terms'][$key]['#attributes']['data-indent'] = $term->depth;
}
$form['terms'][$key]['term'] = array(
- '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
'#type' => 'link',
'#title' => $term->getName(),
'#url' => $term->urlInfo(),
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
index 322c92b..72c3a57 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
@@ -56,7 +56,7 @@ function testTermIndentation() {
// Submit the edited form and check for HTML indentation element presence.
$this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->get('vid') . '/overview', $edit, t('Save'));
- $this->assertPattern('|
|');
+ $this->assertPattern('| data-indent="1" |');
// Check explicitly that term 2's parent is term 1.
$parents = $taxonomy_storage->loadParents($term2->id());
@@ -72,7 +72,7 @@ function testTermIndentation() {
$this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->get('vid' ) . '/overview', $edit, t('Save'));
// All terms back at the root level, no indentation should be present.
- $this->assertNoPattern('|
|');
+ $this->assertNoPattern('| data-indent="1" |');
// Check explicitly that term 2 has no parents.
\Drupal::entityManager()->getStorage('taxonomy_term')->resetCache();