Download as
Browse Code »

Commit fa24dc7c95026462d0fa9a9a2f37c92e52e9c27c

Authored by Daniela Feitosa
2 parents 52142058 37133fc9
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

Merge commit 'refs/merge-requests/237' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/237
Showing 3 changed files with 5 additions and 18 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @fa24dc7
... ... @@ -87,12 +87,6 @@
87 87  
88 88 <% if @page.accept_comments? %>
89 89 <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
90   - <script type="text/javascript">
91   - jQuery( function() {
92   - jQuery('.article-comment').live('mouseover', function() { jQuery(this).find('.icon-delete:first').show(); });
93   - jQuery('.article-comment').live('mouseout', function() { jQuery(this).find('.icon-delete').hide(); });
94   - });
95   - </script>
96 90 <% end %>
97 91 </div><!-- end class="comments" -->
98 92  
... ...
app/views/profile/_common.rhtml
  Diff comments   View file @fa24dc7
1   -
2   -<script type="text/javascript">
3   - jQuery( function() {
4   - var parent_selector = '.profile-wall-description, .profile-activity-description, .profile-network-description';
5   - var child_selector = '.icon-delete, .icon-reply';
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'); });
8   - });
9   -</script>
10   -
11 1 <% unless @action %>
12 2 <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
13 3 <tr>
... ...
public/stylesheets/application.css
  Diff comments   View file @fa24dc7
... ... @@ -1067,6 +1067,9 @@ a.comment-picture {
1067 1067 #content .comments .comment-balloon a.button.icon-delete {
1068 1068 display: none;
1069 1069 }
  1070 +#content .comments .comment-balloon:hover a.button.icon-delete {
  1071 + display: inline;
  1072 +}
1070 1073 .msie7 .article-comments-list .comment-balloon {
1071 1074 margin-top: -15px;
1072 1075 }
... ... @@ -5179,8 +5182,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5179 5182 display: none;
5180 5183 }
5181 5184  
5182   -#profile-wall .profile-wall-activities-comments .article-comment:hover .button-bar,
5183   -#profile-network .profile-wall-activities-comments .article-comment:hover .button-bar {
  5185 +#profile-wall .profile-wall-activities-comments .comment-content:hover .button-bar,
  5186 +#profile-network .profile-wall-activities-comments .comment-content:hover .button-bar {
5184 5187 display: block;
5185 5188 }
5186 5189  
... ...