From f7e09df49bd8d7e52cf7df40bc479dd5d2c71f9f Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 9 Feb 2012 15:50:32 -0800
Subject: [PATCH] fix reshare tempalte; reorder header

---
 .../app/templates/header.handlebars           | 15 +++---
 .../app/templates/reshare.handlebars          | 51 ++++++++++---------
 public/stylesheets/sass/application.sass      |  6 ---
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/public/javascripts/app/templates/header.handlebars b/public/javascripts/app/templates/header.handlebars
index 3cf6860c7..497829194 100644
--- a/public/javascripts/app/templates/header.handlebars
+++ b/public/javascripts/app/templates/header.handlebars
@@ -1,22 +1,21 @@
 <div class="container" style="position:relative;">
 
-
-  <a href="/participate">
+  <a href="/explore">
     <img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "/images/header-logo.png"}}" />
   </a>
 
   <span class="header-nav">
-    <span>
-        <a href="/participate">
-          {{t "participate"}}
-        </a>
-     </span>
-
     <span>
         <a href="/explore">
           {{t "explore"}}
         </a>
     </span>
+
+    <span>
+        <a href="/participate">
+          {{t "participate"}}
+        </a>
+     </span>
   </span>
 
   <div id="nav_badges">
diff --git a/public/javascripts/app/templates/reshare.handlebars b/public/javascripts/app/templates/reshare.handlebars
index 64add00e8..08e399050 100644
--- a/public/javascripts/app/templates/reshare.handlebars
+++ b/public/javascripts/app/templates/reshare.handlebars
@@ -2,39 +2,42 @@
 
   {{#if root}}
 
-    {{#with root}}
-      <a href="/people/{{author.guid}}">
-        <img src="{{author.avatar.small}}" class="avatar" />
-      </a>
+    <div class="media">
 
-      <div class="content">
-        <div class="post_initial_info">
-          <span class="from">
-            <a href="/people/{{author.guid}}">
+      {{#with root}}
+        <a href="/people/{{author.guid}}" class="img">
+          <img src="{{author.avatar.small}}" class="avatar" />
+        </a>
+      {{/with}}
+
+      {{#with root}}
+        <div class="bd">
+          <div>
+            <a href="/people/{{author.guid}}" class="author">
               {{author.name}}
             </a>
-          </span>
 
-          <span class="details">
-            -
-            <a href="/posts/{{id}}">
-              <time class="timeago" datetime="{{created_at}}"/>
-            </a>
-          </span>
+            <span class="details grey">
+              -
+              <a href="/posts/{{id}}">
+                <time class="timeago" datetime="{{created_at}}"/>
+              </a>
 
-          {{#if reshares_count}}
-            -
-            {{t "stream.reshares" count=reshares_count}}
-          {{/if}}
-        </div>
-    {{/with}}
+              {{#if reshares_count}}
+                -
+                {{t "stream.reshares" count=reshares_count}}
+              {{/if}}
+            </span>
+          </div>
+      {{/with}}
+
+        {{> status-message}}
+      </div>
 
-      {{> status-message}}
-      
     </div>
 
   {{else}}
-  
+
     <p>
       {{t "stream.original_post_deleted"}}
     </p>
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 6efc92746..a0faf857f 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -561,13 +561,7 @@ ul.as-selections
 
 
 .stream_element .reshare
-  :padding
-    :left 10px
   :border-left 2px solid #ddd
-  :margin
-    :top 5px
-    :bottom 10px
-
 
 form.new_comment
   input