Changeset 2866:c757993d0d27

Timestamp:

12/21/14 08:54:14 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.7

Message:

role="navigation" cannot be put on <ul> tag, so we should enclosed <ul>…</ul> with <nav role="navigation">, thanks pierrevg for reporting

Files:

• inc/public/default-templates/currywurst/_top.html (modified) (1 diff)
• plugins/simpleMenu/_public.php (modified) (1 diff)
• plugins/widgets/_widgets_functions.php (modified) (2 diffs)

inc/public/default-templates/currywurst/_top.html

@@ -1 +1 @@
 <div class="header">
-     <ul class="skip-links" id="prelude" role="navigation">
-          <li><a href="#main">{{tpl:lang To content}}</a></li>
-          <li><a href="#blognav">{{tpl:lang To menu}}</a></li>
-          <li><a href="#search">{{tpl:lang To search}}</a></li>
-     </ul>
+     <nav role="navigation">
+          <ul class="skip-links" id="prelude">
+               <li><a href="#main">{{tpl:lang To content}}</a></li>
+               <li><a href="#blognav">{{tpl:lang To menu}}</a></li>
+               <li><a href="#search">{{tpl:lang To search}}</a></li>
+          </ul>
+     </nav>
 
      <div class="banner" role="banner">

plugins/simpleMenu/_public.php

@@ -139 +139 @@
                // Final rendering
                if ($ret) {
-                    $ret = '<ul '.($id ? 'id="'.$id.'"' : '').' class="simple-menu'.($class ? ' '.$class : '').'" role="navigation">'."\n".$ret."\n".'</ul>';
+                    $ret = '<nav role="navigation"><ul '.($id ? 'id="'.$id.'"' : '').' class="simple-menu'.($class ? ' '.$class : '').'>'."\n".$ret."\n".'</ul></nav>';
                }
           }

plugins/widgets/_widgets_functions.php

@@ -53 +53 @@
           $res =
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
-          '<ul role="navigation">';
+          '<nav role="navigation"><ul>';
 
           if ($core->url->type != 'default') {
@@ -66 +66 @@
           '<a href="'.$core->blog->url.$core->url->getURLFor("archive").'">'.
           __('Archives').'</a></li>'.
-          '</ul>';
+          '</ul></nav>';
 
           return $w->renderDiv($w->content_only,$w->class,'id="topnav"',$res);