From 2e52def47a14b245bbabaa89fe38b539f560229b Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 22 May 2012 15:10:53 -0700
Subject: [PATCH] DG MS; background colors for great justice (on the stream)

---
 .../javascripts/app/views/comment_view.js     |  3 +-
 .../app/views/post-viewer/reactions.js        |  3 +-
 .../stylesheets/new_styles/_canvas.scss       | 14 +++++++--
 .../templates/post-viewer/comment.jst.hbs     | 30 +++++++++++++------
 app/assets/templates/stream.jst.hbs           |  5 ++++
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/app/views/comment_view.js b/app/assets/javascripts/app/views/comment_view.js
index 4a826a33d..25d4a5c52 100644
--- a/app/assets/javascripts/app/views/comment_view.js
+++ b/app/assets/javascripts/app/views/comment_view.js
@@ -9,7 +9,8 @@ app.views.Comment = app.views.Content.extend({
     });
   },
 
-  initialize : function(){
+  initialize : function(options){
+    this.templateName = options.templateName || this.templateName
     this.model.on("change", this.render, this)
   },
 
diff --git a/app/assets/javascripts/app/views/post-viewer/reactions.js b/app/assets/javascripts/app/views/post-viewer/reactions.js
index 1ade12f74..26b11030d 100644
--- a/app/assets/javascripts/app/views/post-viewer/reactions.js
+++ b/app/assets/javascripts/app/views/post-viewer/reactions.js
@@ -38,7 +38,8 @@ app.views.PostViewerReactions = app.views.Base.extend({
 
     this.$("#post-comments").append(new app.views.Comment({
       model: comment,
-      className : "post-comment media"
+      className : "post-comment media",
+      templateName : "post-viewer/comment"
     }).render().el);
   }
 });
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index ce167e31e..5fac4e51b 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -369,9 +369,19 @@
 /* new stream overrides */
 #stream {
   color : #fff;
-  background-color : #333;
-}
+  background-color : #222;
 
+  .background {
+    @include box-shadow(-2px, 0, 7px, rgba(0,0,0,0.8));
+    position : fixed;
+    background-color : cyan;
+    height : 100%;
+    width : 100%;
+
+    background-color : #333;
+  }
+
+}
 
 #stream-content {
   .stream-frame {
diff --git a/app/assets/templates/post-viewer/comment.jst.hbs b/app/assets/templates/post-viewer/comment.jst.hbs
index fb5da3920..02df70245 100644
--- a/app/assets/templates/post-viewer/comment.jst.hbs
+++ b/app/assets/templates/post-viewer/comment.jst.hbs
@@ -1,15 +1,27 @@
+{{#if canRemove}}
+<div class="controls">
+    <a href="#" class="delete comment_delete" title="{{t "delete"}}">
+        <img alt="Deletelabel" src="{{imageUrl "deletelabel.png"}}" />
+        <a/>
+</div>
+{{/if}}
+
 <div class="img">
-  {{#linkToPerson author}}
-    {{{personImage this "small" "small"}}}
-  {{/linkToPerson}}
+    {{#linkToPerson author}}
+        <div class="profile-image-container smaller" style="background-image : url('{{avatar.large}}')"></div>
+    {{/linkToPerson}}
 </div>
 
 <div class="bd">
-  {{#linkToPerson author}}
-    {{name}}
-  {{/linkToPerson}}
+    <a href="/people/{{author.guid}}" class="author author-name">
+        {{author.name}}
+    </a>
 
-  <div class="comment-content">
-    {{{text}}}
-  </div>
+    <div class="collapsible comment-content">
+        {{{text}}}
+    </div>
+
+    <div class="info">
+        <time class="timeago" datetime="{{created_at}}"/>
+    </div>
 </div>
diff --git a/app/assets/templates/stream.jst.hbs b/app/assets/templates/stream.jst.hbs
index 8f2065a8c..1da65dd22 100644
--- a/app/assets/templates/stream.jst.hbs
+++ b/app/assets/templates/stream.jst.hbs
@@ -1,5 +1,10 @@
 <div id="stream">
     <div class="container">
+
+        <div class="row">
+            <div class="background offset5"></div>
+        </div>
+
         <div class="row">
             <section id="stream-content" class="span4 offset1"/>