Issue #1913692 by mgifford: Convert Seven to HTML5.

8.0.x
Dries 2013-03-12 22:03:15 -07:00
parent 614a6b095d
commit de808c2ac0
2 changed files with 15 additions and 14 deletions

View File

@ -13,9 +13,8 @@
* @ingroup themeable * @ingroup themeable
*/ */
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" <!DOCTYPE html>
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html lang="<?php print $language->langcode ?>" dir="<?php print $language->dir ?>">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->langcode ?>" lang="<?php print $language->langcode ?>" dir="<?php print $language->dir ?>">
<head> <head>
<title><?php print $head_title; ?></title> <title><?php print $head_title; ?></title>
<?php print $head; ?> <?php print $head; ?>
@ -26,9 +25,9 @@
<?php print $page_top; ?> <?php print $page_top; ?>
<div id="branding"> <header id="branding">
<?php if ($title): ?><h1 class="page-title"><?php print $title; ?></h1><?php endif; ?> <?php if ($title): ?><h1 class="page-title"><?php print $title; ?></h1><?php endif; ?>
</div> </header>
<div id="page"> <div id="page">
@ -41,7 +40,7 @@
<?php endif; ?> <?php endif; ?>
</div> </div>
<div id="content" class="clearfix"> <main id="content" class="clearfix">
<?php if ($messages): ?> <?php if ($messages): ?>
<div id="console"><?php print $messages; ?></div> <div id="console"><?php print $messages; ?></div>
<?php endif; ?> <?php endif; ?>
@ -51,11 +50,13 @@
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php print $content; ?> <?php print $content; ?>
</div> </main>
</div> </div>
<?php print $page_bottom; ?> <footer role="contentinfo">
<?php print $page_bottom; ?>
</footer>
</body> </body>
</html> </html>

View File

@ -16,7 +16,7 @@
* @ingroup themeable * @ingroup themeable
*/ */
?> ?>
<div id="branding" class="clearfix" role="navigation"> <header id="branding" class="clearfix" role="navigation">
<?php print $breadcrumb; ?> <?php print $breadcrumb; ?>
<?php print render($title_prefix); ?> <?php print render($title_prefix); ?>
<?php if ($title): ?> <?php if ($title): ?>
@ -26,14 +26,14 @@
<?php if ($primary_local_tasks): ?> <?php if ($primary_local_tasks): ?>
<?php print '<div role="tab">' . render($primary_local_tasks) . '</div>'; ?> <?php print '<div role="tab">' . render($primary_local_tasks) . '</div>'; ?>
<?php endif; ?> <?php endif; ?>
</div> </header>
<div id="page"> <div id="page">
<?php if ($secondary_local_tasks): ?> <?php if ($secondary_local_tasks): ?>
<div class="tabs-secondary clearfix" role="navigation"><?php print render($secondary_local_tasks); ?></div> <div class="tabs-secondary clearfix" role="navigation"><?php print render($secondary_local_tasks); ?></div>
<?php endif; ?> <?php endif; ?>
<div id="content" class="clearfix" role="main"> <main id="content" class="clearfix" role="main">
<div class="element-invisible"><a id="main-content"></a></div> <div class="element-invisible"><a id="main-content"></a></div>
<?php if ($messages): ?> <?php if ($messages): ?>
<div id="console" class="clearfix"><?php print $messages; ?></div> <div id="console" class="clearfix"><?php print $messages; ?></div>
@ -45,10 +45,10 @@
<?php endif; ?> <?php endif; ?>
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?> <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
<?php print render($page['content']); ?> <?php print render($page['content']); ?>
</div> </main>
<div id="footer" role="contentinfo"> <footer id="footer" role="contentinfo">
<?php print $feed_icons; ?> <?php print $feed_icons; ?>
</div> </footer>
</div> </div>