From: <var...@us...> - 2016-03-18 11:20:46
|
Revision: 9817 http://sourceforge.net/p/phpwiki/code/9817 Author: vargenau Date: 2016-03-18 11:20:43 +0000 (Fri, 18 Mar 2016) Log Message: ----------- Add HTML 5 <main> <header> <footer> <nav> in all themes Modified Paths: -------------- trunk/themes/Crao/templates/body.tmpl trunk/themes/Crao/templates/bottom.tmpl trunk/themes/Crao/templates/navbar.tmpl trunk/themes/MonoBook/templates/body.tmpl trunk/themes/MonoBook/templates/browse-footer.tmpl trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/Portland/templates/body.tmpl trunk/themes/Portland/templates/navbar.tmpl trunk/themes/Sidebar/templates/actionbar.tmpl trunk/themes/Sidebar/templates/body.tmpl trunk/themes/Sidebar/templates/content.tmpl trunk/themes/Sidebar/templates/navbar.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Wordpress/templates/actionbar.tmpl trunk/themes/Wordpress/templates/body.tmpl trunk/themes/blog/templates/body.tmpl trunk/themes/blog/templates/browse-footer.tmpl trunk/themes/blog/templates/navbar.tmpl trunk/themes/blog/templates/top.tmpl trunk/themes/default/templates/actionbar.tmpl trunk/themes/default/templates/body.tmpl trunk/themes/default/templates/bottom.tmpl trunk/themes/default/templates/content.tmpl trunk/themes/default/templates/navbar.tmpl trunk/themes/shamino_com/templates/actionbar.tmpl trunk/themes/shamino_com/templates/top.tmpl trunk/themes/smaller/templates/navbar.tmpl trunk/themes/wikilens/templates/body.tmpl trunk/themes/wikilens/templates/navbar.tmpl Modified: trunk/themes/Crao/templates/body.tmpl =================================================================== --- trunk/themes/Crao/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Crao/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,7 +1,9 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > +<header role="banner"> <div id="header"><?php // for top toolbars style sheet ?> <?php echo Template('top') ?> </div> +</header> <div class="toolbar"><?php echo Template('navbar') ?></div> <!-- Page content --> <div id="content"> @@ -9,7 +11,9 @@ <!-- Page title --> <h1><?php echo $HEADER ?></h1> <?php } ?> +<main role="main"> <?php echo $CONTENT ?> +</main> <?php echo Template('bottom') ?> </div> <?php if (isset($revision)) { ?> Modified: trunk/themes/Crao/templates/bottom.tmpl =================================================================== --- trunk/themes/Crao/templates/bottom.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Crao/templates/bottom.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,6 +1,8 @@ +<footer role="contentinfo"> <!-- Add your Disclaimer here --> <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> <?php if (defined('DEBUG') and DEBUG) { ?><?php echo Template('debug') ?><?php } ?> +</footer> <script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script> <script> hljs.tabReplace = ' '; Modified: trunk/themes/Crao/templates/navbar.tmpl =================================================================== --- trunk/themes/Crao/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Crao/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Main Menu"> <!-- The top navigation/search bar --> <form action="<?php echo WikiURL(_("TitleSearch"))?>" method="get" accept-charset="UTF-8" id="searchform"> @@ -46,3 +47,4 @@ </div> </td></tr></table></div> </form> +</nav> Modified: trunk/themes/MonoBook/templates/body.tmpl =================================================================== --- trunk/themes/MonoBook/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/MonoBook/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,17 +1,18 @@ -<?php -// Todo: set the body attr dynamically. here class="ns-2" for mozilla -?> <body <?php echo $WikiTheme->getMoreAttr('body') ?> > <div id="global-wrapper"> <div id="column-content"> <div id="content"> + <header role="banner"> <?php echo Template('top') ?> + </header> + <main role="main"> <div id="bodyContent"> <?php echo $CONTENT ?> <!-- end content --> <div class="visualClear"></div> </div> + </main> </div> <?php if (empty($NOSIGNIN)) { ?> <?php echo Template('signin') ?> Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse-footer.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<footer role="contentinfo"> <?php // <hr class="printer" /> ?> <div class="visualClear"></div> <div id="f-poweredbyico"><a href="http://www.phpwiki.fr/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> @@ -24,3 +25,4 @@ </li> </ul> <div id="f-copyrightico"><a href="http://www.gnu.org/copyleft/fdl.html"><img src="<?php echo $WikiTheme->getImageURL("gnu-fdl.png") ?>" alt="GNU Free Documentation License" /></a></div> +</footer> Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Main Menu"> <?php // With MonoBook it is similar to Sidebar, named boxes at the left. // actionbuttons, navigation, search, toolbox @@ -71,3 +72,4 @@ </div> </div> <!-- end of the left (by default at least) column --> +</nav> Modified: trunk/themes/Portland/templates/body.tmpl =================================================================== --- trunk/themes/Portland/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Portland/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,11 +1,15 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > +<header role="banner"> <!-- Page title and logo --> <h1><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" class="bottom" /></a> <?php echo $HEADER?></h1> +</header> +<main role="main"> <?php echo $CONTENT ?> +</main> <?php echo Template('navbar') ?> <!-- RELATEDPAGES were here. --> Modified: trunk/themes/Portland/templates/navbar.tmpl =================================================================== --- trunk/themes/Portland/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Portland/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Main Menu"> <!-- The bottom navigation/search bar --> <?php echo WikiLink(_("FindPage"), "button") ?> by searching @@ -21,3 +22,4 @@ <?php echo Template('signin') ?> </td> </tr></table> +</nav> Modified: trunk/themes/Sidebar/templates/actionbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/actionbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Sidebar/templates/actionbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -7,6 +7,7 @@ $mayEdit = mayAccessPage('edit', $pagename); $mayChange = mayAccessPage('change', $pagename); ?> +<nav role="navigation" aria-label="Actions Menu"> <div class="portlet" id="p-cactions"> <ul> <?php if ($request->getArg('action') != "") { ?> @@ -30,7 +31,9 @@ <?php } ?> </ul> </div> +</nav> +<nav role="navigation" aria-label="Special Actions Menu"> <?php if ($user->isSignedIn()) { ?> <div class="portlet" id="p-tbx"> <h2><?php echo _("Special Actions") ?> <?php echo $WikiTheme->folderArrow('p-tbx', 'Closed') ?></h2> @@ -65,3 +68,4 @@ </div> </div> <?php } //isSignedIn ?> +</nav> Modified: trunk/themes/Sidebar/templates/body.tmpl =================================================================== --- trunk/themes/Sidebar/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Sidebar/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -2,13 +2,14 @@ <div id="global-wrapper"> <div id="column-content"> <div id="content"> + <main role="main"> <?php echo Template('top') ?> <div id="bodyContent"> <?php echo $CONTENT ?> - <!-- end content --> <div class="visualClear"></div> </div> + </main> </div> <?php if (!$WikiTheme->DUMP_MODE) { ?> <?php echo Template('logo') ?> Modified: trunk/themes/Sidebar/templates/content.tmpl =================================================================== --- trunk/themes/Sidebar/templates/content.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Sidebar/templates/content.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,2 +1,4 @@ +<main role="main"> <?php echo $CONTENT ?> +</main> </body> Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -4,6 +4,7 @@ ?> <!-- The left navigation/search bar --> <!-- Here you should add favorite Links and Categories --> +<nav role="navigation" aria-label="Main Menu"> <div class="portlet" id="p-navigation"> <div class="_pBody"> <ul> @@ -67,3 +68,4 @@ <?php echo Template('rc') ?> <?php echo Template('tags') ?> <!-- end of the left (by default at least) column --> +</nav> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Sidebar/templates/signin.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<header role="banner"> <div class="portlet" id="p-personal"><div class="pBody"><ul> <?php if ($user->isAuthenticated()) { $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?> @@ -18,3 +19,4 @@ </ul> </div> </div> +</header> Modified: trunk/themes/Wordpress/templates/actionbar.tmpl =================================================================== --- trunk/themes/Wordpress/templates/actionbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Wordpress/templates/actionbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Actions Menu"> <div id="actionbar"> <?php @@ -98,3 +99,4 @@ </li> </ul> </div> +</nav> Modified: trunk/themes/Wordpress/templates/body.tmpl =================================================================== --- trunk/themes/Wordpress/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/Wordpress/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,10 +1,13 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > +<header role="banner"> <!-- Page title --> <h1 id="header"><?php echo $HEADER ?></h1> - +</header> +<main role="main"> <!-- Page title and logo --> <?php echo $CONTENT ?> +</main> <?php echo Template('navbar') ?> <!-- RELATEDPAGES were here. --> Modified: trunk/themes/blog/templates/body.tmpl =================================================================== --- trunk/themes/blog/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/blog/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -5,9 +5,11 @@ <?php // $CONTENT includes browse.tmpl ?> <div id="pagetitle"> <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div> +<main role="main"> <div id="bodyContent"> <?php echo $CONTENT?> </div> +</main> <div id="bottom"> <?php echo Template('bottom') ?> Modified: trunk/themes/blog/templates/browse-footer.tmpl =================================================================== --- trunk/themes/blog/templates/browse-footer.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/blog/templates/browse-footer.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<footer role="contentinfo"> <p class="editdate"> <?php if( $page->getName() != _("HomePage")) { ?> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?><br /> @@ -3,2 +4,3 @@ <?php } ?> This site is powered by <a href="http://phpwiki.sourceforge.net">PhpWiki</a>. Page design based on <a href="http://binarybonsai.com/kubrick/">Kubrick</a>,<br />adapted by <a href="http://the.taoofmac.com">Rui Carmo</a> from an original design by <a href="http://binarybonsai.com">Michael Heilemann</a>.</p> +</footer> Modified: trunk/themes/blog/templates/navbar.tmpl =================================================================== --- trunk/themes/blog/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/blog/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Main Menu"> <!-- Additional sidebar navigation --> <div class="box"> <div class="box-title"> @@ -18,3 +19,4 @@ <?php echo Template("blog/signin") ?> </div> </div> +</nav> Modified: trunk/themes/blog/templates/top.tmpl =================================================================== --- trunk/themes/blog/templates/top.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/blog/templates/top.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<header role="banner"> <div id="header"> <?php if ( $request->getArg('action') == 'browse' ) { ?> <div id="yoursiteheader"> @@ -6,6 +7,7 @@ </div> <?php } ?> </div> +</header> <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?> <div id="actionbar"> <?php echo Template('actionbar') ?> Modified: trunk/themes/default/templates/actionbar.tmpl =================================================================== --- trunk/themes/default/templates/actionbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/default/templates/actionbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,4 +1,5 @@ <?php if (!$WikiTheme->DUMP_MODE) { ?> +<nav role="navigation" aria-label="Actions Menu"> <table class="fullwidth"> <tr class="baseline"> <td> @@ -51,4 +52,5 @@ <?php } ?> </tr> </table> +</nav> <?php } ?> Modified: trunk/themes/default/templates/body.tmpl =================================================================== --- trunk/themes/default/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/default/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,12 +1,13 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > - +<header role="banner"> <div id="header"> <?php echo Template('top') ?> </div> +</header> +<main role="main"> <div id="content"> - <?php echo $CONTENT ?> - </div> +</main> <?php echo Template('bottom') ?> </body> Modified: trunk/themes/default/templates/bottom.tmpl =================================================================== --- trunk/themes/default/templates/bottom.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/default/templates/bottom.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<footer role="contentinfo"> <!-- Add your Disclaimer here --> <?php if (!$WikiTheme->DUMP_MODE) { ?> <?php echo empty($WARNINGS) ? '' : $WARNINGS ?> @@ -4,6 +5,7 @@ <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> <?php if (defined('DEBUG') and DEBUG & 1) { ?><?php echo Template('debug') ?><?php } ?> <?php } ?> +</footer> <script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script> <script> hljs.tabReplace = ' '; Modified: trunk/themes/default/templates/content.tmpl =================================================================== --- trunk/themes/default/templates/content.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/default/templates/content.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,5 @@ +<main role="main"> <?php echo $CONTENT ?> +</main> <?php echo Template('bottom') ?> </body> Modified: trunk/themes/default/templates/navbar.tmpl =================================================================== --- trunk/themes/default/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/default/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Main Menu"> <!-- The top navigation/search bar --> <div id="navbuttons"> <?php if (ENABLE_DISCUSSION_LINK) { ?> @@ -46,3 +47,4 @@ echo asXML(HTML::strong("PageLinks: "),$s ? HTML::em($s) : HTML::em('<none>')); } } ?> +</nav> Modified: trunk/themes/shamino_com/templates/actionbar.tmpl =================================================================== --- trunk/themes/shamino_com/templates/actionbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/shamino_com/templates/actionbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Actions Menu"> <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); ?> @@ -21,3 +22,4 @@ <?php echo $SEP?><?php echo Button(_("PageDump")) ?> <!-- End debugging buttons --> <?php } ?> +</nav> Modified: trunk/themes/shamino_com/templates/top.tmpl =================================================================== --- trunk/themes/shamino_com/templates/top.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/shamino_com/templates/top.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -5,6 +5,7 @@ alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" class="align-right" /></a></div> <!-- The top navigation/search bar --> +<nav role="navigation" aria-label="Main Menu"> <div class="wikinavbar"> <a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"> <?php echo WIKI_NAME ?></a> - @@ -30,3 +31,4 @@ <?php } // $NOSIGNIN?> </div> <?php } // HIDE_TOOLBARS ?> +</nav> Modified: trunk/themes/smaller/templates/navbar.tmpl =================================================================== --- trunk/themes/smaller/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/smaller/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,3 +1,4 @@ +<nav role="navigation" aria-label="Main Menu"> <!-- The top navigation/search bar --> <form action="<?php echo WikiURL(_("TitleSearch"))?>" method="get" accept-charset="UTF-8"> @@ -21,3 +22,4 @@ <?php } ?> </div> </form> +</nav> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/wikilens/templates/body.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,18 +1,27 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<table><tr><td colspan="2" class="header"> +<table> +<tr> +<td colspan="2" class="header"> +<header role="banner"> <div id="header"> <?php echo Template('top') ?> </div> -</td></tr> -<tr class="top"><td class="leftnav" style="width:120px"> +</header> +</td> +</tr> +<tr class="top"> +<td class="leftnav" style="width:120px"> +<nav role="navigation" aria-label="Main Menu"> <div class="toolbar"> <?php echo Template('navbar') ?> </div> <hr /> <?plugin IncludePage page="LeftbarContent" quiet="true" ?> -</td><td class="content"> - +</nav> +</td> +<td class="content"> +<main role="main"> <!-- Page title --> <h1><?php echo $HEADER ?> <?php if (!empty($user) && $user->isSignedIn()) { @@ -20,12 +29,12 @@ printXML(HTML::raw(" ")); printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); } ?> </h1> - <div id="content"> - <?php echo $CONTENT ?> - </div> +</main> <?php echo Template('bottom') ?> -</td></tr></table> +</td> +</tr> +</table> </body> Modified: trunk/themes/wikilens/templates/navbar.tmpl =================================================================== --- trunk/themes/wikilens/templates/navbar.tmpl 2016-03-18 10:19:39 UTC (rev 9816) +++ trunk/themes/wikilens/templates/navbar.tmpl 2016-03-18 11:20:43 UTC (rev 9817) @@ -1,6 +1,7 @@ <?php $NSEP = HTML::br(); ?> +<nav role="navigation" aria-label="Main Menu"> <!-- The left navigation/search bar --> <div id="navbuttons"> <?php if (ENABLE_DISCUSSION_LINK) { ?> @@ -39,3 +40,4 @@ } } ?> </div> +</nav> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |