From e43ec9377dffdbf907640bf04a1e0658fa01fa35 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 28 Apr 2011 08:59:42 +0000 Subject: [PATCH] Move files in inc/theme-options up one level. see #17198. git-svn-id: http://svn.automattic.com/wordpress/trunk@17735 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyeleven/functions.php | 2 +- .../images/content-sidebar.png | Bin .../inc/{theme-options => }/images/content.png | Bin .../inc/{theme-options => }/images/dark.png | Bin .../inc/{theme-options => }/images/light.png | Bin .../images/sidebar-content.png | Bin .../inc/{theme-options => }/theme-options.css | 0 .../inc/{theme-options => }/theme-options.js | 0 .../inc/{theme-options => }/theme-options.php | 14 +++++++------- 9 files changed, 8 insertions(+), 8 deletions(-) rename wp-content/themes/twentyeleven/inc/{theme-options => }/images/content-sidebar.png (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/images/content.png (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/images/dark.png (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/images/light.png (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/images/sidebar-content.png (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/theme-options.css (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/theme-options.js (100%) rename wp-content/themes/twentyeleven/inc/{theme-options => }/theme-options.php (94%) diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php index a3367ad472..9672fff1be 100644 --- a/wp-content/themes/twentyeleven/functions.php +++ b/wp-content/themes/twentyeleven/functions.php @@ -88,7 +88,7 @@ function twentyeleven_setup() { /** * Load up our theme options page */ - require( dirname( __FILE__ ) . '/inc/theme-options/theme-options.php' ); + require( dirname( __FILE__ ) . '/inc/theme-options.php' ); /** * Grab Twenty Eleven's Custom Widgets diff --git a/wp-content/themes/twentyeleven/inc/theme-options/images/content-sidebar.png b/wp-content/themes/twentyeleven/inc/images/content-sidebar.png similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/images/content-sidebar.png rename to wp-content/themes/twentyeleven/inc/images/content-sidebar.png diff --git a/wp-content/themes/twentyeleven/inc/theme-options/images/content.png b/wp-content/themes/twentyeleven/inc/images/content.png similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/images/content.png rename to wp-content/themes/twentyeleven/inc/images/content.png diff --git a/wp-content/themes/twentyeleven/inc/theme-options/images/dark.png b/wp-content/themes/twentyeleven/inc/images/dark.png similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/images/dark.png rename to wp-content/themes/twentyeleven/inc/images/dark.png diff --git a/wp-content/themes/twentyeleven/inc/theme-options/images/light.png b/wp-content/themes/twentyeleven/inc/images/light.png similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/images/light.png rename to wp-content/themes/twentyeleven/inc/images/light.png diff --git a/wp-content/themes/twentyeleven/inc/theme-options/images/sidebar-content.png b/wp-content/themes/twentyeleven/inc/images/sidebar-content.png similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/images/sidebar-content.png rename to wp-content/themes/twentyeleven/inc/images/sidebar-content.png diff --git a/wp-content/themes/twentyeleven/inc/theme-options/theme-options.css b/wp-content/themes/twentyeleven/inc/theme-options.css similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/theme-options.css rename to wp-content/themes/twentyeleven/inc/theme-options.css diff --git a/wp-content/themes/twentyeleven/inc/theme-options/theme-options.js b/wp-content/themes/twentyeleven/inc/theme-options.js similarity index 100% rename from wp-content/themes/twentyeleven/inc/theme-options/theme-options.js rename to wp-content/themes/twentyeleven/inc/theme-options.js diff --git a/wp-content/themes/twentyeleven/inc/theme-options/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php similarity index 94% rename from wp-content/themes/twentyeleven/inc/theme-options/theme-options.php rename to wp-content/themes/twentyeleven/inc/theme-options.php index 31ec680ba0..640de706da 100644 --- a/wp-content/themes/twentyeleven/inc/theme-options/theme-options.php +++ b/wp-content/themes/twentyeleven/inc/theme-options.php @@ -21,8 +21,8 @@ function twentyeleven_admin_enqueue_scripts( $hook_suffix ) { if ( $hook_suffix != 'appearance_page_theme_options' ) return; - wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options/theme-options.css', '', '0.1' ); - wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options/theme-options.js' ); + wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', '', '0.1' ); + wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js' ); wp_enqueue_style( 'farbtastic' ); wp_enqueue_script( 'farbtastic' ); } @@ -83,12 +83,12 @@ function twentyeleven_color_schemes() { 'light' => array( 'value' => 'light', 'label' => __( 'Light', 'twentyeleven' ), - 'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/light.png', + 'thumbnail' => get_template_directory_uri() . '/inc/images/light.png', ), 'dark' => array( 'value' => 'dark', 'label' => __( 'Dark', 'twentyeleven' ), - 'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/dark.png', + 'thumbnail' => get_template_directory_uri() . '/inc/images/dark.png', ), ); @@ -105,17 +105,17 @@ function twentyeleven_layouts() { 'content-sidebar' => array( 'value' => 'content-sidebar', 'label' => __( 'Content on left', 'twentyeleven' ), - 'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/content-sidebar.png', + 'thumbnail' => get_template_directory_uri() . '/inc/images/content-sidebar.png', ), 'sidebar-content' => array( 'value' => 'sidebar-content', 'label' => __( 'Content on right', 'twentyeleven' ), - 'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/sidebar-content.png', + 'thumbnail' => get_template_directory_uri() . '/inc/images/sidebar-content.png', ), 'content' => array( 'value' => 'content', 'label' => __( 'One-column, no Sidebar', 'twentyeleven' ), - 'thumbnail' => get_template_directory_uri() . '/inc/theme-options/images/content.png', + 'thumbnail' => get_template_directory_uri() . '/inc/images/content.png', ), );