Filter projects on dashboard

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index c2fb95c..57ede4c 100644 (file)
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -8,6 +8,21 @@ class Dashboard
       @toggleFilter($(event.currentTarget))
       @reloadActivities()
 
+    $(".dash-projects-filter").keyup ->
+      terms = $(this).val()
+      if terms == "" || terms == undefined
+        $(".dash-projects-list li").show()
+      else
+        $(".dash-projects-list li").each (index) ->
+          name = $(this).find(".well-title").text()
+
+          if name.search(terms) == -1
+            $(this).hide()
+          else
+            $(this).show()
+
+
+
   reloadActivities: ->
     $(".content_list").html ''
     Pager.init 20, true

diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 9bc4a09..a058856 100644 (file)
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -46,3 +46,13 @@
   }
 }
 
+.dashboard {
+  .dash-projects-filter {
+    margin: 0;
+    padding: 4px 6px;
+    width: 202px;
+    float: left;
+    margin-top: 3px;
+    margin-left: -2px;
+  }
+}

diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index a106e83..9d9d77b 100644 (file)
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -1,15 +1,13 @@
 .ui-box
-  %h5.title
-    Projects
-    %span.light
-      (#{@projects_count})
+  %h5.title.clearfix
+    = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-projects-filter'
     - if current_user.can_create_project?
       %span.pull-right
-        = link_to new_project_path, class: "btn btn-small" do
+        = link_to new_project_path, class: "btn" do
           %i.icon-plus
           New Project
 
-  %ul.well-list
+  %ul.well-list.dash-projects-list
     - projects.each do |project|
       %li
         = link_to project_path(project), class: dom_class(project) do

diff --git a/app/views/dashboard/_sidebar.html.haml b/app/views/dashboard/_sidebar.html.haml
index 7886b1e..fed4b27 100644 (file)
--- a/app/views/dashboard/_sidebar.html.haml
+++ b/app/views/dashboard/_sidebar.html.haml
@@ -1,8 +1,12 @@
 %ul.nav.nav-tabs.dash-sidebar-tabs
   %li.active
-    = link_to 'Projects', '#projects', 'data-toggle' => 'tab', id: 'sidebar-projects-tab'
+    = link_to '#projects', 'data-toggle' => 'tab', id: 'sidebar-projects-tab' do
+      Projects
+      %span.badge= @projects_count
   %li
-    = link_to 'Groups', '#groups', 'data-toggle' => 'tab', id: 'sidebar-groups-tab'
+    = link_to '#groups', 'data-toggle' => 'tab', id: 'sidebar-groups-tab' do
+      Groups
+      %span.badge= @groups.count
 
 .tab-content
   .tab-pane.active#projects