jro_apps/redmine Commit - r14942:2fbce6515d6f

Add inline image preview/display for attachments and repository entries (#22058)....

Jean-Philippe Lang -

r14942:2fbce6515d6f

parent child

Context file:

r14942:2fbce6515d6f

app/views/attachments/image.html.erb created 644 +3 0

@@ -0,0 +1,3
	1	<%= render :layout => 'layouts/file' do %>
	2	<%= render :partial => 'common/image', :locals => {:path => download_named_attachment_url(@attachment, @attachment.filename), :alt => @attachment.filename} %>
	3	<% end %>

app/views/common/_image.html.erb created 644 +1 0

	@@ -0,0 +1,1
				1	<%= image_tag path, :alt => alt, :class => 'filecontent image' %>

app/controllers/attachments_controller.rb +2 0

                     elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
                       @content = File.read(@attachment.diskfile, :mode => "rb")
                       render :action => 'file'
+                    elsif @attachment.is_image?
+                      render :action => 'image'
                     else
                       download
                     end

app/controllers/repositories_controller.rb +3 -1

                 @content = @repository.cat(@path, @rev)
                 (show_error_not_found; return) unless @content
-                if is_raw ||
+                if !is_raw && Redmine::MimeType.is_type?('image', @path)
+                  # simply render
+                elsif is_raw ||
                      (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
                      ! is_entry_text_data?(@content, @path)
                   # Force the download

app/models/attachment.rb +4 0

                 Redmine::MimeType.is_type?('text', filename)
               end
+              def is_image?
+                Redmine::MimeType.is_type?('image', filename)
+              end
               def is_diff?
                 self.filename =~ /\.(patch|diff)$/i
               end

app/views/attachments/_links.html.erb +1 -1

             </div>
             <% for attachment in attachments %>
             <p><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
-              <% if attachment.is_text? %>
+              <% if attachment.is_text? || attachment.is_image? %>
                 <%= link_to l(:button_view),
                             { :controller => 'attachments', :action => 'show',
                               :id => attachment, :filename => attachment.filename },

app/views/repositories/entry.html.erb +4 0

             <%= render :partial => 'link_to_functions' %>
+            <% if Redmine::MimeType.is_type?('image', @path) %>
+              <%= render :partial => 'common/image', :locals => {:path => url_for(params.merge(:action => 'raw')), :alt => @path} %>
+            <% else %>
             <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
+            <% end %>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>

public/stylesheets/scm.css +2 0

             table.filecontent tr:target th.line-num { background-color:#E0E0E0; color: #777; }
             table.filecontent tr:target td.line-code { background-color:#DDEEFF; }
+            img.filecontent.image { max-width: 100%; }
             /* 12 different colors for the annonate view */
             table.annotate tr.bloc-0 {background: #FFFFBF;}
             table.annotate tr.bloc-1 {background: #EABFFF;}

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages