jro_apps/redmine Commit - r538:f8ef65e8f641

Attachments can now be added to wiki pages (original patch by Pavol Murin). Only authorized users can add/delete attachments....

Jean-Philippe Lang -

r538:f8ef65e8f641

parent child

Context file:

r538:f8ef65e8f641

Collapse all files

app/controllers/attachments_controller.rb created 644 +39 0

@@ -0,0 +1,39
	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	class AttachmentsController < ApplicationController
	19	before_filter :find_project, :check_project_privacy
	20
	21	# sends an attachment
	22	def download
	23	send_file @attachment.diskfile, :filename => @attachment.filename
	24	end
	25
	26	# sends an image to be displayed inline
	27	def show
	28	render(:nothing => true, :status => 404) and return unless @attachment.diskfile =~ /\.(jpeg\|jpg\|gif\|png)$/i
	29	send_file @attachment.diskfile, :type => "image/#{$1}", :disposition => 'inline'
	30	end
	31
	32	private
	33	def find_project
	34	@attachment = Attachment.find(params[:id])
	35	@project = @attachment.project
	36	rescue
	37	render_404
	38	end
	39	end

app/helpers/attachments_helper.rb created 644 +25 0

@@ -0,0 +1,25
	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 AttachmentsHelper
	19	# displays the links to a collection of attachments
	20	def link_to_attachments(attachments, options = {})
	21	if attachments.any?
	22	render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
	23	end
	24	end
	25	end

app/views/attachments/_form.rhtml created 644 +4 0

@@ -0,0 +1,4
	1	<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
	2	<%= image_to_function "add.png", "addFileField();return false" %></label>
	3
	4	<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>

app/views/attachments/_links.rhtml created 644 +13 0

@@ -0,0 +1,13
	1	<div class="attachments">
	2	<% for attachment in attachments %>
	3	<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' %>
	4	(<%= number_to_human_size attachment.filesize %>)
	5	<% unless options[:no_author] %>
	6	<em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em>
	7	<% end %>
	8	<% if options[:delete_url] %>
	9	<%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}), :confirm => l(:text_are_you_sure), :method => :post %>
	10	<% end %>
	11	</p>
	12	<% end %>
	13	</div>

db/migrate/050_add_wiki_attachments_permissions.rb created 644 +11 0

@@ -0,0 +1,11
	1	class AddWikiAttachmentsPermissions < ActiveRecord::Migration
	2	def self.up
	3	Permission.create :controller => 'wiki', :action => 'add_attachment', :description => 'label_attachment_new', :sort => 1750, :is_public => false, :mail_option => 0, :mail_enabled => 0
	4	Permission.create :controller => 'wiki', :action => 'destroy_attachment', :description => 'label_attachment_delete', :sort => 1755, :is_public => false, :mail_option => 0, :mail_enabled => 0
	5	end
	6
	7	def self.down
	8	Permission.find_by_controller_and_action('wiki', 'add_attachment').destroy
	9	Permission.find_by_controller_and_action('wiki', 'destroy_attachment').destroy
	10	end
	11	end

app/controllers/issues_controller.rb +2 -8

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssuesController < ApplicationController
               layout 'base', :except => :export_pdf
               before_filter :find_project, :authorize
               cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
+              helper :attachments
+              include AttachmentsHelper
               def show
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @journals_count = @issue.journals.count
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "#{Journal.table_name}.created_on desc")
               end
               def history
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on desc")
                 @journals_count = @journals.length
               end
               def export_pdf
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.id}.pdf"
               end
               def edit
                 @priorities = Enumeration::get_values('IPRI')
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
                     @issue.init_journal(self.logged_in_user)
                     # Retrieve custom fields and values
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
                     @issue.attributes = params[:issue]
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
               end
               def add_note
                 unless params[:notes].empty?
                   journal = @issue.init_journal(self.logged_in_user, params[:notes])
                   if @issue.save
                     flash[:notice] = l(:notice_successful_update)
                     Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end
                 end
                 show
                 render :action => 'show'
               end
               def change_status
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 @new_status = IssueStatus.find(params[:new_status_id])
                 if params[:confirm]
                   begin
                     journal = @issue.init_journal(self.logged_in_user, params[:notes])
                     @issue.status = @new_status
                     if @issue.update_attributes(params[:issue])
                       # Save attachments
                       params[:attachments].each { |file|
                         next unless file.size > 0
                         a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
                         journal.details << JournalDetail.new(:property => 'attachment',
                                                              :prop_key => a.id,
                                                              :value => a.filename) unless a.new_record?
                       } if params[:attachments] and params[:attachments].is_a? Array
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
               end
               def destroy
                 @issue.destroy
                 redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
               end
               def add_attachment
                 # Save the attachments
                 @attachments = []
                 journal = @issue.init_journal(self.logged_in_user)
                 params[:attachments].each { |file|
                   next unless file.size > 0
                   a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
                   @attachments << a unless a.new_record?
                   journal.details << JournalDetail.new(:property => 'attachment',
                                                        :prop_key => a.id,
                                                        :value => a.filename) unless a.new_record?
                 } if params[:attachments] and params[:attachments].is_a? Array
                 journal.save if journal.details.any?
                 Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
                 a = @issue.attachments.find(params[:attachment_id])
                 a.destroy
                 journal = @issue.init_journal(self.logged_in_user)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => a.id,
                                                      :old_value => a.filename)
                 journal.save
                 redirect_to :action => 'show', :id => @issue
               end
-              # Send the file in stream mode
-              def download
-                @attachment = @issue.attachments.find(params[:attachment_id])
-                send_file @attachment.diskfile, :filename => @attachment.filename
-              rescue
-                render_404
-              end
             private
               def find_project
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
                 @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/messages_controller.rb +3 -7

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MessagesController < ApplicationController
               layout 'base'
               before_filter :find_project, :check_project_privacy
               before_filter :require_login, :only => [:new, :reply]
               verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
+              helper :attachments
+              include AttachmentsHelper
               def show
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?
               end
               def new
                 @message = Message.new(params[:message])
                 @message.author = logged_in_user
                 @message.board = @board
                 if request.post? && @message.save
                   params[:attachments].each { |file|
                     next unless file.size > 0
                     Attachment.create(:container => @message, :file => file, :author => logged_in_user)
                   } if params[:attachments] and params[:attachments].is_a? Array
                   redirect_to :action => 'show', :id => @message
                 end
               end
               def reply
                 @reply = Message.new(params[:reply])
                 @reply.author = logged_in_user
                 @reply.board = @board
                 @message.children << @reply
                 redirect_to :action => 'show', :id => @message
               end
-              def download
-                @attachment = @message.attachments.find(params[:attachment_id])
-                send_file @attachment.diskfile, :filename => @attachment.filename
-              rescue
-                render_404
-              end
             private
               def find_project
                 @board = Board.find(params[:board_id], :include => :project)
                 @project = @board.project
                 @message = @board.topics.find(params[:id]) if params[:id]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/wiki_controller.rb +24 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WikiController < ApplicationController
               layout 'base'
-              before_filter :find_wiki, :check_project_privacy, :except => [:preview]
+              before_filter :find_wiki, :check_project_privacy
-              before_filter :authorize, :only => :destroy
+              before_filter :authorize, :only => [:destroy, :add_attachment, :destroy_attachment]
-              verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
+              verify :method => :post, :only => [:destroy, :destroy_attachment], :redirect_to => { :action => :index }
+              helper :attachments
+              include AttachmentsHelper
               # display a page (in editing mode if it doesn't exist)
               def index
                 page_title = params[:page]
                 @page = @wiki.find_or_new_page(page_title)
                 if @page.new_record?
                   edit
                   render :action => 'edit' and return
                 end
                 @content = @page.content_for_version(params[:version])
                 if params[:export] == 'html'
                   export = render_to_string :action => 'export', :layout => false
                   send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
                   return
                 elsif params[:export] == 'txt'
                   send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
                   return
                 end
                 render :action => 'show'
               end
               # edit an existing page or a new one
               def edit
                 @page = @wiki.find_or_new_page(params[:page])
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
                 @content = @page.content_for_version(params[:version])
                 @content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
                 if request.post?
                   if @content.text == params[:content][:text]
                     # don't save if text wasn't changed
                     redirect_to :action => 'index', :id => @project, :page => @page.title
                     return
                   end
                   @content.text = params[:content][:text]
                   @content.comments = params[:content][:comments]
                   @content.author = logged_in_user
                   # if page is new @page.save will also save content, but not if page isn't a new record
                   if (@page.new_record? ? @page.save : @content.save)
                     redirect_to :action => 'index', :id => @project, :page => @page.title
                   end
                 end
               end
               # show page history
               def history
                 @page = @wiki.find_page(params[:page])
                 # don't load text
                 @versions = @page.content.versions.find :all,
                                                         :select => "id, author_id, comments, updated_on, version",
                                                         :order => 'version DESC'
               end
               # remove a wiki page and its history
               def destroy
                 @page = @wiki.find_page(params[:page])
                 @page.destroy if @page
                 redirect_to :action => 'special', :id => @project, :page => 'Page_index'
               end
               # display special pages
               def special
                 page_title = params[:page].downcase
                 case page_title
                 # show pages index, sorted by title
                 when 'page_index'
                   # eager load information about last updates, without loading text
                   @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
                                                   :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
                                                   :order => 'title'
                 # export wiki to a single html file
                 when 'export'
                   @pages = @wiki.pages.find :all, :order => 'title'
                   export = render_to_string :action => 'export_multiple', :layout => false
                   send_data(export, :type => 'text/html', :filename => "wiki.html")
                   return
                 else
                   # requested special page doesn't exist, redirect to default page
                   redirect_to :action => 'index', :id => @project, :page => nil and return
                 end
                 render :action => "special_#{page_title}"
               end
               def preview
+                page = @wiki.find_page(params[:page])
+                @attachements = page.attachments if page
                 @text = params[:content][:text]
                 render :partial => 'preview'
               end
+              def add_attachment
+                @page = @wiki.find_page(params[:page])
+                # Save the attachments
+                params[:attachments].each { |file|
+                  next unless file.size > 0
+                  a = Attachment.create(:container => @page, :file => file, :author => logged_in_user)
+                } if params[:attachments] and params[:attachments].is_a? Array
+                redirect_to :action => 'index', :page => @page.title
+              end
+              def destroy_attachment
+                @page = @wiki.find_page(params[:page])
+                @page.attachments.find(params[:attachment_id]).destroy
+                redirect_to :action => 'index', :page => @page.title
+              end
             private
               def find_wiki
                 @project = Project.find(params[:id])
                 @wiki = @project.wiki
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/helpers/application_helper.rb +18 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RedCloth
               # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
               # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
               def hard_break( text )
                 text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
               end
             end
             module ApplicationHelper
               # Return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
               # Return true if user is logged in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def link_to_issue(issue)
                 link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime((time.is_a? String) ? time.to_time : time) if time
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => "content", :url => options.merge(:page => paginator.current.previous)},
                                         {:href => url_for(:params => options.merge(:page => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
                                   {:url => {:params => options.merge(:page => n)}, :update => 'content'},
                                   {:href => url_for(:params => options.merge(:page => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => "content", :url => options.merge(:page => paginator.current.next)},
                                              {:href => url_for(:params => options.merge(:page => paginator.current.next))}) if paginator.current.next
                 html
               end
               # textilize text according to system settings and RedCloth availability
               def textilizable(text, options = {})
                 return "" if text.blank?
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|title| "##{title}" }
                 else
                   if @project
                     format_wiki_link = Proc.new {|title| url_for :controller => 'wiki', :action => 'index', :id => @project, :page => title }
                   else
                     format_wiki_link = Proc.new {|title| title }
                   end
                 end
                 # turn wiki links into textile links:
                 # example:
                 #   [[link]] -> "link":link
                 #   [[link|title]] -> "title":link
                 text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }
                 # turn issue ids into links
                 # example:
                 #   #52 -> <a href="/issues/show/52">#52</a>
                 text = text.gsub(/#(\d+)(?=\b)/) {|m| link_to "##{$1}", :controller => 'issues', :action => 'show', :id => $1}
                 # turn revision ids into links (@project needed)
                 # example:
                 #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (@project.id is 6)
                 text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| link_to "r#{$1}", :controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1} if @project
+                # when using an image link, try to use an attachment, if possible
+                attachments = options[:attachments]
+                if attachments
+                  text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+                    align = $1
+                    filename = $2
+                    rf = Regexp.new(filename,  Regexp::IGNORECASE)
+                    # search for the picture in attachments
+                    if found = attachments.detect { |att| att.filename =~ rf }
+                      image_url = url_for :controller => 'attachments', :action => 'show', :id => found.id
+                      "!#{align}#{image_url}!"
+                    else
+                      "!#{align}#{filename}!"
+                    end
+                  end
+                end
                 # finally textilize text
                 @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
                 text = @do_textilize ? auto_link(RedCloth.new(text, [:hard_breaks]).to_html) : simple_format(auto_link(h(text)))
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html].store :class, "tabular"
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def calendar_for(field_id)
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def wikitoolbar_for(field_id)
                 return '' unless Setting.text_formatting == 'textile'
                 javascript_include_tag('jstoolbar') + javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
               end
             end
             class TabularFormBuilder < ActionView::Helpers::FormBuilder
               include GLoc
               def initialize(object_name, object, template, options, proc)
                 set_language_if_valid options.delete(:lang)
                 @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
               end
               (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   return super if options.delete :no_label
                   label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                   label = @template.content_tag("label", label_text,
                                 :class => (@object && @object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {}, html_options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object && @object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

app/models/attachment.rb +5 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/md5"
             class Attachment < ActiveRecord::Base
               belongs_to :container, :polymorphic => true
               belongs_to :author, :class_name => "User", :foreign_key => "author_id"
               validates_presence_of :container, :filename
               cattr_accessor :storage_path
               @@storage_path = "#{RAILS_ROOT}/files"
               def validate
                 errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
               end
             	def file=(incomming_file)
             		unless incomming_file.nil?
             			@temp_file = incomming_file
             			if @temp_file.size > 0
             				self.filename = sanitize_filename(@temp_file.original_filename)
             				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
             				self.content_type = @temp_file.content_type
             				self.filesize = @temp_file.size
             			end
             		end
             	end
             	def file
             	 nil
             	end
             	# Copy temp file to its final location
             	def before_save
             		if @temp_file && (@temp_file.size > 0)
             			logger.debug("saving '#{self.diskfile}'")
             			File.open(diskfile, "wb") do |f|
             				f.write(@temp_file.read)
             			end
             			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
             		end
             	end
             	# Deletes file on the disk
             	def after_destroy
             		if self.filename?
             			File.delete(diskfile) if File.exist?(diskfile)
             		end
             	end
             	# Returns file's location on disk
             	def diskfile
             		"#{@@storage_path}/#{self.disk_filename}"
             	end
               def increment_download
                 increment!(:downloads)
               end
             	# returns last created projects
             	def self.most_downloaded
             		find(:all, :limit => 5, :order => "downloads DESC")
             	end
+              def project
+                container.is_a?(Project) ? container : container.project
+              end
             private
               def sanitize_filename(value)
                   # get only the filename, not the whole path
                   just_filename = value.gsub(/^.*(\\|\/)/, '')
                   # NOTE: File.basename doesn't work right with Windows paths on Unix
                   # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
                   # Finally, replace all non alphanumeric, underscore or periods with underscore
                   @filename = just_filename.gsub(/[^\w\.\-]/,'_')
               end
             end

app/models/message.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Message < ActiveRecord::Base
               belongs_to :board
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               has_many :attachments, :as => :container, :dependent => :destroy
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
               validates_presence_of :subject, :content
               validates_length_of :subject, :maximum => 255
               def after_create
                 board.update_attribute(:last_message_id, self.id)
                 board.increment! :messages_count
                 if parent
                   parent.reload.update_attribute(:last_reply_id, self.id)
                 else
                   board.increment! :topics_count
                 end
               end
+              def project
+                board.project
+              end
             end

app/models/wiki.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Wiki < ActiveRecord::Base
               belongs_to :project
               has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
               validates_presence_of :start_page
               validates_format_of :start_page, :with => /^[^,\.\/\?\;\|]*$/
               # find the page with the given title
               # if page doesn't exist, return a new page
               def find_or_new_page(title)
                 title = Wiki.titleize(title || start_page)
                 find_page(title) || WikiPage.new(:wiki => self, :title => title)
               end
               # find the page with the given title
               def find_page(title)
-                pages.find_by_title(Wiki.titleize(title || start_page))
+                title = start_page if title.blank?
+                pages.find_by_title(Wiki.titleize(title))
               end
               # turn a string into a valid page title
               def self.titleize(title)
                 # replace spaces with _ and remove unwanted caracters
                 title = title.gsub(/\s+/, '_').delete(',./?;|') if title
                 # upcase the first letter
                 title = title[0..0].upcase + title[1..-1] if title
                 title
               end
             end

app/models/wiki_page.rb +5 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WikiPage < ActiveRecord::Base
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
+              has_many :attachments, :as => :container, :dependent => :destroy
               validates_presence_of :title
               validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
               def before_save
                 self.title = Wiki.titleize(title)
               end
               def pretty_title
                 WikiPage.pretty_title(title)
               end
               def content_for_version(version=nil)
                 result = content.versions.find_by_version(version.to_i) if version
                 result ||= content
                 result
               end
               def self.pretty_title(str)
                 (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
+              def project
+                wiki.project
+              end
             end

app/views/issues/show.rhtml +8 -18

             <div class="contextual">
             <%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
             </div>
             <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
             <div class="box">
             <table width="100%">
             <tr>
                 <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
                 <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
                 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td>
                 <td><b><%=l(:field_start_date)%> :</b></td><td><%= format_date(@issue.start_date) %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td>
                 <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>
                 <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
             </tr>
             <tr>
                 <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>
                 <td><b><%=l(:label_spent_time)%> :</b></td>
                 <td><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
             </tr>
             <tr>
             <% n = 0
             for custom_value in @custom_values %>
                 <td><b><%= custom_value.custom_field.name %> :</b></td><td><%= h(show_value(custom_value)) %></td>
             <% n = n + 1
                if (n > 1)
                     n = 0 %>
                     </tr><tr>
              <%end
             end %>
             </tr>
             </table>
             <hr />
             <% if @issue.changesets.any? %>
             <div style="float:right;">
               <em><%= l(:label_revision_plural) %>: <%= @issue.changesets.collect{|changeset| link_to(changeset.revision, :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision)}.join(", ") %></em>
             </div>
             <% end %>
             <b><%=l(:field_description)%> :</b><br /><br />
-            <%= textilizable @issue.description %>
+            <%= textilizable @issue.description, :attachments => @issue.attachments %>
             <br />
             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
             <%= watcher_tag(@issue, @logged_in_user) %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
             <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
               <% form_tag({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
               <%=l(:label_change_status)%> :
               <select name="new_status_id">
               <%= options_from_collection_for_select @status_options, "id", "name" %>
               </select>
               <%= submit_tag l(:button_change) %>
               <% end %>
             <% end %>
             &nbsp;
             </div>
             <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
             <div id="relations" class="box">
             <%= render :partial => 'relations' %>
             </div>
             <% end %>
             <div id="history" class="box">
             <h3><%=l(:label_history)%>
             <% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
             <%= render :partial => 'history', :locals => { :journals => @journals } %>
             <% if @journals_count > @journals.length %>
                 <p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p>
             <% end %>
             </div>
             <div class="box">
             <h3><%=l(:label_attachment_plural)%></h3>
-            <table width="100%">
+            <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
-            <% for attachment in @issue.attachments %>
-            <tr>
-            <td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
-            <td><%= format_date(attachment.created_on) %></td>
-            <td><%= attachment.author.display_name %></td>
-            <td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td>
-            </tr>
-            <% end %>
-            </table>
-            <br />
             <% if authorize_for('issues', 'add_attachment') %>
-              <% form_tag({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
+            <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
-              <p id="attachments_p"><label><%=l(:label_attachment_new)%>
+            <% form_tag({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
-              <%= image_to_function "add.png", "addFileField();return false" %></label>
+              <%= render :partial => 'attachments/form' %>
-              <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <%= submit_tag l(:button_add) %>
-              <%= submit_tag l(:button_add) %>
+            <% end %>
-              <% end %>
             <% end %>
             </div>
             <% if authorize_for('issues', 'add_note') %>
               <div class="box">
               <h3><%= l(:label_add_note) %></h3>
               <% form_tag({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
               <p><label for="notes"><%=l(:field_notes)%></label>
                 <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit'  %></p>
               <%= submit_tag l(:button_add) %>
               <% end %>
               </div>
             <% end %>

app/views/messages/_form.rhtml +1 -4

             <%= error_messages_for 'message' %>
             <div class="box">
             <!--[form:message]-->
             <p><label><%= l(:field_subject) %></label><br />
             <%= f.text_field :subject, :required => true, :size => 80 %></p>
             <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15 %></p>
             <%= wikitoolbar_for 'message_content' %>
             <!--[eoform:message]-->
             <span class="tabular">
-            <p id="attachments_p"><label><%=l(:label_attachment)%>
+            <%= render :partial => 'attachments/form' %>
-            <%= image_to_function "add.png", "addFileField();return false" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
-            </span>
             </div>

app/views/messages/show.rhtml +4 -9

             <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
             <p><em><%= @message.author.name %>, <%= format_time(@message.created_on) %></em></p>
             <div class="wiki">
-            <%= textilizable(@message.content) %>
+            <%= textilizable(@message.content, :attachments => @message.attachments) %>
             </div>
-            <div class="attachments">
+            <%= link_to_attachments @message.attachments, :no_author => true %>
-            <% @message.attachments.each do |attachment| %>
-            <%= link_to attachment.filename, { :action => 'download', :id => @message, :attachment_id => attachment }, :class => 'icon icon-attachment' %>
-            (<%= number_to_human_size(attachment.filesize) %>)<br />
-            <% end %>
-            </div>
-            <br />
             <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
             <% @message.children.each do |message| %>
               <a name="<%= "message-#{message.id}" %>"></a>
               <h4><%=h message.subject %> - <%= message.author.name %>, <%= format_time(message.created_on) %></h4>
               <div class="wiki"><p><%= textilizable message.content %></p></div>
             <% end %>
             <% if @logged_in_user %>
             <p><%= toggle_link l(:button_reply), "reply", :focus => "reply_content" %></p>
             <div id="reply" style="display:none;">
             <%= error_messages_for 'message' %>
             <% form_for :reply, @reply, :url => {:action => 'reply', :id => @message} do |f| %>
               <p><%= f.text_field :subject, :required => true, :size => 60 %></p>
               <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 10 %></p>
               <p><%= submit_tag l(:button_submit) %></p>
             <% end %>
             </div>
-            <% end %>
  No newline at end of file
+            <% end %>

app/views/wiki/_preview.rhtml +1 -1

             <fieldset class="preview"><legend><%= l(:label_preview) %></legend>
-            <%= textilizable @text %>
+            <%= textilizable @text, :attachments => @attachements %>
             </fieldset>

app/views/wiki/show.rhtml +12 -2

             <div class="contextual">
             <%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
             <%= link_to(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
             <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
             <%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
             </div>
             <% if @content.version != @page.content.version %>
                 <p>
                 <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
                 <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}"  %> -
                 <%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
                 <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
                 <br />
                 <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
                 <%=h @content.comments %>
                 </p>
                 <hr />
             <% end %>
             <div class="wiki">
             <% cache "wiki/show/#{@page.id}/#{@content.version}" do %>
-            <%= textilizable @content.text %>
+            <%= textilizable @content.text, :attachments => @page.attachments %>
             <% end %>
             </div>
+            <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
             <%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
-            </div>
  No newline at end of file
+            </div>
+            <% if authorize_for('wiki', 'add_attachment') %>
+            <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
+            <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
+              <%= render :partial => 'attachments/form' %>
+            <%= submit_tag l(:button_add) %>
+            <% end %>
+            <% end %>

public/stylesheets/application.css +2 -1

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             margin:0;
             }
             a{color:#467aa7;font-weight:bold;text-decoration:none;background-color:inherit;}
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{margin:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:0;
             padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             }
             #header{
             height:4.5em;
             margin:0;
             background:#467aa7;
             color:#ffffff;
             margin-bottom:1px;
             }
             #header h1{
             padding:10px 0 0 20px;
             font-size:2em;
             background-color:inherit;
             color:#fff;
             letter-spacing:-1px;
             font-weight:bold;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header h2{
             margin:3px 0 0 40px;
             font-size:1.5em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header a {color:#fff;}
             #navigation{
             height:2.2em;
             line-height:2.2em;
             margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             #navigation li.submenu {background:url(../images/arrow_down.png) 96% 80% no-repeat;}
             #navigation li.submenu a {padding:0px 16px 0px 22px;}
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons *******************/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             vertical-align: middle;
             }
             #navigation .icon {
             background-position: 4px 50%;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-pdf { background-image: url(../images/pdf.png); }
             .icon-csv { background-image: url(../images/csv.png); }
             .icon-html { background-image: url(../images/html.png); }
             .icon-txt { background-image: url(../images/txt.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-feed  { background-image: url(../images/feed.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             /**************** Content styles ****************/
             html>body #content {
             height: auto;
             min-height: 500px;
             }
             #content{
             width: auto;
             height:500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2, #content div.wiki h1 {
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
             #content h4{font-size: 1em; margin-bottom: 12px; margin-top: 20px; font-weight: normal; border-bottom: dotted 1px #c0c0c0;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             #content .tabs{height: 2.6em;}
             #content .tabs ul{margin:0;}
             #content .tabs ul li{
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1em;
             padding:4px;
             border: 1px solid #c0c0c0;
             }
             #content .tabs ul li a.selected, #content .tabs ul li a:hover{
             background-color: #80b0da;
             border: 1px solid #80b0da;
             color: #fff;
             text-decoration:none;
             }
             /***********************************************/
             form {display: inline;}
             blockquote {padding-left: 6px; border-left: 2px solid #ccc;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             input.button-small {font-size: 0.8em;}
             textarea.wiki-edit { width: 99.5%; }
             .select-small {font-size: 0.8em;}
             label {font-weight: bold; font-size: 1em; color: #505050;}
             fieldset {border:1px solid #c0c0c0; padding: 6px;}
             legend {color: #505050;}
             .required {color: #bb0000;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             hr { border:0; border-top: dotted 1px #fff; border-bottom: dotted 1px #c0c0c0; }
             table p {margin:0; padding:0;}
             .highlight { background-color: #FCFD8D;}
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .4em .5em 0 0;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             ul.documents {
             list-style-type: none;
             padding: 0;
             margin: 0;
             }
             ul.documents li {
             background-image: url(../images/32x32/file.png);
             background-repeat: no-repeat;
             background-position: 0 1px;
             padding-left: 36px;
             margin-bottom: 10px;
             margin-left: -37px;
             }
             /********** Table used to display lists of things ***********/
             table.list {
                 width:100%;
                 border-collapse: collapse;
                 border: 1px dotted #d0d0d0;
                 margin-bottom: 6px;
             }
             table.with-cells td {
                 border: 1px solid #d7d7d7;
             }
             table.list td {
                 padding:2px;
             }
             table.list thead th {
                 text-align: center;
                 background: #eee;
                 border: 1px solid #d7d7d7;
                 color: #777;
             }
             table.list tbody th {
             	font-weight: bold;
                 background: #eed;
                 border: 1px solid #d7d7d7;
                 color: #777;
             }
             /********** Validation error messages *************/
             #errorExplanation {
               width: 400px;
               border: 0;
               padding: 7px;
               padding-bottom: 3px;
               margin-bottom: 0px;
             }
             #errorExplanation h2 {
               text-align: left;
               font-weight: bold;
               padding: 5px 5px 10px 26px;
               font-size: 1em;
               margin: -7px;
               background: url(../images/alert.png) no-repeat 6px 6px;
             }
             #errorExplanation p {
               color: #333;
               margin-bottom: 0;
               padding: 5px;
             }
             #errorExplanation ul li {
               font-size: 1em;
               list-style: none;
               margin-left: -16px;
             }
             /*==========  Drop down menu  ==============*/
             div.menu {
               background-color: #FFFFFF;
               border-style: solid;
               border-width: 1px;
               border-color: #7F9DB9;
               position: absolute;
               top: 0px;
               left: 0px;
               padding: 0;
               visibility: hidden;
               z-index: 101;
             }
             div.menu a.menuItem {
               font-size: 10px;
               font-weight: normal;
               line-height: 2em;
               color: #000000;
               background-color: #FFFFFF;
               cursor: default;
               display: block;
               padding: 0 1em;
               margin: 0;
               border: 0;
               text-decoration: none;
               white-space: nowrap;
             }
             div.menu a.menuItem:hover, div.menu a.menuItemHighlight {
               background-color: #80b0da;
               color: #ffffff;
             }
             div.menu a.menuItem span.menuItemText {}
             div.menu a.menuItem span.menuItemArrow {
               margin-right: -.75em;
             }
             /**************** Sidebar styles ****************/
             #subcontent{
             position: absolute;
             left: 0px;
             width:95px;
             padding:20px 20px 10px 5px;
             overflow: hidden;
             }
             #subcontent h2{
             display:block;
             margin:0 0 5px 0;
             font-size:1.0em;
             font-weight:bold;
             text-align:left;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             padding:5px 0;
             margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             .rightbox{
             background: #fafbfc;
             border: 1px solid #c0c0c0;
             float: right;
             padding: 8px;
             position: relative;
             margin: 0 5px 5px;
             }
-            div.attachments {padding-left: 6px; border-left: 2px solid #ccc;}
+            div.attachments {padding-left: 6px; border-left: 2px solid #ccc; margin-bottom: 8px;}
+            div.attachments p {margin-bottom:2px;}
             .overlay{
             position: absolute;
             margin-left:0;
             z-index: 50;
             }
             .layout-active {
             background: #ECF3E1;
             }
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             .login {
             width: 50%;
             text-align: left;
             }
             img.calendar-trigger {
                 cursor: pointer;
                 vertical-align: middle;
                 margin-left: 4px;
             }
             #history p {
                 margin-left: 34px;
             }
             .progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 padding: 3px;
                 width: 40em;
                 text-align: center;
             }
             .progress td { height: 1em; }
             .progress .closed { background: #BAE0BA none repeat scroll 0%; }
             .progress .open { background: #FFF none repeat scroll 0%; }
             /***** Contextual links div *****/
             .contextual {
             float: right;
             font-size: 0.8em;
             line-height: 16px;
             padding: 2px;
             }
             .contextual select, .contextual input {
             font-size: 1em;
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** CSS FORM ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .error {
             color: #cc0000;
             }
             #settings .tabular p{ padding-left: 300px; }
             #settings .tabular label{ margin-left: -300px; width: 295px; }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
             to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
             */
             * html .threepxfix{
             margin-left: 3px;
             }
             /***** Wiki sections ****/
             #content div.wiki { font-size: 110%}
             #content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
             #content div.wiki h2 { font-size: 1.4em;}
             #content div.wiki h3 { font-size: 1.2em;}
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
             }
             div.wiki table, div.wiki td {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki code {
                 font-size: 1.2em;
             }
             #preview .preview { background: #fafbfc url(../images/draft.png); }
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             -moz-opacity:0.5;
             opacity: 0.5;
             -khtml-opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }

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