Changeset 17735

Timestamp:

04/28/2011 08:59:42 AM (15 years ago)

Author:

nacin

Message:

Move files in inc/theme-options up one level. see #17198.

Location:

trunk/wp-content/themes/twentyeleven

Files:

• functions.php (modified) (1 diff)
• inc/images (copied) (copied from trunk/wp-content/themes/twentyeleven/inc/theme-options/images )
• inc/theme-options (deleted)
• inc/theme-options.css (copied) (copied from trunk/wp-content/themes/twentyeleven/inc/theme-options/theme-options.css )
• inc/theme-options.js (copied) (copied from trunk/wp-content/themes/twentyeleven/inc/theme-options/theme-options.js )
• inc/theme-options.php (copied) (copied from trunk/wp-content/themes/twentyeleven/inc/theme-options/theme-options.php ) (3 diffs)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -89 +89 @@
          * Load up our theme options page
          */
-        require( dirname( __FILE__ ) . '/inc/theme-options/theme-options.php' );
+        require( dirname( __FILE__ ) . '/inc/theme-options.php' );
 
         /**

trunk/wp-content/themes/twentyeleven/inc/theme-options.php

@@ -22 +22 @@
                 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' );
@@ -84 +84 @@
                         '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',
                 ),
         );
@@ -106 +106 @@
                         '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',
                 ),
         );