remove repeated link, fixed cucumber

app/views/reshares/_reshare.haml

@@ -8,22 +8,19 @@
     = person_image_link(post.author, :size => :thumb_small)
 
     .content
-      %span.from
-        = person_link(post.author, :class => "hovercardable")
-        %span.details
-          –
-          %span.timeago
-            = link_to(how_long_ago(post), post_path(post))
-          –
-          = t("reshares.reshare.reshare", :count => post.reshares.size)
+      .post_initial_info
+        %span.from
+          = person_link(post.author, :class => "hovercardable")
+          %span.details
+            –
+            %span.timeago
+              = link_to(how_long_ago(post), post_path(post))
+            –
+            = t("reshares.reshare.reshare", :count => post.reshares.size)
 
       - if post.activity_streams?
         = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
       - else
         = render 'status_messages/status_message', :post => post, :photos => post.photos
-      - if defined?(current_user) && current_user && (post.author_id != current_user.person.id) && (post.public?) && !reshare?(post)
-        %span.reshare_action
-          = reshare_link(post)
-
   - else
     = t('.deleted')

features/repost.feature

@@ -93,6 +93,6 @@ Feature: public repost
     And I should see "Bob" 
     And I go to the home page
 
-    And I should see "1 reshare"
+    And I should see "1 Reshare"
 
   Scenario: Can have text