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

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Manuel Raynaud
2013-10-23 19:34:28 +02:00
parent fc49b13ef8 7433971515
commit 4db360a22a
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Controller/Admin/FolderController.php
View File

@@ -48,10 +48,7 @@ class FolderController extends AbstractCrudController
'manual', 'manual',
'folder_order', 'folder_order',
AdminResources::FOLDER_VIEW, AdminResources::FOLDER,
AdminResources::FOLDER_CREATE,
AdminResources::FOLDER_UPDATE,
AdminResources::FOLDER_DELETE,
TheliaEvents::FOLDER_CREATE, TheliaEvents::FOLDER_CREATE,
TheliaEvents::FOLDER_UPDATE, TheliaEvents::FOLDER_UPDATE,

2
templates/admin/default/admin-layout.tpl
View File

@@ -65,7 +65,7 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="profile" href="{url path='admin/profile/update'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li> <li><a class="profile" href="{url path='admin/configuration/administrators'}"><span class="glyphicon glyphicon-edit"></span> {intl l="Profil"}</a></li>
<li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li> <li><a class="logout" href="{url path='admin/logout'}" title="{intl l='Close administation session'}"><span class="glyphicon glyphicon-off"></span> {intl l="Logout"}</a></li>
</ul> </ul>
</div> </div>