Changeset 42217 for trunk/src/wp-admin/nav-menus.php

Timestamp:

11/23/2017 04:08:42 AM (7 years ago)

Author:

pento

Message:

General: Reformat inline if () statements inside HTML tags.

This pattern occurs a handful of times across the codebase:

<div class="foo<?php if ( $bar ) { echo ' baz'; } ?>">

Unfortunately, it doesn't really play nicely with phpcbf, so all instances need to be removed in preperation for auto code formatting.

See #41057.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (7 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -590 +590 @@
         );
     endif;
+
+    $nav_tab_active_class = '';
+    if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
+        $nav_tab_active_class = ' nav-tab-active';
+    }
     ?>
 
@@ -595 +600 @@
 
     <h2 class="nav-tab-wrapper wp-clearfix">
-        <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
+        <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
         <?php if ( $num_locations && $menu_count ) : ?>
             <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
@@ -631 +636 @@
                             <select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
                                 <option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
-                                <?php foreach ( $nav_menus as $menu ) : ?>
-                                    <?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-                                    <option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
+                                <?php
+                                    foreach ( $nav_menus as $menu ) :
+                                        $data_orig = '';
+                                        $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id;
+                                        if ( $selected ) {
+                                            $data_orig = 'data-orig="true"';
+                                        }
+                                        ?>
+                                    <option <?php echo $data_orig; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
                                         <?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
                                     </option>
@@ -722 +733 @@
             </span><!-- /add-new-menu-action -->
         </form>
-    <?php endif; ?>
+    <?php
+        endif;
+
+        $metabox_holder_disabled_class = '';
+        if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+            $metabox_holder_disabled_class = ' metabox-holder-disabled';
+        }
+    ?>
     </div><!-- /manage-menus -->
     <div id="nav-menus-frame" class="wp-clearfix">
-    <div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">
+    <div id="menu-settings-column" class="metabox-holder<?php echo $metabox_holder_disabled_class; ?>">
 
         <div class="clear"></div>
@@ -740 +758 @@
         <div id="menu-management">
             <form id="update-nav-menu" method="post" enctype="multipart/form-data">
-                <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+            <?php
+                $new_screen_class = '';
+                if ( $add_new_screen ) {
+                    $new_screen_class = 'blank-slate';
+                }
+            ?>
+                <div class="menu-edit <?php echo $new_screen_class; ?>">
                     <input type="hidden" name="nav-menu-data">
                     <?php
@@ -771 +795 @@
                             <?php if ( ! $add_new_screen ) : ?>
                             <h3><?php _e( 'Menu Structure' ); ?></h3>
-                            <?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
-                            <div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
+                            <?php
+                                $hide_style = '';
+                                if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+                                    $hide_style = 'style="display: none;"';
+                                }
+                                $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
+                            ?>
+                            <div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
                                 <p><?php echo $starter_copy; ?></p>
                             </div>
@@ -788 +818 @@
                                     <input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
                                 <?php endif; ?>
-                            <?php endif; ?>
-                            <div class="menu-settings" <?php if ( $one_theme_location_no_menus ) { ?>style="display: none;"<?php } ?>>
+                            <?php
+                                endif;
+
+                                $no_menus_style = '';
+                                if ( $one_theme_location_no_menus ) {
+                                    $no_menus_style = 'style="display: none;"';
+                                }
+                            ?>
+                            <div class="menu-settings" <?php echo $no_menus_style; ?>>
                                 <h3><?php _e( 'Menu Settings' ); ?></h3>
                                 <?php