commit 6a577e07fbf9ebea014859e812e6fbae0f6cfa8a Author: Shaun Dychko Date: Sat Jul 18 13:25:45 2015 -0700 remove header and footer tags. diff --git a/core/modules/views/src/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php index 74b0d8b..4bc9af7 100644 --- a/core/modules/views/src/Tests/Handler/AreaEntityTest.php +++ b/core/modules/views/src/Tests/Handler/AreaEntityTest.php @@ -128,8 +128,8 @@ public function doTestRender($entities) { $preview = $view->preview('default', [$entities[1]->id()]); $this->setRawContent(\Drupal::service('renderer')->renderRoot($preview)); $view_class = 'js-view-dom-id-' . $view->dom_id; - $header_xpath = '//div[@class = "' . $view_class . '"]/header[1]'; - $footer_xpath = '//div[@class = "' . $view_class . '"]/footer[last()]'; + $header_xpath = '//div[@class = "' . $view_class . '"]/div[1]'; + $footer_xpath = '//div[@class = "' . $view_class . '"]/div[3]'; $result = $this->xpath($header_xpath); $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.'); @@ -164,7 +164,7 @@ public function doTestRender($entities) { $preview = $view->preview('default', array($entities[1]->id())); $this->setRawContent($renderer->renderRoot($preview)); $view_class = 'js-view-dom-id-' . $view->dom_id; - $result = $this->xpath('//div[@class = "' . $view_class . '"]/header[1]'); + $result = $this->xpath('//div[@class = "' . $view_class . '"]/div[1]'); $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.'); $this->assertTrue(strpos(trim((string) $result[0]), 'test') !== FALSE, 'The rendered entity appeared in the right view mode.'); @@ -173,7 +173,7 @@ public function doTestRender($entities) { $preview = $view->preview('default', array($entities[2]->id())); $this->setRawContent($renderer->renderRoot($preview)); $view_class = 'js-view-dom-id-' . $view->dom_id; - $result = $this->xpath('//div[@class = "' . $view_class . '"]/footer[last()]'); + $result = $this->xpath('//div[@class = "' . $view_class . '"]/div[3]'); $this->assertTrue(strpos($result[0], $entities[2]->label()) === FALSE, 'The rendered entity does not appear in the footer of the view.'); // Test the available view mode options. diff --git a/core/modules/views/templates/views-view.html.twig b/core/modules/views/templates/views-view.html.twig index e81b1ab..4f8203f 100644 --- a/core/modules/views/templates/views-view.html.twig +++ b/core/modules/views/templates/views-view.html.twig @@ -43,9 +43,9 @@ {{ title_suffix }} {% if header %} -
+
{{ header }} -
+ {% endif %} {{ exposed }} @@ -59,9 +59,9 @@ {{ more }} {% if footer %} - + {% endif %} {{ feed_icons }}