From 689bde2e5f763dd27fe583bdb3ed26719697ae74 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Sat, 2 Jul 2011 15:41:50 -0700
Subject: [PATCH] take out useless 'reshare'

---
 app/views/shared/_publisher.html.haml      |  2 +-
 app/views/shared/_reshare.haml             | 11 ----
 app/views/shared/_stream_element.html.haml |  3 -
 public/stylesheets/sass/application.sass   | 73 ----------------------
 4 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 app/views/shared/_reshare.haml

diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index 09a20c826..aa96dbb71 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -20,7 +20,7 @@
           #publisher_textarea_wrapper
             = link_to( image_tag('deletelabel.png'), "#", :id => "hide_publisher", :title => t('.discard_post'))
             %ul#photodropzone
-            = status.text_area :fake_text, :rows => 2, :value => h(params[:prefill]), :tabindex => 1, :placeholder => t('.whats_on_your_mind')
+            = status.text_area :fake_text, :rows => 2, :tabindex => 1, :placeholder => t('.whats_on_your_mind')
             = status.hidden_field :text, :value => '', :class => 'clear_on_submit'
 
             #file-upload{:title => t('.upload_photos')}
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
deleted file mode 100644
index 83bdd30f4..000000000
--- a/app/views/shared/_reshare.haml
+++ /dev/null
@@ -1,11 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-.reshare_pane
-  %span.reshare_button
-    = link_to t('.reshare'), "#"
-
-  %ul.reshare_box
-    = aspect_links(aspects, :prefill => post.text)
-
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 63446e1f4..66ef46deb 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -5,9 +5,6 @@
 .stream_element{:data=>{:guid=>post.id}}
   - if current_user && post.author.owner_id == current_user.id
     .right.controls
-      - reshare_aspects = aspects_without_post(all_aspects, post)
-      - unless reshare_aspects.empty?
-        = render 'shared/reshare', :aspects => reshare_aspects, :post => post
       = link_to image_tag('deletelabel.png'), status_message_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete stream_element_delete", :title => t('delete')
   - else
     .right.controls
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index bc2746938..6d57883cf 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -489,79 +489,6 @@ ul.dropdown
     :decoration none
   :border none
 
-.right .reshare_pane .reshare_button a.inactive
-  :color #ccc
-  &:hover
-    :text
-      :decoration none
-  :cursor default
-
-.right .reshare_pane .reshare_button
-  :padding 2px
-  &.active
-    @include border-radius(5px)
-
-    :background
-      :color #333
-    a
-      :color #fff
-      :text-shadow none
-
-.right .reshare_pane
-  :margin
-    :left 5px
-    :right 5px
-  :display inline
-  :position relative
-
-
-  ul.reshare_box
-    :width 150px
-    :display none
-    :z-index 10
-    :position absolute
-    :margin
-      :top 0
-    :padding 0
-
-    :background
-      :color #fafafa
-
-    :border 5px solid #333
-
-    :text-shadow 0 2px #fff
-    :color #000
-
-    > li
-      :font
-        :weight bold
-      :color #ccc
-      :border
-        :top 1px solid #fff
-        :bottom 1px solid #ccc
-
-      &:first-child
-        :border
-          :top none
-      &:last-child
-        :border
-          :bottom none
-      a
-        :display block
-        :height 100%
-        :padding 2px 5px
-        :cursor default
-
-        &:hover
-          :background
-            :color #eee
-          :text
-            :decoration none
-        &:active
-          :background
-            :color #ccc
-
-
 #user_name
   :margin
     :bottom 20px