List groups on Dashboard#projects page

5 files changed, 48 insertions, 25 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index 9637be679af..bc6c786da50 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -56,23 +56,6 @@
   line-height: 24px;
 }
 
-/** FORMS **/
-input[type='search'].search-text-input {
-  background-image: url("icon-search.png");
-  background-repeat: no-repeat;
-  background-position: 10px;
-  padding-left: 25px;
-  @include border-radius(4px);
-  border: 1px solid #ccc;
-}
-
-input[type='text'].danger {
-  background: #F2DEDE!important;
-  border-color: #D66;
-  text-shadow: 0 1px 1px #fff
-}
-
-fieldset legend { font-size: 15px; }
 
 .tab-content {
   overflow: visible;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/forms.scss b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
index d1feb554404..020a0bf7fd5 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/forms.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/forms.scss
@@ -31,3 +31,22 @@ input {
   }
 }
 
+input[type='search'].search-text-input {
+  background-image: url("icon-search.png");
+  background-repeat: no-repeat;
+  background-position: 10px;
+  padding-left: 25px;
+  @include border-radius(4px);
+  border: 1px solid #ccc;
+}
+
+input[type='text'].danger {
+  background: #F2DEDE!important;
+  border-color: #D66;
+  text-shadow: 0 1px 1px #fff
+}
+
+fieldset legend {
+  font-size: 16px;
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/nav.scss b/app/assets/stylesheets/gitlab_bootstrap/nav.scss
index 40616f7540a..aa4cb1ed5fd 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/nav.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/nav.scss
@@ -22,6 +22,7 @@
       background: #F1F1F1;
       color: $style_color;
       font-weight: bold;
+      text-shadow: 0 1px 1px #fff;
     }
 
     &.nav-stacked-menu {
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 23da2c274dc..33b2a5cd7e7 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -33,9 +33,13 @@ class DashboardController < ApplicationController
                   current_user.owned_projects
                 else
                   current_user.authorized_projects
-                end.sorted_by_activity
+                end
+
+    @projects = @projects.where(namespace_id: Group.find_by_name(params[:group])) if params[:group].present?
+    @projects = @projects.includes(:namespace).sorted_by_activity
 
     @labels = current_user.authorized_projects.tags_on(:labels)
+    @groups = current_user.authorized_groups
 
     @projects = @projects.tagged_with(params[:label]) if params[:label].present?
     @projects = @projects.page(params[:page]).per(30)
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 3599320dfb3..0dcb1a87e9a 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -26,14 +26,30 @@
           %span.pull-right
             = current_user.owned_projects.count
 
+
+    - if @groups.present?
+      %fieldset
+        %legend Groups
+        %ul.bordered-list
+          - @groups.each do |group|
+            %li{ class: (group.name == params[:group]) ? 'active' : 'light' }
+              = link_to projects_dashboard_path(group: group.name) do
+                %i.icon-folder-close-alt
+                = group.name
+                %small.pull-right
+                  = group.projects.count
+
+
+
     - if @labels.present?
-      %p.light Filter by label:
-      %ul.bordered-list
-        - @labels.each do |label|
-          %li{ class: (label.name == params[:label]) ? 'active' : 'light' }
-            = link_to projects_dashboard_path(scope: params[:scope], label: label.name) do
-              %i.icon-tag
-              = label.name
+      %fieldset
+        %legend Labels
+        %ul.bordered-list
+          - @labels.each do |label|
+            %li{ class: (label.name == params[:label]) ? 'active' : 'light' }
+              = link_to projects_dashboard_path(scope: params[:scope], label: label.name) do
+                %i.icon-tag
+                = label.name
 
   .span9
     %ul.bordered-list.my-projects.top-list