Permalink
Browse files

Fix filepaths.

  • Loading branch information...
devinsays committed May 14, 2011
1 parent 6926ce7 commit d82edc193a6dc70d094c09819a28c6360e258eed
Showing with 10 additions and 11 deletions.
  1. +4 −5 admin/options-framework.php
  2. +1 −1 admin/options-medialibrary-uploader.php
  3. +5 −5 functions.php
@@ -28,7 +28,6 @@
/* Basic plugin definitions */
define('OPTIONS_FRAMEWORK_VERSION', '0.6');
-define('OPTIONS_FRAMEWORK_URL', OF_DIRECTORY . "/admin/");
/* Make sure we don't expose any info if called directly */
@@ -203,8 +202,8 @@ function optionsframework_add_page() {
/* Loads the CSS */
function optionsframework_load_styles() {
- wp_enqueue_style('admin-style', OPTIONS_FRAMEWORK_URL.'css/admin-style.css');
- wp_enqueue_style('color-picker', OPTIONS_FRAMEWORK_URL.'css/colorpicker.css');
+ wp_enqueue_style('admin-style', OPTIONS_FRAMEWORK_DIRECTORY .'css/admin-style.css');
+ wp_enqueue_style('color-picker', OPTIONS_FRAMEWORK_DIRECTORY .'css/colorpicker.css');
}
/* Loads the javascript */
@@ -216,8 +215,8 @@ function optionsframework_load_scripts() {
// Enqueued scripts
wp_enqueue_script('jquery-ui-core');
- wp_enqueue_script('color-picker', OPTIONS_FRAMEWORK_URL.'js/colorpicker.js', array('jquery'));
- wp_enqueue_script('options-custom', OPTIONS_FRAMEWORK_URL.'js/options-custom.js', array('jquery'));
+ wp_enqueue_script('color-picker', OPTIONS_FRAMEWORK_DIRECTORY . 'js/colorpicker.js', array('jquery'));
+ wp_enqueue_script('options-custom', OPTIONS_FRAMEWORK_DIRECTORY . 'js/options-custom.js', array('jquery'));
}
function of_admin_head() {
@@ -70,7 +70,7 @@ function optionsframework_mlu_css () {
function optionsframework_mlu_js () {
// Registers custom scripts for the Media Library AJAX uploader.
- wp_register_script( 'of-medialibrary-uploader', OPTIONS_FRAMEWORK_URL .'js/of-medialibrary-uploader.js', array( 'jquery', 'thickbox' ) );
+ wp_register_script( 'of-medialibrary-uploader', OPTIONS_FRAMEWORK_DIRECTORY .'js/of-medialibrary-uploader.js', array( 'jquery', 'thickbox' ) );
wp_enqueue_script( 'of-medialibrary-uploader' );
wp_enqueue_script( 'media-upload' );
}
View
@@ -7,11 +7,11 @@
/* Set the file path based on whether the Options Framework Theme is a parent theme or child theme */
if ( STYLESHEETPATH == TEMPLATEPATH ) {
- define('OF_FILEPATH', TEMPLATEPATH);
- define('OF_DIRECTORY', get_bloginfo('template_directory'));
+ define('OPTIONS_FRAMEWORK_URL', TEMPLATEPATH . '/admin/');
+ define('OPTIONS_FRAMEWORK_DIRECTORY', get_bloginfo('template_directory') . '/admin/');
} else {
- define('OF_FILEPATH', STYLESHEETPATH);
- define('OF_DIRECTORY', get_bloginfo('stylesheet_directory'));
+ define('OPTIONS_FRAMEWORK_URL', STYLESHEETPATH . '/admin/');
+ define('OPTIONS_FRAMEWORK_DIRECTORY', get_bloginfo('stylesheet_directory') . '/admin/');
}
-require_once (OF_FILEPATH . '/admin/options-framework.php');
+require_once (OPTIONS_FRAMEWORK_URL . 'options-framework.php');

0 comments on commit d82edc1

Please sign in to comment.