Merge branch 'master' of github.com:diaspora/diaspora_rails

app/controllers/blogs_controller.rb

@@ -42,6 +42,6 @@ class BlogsController < ApplicationController
     @blog = Blog.where(:id => params[:id]).first
     @blog.destroy
     flash[:notice] = "Successfully destroyed blog."
-    redirect_to blogs_url
+    redirect_to root_url
   end
 end

app/controllers/bookmarks_controller.rb

@@ -43,6 +43,6 @@ class BookmarksController < ApplicationController
     @bookmark = Bookmark.first(:conditions => {:id => params[:id]})    
     @bookmark.destroy
     flash[:notice] = "Successfully destroyed bookmark."
-    redirect_to bookmarks_url
+    redirect_to root_url
   end
 end

app/controllers/status_messages_controller.rb

@@ -33,7 +33,7 @@ class StatusMessagesController < ApplicationController
     @status_message = StatusMessage.where(:id => params[:id]).first
     @status_message.destroy
     flash[:notice] = "Successfully destroyed status message."
-    redirect_to status_messages_url
+    redirect_to root_url
   end
   
   def show

app/views/blogs/_blog.html.haml

@@ -14,4 +14,4 @@
 
   - if mine?(post)
     .destroy_link
-      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
+      = link_to 'Delete', blog_path(post), :confirm => 'Are you sure?', :method => :delete

app/views/bookmarks/_bookmark.html.haml

@@ -15,4 +15,4 @@
 
   - if mine?(post)
     .destroy_link
-      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
+      = link_to 'Delete', bookmark_path(post), :confirm => 'Are you sure?', :method => :delete

app/views/layouts/application.html.haml

@@ -19,11 +19,10 @@
   
   = javascript_include_tag 'satisfaction' , 'satisfaction-display'
   %body
-    - flash.each do |name, msg|
-      = content_tag :div, msg, :id => "flash_#{name}"
-    
     %header
       .container
+        - flash.each do |name, msg|
+          = content_tag :div, msg, :id => "flash_#{name}"
         %a#diaspora_text{:href => root_path}
           %img{:src => '/images/diaspora_white.png'}
           preview

public/stylesheets/application.css

@@ -11,12 +11,13 @@ a {
 #flash_error,
 #flash_alert {
   z-index: 60;
-  position: fixed;
+  position: absolute;
   padding: 5px 8px;
   margin: 0;
   width: 400px;
   top: 0px;
-  left: 200px; }
+  margin-left: 230px;
+  color: #666666; }
 
 #flash_notice {
   background-color: #ccffcc;

public/stylesheets/sass/application.sass

@@ -11,12 +11,14 @@ a
 #flash_error,
 #flash_alert
   :z-index 60
-  :position fixed
+  :position absolute
   :padding 5px 8px
   :margin 0
   :width 400px
   :top 0px
-  :left 200px
+  :margin
+    :left 230px
+  :color #666
 
 #flash_notice
   :background-color #CFC