+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_folder_radio.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_folder_radio.tpl
new file mode 100644
index 000000000..9d0644212
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_folder_radio.tpl
@@ -0,0 +1,34 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+
+
+
+
+
+
+ {$children}
+
+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_item_radio.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_item_radio.tpl
new file mode 100644
index 000000000..d53652678
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/tree/tree_node_item_radio.tpl
@@ -0,0 +1,31 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar_link.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar_link.tpl
deleted file mode 100644
index 52c8480aa..000000000
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar_link.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-* @author PrestaShop SA
-* @copyright 2007-2013 PrestaShop SA
-* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*}
-
- {if isset($icon_class)} {/if}{l s=$label}
-
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar_search.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar_search.tpl
deleted file mode 100644
index c98704a2f..000000000
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar_search.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-* @author PrestaShop SA
-* @copyright 2007-2013 PrestaShop SA
-* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*}
-{l s=$label}
-{if isset($typeahead_source) && isset($id)}
-
-{/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index bdc78a643..6190f449e 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -289,8 +289,7 @@
+ {/if}
{/if}
{elseif $input.type == 'select'}
{if isset($input.options.query) && !$input.options.query && isset($input.empty_message)}
@@ -405,7 +417,7 @@
{elseif $input.type == 'shop'}
{$input.html}
{elseif $input.type == 'categories'}
- {include file='helpers/form/form_category.tpl' categories=$input.values}
+ {$categories_tree}
{elseif $input.type == 'categories_select'}
{$input.category_tree}
{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl b/admin-dev/themes/default/template/helpers/tree/tree.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree.tpl
diff --git a/admin-dev/themes/default/template/helpers/tree/tree_categories.tpl b/admin-dev/themes/default/template/helpers/tree/tree_categories.tpl
new file mode 100644
index 000000000..0239a9894
--- /dev/null
+++ b/admin-dev/themes/default/template/helpers/tree/tree_categories.tpl
@@ -0,0 +1,116 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl b/admin-dev/themes/default/template/helpers/tree/tree_header.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree_header.tpl
diff --git a/admin-dev/themes/default/template/helpers/tree/tree_node_folder.tpl b/admin-dev/themes/default/template/helpers/tree/tree_node_folder.tpl
index 7c7183a33..36a5c1298 100644
--- a/admin-dev/themes/default/template/helpers/tree/tree_node_folder.tpl
+++ b/admin-dev/themes/default/template/helpers/tree/tree_node_folder.tpl
@@ -22,7 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder_associations.tpl b/admin-dev/themes/default/template/helpers/tree/tree_node_folder_checkbox.tpl
similarity index 84%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder_associations.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree_node_folder_checkbox.tpl
index 2d76f50d3..80083b3d9 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder_associations.tpl
+++ b/admin-dev/themes/default/template/helpers/tree/tree_node_folder_checkbox.tpl
@@ -23,8 +23,8 @@
* International Registered Trademark & Property of PrestaShop SA
*}
-
-
+
+
{$node['name']}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl b/admin-dev/themes/default/template/helpers/tree/tree_node_folder_radio.tpl
similarity index 84%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree_node_folder_radio.tpl
index 91bfdcf67..33af6b61a 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl
+++ b/admin-dev/themes/default/template/helpers/tree/tree_node_folder_radio.tpl
@@ -23,8 +23,8 @@
* International Registered Trademark & Property of PrestaShop SA
*}
-
-
+
+
{$node['name']}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item_associations.tpl b/admin-dev/themes/default/template/helpers/tree/tree_node_item_checkbox.tpl
similarity index 84%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item_associations.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree_node_item_checkbox.tpl
index 6aeccb01a..ca0235597 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item_associations.tpl
+++ b/admin-dev/themes/default/template/helpers/tree/tree_node_item_checkbox.tpl
@@ -22,9 +22,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-
+
-
+
{$node['name']}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl b/admin-dev/themes/default/template/helpers/tree/tree_node_item_radio.tpl
similarity index 84%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree_node_item_radio.tpl
index b32174dea..911a69bdc 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl
+++ b/admin-dev/themes/default/template/helpers/tree/tree_node_item_radio.tpl
@@ -22,9 +22,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-
+
-
+
{$node['name']}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar.tpl b/admin-dev/themes/default/template/helpers/tree/tree_toolbar.tpl
similarity index 100%
rename from admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar.tpl
rename to admin-dev/themes/default/template/helpers/tree/tree_toolbar.tpl
diff --git a/admin-dev/themes/default/template/nav-top.tpl b/admin-dev/themes/default/template/nav-top.tpl
index 5b2d4e649..21775fbdc 100644
--- a/admin-dev/themes/default/template/nav-top.tpl
+++ b/admin-dev/themes/default/template/nav-top.tpl
@@ -1,4 +1,4 @@
-