Merge branch 'master' into persona

src/root/overview.tt

@@ -1,7 +1,7 @@
 [% WRAPPER layout.tt title="Overview" hideHeader=1 %]
 [% PROCESS common.tt %]
 
-[% IF newItems.size != 0 %]
+[% IF newsItems.size != 0 %]
   <div class="alert alert-info">
     [% FOREACH i IN newsItems %]
       <div class="news-item">
@@ -15,6 +15,8 @@
 
 <h2>Projects</h2>
 
+[% IF projects.size != 0 %]
+
 <p>The following projects are hosted on this server:</p>
 
 <table class="table table-condensed table-striped clickable-rows">
@@ -36,4 +38,11 @@
   </tbody>
 </table>
 
+[% ELSE %]
+
+  <div class="alert alert-warning">Hydra has no projects yet. Please
+  <a href="[% c.uri_for(c.controller('Project').action_for('create')) %]">create a project</a>.</div>
+
+[% END %]
+
 [% END %]

src/root/topbar.tt

@@ -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 %]
 

src/root/user.tt

@@ -71,7 +71,7 @@
         <div class="controls">
           <select multiple="multiple" name="roles" class="span3" [% IF !c.check_user_roles('admin') %]disabled="disabled"[% END %]>
             [% INCLUDE roleoption role="admin" %]
-            [% INCLUDE roleoption role="create-project" %]
+            [% INCLUDE roleoption role="create-projects" %]
           </select>
         </div>
       </div>