commit 7dae4c217202c88251e5109f4230105020f760c0
Author: Julien Dubois <julien@happyculture.coop>
Date:   Tue Jun 21 17:39:45 2016 +0200

    Issue #1399990: Remove "Display author and date information" in Display Settings in favor of listing Author and Date in Manage Displays.

diff --git a/core/modules/book/config/install/node.type.book.yml b/core/modules/book/config/install/node.type.book.yml
index 0c07a79..9838ed9 100644
--- a/core/modules/book/config/install/node.type.book.yml
+++ b/core/modules/book/config/install/node.type.book.yml
@@ -10,4 +10,4 @@ description: '<em>Books</em> have a built-in hierarchical navigation. Use for ha
 help: ''
 new_revision: true
 preview_mode: 1
-display_submitted: true
+display_submitted: false
diff --git a/core/modules/forum/config/optional/node.type.forum.yml b/core/modules/forum/config/optional/node.type.forum.yml
index 8ed965d..9ec4217 100644
--- a/core/modules/forum/config/optional/node.type.forum.yml
+++ b/core/modules/forum/config/optional/node.type.forum.yml
@@ -10,4 +10,4 @@ description: 'A <em>forum topic</em> starts a new discussion thread within a for
 help: ''
 new_revision: false
 preview_mode: 1
-display_submitted: true
+display_submitted: false
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index aade3e8..6862a14 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -131,26 +131,35 @@ function node_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function node_theme() {
-  return array(
-    'node' => array(
+  return [
+    'node' => [
       'render element' => 'elements',
-    ),
-    'node_add_list' => array(
-      'variables' => array('content' => NULL),
-    ),
-    'node_edit_form' => array(
+    ],
+    'node_add_list' => [
+      'variables' => ['content' => NULL],
+    ],
+    'node_edit_form' => [
       'render element' => 'form',
-    ),
-    'field__node__title' => array(
+    ],
+    'field__node__title' => [
       'base hook' => 'field',
-    ),
-    'field__node__uid' => array(
+    ],
+    'field__node__uid' => [
       'base hook' => 'field',
-    ),
-    'field__node__created' => array(
+    ],
+    'field__node__created' => [
       'base hook' => 'field',
-    ),
-  );
+    ],
+    'node_submitted_by' => [
+      'variables' => [
+        'author_picture' => FALSE,
+        'author_attributes' => [],
+        'author_name' => '',
+        'date' => '',
+        'metadata' => [],
+      ],
+    ],
+  ];
 }
 
 /**
@@ -367,15 +376,21 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
  * Implements hook_entity_extra_field_info().
  */
 function node_entity_extra_field_info() {
-  $extra = array();
+  $extra = [];
   $description = t('Node module element');
   foreach (NodeType::loadMultiple() as $bundle) {
-    $extra['node'][$bundle->id()]['display']['links'] = array(
+    $extra['node'][$bundle->id()]['display']['links'] = [
       'label' => t('Links'),
       'description' => $description,
       'weight' => 100,
       'visible' => TRUE,
-    );
+    ];
+    $extra['node'][$bundle->id()]['display']['submitted_by'] = [
+      'label' => t('Submitted by'),
+      'description' => t('Author name and node submission date'),
+      'weight' => -4,
+      'visible' => $bundle->displaySubmitted(),
+    ];
   }
 
   return $extra;
@@ -575,10 +590,6 @@ function template_preprocess_node(&$variables) {
   $variables['node'] = $variables['elements']['#node'];
   /** @var \Drupal\node\NodeInterface $node */
   $node = $variables['node'];
-  $variables['date'] = drupal_render($variables['elements']['created']);
-  unset($variables['elements']['created']);
-  $variables['author_name'] = drupal_render($variables['elements']['uid']);
-  unset($variables['elements']['uid']);
 
   $variables['url'] = $node->url('canonical', array(
     'language' => $node->language(),
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index 51794be..dbcab09 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -398,9 +398,12 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDefaultValueCallback('Drupal\node\Entity\Node::getCurrentUserId')
       ->setTranslatable(TRUE)
       ->setDisplayOptions('view', array(
-        'label' => 'hidden',
-        'type' => 'author',
-        'weight' => 0,
+        'label' => 'above',
+        'type' => 'entity_reference_label',
+        'weight' => -2,
+        'settings' => array(
+          'link' => TRUE,
+        ),
       ))
       ->setDisplayOptions('form', array(
         'type' => 'entity_reference_autocomplete',
@@ -411,6 +414,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
           'placeholder' => '',
         ),
       ))
+      ->setDisplayConfigurable('view', TRUE)
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['status'] = BaseFieldDefinition::create('boolean')
@@ -428,12 +432,18 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDisplayOptions('view', array(
         'label' => 'hidden',
         'type' => 'timestamp',
-        'weight' => 0,
+        'weight' => -3,
+        'settings' => array(
+          'format_type' => 'medium',
+          'custom_date_format' => '',
+          'timezone' => '',
+        ),
       ))
       ->setDisplayOptions('form', array(
         'type' => 'datetime_timestamp',
         'weight' => 10,
       ))
+      ->setDisplayConfigurable('view', TRUE)
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['changed'] = BaseFieldDefinition::create('changed')
diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php
index d5fb998..442a3fa 100644
--- a/core/modules/node/src/NodeTypeForm.php
+++ b/core/modules/node/src/NodeTypeForm.php
@@ -171,18 +171,6 @@ public function form(array $form, FormStateInterface $form_state) {
         '#default_value' => $language_configuration,
       );
     }
-    $form['display'] = array(
-      '#type' => 'details',
-      '#title' => t('Display settings'),
-      '#group' => 'additional_settings',
-    );
-    $form['display']['display_submitted'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Display author and date information'),
-      '#default_value' => $type->displaySubmitted(),
-      '#description' => t('Author username and publish date will be displayed.'),
-    );
-
     return $this->protectBundleIdElement($form);
   }
 
diff --git a/core/modules/node/src/NodeTypeInterface.php b/core/modules/node/src/NodeTypeInterface.php
index c034ffb..5162134 100644
--- a/core/modules/node/src/NodeTypeInterface.php
+++ b/core/modules/node/src/NodeTypeInterface.php
@@ -38,6 +38,8 @@ public function setNewRevision($new_revision);
    *
    * @return bool
    *   TRUE if the submitted by information should be shown.
+   *
+   * @deprecated in Drupal 8.2.x, will be removed before Drupal 9.0.
    */
   public function displaySubmitted();
 
@@ -46,6 +48,8 @@ public function displaySubmitted();
    *
    * @param bool $display_submitted
    *   TRUE if the submitted by information should be shown.
+   *
+   * @deprecated in Drupal 8.2.x, will be removed before Drupal 9.0.
    */
   public function setDisplaySubmitted($display_submitted);
 
diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index f4243b2..1c68252 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\node;
 
+use Drupal\Core\Template\Attribute;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityViewBuilder;
@@ -38,6 +39,18 @@ public function buildComponents(array &$build, array $entities, array $displays,
         );
       }
 
+      if ($display->getComponent('submitted_by') && \Drupal::configFactory()->get('node.type.' . $bundle)->get('display_submitted')) {
+        $build[$id]['submitted_by'] = [
+          '#theme' => 'node_submitted_by',
+          '#author_name' => drupal_render_root($build[$id]['uid']),
+          '#date' => drupal_render_root($build[$id]['created']),
+          '#author_attributes' => new Attribute(),
+        ];
+        if (theme_get_setting('features.node_user_picture')) {
+          $build[$id]['submitted_by']['#author_picture'] = user_view($entity->getOwner(), 'compact');
+        }
+      }
+
       // Add Language field text element to node render array.
       if ($display->getComponent('langcode')) {
         $build[$id]['langcode'] = array(
diff --git a/core/modules/node/src/Tests/NodePostSettingsTest.php b/core/modules/node/src/Tests/NodePostSettingsTest.php
index bc3dd99..6bdd243 100644
--- a/core/modules/node/src/Tests/NodePostSettingsTest.php
+++ b/core/modules/node/src/Tests/NodePostSettingsTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\node\Tests;
+use Drupal\node\Entity\NodeType;
 
 /**
  * Tests that the post information (submitted by Username on date) text displays
@@ -23,9 +24,9 @@ protected function setUp() {
   function testPagePostInfo() {
 
     // Set "Basic page" content type to display post information.
-    $edit = array();
-    $edit['display_submitted'] = TRUE;
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $node_type_config = NodeType::load('page');
+    $node_type_config->setDisplaySubmitted(TRUE);
+    $node_type_config->save();
 
     // Create a node.
     $edit = array();
@@ -40,9 +41,9 @@ function testPagePostInfo() {
     $node->delete();
 
     // Set "Basic page" content type to display post information.
-    $edit = array();
-    $edit['display_submitted'] = FALSE;
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $node_type_config = NodeType::load('page');
+    $node_type_config->setDisplaySubmitted(FALSE);
+    $node_type_config->save();
 
     // Create a node.
     $edit = array();
diff --git a/core/modules/node/templates/node-submitted-by.html.twig b/core/modules/node/templates/node-submitted-by.html.twig
new file mode 100644
index 0000000..8aabecc
--- /dev/null
+++ b/core/modules/node/templates/node-submitted-by.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the node created field.
+ *
+ * This is an override of field.html.twig for the node created field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - author_picture: .
+ * - author_attributes: .
+ * - author_name: .
+ * - date: .
+ * - metadata: .
+ *
+ * @see field.html.twig
+ *
+ * @ingroup themeable
+ */
+#}
+{{ author_picture }}
+<div{{ author_attributes.addClass('node__submitted') }}>
+    {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
+    {{ metadata }}
+</div>
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index c7ada1e..4f69e8b 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -20,11 +20,9 @@
  *   or print a subset such as {{ content.field_example }}. Use
  *   {{ content|without('field_example') }} to temporarily suppress the printing
  *   of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- *   view mode.
  * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
+ * - created: Themed creation date field.
+ * - uid: Themed author name field.
  * - url: Direct URL of the current node.
  * - display_submitted: Whether submission information should be displayed.
  * - attributes: HTML attributes for the containing element.
@@ -82,18 +80,9 @@
   {% endif %}
   {{ title_suffix }}
 
-  {% if display_submitted %}
-    <footer>
-      {{ author_picture }}
-      <div{{ author_attributes }}>
-        {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
-        {{ metadata }}
-      </div>
-    </footer>
-  {% endif %}
+  {{ metadata }}
 
   <div{{ content_attributes }}>
     {{ content }}
   </div>
-
 </article>
diff --git a/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml b/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml
index b65ee9f..14cebe5 100644
--- a/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml
+++ b/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml
@@ -3,7 +3,7 @@ name: Default
 description: 'Default description.'
 help: ''
 new_revision: true
-display_submitted: true
+display_submitted: false
 preview_mode: 1
 status: true
 langcode: en
diff --git a/core/modules/node/tests/modules/node_test_config/sync/node.type.import.yml b/core/modules/node/tests/modules/node_test_config/sync/node.type.import.yml
index f1bafe4..e1c7cbf 100644
--- a/core/modules/node/tests/modules/node_test_config/sync/node.type.import.yml
+++ b/core/modules/node/tests/modules/node_test_config/sync/node.type.import.yml
@@ -3,7 +3,7 @@ name: Import
 description: 'Import description.'
 help: ''
 new_revision: false
-display_submitted: true
+display_submitted: false
 preview_mode: 1
 status: true
 langcode: en
diff --git a/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml b/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml
index 5d843bc..1ed193d 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml
@@ -7,5 +7,5 @@ description: null
 help: null
 new_revision: false
 preview_mode: 1
-display_submitted: true
+display_submitted: false
 third_party_settings: {  }
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 3108ee1..6ad869f 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -323,7 +323,7 @@ function rdf_preprocess_node(&$variables) {
 
   // Adds RDFa markup for the date.
   $created_mapping = $mapping->getPreparedFieldMapping('created');
-  if (!empty($created_mapping) && $variables['display_submitted']) {
+  if (!empty($created_mapping)) {
     $date_attributes = rdf_rdfa_attributes($created_mapping, $variables['node']->get('created')->first()->toArray());
     $rdf_metadata = array(
       '#theme' => 'rdf_metadata',
diff --git a/core/modules/search/src/Tests/SearchExactTest.php b/core/modules/search/src/Tests/SearchExactTest.php
index d17646b..c537fe4 100644
--- a/core/modules/search/src/Tests/SearchExactTest.php
+++ b/core/modules/search/src/Tests/SearchExactTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\search\Tests;
+use Drupal\node\Entity\NodeType;
 
 /**
  * Tests that searching for a phrase gets the correct page count.
@@ -56,8 +57,8 @@ function testExactQuery() {
     $this->assertNoLinkByHref('page=2', '3rd page link is not found for exact phrase search.');
 
     // Check that with post settings turned on the post information is displayed.
-    $node_type_config = \Drupal::configFactory()->getEditable('node.type.page');
-    $node_type_config->set('display_submitted', TRUE);
+    $node_type_config = NodeType::load('page');
+    $node_type_config->setDisplaySubmitted(TRUE);
     $node_type_config->save();
 
     $edit = array('keys' => 'Druplicon');
@@ -67,13 +68,11 @@ function testExactQuery() {
 
     // Check that with post settings turned off the user and changed date
     // information is not displayed.
-    $node_type_config->set('display_submitted', FALSE);
+    $node_type_config->setDisplaySubmitted(FALSE);
     $node_type_config->save();
     $edit = array('keys' => 'Druplicon');
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoText($user->getUsername(), 'Basic page node does not display author name when post settings are off.');
     $this->assertNoText(format_date($node->getChangedTime(), 'short'), 'Basic page node does not display post date when post settings are off.');
-
   }
-
 }
diff --git a/core/modules/simpletest/src/ContentTypeCreationTrait.php b/core/modules/simpletest/src/ContentTypeCreationTrait.php
index 54712df..5700c3d 100644
--- a/core/modules/simpletest/src/ContentTypeCreationTrait.php
+++ b/core/modules/simpletest/src/ContentTypeCreationTrait.php
@@ -37,6 +37,12 @@ protected function createContentType(array $values = array()) {
       'name' => $id,
     );
     $type = NodeType::create($values);
+
+    // If the display submitted flag is passed, set its value.
+    if (isset($values['display_submitted'])) {
+      $type->setDisplaySubmitted($values['display_submitted']);
+    }
+
     $status = $type->save();
     node_add_body_field($type);
 
diff --git a/core/modules/statistics/tests/themes/statistics_test_attached/node.html.twig b/core/modules/statistics/tests/themes/statistics_test_attached/node.html.twig
index 03bb578..0c13f95 100644
--- a/core/modules/statistics/tests/themes/statistics_test_attached/node.html.twig
+++ b/core/modules/statistics/tests/themes/statistics_test_attached/node.html.twig
@@ -8,15 +8,7 @@
   {% endif %}
   {{ title_suffix }}
 
-  {% if display_submitted %}
-    <footer>
-      {{ author_picture }}
-      <div{{ author_attributes }}>
-        {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
-        {{ metadata }}
-      </div>
-    </footer>
-  {% endif %}
+  {{ metadata }}
 
   <div{{ content_attributes }}>
     {{ content.body }}
diff --git a/core/modules/system/src/Form/ThemeSettingsForm.php b/core/modules/system/src/Form/ThemeSettingsForm.php
index 068eb0a..ba8c67f 100644
--- a/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -132,6 +132,8 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
     );
 
     // Toggle settings
+    // The node_user_picture setting should be deprecated in Drupal 9.x
+    // in favour of the "Authored by" field in the manage display tab.
     $toggles = array(
       'node_user_picture' => t('User pictures in posts'),
       'comment_user_picture' => t('User pictures in comments'),
diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php
index 3f8db42..d4c4bcf 100644
--- a/core/modules/user/src/Tests/UserPictureTest.php
+++ b/core/modules/user/src/Tests/UserPictureTest.php
@@ -100,7 +100,7 @@ function testPictureOnNodeComment() {
 
     // Verify that the image is displayed on the node page.
     $this->drupalGet('node/' . $node->id());
-    $elements = $this->cssSelect('.node__meta .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
+    $elements = $this->cssSelect('.node__content .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
     $this->assertEqual(count($elements), 1, 'User picture with alt text found on node page.');
 
     // Enable user pictures on comments, instead of nodes.
diff --git a/core/profiles/standard/config/install/node.type.article.yml b/core/profiles/standard/config/install/node.type.article.yml
index 1fd439c..b8a1f4d 100644
--- a/core/profiles/standard/config/install/node.type.article.yml
+++ b/core/profiles/standard/config/install/node.type.article.yml
@@ -7,4 +7,4 @@ description: 'Use <em>articles</em> for time-sensitive content like news, press
 help: ''
 new_revision: true
 preview_mode: 1
-display_submitted: true
+display_submitted: false
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index b257ad3..847a48c 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -20,11 +20,9 @@
  *   or print a subset such as {{ content.field_example }}. Use
  *   {{ content|without('field_example') }} to temporarily suppress the printing
  *   of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- *   view mode.
  * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
+ * - created: Themed creation date field.
+ * - uid: Themed author name field.
  * - url: Direct URL of the current node.
  * - display_submitted: Whether submission information should be displayed.
  * - attributes: HTML attributes for the containing element.
@@ -87,16 +85,10 @@
       </h2>
     {% endif %}
     {{ title_suffix }}
-    {% if display_submitted %}
-      <div class="node__meta">
-        {{ author_picture }}
-        <span{{ author_attributes }}>
-          {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
-        </span>
-        {{ metadata }}
-      </div>
-    {% endif %}
   </header>
+
+  {{ metadata }}
+
   <div{{ content_attributes.addClass('node__content', 'clearfix') }}>
     {{ content }}
   </div>
diff --git a/core/themes/classy/templates/content/node.html.twig b/core/themes/classy/templates/content/node.html.twig
index 7f99e79..c8c33c1 100644
--- a/core/themes/classy/templates/content/node.html.twig
+++ b/core/themes/classy/templates/content/node.html.twig
@@ -20,11 +20,9 @@
  *   or print a subset such as {{ content.field_example }}. Use
  *   {{ content|without('field_example') }} to temporarily suppress the printing
  *   of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- *   view mode.
  * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
+ * - created: Themed creation date field.
+ * - uid: Themed author name field.
  * - url: Direct URL of the current node.
  * - display_submitted: Whether submission information should be displayed.
  * - attributes: HTML attributes for the containing element.
@@ -91,15 +89,7 @@
   {% endif %}
   {{ title_suffix }}
 
-  {% if display_submitted %}
-    <footer class="node__meta">
-      {{ author_picture }}
-      <div{{ author_attributes.addClass('node__submitted') }}>
-        {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
-        {{ metadata }}
-      </div>
-    </footer>
-  {% endif %}
+  {{ metadata }}
 
   <div{{ content_attributes.addClass('node__content') }}>
     {{ content }}
diff --git a/core/themes/stable/templates/content/node.html.twig b/core/themes/stable/templates/content/node.html.twig
index e9dcd0b..f6d1807 100644
--- a/core/themes/stable/templates/content/node.html.twig
+++ b/core/themes/stable/templates/content/node.html.twig
@@ -20,11 +20,9 @@
  *   or print a subset such as {{ content.field_example }}. Use
  *   {{ content|without('field_example') }} to temporarily suppress the printing
  *   of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- *   view mode.
  * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
+ * - created: Themed creation date field.
+ * - uid: Themed author name field.
  * - url: Direct URL of the current node.
  * - display_submitted: Whether submission information should be displayed.
  * - attributes: HTML attributes for the containing element.
@@ -80,15 +78,7 @@
   {% endif %}
   {{ title_suffix }}
 
-  {% if display_submitted %}
-    <footer>
-      {{ author_picture }}
-      <div{{ author_attributes }}>
-        {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
-        {{ metadata }}
-      </div>
-    </footer>
-  {% endif %}
+  {{ metadata }}
 
   <div{{ content_attributes }}>
     {{ content }}