Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
Kevin Granger
@@ -53,15 +53,7 @@
|
||||
</script>
|
||||
<div class="bloc-leadin">
|
||||
<div id="container_category_tree">
|
||||
<a class="btn btn-default" href="javascript:void(0);" id="toggle_category_tree">
|
||||
<form>
|
||||
<input type="checkbox" {if $is_category_filter}checked="checked"{/if} />
|
||||
<i class="icon-tags"></i> {l s='Filter by category'}
|
||||
</form>
|
||||
</a>
|
||||
<div id="block_category_tree" {if !$is_category_filter}style="display:none"{/if}>
|
||||
{$category_tree}
|
||||
</div>
|
||||
{$category_tree}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
+118
@@ -0,0 +1,118 @@
|
||||
{*
|
||||
* 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 <contact@prestashop.com>
|
||||
* @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
|
||||
*}
|
||||
<div class="panel">
|
||||
{if isset($header)}{$header}{/if}
|
||||
<div id="block_category_tree"{if !$is_category_filter} style="display:none"{/if}>
|
||||
{if isset($nodes)}
|
||||
<ul id="{$id}" class="tree">
|
||||
{$nodes}
|
||||
</ul>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
{if isset($use_checkbox) && $use_checkbox == true}
|
||||
function checkAllAssociatedCategories($tree)
|
||||
{
|
||||
$tree.find(":input[type=checkbox]").each(
|
||||
function()
|
||||
{
|
||||
$(this).prop("checked", true);
|
||||
$(this).parent().addClass("tree-selected");
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function uncheckAllAssociatedCategories($tree)
|
||||
{
|
||||
$tree.find(":input[type=checkbox]").each(
|
||||
function()
|
||||
{
|
||||
$(this).prop("checked", false);
|
||||
$(this).parent().removeClass("tree-selected");
|
||||
}
|
||||
);
|
||||
}
|
||||
{/if}
|
||||
{if isset($use_search) && $use_search == true}
|
||||
$("#{$id}-categories-search").bind("typeahead:selected", function(obj, datum) {
|
||||
$("#{$id}").find(":input").each(
|
||||
function()
|
||||
{
|
||||
if ($(this).val() == datum.id_category)
|
||||
{
|
||||
$(this).prop("checked", true);
|
||||
$(this).parent().addClass("tree-selected");
|
||||
$(this).parents("ul.tree").each(
|
||||
function()
|
||||
{
|
||||
$(this).children().children().children(".icon-folder-close")
|
||||
.removeClass("icon-folder-close")
|
||||
.addClass("icon-folder-open");
|
||||
$(this).show();
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
{/if}
|
||||
$(document).ready(function () {
|
||||
$("#{$id}").tree("collapseAll");
|
||||
$("#{$id}").find(":input[type=radio]").click(
|
||||
function()
|
||||
{
|
||||
location.href = location.href.replace(
|
||||
/&id_category=[0-9]*/, "")+"&id_category="
|
||||
+$(this).val();
|
||||
}
|
||||
);
|
||||
|
||||
{if isset($selected_categories)}
|
||||
{assign var=imploded_selected_categories value='","'|implode:$selected_categories}
|
||||
var selected_categories = new Array("{$imploded_selected_categories}");
|
||||
|
||||
$("#{$id}").find(":input").each(
|
||||
function()
|
||||
{
|
||||
if ($.inArray($(this).val(), selected_categories) != -1)
|
||||
{
|
||||
$(this).prop("checked", true);
|
||||
$(this).parent().addClass("tree-selected");
|
||||
$(this).parents("ul.tree").each(
|
||||
function()
|
||||
{
|
||||
$(this).children().children().children(".icon-folder-close")
|
||||
.removeClass("icon-folder-close")
|
||||
.addClass("icon-folder-open");
|
||||
$(this).show();
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
{/if}
|
||||
});
|
||||
</script>
|
||||
@@ -0,0 +1,42 @@
|
||||
{*
|
||||
* 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 <contact@prestashop.com>
|
||||
* @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
|
||||
*}
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$('#filter-by-category').click(function() {
|
||||
if ($(this).is(':checked')) {
|
||||
$('#block_category_tree').show();
|
||||
$('#category-tree-toolbar').show();
|
||||
} else {
|
||||
$('#block_category_tree').hide();
|
||||
$('#category-tree-toolbar').hide();
|
||||
location.href = '{$base_url}&reset_filter_category=1';
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<div class="panel-heading">
|
||||
<input type="checkbox" id="filter-by-category" {if $is_category_filter}checked="checked"{/if} /> <i class="icon-tags"></i> {l s=$title}
|
||||
<div class="pull-right" id="category-tree-toolbar"{if !$is_category_filter} style="display:none"{/if}>{if isset($toolbar)}{$toolbar}{/if}</div>
|
||||
</div>
|
||||
@@ -0,0 +1,25 @@
|
||||
{*
|
||||
* 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 <contact@prestashop.com>
|
||||
* @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($actions)}{foreach from=$actions item=action}{$action->render()}{/foreach}{/if}
|
||||
@@ -329,7 +329,8 @@ class TreeCore
|
||||
$this->getTemplateFile($this->getHeaderTemplate()),
|
||||
$this->getContext()->smarty
|
||||
);
|
||||
$headerTemplate->assign(array(
|
||||
$headerTemplate->assign($this->getAttributes())
|
||||
->assign(array(
|
||||
'title' => $this->getTitle(),
|
||||
'toolbar' => $this->useToolbar() ? $this->renderToolbar() : null
|
||||
));
|
||||
@@ -337,9 +338,8 @@ class TreeCore
|
||||
}
|
||||
|
||||
//Assign Tree nodes
|
||||
$template
|
||||
->assign($this->getAttributes())
|
||||
->assign(array(
|
||||
$template->assign($this->getAttributes())
|
||||
->assign(array(
|
||||
'id' => $this->getId(),
|
||||
'nodes' => $this->renderNodes($data)
|
||||
));
|
||||
|
||||
@@ -2273,7 +2273,9 @@ class AdminProductsControllerCore extends AdminController
|
||||
|
||||
// Generate category selection tree
|
||||
$tree = new HelperTreeCategories('categories-tree', 'Filter by category');
|
||||
$tree->setSelectedCategories(array((int)$id_category));
|
||||
$tree->setAttribute('is_category_filter', (bool)$this->id_current_category)
|
||||
->setAttribute('base_url', preg_replace('#&id_category=[0-9]*#', '', self::$currentIndex).'&token='.$this->token)
|
||||
->setSelectedCategories(array((int)$id_category));
|
||||
$this->tpl_list_vars['category_tree'] = $tree->render();
|
||||
|
||||
// used to build the new url when changing category
|
||||
|
||||
Reference in New Issue
Block a user