TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix breadcrumb for content/folder part

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-30 15:13:04 +02:00
parent d7e9752d63
commit f25922c60a
8 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Thelia/Controller/Admin/ContentController.php
View File

@@ -242,7 +242,8 @@ class ContentController extends AbstractCrudController
{ {
return array( return array(
'content_id' => $this->getRequest()->get('content_id', 0), 'content_id' => $this->getRequest()->get('content_id', 0),
'current_tab' => $this->getRequest()->get('current_tab', 'general') 'current_tab' => $this->getRequest()->get('current_tab', 'general'),
'folder_id' => $this->getFolderId(),
); );
} }

1
core/lib/Thelia/Controller/Admin/ProductController.php
View File

@@ -43,6 +43,7 @@ use Thelia\Model\CategoryQuery;
use Thelia\Core\Event\Product\ProductAddAccessoryEvent; use Thelia\Core\Event\Product\ProductAddAccessoryEvent;
use Thelia\Core\Event\Product\ProductDeleteAccessoryEvent; use Thelia\Core\Event\Product\ProductDeleteAccessoryEvent;
use Thelia\Model\ProductSaleElementsQuery;
/** /**
* Manages products * Manages products

2
core/lib/Thelia/Core/Template/Loop/FolderPath.php
View File

@@ -131,7 +131,7 @@ class FolderPath extends BaseI18nLoop
// Prevent circular refererences // Prevent circular refererences
if (in_array($parent, $ids)) { if (in_array($parent, $ids)) {
throw new \LogicException(sprintf("Circular reference detected in category ID=%d hierarchy (category ID=%d appears more than one times in path)", $id, $parent)); throw new \LogicException(sprintf("Circular reference detected in folder ID=%d hierarchy (folder ID=%d appears more than one times in path)", $id, $parent));
} }
$ids[] = $parent; $ids[] = $parent;

2
templates/admin/default/content-edit.html
View File

@@ -8,7 +8,7 @@
<div class="folder edit-folder"> <div class="folder edit-folder">
<div id="wrapper" class="container"> <div id="wrapper" class="container">
{* include file="includes/folder-breadcrumb.html" editing_category="true" *} {include file="includes/folder-breadcrumb.html" editing_category="false" editing_content="true"}
<div class="row"> <div class="row">
{loop name="content_edit" type="content" visible="*" id="{$content_id}" backend_context="1" lang="$edit_language_id"} {loop name="content_edit" type="content" visible="*" id="{$content_id}" backend_context="1" lang="$edit_language_id"}

2
templates/admin/default/folder-edit.html
View File

@@ -8,7 +8,7 @@
<div class="folder edit-folder"> <div class="folder edit-folder">
<div id="wrapper" class="container"> <div id="wrapper" class="container">
{* include file="includes/folder-breadcrumb.html" editing_category="true" *} {include file="includes/folder-breadcrumb.html" editing_category="true" }
<div class="row"> <div class="row">
{loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"} {loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"}

2
templates/admin/default/folders.html
View File

@@ -9,7 +9,7 @@
<div id="wrapper" class="container"> <div id="wrapper" class="container">
{include file="includes/folder-breadcrumb.html" } {include file="includes/folder-breadcrumb.html" folder_id=$parent }
{module_include location='folders_top'} {module_include location='folders_top'}

4
templates/admin/default/includes/catalog-breadcrumb.html
View File

@@ -1,8 +1,8 @@
{* Breadcrumb for categories browsing and editing *} {* Breadcrumb for categories browsing and editing *}
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='admin/home'}">Home</a></li> <li><a href="{url path='admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='admin/catalog'}">Catalog</a></li> <li><a href="{url path='admin/catalog'}">{intl l="Catalog"}</a></li>
{ifloop rel="category_path"} {ifloop rel="category_path"}
{loop name="category_path" type="category-path" visible="*" category=$category_id} {loop name="category_path" type="category-path" visible="*" category=$category_id}

12
templates/admin/default/includes/folder-breadcrumb.html
View File

@@ -1,11 +1,11 @@
{* Breadcrumb for folders browsing and editing *} {* Breadcrumb for folders browsing and editing *}
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="{url path='admin/home'}">Home</a></li> <li><a href="{url path='admin/home'}">{intl l="Home"}</a></li>
<li><a href="{url path='admin/folders'}">Folders</a> <li><a href="{url path='admin/folders'}">{intl l="Folders"}</a>
{ifloop rel="folder_path"}</li> {ifloop rel="folder_path"}</li>
{loop name="folder_path" type="folder-path" visible="*" folder=$parent} {loop name="folder_path" type="folder-path" visible="*" folder=$folder_id}
{if $ID == $parent} {if $ID == $parent}
<li class="active"> <li class="active">
{if $editing_folder == true} {if $editing_folder == true}
@@ -23,4 +23,10 @@
{elseloop rel="folder_path"} {elseloop rel="folder_path"}
</li> </li>
{/elseloop} {/elseloop}
{if $editing_content == true}
{loop name="content_path" type="content" visible="*" id=$content_id}
<li>{intl l="Editing %title" title="$TITLE"}</li>
{/loop}
{/if}
</ul> </ul>