Changeset 22089

Timestamp:

10/01/2012 02:58:05 PM (12 years ago)

Author:

nacin

Message:

Provide no-customize fallback to the welcome screen. Use the customize overlay rather than a page reload. see #21368.

Location:

trunk/wp-admin

Files:

• includes/dashboard.php (modified) (1 diff)
• index.php (modified) (1 diff)

trunk/wp-admin/includes/dashboard.php

@@ -1241 +1241 @@
         <h4><?php _e( 'Get Started' ); ?></h4>
         <p><?php _e( 'First, tweak the look of your site:' ); ?></p>
-        <a class="button-primary welcome-button" href="<?php echo add_query_arg( 'url', urlencode( admin_url( '/' ) ), wp_customize_url() ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+        <a class="button-primary welcome-button load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+        <a class="button-primary welcome-button hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
         <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-            <p><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
+            <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
         <?php endif; ?>
     </div>

trunk/wp-admin/index.php

@@ -18 +18 @@
 
 wp_enqueue_script( 'dashboard' );
-wp_enqueue_script( 'plugin-install' );
-wp_enqueue_script( 'media-upload' );
+if ( current_user_can( 'edit_theme_options' ) )
+    wp_enqueue_script( 'customize-loader' );
+if ( current_user_can( 'install_plugins' ) )
+    wp_enqueue_script( 'plugin-install' );
+if ( current_user_can( 'upload_files' ) )
+    wp_enqueue_script( 'media-upload' );
 add_thickbox();