Commit 59b1f0c06e520317243e0add70f2d6d570e313f2
1 parent
2fd0c505
Exists in
master
and in
28 other branches
Small fixes asked by Vicente
Showing
3 changed files
with
10 additions
and
4 deletions
Show diff stats
app/models/uploaded_file.rb
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | # of the file itself is kept. (FIXME?) | 4 | # of the file itself is kept. (FIXME?) |
| 5 | class UploadedFile < Article | 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 | include ShortFilename | 9 | include ShortFilename |
| 10 | 10 | ||
| @@ -25,7 +25,7 @@ class UploadedFile < Article | @@ -25,7 +25,7 @@ class UploadedFile < Article | ||
| 25 | end | 25 | end |
| 26 | 26 | ||
| 27 | def thumbnail_path | 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 | end | 29 | end |
| 30 | 30 | ||
| 31 | def display_title | 31 | def display_title |
app/views/profile/_profile_scrap.rhtml
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div class='profile-activity-image'> | 2 | <div class='profile-activity-image'> |
| 3 | <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %> | 3 | <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %> |
| 4 | </div> | 4 | </div> |
| 5 | - <% comment_balloon :class => 'profile-activity-description' do %> | 5 | + <div class='profile-activity-description'> |
| 6 | <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p> | 6 | <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p> |
| 7 | <p class='profile-activity-text'><%= txt2html scrap.content %></p> | 7 | <p class='profile-activity-text'><%= txt2html scrap.content %></p> |
| 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> |
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | </span> | 13 | </span> |
| 14 | <% end %> | 14 | <% end %> |
| 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) %> | 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 | </div> | 17 | </div> |
| 18 | <ul class="profile-activity-scrap-replies"> | 18 | <ul class="profile-activity-scrap-replies"> |
| 19 | <% scrap.replies.map do |reply| %> | 19 | <% scrap.replies.map do |reply| %> |
public/designs/templates/default/stylesheets/style.css