Commit 14d0ef8f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Show images preview in notes. Show line additions/deletions for commit

parent ef5b36ea
...@@ -11,7 +11,7 @@ class Commit ...@@ -11,7 +11,7 @@ class Commit
attr_accessor :commit, :head, :refs attr_accessor :commit, :head, :refs
delegate :message, :authored_date, :committed_date, :parents, :sha, delegate :message, :authored_date, :committed_date, :parents, :sha,
:date, :committer, :author, :diffs, :tree, :id, :date, :committer, :author, :diffs, :tree, :id, :stats,
:to_patch, to: :commit :to_patch, to: :commit
class << self class << self
......
# encoding: utf-8 # encoding: utf-8
class AttachmentUploader < CarrierWave::Uploader::Base class AttachmentUploader < CarrierWave::Uploader::Base
# Include RMagick or ImageScience support:
# include CarrierWave::RMagick
# include CarrierWave::MiniMagick
# include CarrierWave::ImageScience
# Choose what kind of storage to use for this uploader:
storage :file storage :file
# storage :fog
# Override the directory where uploaded files will be stored.
# This is a sensible default for uploaders that are meant to be mounted:
def store_dir def store_dir
"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end end
# Provide a default URL as a default if there hasn't been a file uploaded: def image?
# def default_url %w(png jpg jpeg).include?(file.extension)
# "/images/fallback/" + [version_name, "default.png"].compact.join('_') end
# end
# Process files as they are uploaded:
# process scale: [200, 300]
#
# def scale(width, height)
# # do something
# end
# Create different versions of your uploaded files:
# version :thumb do
# process scale: [50, 50]
# end
# Add a white list of extensions which are allowed to be uploaded.
# For images you might use something like this:
# def extension_white_list
# %w(jpg jpeg gif png)
# end
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
# def filename
# "something.jpg" if original_filename
# end
end end
= render "commits/commit_box" = render "commits/commit_box"
%p.right
This commit has
%span.cgreen #{@commit.stats.additions} additions
and
%span.cred #{@commit.stats.deletions} deletions
= render "commits/diffs", diffs: @commit.diffs = render "commits/diffs", diffs: @commit.diffs
= render "notes/notes_with_form", tid: @commit.id, tt: "commit" = render "notes/notes_with_form", tid: @commit.id, tt: "commit"
= render "notes/per_line_form" = render "notes/per_line_form"
:javascript :javascript
$(function(){ $(function(){
PerLineNotes.init(); PerLineNotes.init();
...@@ -19,7 +25,7 @@ ...@@ -19,7 +25,7 @@
, h = event.currentTarget.naturalHeight; , h = event.currentTarget.naturalHeight;
$('.image.diff_added .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px'); $('.image.diff_added .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
}, this)); }, this));
}); });
}); });
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
= preserve do = preserve do
= markdown(note.note) = markdown(note.note)
- if note.attachment.url - if note.attachment.url
- if note.attachment.image?
= image_tag note.attachment.url, class: 'thumbnail span4'
.right .right
%div.file %div.file
= link_to note.attachment_identifier, note.attachment.url, target: "_blank" = link_to note.attachment_identifier, note.attachment.url, target: "_blank"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment