ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into persona

Browse Source
This commit is contained in:
Eelco Dolstra
2013-11-06 12:35:36 +01:00
parent 8a0200edd2 27a740d4b1
commit 63100b0ee8
7 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/root/topbar.tt
View File

@@ -72,12 +72,14 @@
[% END %]
[% END %]
[% IF c.user_exists && c.check_user_roles('admin') %]
[% IF c.user_exists && (c.check_user_roles('admin') ||
c.check_user_roles('create-projects')) %]
[% WRAPPER makeSubMenu title="Admin" %]
[% IF c.check_user_roles('admin') %]
[% IF c.check_user_roles('admin') || c.check_user_roles('create-projects') %]
[% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create')) title = "Create project" %]
<li class="divider"></li>
[% END %]
[% IF c.check_user_roles('admin') %]
[% INCLUDE menuItem
uri = c.uri_for(c.controller('Admin').action_for('machines'))
title = "Manage machines" %]
@@ -103,6 +105,7 @@
title = "Clear VCS caches"
confirmmsg = "Are you sure you want to clear the VCS cache?"
class = "" %]
[% END %]
[% END %]
[% END %]