From b77a0c10ec1584207f2ae7caeafd92a46cf6468e Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 14 Nov 2011 10:16:12 +0900
Subject: [PATCH] Issue #1077602 by Jacine, dcmouyard, skottler, jasonrsavino
et al: Convert node.tpl.php to HTML5.
---
core/modules/node/node.module | 3 +++
core/modules/node/node.tpl.php | 16 +++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 81ee84123c68..c429fe54fe81 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1476,6 +1476,9 @@ function template_preprocess_node(&$variables) {
$variables['user_picture'] = '';
}
+ // Add article ARIA role.
+ $variables['attributes_array']['role'] = 'article';
+
// Gather node classes.
$variables['classes_array'][] = drupal_html_class('node-' . $node->type);
if ($variables['promote']) {
diff --git a/core/modules/node/node.tpl.php b/core/modules/node/node.tpl.php
index 06dc1997bc8e..adb9aa2f6547 100644
--- a/core/modules/node/node.tpl.php
+++ b/core/modules/node/node.tpl.php
@@ -78,20 +78,19 @@
* @see template_process()
*/
?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
-
- <?php print $user_picture; ?>
+<article id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
<?php print render($title_prefix); ?>
<?php if (!$page): ?>
- <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
+ <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>" rel="bookmark"><?php print $title; ?></a></h2>
<?php endif; ?>
<?php print render($title_suffix); ?>
<?php if ($display_submitted): ?>
- <div class="submitted">
- <?php print $submitted; ?>
- </div>
+ <footer>
+ <?php print $user_picture; ?>
+ <p class="submitted"><?php print $submitted; ?></p>
+ </footer>
<?php endif; ?>
<div class="content"<?php print $content_attributes; ?>>
@@ -104,7 +103,6 @@
</div>
<?php print render($content['links']); ?>
-
<?php print render($content['comments']); ?>
-</div>
+</article>
--
GitLab