Commit
7187815558373f091ca5a6d384885296908d90ca
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Added new files
| @@ -0,0 +1,4 @@ |
| @@ -0,0 +1,4 @@ |
| |
1
| +<%= @message %> |
| |
2
| +<% unless @activities.nil? %> |
| |
3
| + <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %> |
| |
4
| +<% end %> |
| @@ -0,0 +1,4 @@ |
| @@ -0,0 +1,4 @@ |
| |
1
| +<%= @message %> |
| |
2
| +<% unless @activities.nil? %> |
| |
3
| + <%= render :partial => 'profile_activities_scraps', :locals => {:activities => @activities} %> |
| |
4
| +<% end %> |
| @@ -0,0 +1,12 @@ |
| @@ -0,0 +1,12 @@ |
| |
1
| +<div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'> |
| |
2
| + <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'> |
| |
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 %> |
| |
5
| + <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress' } %> |
| |
6
| + <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %> |
| |
7
| + <%= hidden_field_tag 'receiver_id', scrap.sender.id %> |
| |
8
| + <% end %> |
| |
9
| + </p> |
| |
10
| + </div> |
| |
11
| + <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div> |
| |
12
| +</div> |