Download as
Browse Code »

Commit 9b2304e3a776e7e9ae4d406d0a5bab61b8ac77ed

Authored by Daniela Feitosa
1 parent 185ab972
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

More enhancements on wall

Showing 9 changed files with 17 additions and 25 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @9b2304e
@@ -3,7 +3,7 @@ class ProfileController < PublicController @@ -3,7 +3,7 @@ class ProfileController < PublicController
3 needs_profile 3 needs_profile
4 before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add] 4 before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5 before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse] 5 before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
6 - 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] 6 + 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]
7 7
8 helper TagsHelper 8 helper TagsHelper
9 9
@@ -193,11 +193,6 @@ class ProfileController < PublicController @@ -193,11 +193,6 @@ class ProfileController < PublicController
193 render :partial => 'profile_activities_list', :locals => {:activities => activities} 193 render :partial => 'profile_activities_list', :locals => {:activities => activities}
194 end 194 end
195 195
196 - def view_more_scraps  
197 - @scraps = @profile.scraps_received.not_replies.paginate(:per_page => 30, :page => params[:page])  
198 - render :partial => 'profile_scraps', :locals => {:scraps => @scraps}  
199 - end  
200 -  
201 def view_more_activities 196 def view_more_activities
202 @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page]) 197 @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
203 render :partial => 'profile_activities_list', :locals => {:activities => @activities} 198 render :partial => 'profile_activities_list', :locals => {:activities => @activities}
app/views/profile/_create_article.rhtml
  Diff comments   View file @9b2304e
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %> 14 <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
15 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p> 15 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
16 <div class='profile-wall-actions'> 16 <div class='profile-wall-actions'>
17 - <%= link_to_function s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()" %> 17 + <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
18 <%= 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 %> 18 <%= 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 %>
19 </div> 19 </div>
20 </div> 20 </div>
app/views/profile/_default_activity.rhtml
  Diff comments   View file @9b2304e
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p> 5 <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
6 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p> 6 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
7 <div class='profile-wall-actions'> 7 <div class='profile-wall-actions'>
8 - <%= link_to_function s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()" %> 8 + <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
9 <%= 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 %> 9 <%= 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 %>
10 </div> 10 </div>
11 </div> 11 </div>
app/views/profile/_profile_network_activities.rhtml
  Diff comments   View file @9b2304e
@@ -2,12 +2,6 @@ @@ -2,12 +2,6 @@
2 <li class='profile-activity-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'> 2 <li class='profile-activity-item <%= activity.verb %>' id='profile-network-item-<%= activity.id %>'>
3 <%= render :partial => activity.verb, :locals => { :activity => activity }%> 3 <%= render :partial => activity.verb, :locals => { :activity => activity }%>
4 <hr/> 4 <hr/>
5 - <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>  
6 - <%= render :partial => 'comment', :collection => activity.comments %>  
7 - </ul>  
8 -  
9 - <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>  
10 - <hr />  
11 </li> 5 </li>
12 <% end %> 6 <% end %>
13 <% if network_activities.current_page < network_activities.total_pages %> 7 <% if network_activities.current_page < network_activities.total_pages %>
app/views/profile/_profile_scrap.rhtml
  Diff comments   View file @9b2304e
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 </div> 22 </div>
23 <% end %> 23 <% end %>
24 24
25 - <ul class="profile-wall-activities-comments scrap-replies" style="width: auto;padding-left:0px; <%= 'display:none;' if (scrap.replies.count > 2) %>" > 25 + <ul class="profile-wall-activities-comments scrap-replies" style="width: auto; <%= 'display:none;' if (scrap.replies.count > 2) %>" >
26 <% scrap.replies.map do |reply| %> 26 <% scrap.replies.map do |reply| %>
27 <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %> 27 <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
28 <% end %> 28 <% end %>
app/views/profile/_profile_scraps.rhtml
  Diff comments   View file @9b2304e
1 -<% scraps.map do |scrap| %>  
2 - <%= render :partial => 'profile_scrap', :locals => {:scrap => scrap} %>  
3 -<% end %>  
4 -<% if scraps.current_page < scraps.total_pages %>  
5 - <div id='profile_scraps_page_<%= scraps.current_page %>'>  
6 - <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_scraps', :page => (scraps.current_page + 1)}, :update => "profile_scraps_page_#{scraps.current_page}" %>  
7 - </div>  
8 -<% end %> 1 +NÃO DEVE APARECER
app/views/profile/_upload_image.rhtml
  Diff comments   View file @9b2304e
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p> 6 <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
7 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p> 7 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
8 <div class='profile-wall-actions'> 8 <div class='profile-wall-actions'>
9 - <%= link_to_function(s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()") unless activity.get_view_url.size == 1 %> 9 + <%= link_to(s_('profile|Comment'), '#', { :class => 'focus-on-comment'}) unless activity.get_view_url.size == 1 %>
10 <%= 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 %> 10 <%= 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 %>
11 </div> 11 </div>
12 </div> 12 </div>
public/javascripts/application.js
  Diff comments   View file @9b2304e
@@ -738,4 +738,9 @@ jQuery(function($){ @@ -738,4 +738,9 @@ jQuery(function($){
738 $(link).hide(); 738 $(link).hide();
739 return false; 739 return false;
740 }); 740 });
  741 + $('.focus-on-comment').live('click', function(e) {
  742 + var link = this;
  743 + $(link).parents('.profile-activity-item').find('textarea').focus();
  744 + return false;
  745 + });
741 }); 746 });
public/stylesheets/application.css
  Diff comments   View file @9b2304e
@@ -6350,6 +6350,11 @@ h1#agenda-title { @@ -6350,6 +6350,11 @@ h1#agenda-title {
6350 width: auto; 6350 width: auto;
6351 } 6351 }
6352 6352
  6353 +#profile-wall ul.profile-wall-activities-comments ul,
  6354 +#profile-network ul.profile-wall-activities-comments ul {
  6355 + padding-left: 0px;
  6356 +}
  6357 +
6353 #profile-wall .profile-wall-activities-comments li, 6358 #profile-wall .profile-wall-activities-comments li,
6354 #profile-network .profile-wall-activities-comments li { 6359 #profile-network .profile-wall-activities-comments li {
6355 background: #f0f0f1; 6360 background: #f0f0f1;
@@ -6577,7 +6582,7 @@ h1#agenda-title { @@ -6577,7 +6582,7 @@ h1#agenda-title {
6577 background: #f0f0f1; 6582 background: #f0f0f1;
6578 border-bottom: 1px solid #d2d2d2; 6583 border-bottom: 1px solid #d2d2d2;
6579 border-top: 1px solid #fff; 6584 border-top: 1px solid #fff;
6580 - Xmargin-left: 50px; 6585 + margin-left: 50px;
6581 padding: 0 5px; 6586 padding: 0 5px;
6582 } 6587 }
6583 6588