jro_apps/redmine Commit - r518:8614c00c8a3e

Text files can now be viewed online when browsing the repository....

Jean-Philippe Lang -

r518:8614c00c8a3e

parent child

Context file:

r518:8614c00c8a3e

Collapse all files

app/views/repositories/entry.rhtml created 644 +23 0

@@ -0,0 +1,23
	1	<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
	2
	3	<table class="list">
	4	<thead>
	5	<tr>
	6	<th colspan="2" class="list-filename"><%= @path %></th>
	7	</tr>
	8	</thead>
	9	<tbody>
	10	<% line_num = 1 %>
	11	<% @content.each_line do \|line\| %>
	12	<tr>
	13	<th class="line-num"><%= line_num %></th>
	14	<td class="line-code"><%= h(line).gsub(/\s/, ' ') %></td>
	15	</tr>
	16	<% line_num += 1 %>
	17	<% end %>
	18	<tbody>
	19	</table>
	20
	21	<% content_for :header_tags do %>
	22	<%= stylesheet_link_tag "scm" %>
	23	<% end %>

lib/redmine/mime_type.rb created 644 +58 0

@@ -0,0 +1,58
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module MimeType
	20
	21	MIME_TYPES = {
	22	'text/plain' => 'txt',
	23	'text/css' => 'css',
	24	'text/html' => 'html,htm,xhtml',
	25	'text/x-javascript' => 'js',
	26	'text/x-html-template' => 'rhtml',
	27	'text/x-ruby' => 'rb,ruby',
	28	'image/gif' => 'gif',
	29	'image/jpeg' => 'jpg,jpeg,jpe',
	30	'image/png' => 'png',
	31	'image/tiff' => 'tiff,tif'
	32	}.freeze
	33
	34	EXTENSIONS = MIME_TYPES.inject({}) do \|map, (type, exts)\|
	35	exts.split(',').each {\|ext\| map[ext] = type}
	36	map
	37	end
	38
	39	# returns mime type for name or nil if unknown
	40	def self.of(name)
	41	return nil unless name
	42	m = name.to_s.match(/\.([^\.]+)$/)
	43	EXTENSIONS[m[1]] if m
	44	end
	45
	46	def self.main_mimetype_of(name)
	47	mimetype = of(name)
	48	mimetype.split('/').first if mimetype
	49	end
	50
	51	# return true if mime-type for name is type/*
	52	# otherwise false
	53	def self.is_type?(type, name)
	54	main_mimetype = main_mimetype_of(name)
	55	type.to_s == main_mimetype
	56	end
	57	end
	58	end

app/controllers/repositories_controller.rb +4 -4

               end
               def entry
-                if 'raw' == params[:format]
+                @content = @repository.scm.cat(@path, @rev)
-                  content = @repository.scm.cat(@path, @rev)
+                show_error and return unless @content
-                  show_error and return unless content
+                if 'raw' == params[:format]
-                  send_data content, :filename => @path.split('/').last
+                  send_data @content, :filename => @path.split('/').last
                 end
               end

app/models/svn_repos.rb +5 0

                   cmd << " --username #{@login} --password #{@password}" if @login
                   cat = nil
                   shellout(cmd) do |io|
+                    io.binmode
                     cat = io.read
                   end
                   return nil if $? && $?.exitstatus != 0
                 def is_dir?
                   'dir' == self.kind
                 end
+                def is_text?
+                  Redmine::MimeType.is_type?('text', name)
+                end
               end
               class Revisions < Array

app/views/repositories/revisions.rhtml +6 -1

             <% if @entry && @entry.is_file? %>
             <h3><%=h @entry.name %></h3>
-            <p><%= link_to l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= number_to_human_size @entry.size %>)</p>
+            <p>
+            <% if @entry.is_text? %>
+            <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+            <% end %>
+            <%= link_to l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' } %>
+            (<%= number_to_human_size @entry.size %>)</p>
             <% end %>
             <h3><%= l(:label_revision_plural) %></h3>

lib/redmine.rb +1 0

             require 'redmine/version'
+            require 'redmine/mime_type'
             require 'redmine/acts_as_watchable/init'

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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