From 39be1925b14d836d9559c6a2eb4a370d4b7a83eb Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 3 May 2012 08:10:10 +0000 Subject: [PATCH] // Rename treeview to treeview-categories --- classes/helper/Helper.php | 8 ++++---- classes/helper/HelperForm.php | 6 +++--- controllers/admin/AdminProductsController.php | 8 ++++---- css/retro-compat.css.php | 4 ++-- .../images/ajax-loader.gif | Bin .../images/file.gif | Bin .../images/folder-closed.gif | Bin .../images/folder.gif | Bin .../images/minus.gif | Bin .../images/plus.gif | Bin .../images/treeview-black-line.gif | Bin .../images/treeview-black.gif | Bin .../images/treeview-default-line.gif | Bin .../images/treeview-default.gif | Bin .../images/treeview-famfamfam-line.gif | Bin .../images/treeview-famfamfam.gif | Bin .../images/treeview-gray-line.gif | Bin .../images/treeview-gray.gif | Bin .../images/treeview-red-line.gif | Bin .../images/treeview-red.gif | Bin .../jquery.treeview-categories.async.js} | 0 .../jquery.treeview-categories.css} | 0 .../jquery.treeview-categories.edit.js} | 0 .../jquery.treeview-categories.js} | 0 .../jquery.treeview-categories.sortable.js} | 0 js/retro-compat.js.php | 16 ++++++++-------- 26 files changed, 21 insertions(+), 21 deletions(-) rename js/jquery/plugins/{treeview => treeview-categories}/images/ajax-loader.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/file.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/folder-closed.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/folder.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/minus.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/plus.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-black-line.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-black.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-default-line.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-default.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-famfamfam-line.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-famfamfam.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-gray-line.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-gray.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-red-line.gif (100%) rename js/jquery/plugins/{treeview => treeview-categories}/images/treeview-red.gif (100%) rename js/jquery/plugins/{treeview/jquery.treeview.async.js => treeview-categories/jquery.treeview-categories.async.js} (100%) rename js/jquery/plugins/{treeview/jquery.treeview.css => treeview-categories/jquery.treeview-categories.css} (100%) rename js/jquery/plugins/{treeview/jquery.treeview.edit.js => treeview-categories/jquery.treeview-categories.edit.js} (100%) rename js/jquery/plugins/{treeview/jquery.treeview.js => treeview-categories/jquery.treeview-categories.js} (100%) rename js/jquery/plugins/{treeview/jquery.treeview.sortable.js => treeview-categories/jquery.treeview-categories.sortable.js} (100%) diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php index e4ac12456..f7f54e3f7 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.php @@ -197,11 +197,11 @@ class HelperCore if (!$use_radio) $input_name = $input_name.'[]'; - $this->context->controller->addCSS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.css'); + $this->context->controller->addCSS(_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css'); $this->context->controller->addJs(array( - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.js', - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js', - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.js', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js', _PS_JS_DIR_.'admin-categories-tree.js')); if ($use_search) $this->context->controller->addJs(_PS_JS_DIR_.'jquery/plugins/autocomplete/jquery.autocomplete.js'); diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php index 7d5a778a8..52d82cd3f 100644 --- a/classes/helper/HelperForm.php +++ b/classes/helper/HelperForm.php @@ -91,11 +91,11 @@ class HelperFormCore extends Helper if ($categories) { // Added Jquery plugin treeview (css and js files) - $this->context->controller->addJqueryPlugin('treeview'); + $this->context->controller->addJqueryPlugin('treeview-categories'); // Added JS files - $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js'); - $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js'); + $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js'); + $this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js'); $this->context->controller->addJS(_PS_JS_DIR_.'admin-categories-tree.js'); if (isset($params['use_search']) && $params['use_search']) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index c0c64bd5a..b243ccf79 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3932,16 +3932,16 @@ class AdminProductsControllerCore extends AdminController _PS_JS_DIR_.'tinymce.inc.js', _PS_JS_DIR_.'fileuploader.js', _PS_JS_DIR_.'admin-dnd.js', - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.js', - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.async.js', - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.edit.js', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.js', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js', _PS_JS_DIR_.'admin-categories-tree.js', _PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js', _PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js' )); $this->addCSS(array( - _PS_JS_DIR_.'jquery/plugins/treeview/jquery.treeview.css', + _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css', _PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css', )); diff --git a/css/retro-compat.css.php b/css/retro-compat.css.php index 95102a651..2cec9910a 100644 --- a/css/retro-compat.css.php +++ b/css/retro-compat.css.php @@ -16,8 +16,8 @@ $css_files = array( array('new_file' => $css_folder.'plugins/fancybox/jquery.fancybox.css'), 'jquery.jgrowl.css'=> array('new_file' => $css_folder.'plugins/jgrowl/jquery.jgrowl.css'), - 'jquery.treeview.css' => - array('new_file' => $css_folder.'plugins/treeview/jquery.treeview.css'), + 'jquery.treeview-categories.css' => + array('new_file' => $css_folder.'plugins/treeview-categories/jquery.treeview-categories.css'), 'jqzoom.css' => array('new_file' => $css_folder.'plugins/jqzoom/jquery.jqzoom.css'), 'tabpane.css' => diff --git a/js/jquery/plugins/treeview/images/ajax-loader.gif b/js/jquery/plugins/treeview-categories/images/ajax-loader.gif similarity index 100% rename from js/jquery/plugins/treeview/images/ajax-loader.gif rename to js/jquery/plugins/treeview-categories/images/ajax-loader.gif diff --git a/js/jquery/plugins/treeview/images/file.gif b/js/jquery/plugins/treeview-categories/images/file.gif similarity index 100% rename from js/jquery/plugins/treeview/images/file.gif rename to js/jquery/plugins/treeview-categories/images/file.gif diff --git a/js/jquery/plugins/treeview/images/folder-closed.gif b/js/jquery/plugins/treeview-categories/images/folder-closed.gif similarity index 100% rename from js/jquery/plugins/treeview/images/folder-closed.gif rename to js/jquery/plugins/treeview-categories/images/folder-closed.gif diff --git a/js/jquery/plugins/treeview/images/folder.gif b/js/jquery/plugins/treeview-categories/images/folder.gif similarity index 100% rename from js/jquery/plugins/treeview/images/folder.gif rename to js/jquery/plugins/treeview-categories/images/folder.gif diff --git a/js/jquery/plugins/treeview/images/minus.gif b/js/jquery/plugins/treeview-categories/images/minus.gif similarity index 100% rename from js/jquery/plugins/treeview/images/minus.gif rename to js/jquery/plugins/treeview-categories/images/minus.gif diff --git a/js/jquery/plugins/treeview/images/plus.gif b/js/jquery/plugins/treeview-categories/images/plus.gif similarity index 100% rename from js/jquery/plugins/treeview/images/plus.gif rename to js/jquery/plugins/treeview-categories/images/plus.gif diff --git a/js/jquery/plugins/treeview/images/treeview-black-line.gif b/js/jquery/plugins/treeview-categories/images/treeview-black-line.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-black-line.gif rename to js/jquery/plugins/treeview-categories/images/treeview-black-line.gif diff --git a/js/jquery/plugins/treeview/images/treeview-black.gif b/js/jquery/plugins/treeview-categories/images/treeview-black.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-black.gif rename to js/jquery/plugins/treeview-categories/images/treeview-black.gif diff --git a/js/jquery/plugins/treeview/images/treeview-default-line.gif b/js/jquery/plugins/treeview-categories/images/treeview-default-line.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-default-line.gif rename to js/jquery/plugins/treeview-categories/images/treeview-default-line.gif diff --git a/js/jquery/plugins/treeview/images/treeview-default.gif b/js/jquery/plugins/treeview-categories/images/treeview-default.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-default.gif rename to js/jquery/plugins/treeview-categories/images/treeview-default.gif diff --git a/js/jquery/plugins/treeview/images/treeview-famfamfam-line.gif b/js/jquery/plugins/treeview-categories/images/treeview-famfamfam-line.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-famfamfam-line.gif rename to js/jquery/plugins/treeview-categories/images/treeview-famfamfam-line.gif diff --git a/js/jquery/plugins/treeview/images/treeview-famfamfam.gif b/js/jquery/plugins/treeview-categories/images/treeview-famfamfam.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-famfamfam.gif rename to js/jquery/plugins/treeview-categories/images/treeview-famfamfam.gif diff --git a/js/jquery/plugins/treeview/images/treeview-gray-line.gif b/js/jquery/plugins/treeview-categories/images/treeview-gray-line.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-gray-line.gif rename to js/jquery/plugins/treeview-categories/images/treeview-gray-line.gif diff --git a/js/jquery/plugins/treeview/images/treeview-gray.gif b/js/jquery/plugins/treeview-categories/images/treeview-gray.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-gray.gif rename to js/jquery/plugins/treeview-categories/images/treeview-gray.gif diff --git a/js/jquery/plugins/treeview/images/treeview-red-line.gif b/js/jquery/plugins/treeview-categories/images/treeview-red-line.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-red-line.gif rename to js/jquery/plugins/treeview-categories/images/treeview-red-line.gif diff --git a/js/jquery/plugins/treeview/images/treeview-red.gif b/js/jquery/plugins/treeview-categories/images/treeview-red.gif similarity index 100% rename from js/jquery/plugins/treeview/images/treeview-red.gif rename to js/jquery/plugins/treeview-categories/images/treeview-red.gif diff --git a/js/jquery/plugins/treeview/jquery.treeview.async.js b/js/jquery/plugins/treeview-categories/jquery.treeview-categories.async.js similarity index 100% rename from js/jquery/plugins/treeview/jquery.treeview.async.js rename to js/jquery/plugins/treeview-categories/jquery.treeview-categories.async.js diff --git a/js/jquery/plugins/treeview/jquery.treeview.css b/js/jquery/plugins/treeview-categories/jquery.treeview-categories.css similarity index 100% rename from js/jquery/plugins/treeview/jquery.treeview.css rename to js/jquery/plugins/treeview-categories/jquery.treeview-categories.css diff --git a/js/jquery/plugins/treeview/jquery.treeview.edit.js b/js/jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js similarity index 100% rename from js/jquery/plugins/treeview/jquery.treeview.edit.js rename to js/jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js diff --git a/js/jquery/plugins/treeview/jquery.treeview.js b/js/jquery/plugins/treeview-categories/jquery.treeview-categories.js similarity index 100% rename from js/jquery/plugins/treeview/jquery.treeview.js rename to js/jquery/plugins/treeview-categories/jquery.treeview-categories.js diff --git a/js/jquery/plugins/treeview/jquery.treeview.sortable.js b/js/jquery/plugins/treeview-categories/jquery.treeview-categories.sortable.js similarity index 100% rename from js/jquery/plugins/treeview/jquery.treeview.sortable.js rename to js/jquery/plugins/treeview-categories/jquery.treeview-categories.sortable.js diff --git a/js/retro-compat.js.php b/js/retro-compat.js.php index 2e742dd47..3a08c1708 100755 --- a/js/retro-compat.js.php +++ b/js/retro-compat.js.php @@ -52,14 +52,14 @@ $plugins = array( array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'), 'jquery-ui-1.8.10.custom.min.js' => array('new_file' => __DIR__.'/jquery/jquery-ui.will.be.removed.in.1.6.js', 'name' => ''), - 'jquery.treeview.async.js' => - array('new_file' => $plugins_folder.'treeview/jquery.treeview.async.js', 'name' => 'treeview.async'), - 'jquery.treeview.edit.js' => - array('new_file' => $plugins_folder.'treeview/jquery.treeview.edit.js', 'name' => 'treeview.edit'), - 'jquery.treeview.js' => - array('new_file' => $plugins_folder.'treeview/jquery.treeview.js', 'name' => 'treeview'), - 'jquery.treeview.sortable.js' => - array('new_file' => $plugins_folder.'treeview/jquery.treeview.sortable.js', 'name' => 'treeview.sortable'), + 'jquery.treeview-categories.async.js' => + array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.async.js', 'name' => 'treeview-categories.async'), + 'jquery.treeview-categories.edit.js' => + array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.edit.js', 'name' => 'treeview-categories.edit'), + 'jquery.treeview-categories.js' => + array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.js', 'name' => 'treeview-categories'), + 'jquery.treeview-categories.sortable.js' => + array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.sortable.js', 'name' => 'treeview-categories.sortable'), 'tabpane.js' => array('new_file' => $plugins_folder.'tabpane/jquery.tabpane.js', 'name' => 'tabpane'), );