From 44ac961b8d7e07f794330b6e527c50b437923fb5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 3 Jul 2013 20:10:27 +0300
Subject: [PATCH] group filter from dashboard. Design improvements of dashboard

---
 app/assets/javascripts/dashboard.js.coffee     |  9 ++++----
 app/assets/stylesheets/sections/dashboard.scss | 31 ++++++++++++++++++++++----
 app/assets/stylesheets/sections/events.scss    |  4 ++--
 app/views/dashboard/_groups.html.haml          | 10 ++++-----
 app/views/dashboard/_projects.html.haml        |  4 ++--
 5 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index 57ede4ca5..8db53039e 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -8,15 +8,16 @@ class Dashboard
       @toggleFilter($(event.currentTarget))
       @reloadActivities()
 
-    $(".dash-projects-filter").keyup ->
+    $(".dash-filter").keyup ->
       terms = $(this).val()
+      uiBox = $(this).parents('.ui-box').first()
       if terms == "" || terms == undefined
-        $(".dash-projects-list li").show()
+        uiBox.find(".dash-list li").show()
       else
-        $(".dash-projects-list li").each (index) ->
+        uiBox.find(".dash-list li").each (index) ->
           name = $(this).find(".well-title").text()
 
-          if name.search(terms) == -1
+          if name.toLowerCase().search(terms.toLowerCase()) == -1
             $(this).hide()
           else
             $(this).show()
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 2e5c93134..57088e550 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -7,7 +7,9 @@
     @extend .pull-right;
 
     .ui-box {
-      margin: 3px;
+      margin: 0px;
+      box-shadow: none;
+
       > .title {
         padding: 2px 15px;
       }
@@ -28,7 +30,6 @@
           }
         }
       }
-      @extend .ui-box;
     }
   }
 }
@@ -47,7 +48,7 @@
 }
 
 .dashboard {
-  .dash-projects-filter {
+  .dash-filter {
     margin: 0;
     padding: 4px 6px;
     width: 202px;
@@ -58,7 +59,29 @@
 }
 
 @media (max-width: 1200px) {
-  .dashboard .dash-projects-filter {
+  .dashboard .dash-filter {
     width: 132px;
   }
 }
+
+.dash-sidebar-tabs {
+  margin-bottom: 2px;
+  border: none;
+  margin: 0;
+
+  li {
+    &.active {
+      a {
+        @include linear-gradient(#f5f5f5, #eee);
+        border-bottom: 1px solid #EEE !important;
+        &:hover {
+          background: #eee;
+        }
+      }
+    }
+
+    a {
+      border-color: #CCC !important;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index d057bcf66..b4e4c3fd8 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -51,7 +51,7 @@
     .event-note {
       color: #555;
       margin-top: 5px;
-      margin-left: 40px;
+      margin-left: 35px;
 
       pre {
         border: none;
@@ -95,7 +95,7 @@
     }
   }
   ul {
-    margin-left: 50px;
+    margin-left: 35px;
     margin-bottom: 5px;
     .avatar {
       width: 18px;
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 2fedf87a9..e138b42be 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -1,14 +1,12 @@
 .ui-box
-  %h5.title
-    Groups
-    %span.light
-      (#{groups.count})
+  %h5.title.clearfix
+    = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
     - if current_user.can_create_group?
       %span.pull-right
-        = link_to new_group_path, class: "btn btn-small" do
+        = link_to new_group_path, class: "btn" do
           %i.icon-plus
           New Group
-  %ul.well-list
+  %ul.well-list.dash-list
     - groups.each do |group|
       %li
         = link_to group_path(id: group.path), class: dom_class(group) do
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index 9d9d77b30..ae1e2e363 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -1,13 +1,13 @@
 .ui-box
   %h5.title.clearfix
-    = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-projects-filter'
+    = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
     - if current_user.can_create_project?
       %span.pull-right
         = link_to new_project_path, class: "btn" do
           %i.icon-plus
           New Project
 
-  %ul.well-list.dash-projects-list
+  %ul.well-list.dash-list
     - projects.each do |project|
       %li
         = link_to project_path(project), class: dom_class(project) do
-- 
2.11.0