removed second #stream declaration on status_message#show. fixed bug where...

removed second #stream declaration on status_message#show.  fixed bug where show pages would get posts as well as comments.

app/views/comments/_comment.html.haml

@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-%li.comment{:id => post.id}
+%li.comment
   = person_image_link(post.person)
   .content
     .from

app/views/js/_websocket_js.haml

@@ -45,7 +45,7 @@
 
   function processComment(post_id, html){
     post = $("*[data-guid='"+post_id+"']'");
-    $(' .comments li:last', post ).before(
+    $('.comments li:last', post ).before(
       $(html).fadeIn("fast", function(){})
     );
     toggler = $('.show_post_comments', post)
@@ -63,9 +63,9 @@
   function processPost(className, html, aspectIds){
     if(onPageForAspects(aspectIds)){
       var addPostToStream = function (html){
-        $("#stream").prepend(
+        $("#stream:not('.show')").prepend(
           $(html).fadeIn("fast", function(){
-            $("#stream label:first").inFieldLabels();
+            $("#stream").find("label").first().inFieldLabels();
           })
         )
       };

app/views/status_messages/show.html.haml

@@ -6,13 +6,10 @@
 = render 'shared/author_info', :post => @status_message
 
 .span-14.append-1.last
-  #stream
-    %h1.show_text
-      = make_links(@status_message.message)
+  %h1.show_text
+    = make_links(@status_message.message)
 
-  = "Posted #{how_long_ago(@status_message)} to"
-  - for aspect in current_user.aspects_with_post( @status_message.id )
-    = link_to aspect.name, aspect
+  = how_long_ago(@status_message)
 
   - if current_user.owns? @status_message
     %p

public/javascripts/stream.js

@@ -5,9 +5,9 @@
 
 
 $(document).ready(function(){
-  
+
   // expand all comments on page load
-	$("#stream").find('.comments').each(function(index) {
+	$("#stream:not('.show')").find('.comments').each(function(index) {
       var comments = $(this);
 	    if(comments.children("li").length > 1) {
         var show_comments_toggle = comments.closest("li").find(".show_post_comments");
@@ -16,7 +16,7 @@ $(document).ready(function(){
   });
 
   // comment toggle action
-  $("#stream").delegate("a.show_post_comments", "click", function(evt) {
+  $("#stream:not('.show')").delegate("a.show_post_comments", "click", function(evt) {
     evt.preventDefault();
     expandComments($(this));
   });