Permalink
Browse files

Updated path variables

Updated translation path and options framework path.
  • Loading branch information...
1 parent e2062f0 commit 9d6405e6c927499c6f3769ccd9d5110ade425517 @simplethemes committed Jun 15, 2012
Showing with 13 additions and 13 deletions.
  1. +4 −4 skeleton/admin/options-framework.php
  2. +4 −4 skeleton/functions.php
  3. +5 −5 skeleton_childtheme/functions.php
@@ -169,8 +169,8 @@ function optionsframework_add_page() {
/* Loads the CSS */
function optionsframework_load_styles() {
- wp_enqueue_style('admin-style', OPTIONS_FRAMEWORK_DIRECTORY.'css/admin-style.css');
- wp_enqueue_style('color-picker', OPTIONS_FRAMEWORK_DIRECTORY.'css/colorpicker.css');
+ wp_enqueue_style('admin-style', OPTIONS_FRAMEWORK_URL.'css/admin-style.css');
+ wp_enqueue_style('color-picker', OPTIONS_FRAMEWORK_URL.'css/colorpicker.css');
}
/* Loads the javascript */
@@ -182,8 +182,8 @@ function optionsframework_load_scripts() {
// Enqueued scripts
wp_enqueue_script('jquery-ui-core');
- 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'));
+ 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'));
}
function of_admin_head() {
View
@@ -71,10 +71,10 @@
if ( !function_exists( 'optionsframework_init' ) ) {
- define('OPTIONS_FRAMEWORK_URL', PARENT_DIR . '/admin/');
- define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_URL', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_DIR . '/admin/');
-require_once (OPTIONS_FRAMEWORK_URL . 'options-framework.php');
+require_once (OPTIONS_FRAMEWORK_DIRECTORY . 'options-framework.php');
}
@@ -245,7 +245,7 @@ function skeleton_setup() {
// Make theme available for translation
// Translations can be filed in the /languages/ directory
- load_theme_textdomain( 'skeleton', PARENT_DIR . '/languages' );
+ load_theme_textdomain( 'smpl', PARENT_DIR . '/languages' );
$locale = get_locale();
$locale_file = PARENT_DIR . "/languages/$locale.php";
@@ -62,7 +62,7 @@
@define( 'PARENT_DIR', get_template_directory() );
@define( 'CHILD_DIR', get_stylesheet_directory() );
-@define( 'PARENT_URL', get_stylesheet_directory_uri() );
+@define( 'PARENT_URL', get_template_directory_uri() );
@define( 'CHILD_URL', get_stylesheet_directory_uri() );
@@ -74,10 +74,10 @@
if ( !function_exists( 'optionsframework_init' ) ) {
- define('OPTIONS_FRAMEWORK_URL', PARENT_DIR . '/admin/');
- define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_URL', PARENT_URL . '/admin/');
+ define('OPTIONS_FRAMEWORK_DIRECTORY', PARENT_DIR . '/admin/');
-require_once (OPTIONS_FRAMEWORK_URL . 'options-framework.php');
+require_once (OPTIONS_FRAMEWORK_DIRECTORY . 'options-framework.php');
}
@@ -230,7 +230,7 @@ function skeleton_setup() {
// Make theme available for translation
// Translations can be filed in the /languages/ directory
- load_theme_textdomain( 'skeleton', PARENT_DIR . '/languages' );
+ load_theme_textdomain( 'smpl', PARENT_DIR . '/languages' );
$locale = get_locale();
$locale_file = PARENT_DIR . "/languages/$locale.php";

0 comments on commit 9d6405e

Please sign in to comment.