From 2a7bc491900d90ec014e6c79c61d4b9e0f0ea7b4 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Mon, 9 Sep 2013 19:03:38 +0200 Subject: [PATCH] // treeview --- admin-dev/themes/default/css/admin-theme.sass | 60 ------------------- .../products/helpers/list/list_header.tpl | 9 ++- .../products/helpers/tree/tree.tpl | 4 +- .../products/helpers/tree/tree_header.tpl | 2 +- .../helpers/tree/tree_node_folder.tpl | 1 - .../tree/tree_node_folder_associations.tpl | 13 ++-- .../products/helpers/tree/tree_node_item.tpl | 3 - .../tree/tree_node_item_associations.tpl | 8 ++- .../template/helpers/list/list_header.tpl | 2 +- 9 files changed, 21 insertions(+), 81 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index f249b7d34..e3889b813 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -1168,11 +1168,6 @@ fieldset > .row +opacity(1) +scale(1) - -$treeBackgroundHover: lighten(blue,30%) -$treeBackgroundSelect: blue - - .tree padding: 0 0 0 20px list-style: none @@ -1202,61 +1197,6 @@ $treeBackgroundSelect: blue background-color: #ccc +border-radius(6px) -// .tree -// padding: 0 0 0 18px -// .tree-folder -// width: 100% -// min-height: 20px -// cursor: pointer -// margin-top: 1px -// .tree-folder-header -// position: relative -// height: 20px -// +border-radius(6px) -// &:hover -// background-color: $treeBackgroundHover -// i -// position: absolute -// float: left -// top: 1px -// left: 5px -// .tree-folder-name -// padding-left: 29px -// white-space: nowrap -// overflow: hidden -// text-overflow: ellipsis -// .tree-folder-content -// margin-left: 23px -// .tree-item -// position: relative -// width: 100% -// height: 20px -// cursor: pointer -// margin-top: 1px -// &:hover -// background-color: $treeBackgroundHover -// .tree-item-name -// position: absolute -// left: 29px -// .tree-dot -// position: absolute -// top: 8px -// left: 10px -// display: block -// width: 4px -// height: 4px -// background-color: #ccc -// +border-radius(6px) -// .icon-ok -// position: absolute -// top: 1px -// left: 5px -// .tree-selected -// background-color: $treeBackgroundSelect -// &:hover -// background-color: $treeBackgroundSelect - - #carrier_wizard.swMain position: relative display: block diff --git a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl index 869aaa2b3..6b51a87aa 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl @@ -37,7 +37,6 @@ else location.href = base_url + '&reset_filter_category=1'; }); - // Make sure the checkbox is checked/unchecked when the link is clicked $('#toggle_category_tree').bind('click', function(event){ event.preventDefault(); @@ -51,13 +50,13 @@ } }); }); -
{/if} -{/block} +{/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl index 2a87df981..a3b5b109f 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl @@ -23,8 +23,8 @@ * International Registered Trademark & Property of PrestaShop SA *}
- {if $header}{$header}{/if} - {if $nodes} + {if isset($header)}{$header}{/if} + {if isset($nodes)}
    {$nodes}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl index 018240150..ad911bad0 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl @@ -24,5 +24,5 @@ *}
 {l s=$title} - {if $toolbar}{$toolbar}{/if} + {if isset($toolbar)}{$toolbar}{/if}
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl index 06472b496..64353a612 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder.tpl @@ -23,7 +23,6 @@ * 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/controllers/products/helpers/tree/tree_node_folder_associations.tpl index 0f28242d9..5c55636fc 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder_associations.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_folder_associations.tpl @@ -22,13 +22,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  • - - - - - - +
  • + + + + +
      {$children}
    diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl index a5451b097..8c6bc12ce 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item.tpl @@ -23,12 +23,9 @@ * 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_node_item_associations.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item_associations.tpl index 75c8c2003..2bc17b227 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item_associations.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_node_item_associations.tpl @@ -22,4 +22,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  •  {$name}
    • \ No newline at end of file +
  • + +
    • \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index dfd8a06d4..3916ef9cd 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -251,7 +251,7 @@ {l s='Reset'} {/if}