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

Timestamp:

11/12/2011 12:26:55 AM (14 years ago)

Author:

koopersmith

Message:

Improve admin bar markup. Un-nest top level secondary menu. Remove unnecessary span. see #18197.

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (4 diffs)

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

@@ -143 +143 @@
                     }
 
-                    if ( ! empty( $this->root->children->secondary ) ):
-                        ?><ul class="ab-top-menu top-secondary"><?php
-
-                            foreach ( $this->root->children->secondary as $node ) {
-                                $this->recursive_render( $node );
-                            }
-
-                        ?></ul><?php
-                    endif;
+                ?></ul>
+                <ul class="ab-top-menu ab-top-secondary"><?php
+
+                    foreach ( $this->root->children->secondary as $node ) {
+                        $this->recursive_render( $node );
+                    }
+
                 ?></ul>
             </div>
@@ -188 +186 @@
             ?>><?php
 
-            if ( $is_parent ) :
-                ?><span><?php
-            endif;
-
             echo $node->title;
-
-            if ( $is_parent ) :
-                ?></span><?php
-            endif;
 
             ?></a>
@@ -202 +192 @@
             <?php
             if ( $is_parent ) :
-                ?><ul><?php
+                ?><ul class="ab-submenu"><?php
                 foreach ( $node->children->primary as $child_node ) {
                     $this->recursive_render( $child_node );
@@ -208 +198 @@
 
                 if ( ! empty( $node->children->secondary ) ):
-                    ?><ul class="sub-secondary"><?php
+                    ?><ul class="ab-sub-secondary"><?php
                     foreach ( $node->children->secondary as $child_node ) {
                         $this->recursive_render( $child_node );