diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index 7ca1f2441..27a5c8690 100644 --- a/app/controllers/blogs_controller.rb +++ b/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 diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb index bf3e54f08..2f62d5cd3 100644 --- a/app/controllers/bookmarks_controller.rb +++ b/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 diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index bec255e55..d4061d124 100644 --- a/app/controllers/status_messages_controller.rb +++ b/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 diff --git a/app/views/blogs/_blog.html.haml b/app/views/blogs/_blog.html.haml index 34d53f226..c4b0fc90b 100644 --- a/app/views/blogs/_blog.html.haml +++ b/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 diff --git a/app/views/bookmarks/_bookmark.html.haml b/app/views/bookmarks/_bookmark.html.haml index 953d13b0e..4b5ab6865 100644 --- a/app/views/bookmarks/_bookmark.html.haml +++ b/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 diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 761ad5894..36af0216f 100644 --- a/app/views/layouts/application.html.haml +++ b/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 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1b3e26d33..784d4582a 100644 --- a/public/stylesheets/application.css +++ b/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; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 75a3938ed..520f4c869 100644 --- a/public/stylesheets/sass/application.sass +++ b/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