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

…into merge-requests/237

Merge commit 'refs/merge-requests/237' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/237
Daniela Feitosa
2 parents 52142058 37133fc9
Showing 3 changed files with 5 additions and 18 deletions Show diff stats
app/views/content_viewer/view_page.rhtml
app/views/profile/_common.rhtml
public/stylesheets/application.css
@@ -87,12 +87,6 @@
   <% if @page.accept_comments? %>
     <div id="page-comment-form"><%= render :partial => 'comment_form' %></div>
-    <script type="text/javascript">
-      jQuery( function() {
-        jQuery('.article-comment').live('mouseover', function() { jQuery(this).find('.icon-delete:first').show(); });
-        jQuery('.article-comment').live('mouseout', function() { jQuery(this).find('.icon-delete').hide(); });
-      });
-    </script>
   <% end %>
 </div><!-- end class="comments" -->
-
-<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';
-    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'); });
-  });
-</script>
-
 <% unless @action %>
   <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
     <tr>
@@ -1067,6 +1067,9 @@ a.comment-picture {
 #content .comments .comment-balloon a.button.icon-delete {
   display: none;
 }
+#content .comments .comment-balloon:hover a.button.icon-delete {
+  display: inline;
+}
 .msie7 .article-comments-list .comment-balloon {
   margin-top: -15px;
 }
@@ -5179,8 +5182,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   display: none;
 }
-#profile-wall .profile-wall-activities-comments .article-comment:hover .button-bar,
-#profile-network .profile-wall-activities-comments .article-comment:hover .button-bar {
+#profile-wall .profile-wall-activities-comments .comment-content:hover .button-bar,
+#profile-network .profile-wall-activities-comments .comment-content:hover .button-bar {
   display: block;
 }
	@@ -87,12 +87,6 @@		@@ -87,12 +87,6 @@
87		87
88	<% if @page.accept_comments? %>	88	<% if @page.accept_comments? %>
89	<div id="page-comment-form"><%= render :partial => 'comment_form' %></div>	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	<% end %>	90	<% end %>
97	</div><!-- end class="comments" -->	91	</div><!-- end class="comments" -->
98		92
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	<% unless @action %>	1	<% unless @action %>
12	<% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>	2	<% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
13	<tr>	3	<tr>