Ticket #48406: 48406.diff

src/wp-admin/css/dashboard.css

@@ -130 +130 @@
         color: #72777c;
 }
 
-.welcome-panel a {
+.welcome-panel li a {
         text-decoration: none;
 }
 
@@ -260 +260 @@
         top: -2px;
 }
 
+.welcome-panel .welcome-widgets:before {
+        content: "\f538";
+        top: -2px;
+}
+
+.welcome-panel .welcome-menus:before {
+        content: "\f163";
+        top: -2px;
+}
+
 .welcome-panel .welcome-comments:before {
         content: "\f117";
         top: -1px;
@@ -886 +896 @@
         min-width: 0;
 }
 
-#dashboard-widgets a,
-#dashboard-widgets .button-link {
+#dashboard-widgets li a,
+#dashboard-widgets .button-link,
+.community-events-footer a {
         text-decoration: none;
 }
 

src/wp-admin/includes/dashboard.php

@@ -1797 +1797 @@
         <div class="welcome-panel-column welcome-panel-last">
                 <h3><?php _e( 'More Actions' ); ?></h3>
                 <ul>
-                <?php
-                if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) :
-                        if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
-                                $widgets_menus_link = sprintf(
-                                        /* translators: 1: URL to Widgets screen, 2: URL to Menus screen. */
-                                        __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
-                                        admin_url( 'widgets.php' ),
-                                        admin_url( 'nav-menus.php' )
-                                );
-                        } elseif ( current_theme_supports( 'widgets' ) ) {
-                                $widgets_menus_link = '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
-                        } else {
-                                $widgets_menus_link = '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
-                        }
-                        ?>
-                        <li><div class="welcome-icon welcome-widgets-menus"><?php echo $widgets_menus_link; ?></div></li>
+                <?php if ( current_theme_supports( 'widgets' ) ) : ?>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-widgets">' . __( 'Manage widgets' ) . '</a>', admin_url( 'widgets.php' ) ); ?></li>
                 <?php endif; ?>
+                <?php if ( current_theme_supports( 'menus' ) ) : ?>
+                        <li><?php printf( '<a href="%s" class="welcome-icon welcome-menus">' . __( 'Manage menus' ) . '</a>', admin_url( 'nav-menus.php' ) ); ?></li>
+                <?php endif; ?>
                 <?php if ( current_user_can( 'manage_options' ) ) : ?>
                         <li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
                 <?php endif; ?>