Changeset 3019:a2b9d58505b1

Timestamp:

06/28/15 09:55:42 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Encapsulate <ul>…</ul> with <nav role="navigation">…</nav> when <ul> used for navigation role (simpleMenu, navigation widget), fixes #2030

Files:

• plugins/simpleMenu/_public.php (modified) (1 diff)
• plugins/widgets/_widgets_functions.php (modified) (2 diffs)
• themes/berlin/scss/partials/_sidebar.scss (modified) (1 diff)
• themes/berlin/style.css (modified) (1 diff)

plugins/simpleMenu/_public.php

@@ -146 +146 @@
                // 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);

themes/berlin/scss/partials/_sidebar.scss

@@ -42 +42 @@
     line-height: 1.71429;
     > ul {
+        @include no-bullets;
+        padding-left: 0;
+    }
+    > nav ul {
         @include no-bullets;
         padding-left: 0;

themes/berlin/style.css

@@ -697 +697 @@
       list-style-type: none;
       margin-left: 0; }
+  .blognav__widgets .widget > nav ul, .blogextra__widgets .widget > nav ul {
+    list-style: none;
+    padding-left: 0; }
+    .blognav__widgets .widget > nav ul li, .blogextra__widgets .widget > nav ul li {
+      list-style-image: none;
+      list-style-type: none;
+      margin-left: 0; }
 
 .blognav__widgets ul, .blogextra__widgets ul {