From 9b2304e3a776e7e9ae4d406d0a5bab61b8ac77ed Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Mon, 21 May 2012 21:53:05 -0300
Subject: [PATCH] More enhancements on wall

---
 app/controllers/public/profile_controller.rb        |  7 +------
 app/views/profile/_create_article.rhtml             |  2 +-
 app/views/profile/_default_activity.rhtml           |  2 +-
 app/views/profile/_profile_network_activities.rhtml |  6 ------
 app/views/profile/_profile_scrap.rhtml              |  2 +-
 app/views/profile/_profile_scraps.rhtml             |  9 +--------
 app/views/profile/_upload_image.rhtml               |  2 +-
 public/javascripts/application.js                   |  5 +++++
 public/stylesheets/application.css                  |  7 ++++++-
 9 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index 6de2dd0..bfef279 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -3,7 +3,7 @@ class ProfileController < PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
   before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
 
   helper TagsHelper
 
@@ -193,11 +193,6 @@ class ProfileController < PublicController
     render :partial => 'profile_activities_list', :locals => {:activities => activities}
   end
 
-  def view_more_scraps
-    @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])
-    render :partial => 'profile_scraps', :locals => {:scraps => @scraps}
-  end
-
   def view_more_activities
     @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_activities_list', :locals => {:activities => @activities}
diff --git a/app/views/profile/_create_article.rhtml b/app/views/profile/_create_article.rhtml
index d5bba14..31cff3b 100644
--- a/app/views/profile/_create_article.rhtml
+++ b/app/views/profile/_create_article.rhtml
@@ -14,7 +14,7 @@
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
-    <%= link_to_function s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()" %>
+    <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id, :only_hide => true}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
diff --git a/app/views/profile/_default_activity.rhtml b/app/views/profile/_default_activity.rhtml
index 054d3a8..0195183 100644
--- a/app/views/profile/_default_activity.rhtml
+++ b/app/views/profile/_default_activity.rhtml
@@ -5,7 +5,7 @@
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
-    <%= link_to_function s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()" %>
+    <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
diff --git a/app/views/profile/_profile_network_activities.rhtml b/app/views/profile/_profile_network_activities.rhtml
index c7e34f7..688c89b 100644
--- a/app/views/profile/_profile_network_activities.rhtml
+++ b/app/views/profile/_profile_network_activities.rhtml
@@ -2,12 +2,6 @@
   <li class='profile-activity-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
     <%= render :partial => activity.verb, :locals => { :activity => activity }%>
     <hr/>
-    <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
-      <%= render :partial => 'comment', :collection => activity.comments %>
-    </ul>
-  
-    <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %> 
-    <hr />  
   </li>
 <% end %>
 <% if network_activities.current_page < network_activities.total_pages %>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index 45fe0cd..be62faf 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -22,7 +22,7 @@
     </div>
   <% end %>
 
-  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;padding-left:0px; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
+  <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
diff --git a/app/views/profile/_profile_scraps.rhtml b/app/views/profile/_profile_scraps.rhtml
index 9e07a21..e4630da 100644
--- a/app/views/profile/_profile_scraps.rhtml
+++ b/app/views/profile/_profile_scraps.rhtml
@@ -1,8 +1 @@
-<% scraps.map do |scrap| %>
-  <%= render :partial => 'profile_scrap', :locals => {:scrap => scrap} %>
-<% end %>
-<% if scraps.current_page < scraps.total_pages %>
-  <div id='profile_scraps_page_<%= scraps.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_scraps', :page => (scraps.current_page + 1)}, :update => "profile_scraps_page_#{scraps.current_page}" %>
-  </div>
-<% end %>
+NÃO DEVE APARECER
diff --git a/app/views/profile/_upload_image.rhtml b/app/views/profile/_upload_image.rhtml
index 9b98d9f..1e72377 100644
--- a/app/views/profile/_upload_image.rhtml
+++ b/app/views/profile/_upload_image.rhtml
@@ -6,7 +6,7 @@
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
     <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
     <div class='profile-wall-actions'>
-      <%= link_to_function(s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()") unless activity.get_view_url.size == 1 %>
+      <%= link_to(s_('profile|Comment'), '#', { :class => 'focus-on-comment'}) unless activity.get_view_url.size == 1 %>
       <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
     </div>
   </div>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a64a8e0..cd630bb 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -738,4 +738,9 @@ jQuery(function($){
      $(link).hide();
      return false;
   });
+  $('.focus-on-comment').live('click', function(e) {
+     var link = this;
+     $(link).parents('.profile-activity-item').find('textarea').focus();
+     return false;
+  });
 });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5ea4718..4b2436e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6350,6 +6350,11 @@ h1#agenda-title {
   width: auto;
 }
 
+#profile-wall ul.profile-wall-activities-comments ul,
+#profile-network ul.profile-wall-activities-comments ul {
+  padding-left: 0px;
+}
+
 #profile-wall .profile-wall-activities-comments li,
 #profile-network .profile-wall-activities-comments li {
   background: #f0f0f1;
@@ -6577,7 +6582,7 @@ h1#agenda-title {
   background: #f0f0f1;
   border-bottom: 1px solid #d2d2d2;
   border-top: 1px solid #fff;
-  Xmargin-left: 50px;
+  margin-left: 50px;
   padding: 0 5px;
 }
 
--
libgit2 0.21.2