Changeset 19270 for trunk/wp-includes/class-wp-admin-bar.php

Timestamp:

11/14/2011 11:05:37 AM (14 years ago)

Author:

koopersmith

Message:

More admin bar markup improvements. Make primary and secondary submenu groups siblings (and prevent ul nesting issues). see #18197.

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (1 diff)

trunk/wp-includes/class-wp-admin-bar.php

@@ -192 +192 @@
             <?php
             if ( $is_parent ) :
-                ?><ul class="ab-submenu"><?php
-                foreach ( $node->children->primary as $child_node ) {
-                    $this->recursive_render( $child_node );
-                }
-
-                if ( ! empty( $node->children->secondary ) ):
-                    ?><ul class="ab-sub-secondary"><?php
-                    foreach ( $node->children->secondary as $child_node ) {
+                ?><div class="ab-sub-wrapper"><?php
+
+                    // Render primary submenu
+                    ?><ul class="ab-submenu"><?php
+                    foreach ( $node->children->primary as $child_node ) {
                         $this->recursive_render( $child_node );
                     }
                     ?></ul><?php
-                endif;
-                ?></ul><?php
+
+                    // Render secondary submenu
+                    if ( ! empty( $node->children->secondary ) ):
+                        ?><ul class="ab-submenu ab-sub-secondary"><?php
+                        foreach ( $node->children->secondary as $child_node ) {
+                            $this->recursive_render( $child_node );
+                        }
+                        ?></ul><?php
+                    endif;
+
+                ?></div><?php
             endif;