Download as
Browse Code »

Commit 38ea8816a68bf31aa3357fa18b6610c77e97b34c

Authored by Daniela Feitosa
1 parent 727baee6
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

Fixed problem wits scrap reply

Showing 4 changed files with 13 additions and 4 deletions   Show diff stats
app/views/profile/_create_article.rhtml
  Diff comments   View file @38ea881
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %> 10 <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
11 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p> 11 <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
12 <div class='profile-wall-actions'> 12 <div class='profile-wall-actions'>
13 - <%= link_to _('Comment'), "#reply_content_#{activity.id}" %> 13 + <%= link_to_function _('Comment'), "$('reply_content_#{activity.id}').focus()" %>
14 <%= 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 %> 14 <%= 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 %>
15 </div> 15 </div>
16 </div> 16 </div>
app/views/profile/_default_activity.rhtml
  Diff comments   View file @38ea881
@@ -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 _('Comment'), "#reply_content_#{activity.id}" %> 8 + <%= link_to_function _('Comment'), "$('reply_content_#{activity.id}').focus()" %>
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_scrap.rhtml
  Diff comments   View file @38ea881
@@ -8,7 +8,9 @@ @@ -8,7 +8,9 @@
8 <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p> 8 <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
9 <div class='profile-wall-actions'> 9 <div class='profile-wall-actions'>
10 <% if logged_in? && current_person.follows?(scrap.sender) %> 10 <% if logged_in? && current_person.follows?(scrap.sender) %>
11 - <span class='profile-activity-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-activity-reply-response-#{scrap.id}'],['#profile-activity-reply-#{scrap.id}', '#profile-activity-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span> 11 + <span class='profile-activity-send-reply'>
  12 + <%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %>
  13 + </span>
12 <% end %> 14 <% end %>
13 <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %> 15 <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
14 <% end %> 16 <% end %>
app/views/profile/_profile_scrap_reply_form.rhtml
  Diff comments   View file @38ea881
@@ -2,7 +2,14 @@ @@ -2,7 +2,14 @@
2 <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'> 2 <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>
3 <p class='profile-wall-reply'> 3 <p class='profile-wall-reply'>
4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %> 4 <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
5 - <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress' } %> 5 + <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}",
  6 + :cols => 50,
  7 + :rows => 1,
  8 + :class => 'submit-with-keypress',
  9 + :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
  10 + :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
  11 +
  12 + } %>
6 <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %> 13 <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>
7 <%= hidden_field_tag 'receiver_id', scrap.sender.id %> 14 <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
8 <% end %> 15 <% end %>