Download as
Browse Code »

Commit 1c19c8af4e7bcf18c0184959e7af68c8c99ea6d6

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 01a342f3
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 2 <script type="text/javascript">
3 3 jQuery( function() {
4 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 6 jQuery(parent_selector).live('mouseover', function () { jQuery(this).find(child_selector).css('visibility', 'visible'); });
7 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 3 <div class='profile-network-image'>
4 4 <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
5 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 7 <% end %>
8 8 </div>
9 9 <div class='profile-network-description'>
... ...
app/views/profile/_profile_scrap.rhtml
  Diff comments   View file @1c19c8a
... ... @@ -2,7 +2,7 @@
2 2 <div class='profile-wall-image'>
3 3 <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
4 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 6 <% end %>
7 7 </div>
8 8 <% comment_balloon :class => 'profile-wall-description' do %>
... ...
public/designs/icons/tango/style.css
  Diff comments   View file @1c19c8a
... ... @@ -89,7 +89,6 @@
89 89 .icon-media-next { background-image: url(Tango/16x16/actions/media-skip-forward.png) }
90 90 .icon-lock { background-image: url(Tango/16x16/actions/lock.png) }
91 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 92 .icon-reply { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
94 93 .icon-newforum { background-image: url(Tango/16x16/apps/system-users.png) }
95 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 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 1179 #article .comment-reply-link:hover {
1179 1180 text-decoration: underline;
1180 1181 }
... ... @@ -5532,10 +5533,8 @@ h1#agenda-title {
5532 5533 }
5533 5534  
5534 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 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 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 5640 .limited-text-area p {
5657 5641 margin: 0;
5658 5642 font-size: 11px;
... ... @@ -5831,7 +5815,7 @@ h1#agenda-title {
5831 5815  
5832 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 5819 visibility: hidden;
5836 5820 border-radius: 3px;
5837 5821 -webkit-border-radius: 3px;
... ... @@ -5938,7 +5922,6 @@ h1#agenda-title {
5938 5922 .msie7 #profile-network .profile-network-send-message,
5939 5923 .msie7 #profile-wall .profile-wall-send-message {
5940 5924 line-height: 24px;
5941   - margin-top: 2px;
5942 5925 }
5943 5926  
5944 5927 .msie7 #profile-wall a.button.with-text.icon-cancel {
... ...