From f204910aa4abcecb448314728caa998e0988c921 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 25 Oct 2011 17:33:57 -0700
Subject: [PATCH] add 'mark all as read' on notification dropdown

---
 app/controllers/notifications_controller.rb |  2 +-
 app/views/layouts/_header.html.haml         |  5 ++++-
 public/stylesheets/sass/application.sass    | 15 +++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 99340eaa7..c27df96c7 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -50,7 +50,7 @@ class NotificationsController < VannaController
 
   post_process :html do
     def post_read_all(json)
-      Response.new(:status => 302, :location => aspects_path)
+      Response.new(:status => 302, :location => multi_path)
     end
   end
 
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 84b69d7df..923013d72 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -40,7 +40,10 @@
 
     #notification_dropdown
       .header
-        = link_to t('.view_all'), notifications_path, :id => "view_all_notifications"
+        .right
+          = link_to t('notifications.index.mark_all_as_read'), read_all_notifications_path
+          \|
+          = link_to t('.view_all'), notifications_path, :id => "view_all_notifications"
         %h4
           = t('.recent_notifications')
       .notifications
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index b57e10843..06b7ca75e 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3075,14 +3075,6 @@ a.toggle_selector
   :position absolute
   :left 0
 
-#view_all_notifications
-  :float right
-  :margin
-    :right 3px
-  :font
-    :weight bold
-
-
 #notification_dropdown
   @include dropdown-shadow
 
@@ -3096,6 +3088,13 @@ a.toggle_selector
 
   :color #444
 
+  .right
+    :font-size smaller
+    :right 10px
+    :top 13px
+    :font
+      :weight bold
+
   a
     :color $blue