Download as
Browse Code »

Commit 1c19c8af4e7bcf18c0184959e7af68c8c99ea6d6

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 01a342f3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Changing scrap button to a single link 

- removed 'icon-scrap' CSS class

(ActionItem1854)
Showing 5 changed files with 7 additions and 25 deletions   Show diff stats
app/views/profile/_common.rhtml
  Diff comments   View file @1c19c8a
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <script type="text/javascript"> 2 <script type="text/javascript">
3 jQuery( function() { 3 jQuery( function() {
4 var parent_selector = '.profile-wall-description, .profile-activity-description, .profile-network-description'; 4 var parent_selector = '.profile-wall-description, .profile-activity-description, .profile-network-description';
5 - var child_selector = '.icon-delete, .icon-reply, .icon-scrap'; 5 + var child_selector = '.icon-delete, .icon-reply';
6 jQuery(parent_selector).live('mouseover', function () { jQuery(this).find(child_selector).css('visibility', 'visible'); }); 6 jQuery(parent_selector).live('mouseover', function () { jQuery(this).find(child_selector).css('visibility', 'visible'); });
7 jQuery(parent_selector).live('mouseout', function () { jQuery(this).find(child_selector).css('visibility', 'hidden'); }); 7 jQuery(parent_selector).live('mouseout', function () { jQuery(this).find(child_selector).css('visibility', 'hidden'); });
8 }); 8 });
app/views/profile/_profile_network_activities.rhtml
  Diff comments   View file @1c19c8a
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class='profile-network-image'> 3 <div class='profile-network-image'>
4 <%= link_to(profile_image(activity.user, :minor), activity.user.url) %> 4 <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
5 <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %> 5 <% if logged_in? && current_person.follows?(activity.user) && current_person != activity.user %>
6 - <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> 6 + <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>
7 <% end %> 7 <% end %>
8 </div> 8 </div>
9 <div class='profile-network-description'> 9 <div class='profile-network-description'>
app/views/profile/_profile_scrap.rhtml
  Diff comments   View file @1c19c8a
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class='profile-wall-image'> 2 <div class='profile-wall-image'>
3 <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %> 3 <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
4 <% if logged_in? && current_person.follows?(scrap.sender) && current_person != scrap.sender %> 4 <% if logged_in? && current_person.follows?(scrap.sender) && current_person != scrap.sender %>
5 - <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> 5 + <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>
6 <% end %> 6 <% end %>
7 </div> 7 </div>
8 <% comment_balloon :class => 'profile-wall-description' do %> 8 <% comment_balloon :class => 'profile-wall-description' do %>
public/designs/icons/tango/style.css
  Diff comments   View file @1c19c8a
@@ -89,7 +89,6 @@ @@ -89,7 +89,6 @@
89 .icon-media-next { background-image: url(Tango/16x16/actions/media-skip-forward.png) } 89 .icon-media-next { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
90 .icon-lock { background-image: url(Tango/16x16/actions/lock.png) } 90 .icon-lock { background-image: url(Tango/16x16/actions/lock.png) }
91 .icon-chat { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat } 91 .icon-chat { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
92 -.icon-scrap { background-image: url(Tango/16x16/actions/format-justify-left.png) }  
93 .icon-reply { background-image: url(Tango/16x16/actions/mail-reply-sender.png) } 92 .icon-reply { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
94 .icon-newforum { background-image: url(Tango/16x16/apps/system-users.png) } 93 .icon-newforum { background-image: url(Tango/16x16/apps/system-users.png) }
95 .icon-forum { background-image: url(Tango/16x16/apps/system-users.png) } 94 .icon-forum { background-image: url(Tango/16x16/apps/system-users.png) }
public/stylesheets/application.css
  Diff comments   View file @1c19c8a
@@ -1175,6 +1175,7 @@ a.comment-picture { @@ -1175,6 +1175,7 @@ a.comment-picture {
1175 color: #000; 1175 color: #000;
1176 } 1176 }
1177 1177
  1178 +#profile-activity .profile-activity-send-message a:hover, #profile-network .profile-network-send-message a:hover, #profile-wall .profile-wall-send-message a:hover,
1178 #article .comment-reply-link:hover { 1179 #article .comment-reply-link:hover {
1179 text-decoration: underline; 1180 text-decoration: underline;
1180 } 1181 }
@@ -5532,10 +5533,8 @@ h1#agenda-title { @@ -5532,10 +5533,8 @@ h1#agenda-title {
5532 } 5533 }
5533 5534
5534 #profile-activity .profile-activity-send-message, #profile-network .profile-network-send-message, #profile-wall .profile-wall-send-message { 5535 #profile-activity .profile-activity-send-message, #profile-network .profile-network-send-message, #profile-wall .profile-wall-send-message {
5535 - text-decoration: none;  
5536 - font-size: 11px;  
5537 - color: #000;  
5538 - margin: 10px 0 0 0; 5536 + font-size: 10px;
  5537 + margin: 2px 0 0 0;
5539 } 5538 }
5540 5539
5541 #profile-activity .profile-activity-send-message a, #profile-network .profile-network-send-message a, #profile-wall .profile-wall-send-message a { 5540 #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 { @@ -5638,21 +5637,6 @@ h1#agenda-title {
5638 margin: 0; 5637 margin: 0;
5639 } 5638 }
5640 5639
5641 -.profile-send-message {  
5642 - color: #555;  
5643 - border: 1px solid #ccc;  
5644 - background-color: #eee;  
5645 - padding: 4px 4px 4px 20px;  
5646 - background-repeat: no-repeat;  
5647 - background-position: 4px center;  
5648 -}  
5649 -  
5650 -.ui-widget-content .profile-send-message:hover,  
5651 -.profile-send-message:hover {  
5652 - color: #eee;  
5653 - background-color: #555;  
5654 -}  
5655 -  
5656 .limited-text-area p { 5640 .limited-text-area p {
5657 margin: 0; 5641 margin: 0;
5658 font-size: 11px; 5642 font-size: 11px;
@@ -5831,7 +5815,7 @@ h1#agenda-title { @@ -5831,7 +5815,7 @@ h1#agenda-title {
5831 5815
5832 /* friends online }}} */ 5816 /* friends online }}} */
5833 5817
5834 -#profile-wall .profile-wall-description .icon-scrap, #profile-wall .profile-wall-description .icon-reply { 5818 +#profile-wall .profile-wall-description .icon-reply {
5835 visibility: hidden; 5819 visibility: hidden;
5836 border-radius: 3px; 5820 border-radius: 3px;
5837 -webkit-border-radius: 3px; 5821 -webkit-border-radius: 3px;
@@ -5938,7 +5922,6 @@ h1#agenda-title { @@ -5938,7 +5922,6 @@ h1#agenda-title {
5938 .msie7 #profile-network .profile-network-send-message, 5922 .msie7 #profile-network .profile-network-send-message,
5939 .msie7 #profile-wall .profile-wall-send-message { 5923 .msie7 #profile-wall .profile-wall-send-message {
5940 line-height: 24px; 5924 line-height: 24px;
5941 - margin-top: 2px;  
5942 } 5925 }
5943 5926
5944 .msie7 #profile-wall a.button.with-text.icon-cancel { 5927 .msie7 #profile-wall a.button.with-text.icon-cancel {