From 1c19c8af4e7bcf18c0184959e7af68c8c99ea6d6 Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@colivre.coop.br>
Date: Fri, 18 Feb 2011 16:23:16 -0300
Subject: [PATCH] Changing scrap button to a single link

---
 app/views/profile/_common.rhtml                     |  2 +-
 app/views/profile/_profile_network_activities.rhtml |  2 +-
 app/views/profile/_profile_scrap.rhtml              |  2 +-
 public/designs/icons/tango/style.css                |  1 -
 public/stylesheets/application.css                  | 25 ++++---------------------
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/app/views/profile/_common.rhtml b/app/views/profile/_common.rhtml
index 8b394b5..69b4099 100644
--- a/app/views/profile/_common.rhtml
+++ b/app/views/profile/_common.rhtml
@@ -2,7 +2,7 @@
 <script type="text/javascript">
   jQuery( function() {
     var parent_selector = '.profile-wall-description, .profile-activity-description, .profile-network-description';
-    var child_selector = '.icon-delete, .icon-reply, .icon-scrap';
+    var child_selector = '.icon-delete, .icon-reply';
     jQuery(parent_selector).live('mouseover', function () { jQuery(this).find(child_selector).css('visibility', 'visible'); });
     jQuery(parent_selector).live('mouseout', function () { jQuery(this).find(child_selector).css('visibility', 'hidden'); });
   });
diff --git a/app/views/profile/_profile_network_activities.rhtml b/app/views/profile/_profile_network_activities.rhtml
index ed32049..df01d4f 100644
--- a/app/views/profile/_profile_network_activities.rhtml
+++ b/app/views/profile/_profile_network_activities.rhtml
@@ -3,7 +3,7 @@
       <div class='profile-network-image'>
         <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
         <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %>
-          <p class='profile-network-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-network-message-response-#{activity.id}'],['#profile-network-message-#{activity.id}', '#profile-network-form-#{activity.id}']);$('content_#{activity.id}').value='';return false", :class => "profile-send-message icon-scrap" %></p>
+          <p class='profile-network-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-network-message-response-#{activity.id}'],['#profile-network-message-#{activity.id}', '#profile-network-form-#{activity.id}']);$('content_#{activity.id}').value='';return false", :class => "profile-send-message" %></p>
         <% end %>
       </div>
       <div class='profile-network-description'>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index 9c9769b..a35921a 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -2,7 +2,7 @@
   <div class='profile-wall-image'>
     <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
     <% if logged_in? && current_person.follows?(scrap.sender) && current_person != scrap.sender %>
-      <p class='profile-wall-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-message-#{scrap.id}', '#profile-wall-form-#{scrap.id}']);$('content_#{scrap.id}').value='';return false", :class => "profile-send-message icon-scrap" %></p>
+      <p class='profile-wall-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-message-#{scrap.id}', '#profile-wall-form-#{scrap.id}']);$('content_#{scrap.id}').value='';return false", :class => "profile-send-message" %></p>
     <% end %>
   </div>
   <% comment_balloon :class => 'profile-wall-description' do %>
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index c711478..084b16c 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -89,7 +89,6 @@
 .icon-media-next       { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
 .icon-lock	       { background-image: url(Tango/16x16/actions/lock.png) }
 .icon-chat             { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
-.icon-scrap	       { background-image: url(Tango/16x16/actions/format-justify-left.png) }
 .icon-reply            { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
 .icon-newforum   { background-image: url(Tango/16x16/apps/system-users.png) }
 .icon-forum      { background-image: url(Tango/16x16/apps/system-users.png) }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a3e1879..877ad50 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1175,6 +1175,7 @@ a.comment-picture {
   color: #000;
 }
 
+#profile-activity .profile-activity-send-message a:hover, #profile-network .profile-network-send-message a:hover, #profile-wall .profile-wall-send-message a:hover,
 #article .comment-reply-link:hover {
   text-decoration: underline;
 }
@@ -5532,10 +5533,8 @@ h1#agenda-title {
 }
 
 #profile-activity .profile-activity-send-message, #profile-network .profile-network-send-message, #profile-wall .profile-wall-send-message {
-  text-decoration: none;
-  font-size: 11px;
-  color: #000;
-  margin: 10px 0 0 0;
+  font-size: 10px;
+  margin: 2px 0 0 0;
 }
 
 #profile-activity .profile-activity-send-message a, #profile-network .profile-network-send-message a, #profile-wall .profile-wall-send-message a {
@@ -5638,21 +5637,6 @@ h1#agenda-title {
   margin: 0;
 }
 
-.profile-send-message {
-  color: #555;
-  border: 1px solid #ccc;
-  background-color: #eee;
-  padding: 4px 4px 4px 20px;
-  background-repeat: no-repeat;
-  background-position: 4px center;
-}
-
-.ui-widget-content .profile-send-message:hover,
-.profile-send-message:hover {
-  color: #eee;
-  background-color: #555;
-}
-
 .limited-text-area p {
   margin: 0;
   font-size: 11px;
@@ -5831,7 +5815,7 @@ h1#agenda-title {
 
 /* friends online }}} */
 
-#profile-wall .profile-wall-description .icon-scrap, #profile-wall .profile-wall-description .icon-reply {
+#profile-wall .profile-wall-description .icon-reply {
   visibility: hidden;
   border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -5938,7 +5922,6 @@ h1#agenda-title {
 .msie7 #profile-network .profile-network-send-message,
 .msie7 #profile-wall .profile-wall-send-message {
   line-height: 24px;
-	margin-top: 2px;
 }
 
 .msie7 #profile-wall a.button.with-text.icon-cancel {
--
libgit2 0.21.2