Issue #1343982 by JohnAlbin: Convert node markup to HTML5

diff --git a/STARTERKIT/css/nodes.css b/STARTERKIT/css/nodes.css
index fe1265a..ccfd560 100644 (file)
--- a/STARTERKIT/css/nodes.css
+++ b/STARTERKIT/css/nodes.css
@@ -23,7 +23,7 @@
   /* background-color: #fff4f4; */ /* Drupal core uses a #fff4f4 background */
 }
 
-.node-unpublished div.unpublished,
+.node-unpublished p.unpublished,
 .comment-unpublished p.unpublished /* The word "Unpublished" displayed underneath the content. */ {
   height: 0;
   overflow: visible;

diff --git a/STARTERKIT/sass/nodes.scss b/STARTERKIT/sass/nodes.scss
index 9b7853b..a3feeaa 100644 (file)
--- a/STARTERKIT/sass/nodes.scss
+++ b/STARTERKIT/sass/nodes.scss
@@ -53,7 +53,7 @@
 .node-unpublished { // Unpublished nodes
   // background-color: #fff4f4; // Drupal core uses a #fff4f4 background
 
-  div.unpublished { // The word "Unpublished" displayed underneath the content.
+  p.unpublished { // The word "Unpublished" displayed underneath the content.
     @include unpublished-div;
   }
 }

diff --git a/templates/node.tpl.php b/templates/node.tpl.php
index dac697c..e2258ad 100644 (file)
--- a/templates/node.tpl.php
+++ b/templates/node.tpl.php
@@ -83,36 +83,36 @@
  * @see template_process()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+<article class="node-<?php print $node->nid; ?> <?php print $classes; ?> clearfix"<?php print $attributes; ?>>
 
-  <?php print render($title_prefix); ?>
-  <?php if (!$page && $title): ?>
-    <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
-  <?php endif; ?>
-  <?php print render($title_suffix); ?>
+  <header>
+    <?php print render($title_prefix); ?>
+    <?php if (!$page && $title): ?>
+      <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
+    <?php endif; ?>
+    <?php print render($title_suffix); ?>
 
-  <?php if ($unpublished): ?>
-    <div class="unpublished"><?php print t('Unpublished'); ?></div>
-  <?php endif; ?>
+    <?php if ($display_submitted): ?>
+      <p class="submitted">
+        <?php print $user_picture; ?>
+        <?php print $submitted; ?>
+      </p>
+    <?php endif; ?>
 
-  <?php if ($display_submitted): ?>
-    <div class="submitted">
-      <?php print $user_picture; ?>
-      <?php print $submitted; ?>
-    </div>
-  <?php endif; ?>
+    <?php if ($unpublished): ?>
+      <p class="unpublished"><?php print t('Unpublished'); ?></p>
+    <?php endif; ?>
+  </header>
 
-  <div class="content"<?php print $content_attributes; ?>>
-    <?php
-      // We hide the comments and links now so that we can render them later.
-      hide($content['comments']);
-      hide($content['links']);
-      print render($content);
-    ?>
-  </div>
+  <?php
+    // We hide the comments and links now so that we can render them later.
+    hide($content['comments']);
+    hide($content['links']);
+    print render($content);
+  ?>
 
   <?php print render($content['links']); ?>
 
   <?php print render($content['comments']); ?>
 
-</div><!-- /.node -->
+</article><!-- /.node -->