diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2ed5dd16c..f54f4af46 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -73,6 +73,8 @@ .clearfix + = render 'posts/debug' + %footer .container .brandon= t('.powered_by') diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index 75adefe4c..1a4bd75df 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -20,7 +20,6 @@ - for aspect in current_user.aspects_with_post( post.id ) %li= link_to aspect.name, aspect - - if current_user.owns?(post) .right = render 'shared/reshare', :current_user => current_user, :post => post if post.is_a? StatusMessage = link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete" diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js index 333415652..8e2074d78 100644 --- a/public/javascripts/web-socket-receiver.js +++ b/public/javascripts/web-socket-receiver.js @@ -114,7 +114,7 @@ processPerson: function(response){ }, onPageForAspects: function(aspectIds){ - if(location.pathname == '/' && WebSocketReceiver.onPageOne()){ + if(location.pathname == '/aspects' && WebSocketReceiver.onPageOne()){ return true } var found = false; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index cada73ff0..b9fc3686d 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -407,7 +407,6 @@ li.message &:active :color #005D9C - .right .reshare_pane .reshare_button a.inactive :color #ccc &:hover @@ -668,6 +667,10 @@ li.message .from .right :text :decoration underline +li.message:hover + .right + :display inline + .request_buttons :position absolute :right 0