Changed plugins_url to tools_url to facilitate move of tz-tools to wp-content

@@ -7,7 +7,7 @@ class Branding {
 
 
 class Branding_Actions {
 class Branding_Actions {
     public static function admin_print_styles() {
     public static function admin_print_styles() {
-        _enqueue_style('branding-style', plugins_url('css/tenzing.css', __FILE__));
+        _enqueue_style('branding-style', TzTools::tools_url('css/tenzing.css', __FILE__));
     }
     }
 
 
     public static function admin_head() {
     public static function admin_head() {
@@ -22,7 +22,7 @@ class Branding_Actions {
     }
     }
 
 
     public static function login_head() {
     public static function login_head() {
-        echo '<link rel="stylesheet" type="text/css" href="' . plugins_url('css/tz_login.css', __FILE__) . '" />';
+        echo '<link rel="stylesheet" type="text/css" href="' . TzTools::tools_url('css/tz_login.css', __FILE__) . '" />';
     }
     }
 }
 }
 
 

@@ -285,7 +285,7 @@ class PagePermissions_Actions {
             ob_end_clean();
             ob_end_clean();
         }
         }
 
 
-        _enqueue_script('page-permissions', plugins_url('PagePermissions.js', __FILE__));
+        _enqueue_script('page-permissions', TzTools::tools_url('PagePermissions.js', __FILE__));
         _localize_script('page-permissions', 'TzPagePermissionsData', Array(
         _localize_script('page-permissions', 'TzPagePermissionsData', Array(
             'trigger'      => PagePermissions::ELE_SEL
             'trigger'      => PagePermissions::ELE_SEL
           , 'focus'        => PagePermissions::OPT_CUST
           , 'focus'        => PagePermissions::OPT_CUST

@@ -110,7 +110,7 @@ class ShortCodes_Actions {
 
 
     public static function admin_print_scripts() {
     public static function admin_print_scripts() {
         if ($GLOBALS['editing']) {
         if ($GLOBALS['editing']) {
-            _enqueue_script('shortcoder', plugins_url('shortcoder.js', __FILE__), Array('jquery'));
+            _enqueue_script('shortcoder', TzTools::tools_url('shortcoder.js', __FILE__), Array('jquery'));
 
 
             echo "<script type=\"text/javascript\">\n/* <![CDATA[ */\n";
             echo "<script type=\"text/javascript\">\n/* <![CDATA[ */\n";
             echo 'var TzRegisteredShortCodes = ' . json_encode(ShortCodes::getRegistered());
             echo 'var TzRegisteredShortCodes = ' . json_encode(ShortCodes::getRegistered());

@@ -4,7 +4,7 @@ class MenuWidget extends WP_Widget {
         register_widget(__CLASS__);
         register_widget(__CLASS__);
 
 
         if (is_admin()) {
         if (is_admin()) {
-            _enqueue_script('tz-menu-widget', plugins_url('MenuWidget.js', __FILE__), Array('addEvent'));
+            _enqueue_script('tz-menu-widget', TzTools::tools_url('MenuWidget.js', __FILE__), Array('addEvent'));
         }
         }
     }
     }
 
 

 <?php
 <?php
 /*
 /*
 Plugin Name: Tenzing Tools
 Plugin Name: Tenzing Tools
-Version: 0.1
-Description: Various classes to help out with stuff
+Version: 0.3b
+Description: Various classes and functions to help out with stuff
 Author: Tenzing
 Author: Tenzing
 */
 */
 
 
@@ -18,9 +18,9 @@ class TzTools {
 
 
         require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'wp_functions.php');
         require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'wp_functions.php');
 
 
-        _register_script('addEvent', plugins_url('addEvent.js', __FILE__));
-        _register_script('xmlhttpHandler', plugins_url('xmlhttpHandler.js', __FILE__));
-        _register_script('fireEvent', plugins_url('fireEvent.js', __FILE__));
+        _register_script('addEvent', self::tools_url('addEvent.js', __FILE__));
+        _register_script('xmlhttpHandler', self::tools_url('xmlhttpHandler.js', __FILE__));
+        _register_script('fireEvent', self::tools_url('fireEvent.js', __FILE__));
 
 
         add_action('widgets_init', Array('MenuWidget', 'init'));
         add_action('widgets_init', Array('MenuWidget', 'init'));
         self::import('ShortCodes');
         self::import('ShortCodes');
@@ -40,6 +40,14 @@ class TzTools {
             include($file);
             include($file);
         }
         }
     }
     }
+
+    public static function tools_url($script, $base_file = false) {
+        $base_dir = (false === $base_file ? dirname(__FILE__) : dirname($base_file));
+        $rel_path = str_replace(ABSPATH, '', $base_dir);
+        $script   = site_url() . '/' . $rel_path . '/' . $script;
+
+        return $script;
+    }
 }
 }
 
 
 function add_actions($class) {
 function add_actions($class) {
@@ -103,4 +111,4 @@ function _custom_revision() {
     $args = func_get_args();
     $args = func_get_args();
     return call_user_func_array('_custom_page', $args);
     return call_user_func_array('_custom_page', $args);
 }
 }
-?>
\ No newline at end of file
+?>