Download as
Browse Code »

Commit 59b1f0c06e520317243e0add70f2d6d570e313f2

Authored by Daniela Feitosa
1 parent 2fd0c505
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Small fixes asked by Vicente

Showing 3 changed files with 10 additions and 4 deletions   Show diff stats
app/models/uploaded_file.rb
  Diff comments   View file @59b1f0c
... ... @@ -4,7 +4,7 @@
4 4 # of the file itself is kept. (FIXME?)
5 5 class UploadedFile < Article
6 6  
7   - track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent
  7 + track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :action_tracker_target
8 8  
9 9 include ShortFilename
10 10  
... ... @@ -25,7 +25,7 @@ class UploadedFile &lt; Article
25 25 end
26 26  
27 27 def thumbnail_path
28   - self.image? ? self.full_filename(:thumb).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
  28 + self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
29 29 end
30 30  
31 31 def display_title
... ...
app/views/profile/_profile_scrap.rhtml
  Diff comments   View file @59b1f0c
... ... @@ -2,7 +2,7 @@
2 2 <div class='profile-activity-image'>
3 3 <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
4 4 </div>
5   - <% comment_balloon :class => 'profile-activity-description' do %>
  5 + <div class='profile-activity-description'>
6 6 <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
7 7 <p class='profile-activity-text'><%= txt2html scrap.content %></p>
8 8 <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
... ... @@ -13,7 +13,7 @@
13 13 </span>
14 14 <% end %>
15 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) %>
16   - <% end %>
  16 + </div>
17 17 </div>
18 18 <ul class="profile-activity-scrap-replies">
19 19 <% scrap.replies.map do |reply| %>
... ...
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @59b1f0c
... ... @@ -24,3 +24,9 @@
24 24 #profile-wall ul {
25 25 width: 460px;
26 26 }
  27 +#profile-activity ul.comment-replies,
  28 +#profile-network ul.comment-replies,
  29 +#profile-wall ul.comment-replies {
  30 + width: auto;
  31 +}
  32 +
... ...