jro_apps/redmine Commit - r9754:7b40767428ac

Deprecated :confirm => 'Text' option....

Jean-Philippe Lang -

r9754:7b40767428ac

parent child

Context file:

r9754:7b40767428ac

Expand all files

app/helpers/application_helper.rb +10 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2012  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 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               include Redmine::I18n
               include GravatarHelper::PublicMethods
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               #
               # @param [String] name Anchor text (passed to link_to)
               # @param [Hash] options Hash params. This will checked by authorize_for to see if the user is authorized
               # @param [optional, Hash] html_options Options passed to link_to
               # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to
               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] || params[:controller], options[:action])
               end
               # Display a link to remote if user is authorized
               def link_to_remote_if_authorized(name, options = {}, html_options = nil)
                 url = options[:url] || {}
                 link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
               end
               # Displays a link to user's account page if active
               def link_to_user(user, options={})
                 if user.is_a?(User)
                   name = h(user.name(options[:format]))
                   if user.active?
                     link_to name, :controller => 'users', :action => 'show', :id => user
                   else
                     name
                   end
                 else
                   h(user.to_s)
                 end
               end
               # Displays a link to +issue+ with its subject.
               # Examples:
               #
               #   link_to_issue(issue)                        # => Defect #6: This is the subject
               #   link_to_issue(issue, :truncate => 6)        # => Defect #6: This i...
               #   link_to_issue(issue, :subject => false)     # => Defect #6
               #   link_to_issue(issue, :project => true)      # => Foo - Defect #6
               #
               def link_to_issue(issue, options={})
                 title = nil
                 subject = nil
                 if options[:subject] == false
                   title = truncate(issue.subject, :length => 60)
                 else
                   subject = issue.subject
                   if options[:truncate]
                     subject = truncate(subject, :length => options[:truncate])
                   end
                 end
                 s = link_to "#{h(issue.tracker)} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue},
                                                              :class => issue.css_classes,
                                                              :title => title
                 s << h(": #{subject}") if subject
                 s = h("#{issue.project} - ") + s if options[:project]
                 s
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 action = options.delete(:download) ? 'download' : 'show'
                 opt_only_path = {}
                 opt_only_path[:only_path] = (options[:only_path] == false ? false : true)
                 options.delete(:only_path)
                 link_to(h(text),
                        {:controller => 'attachments', :action => action,
                         :id => attachment, :filename => attachment.filename}.merge(opt_only_path),
                        options)
               end
               # Generates a link to a SCM revision
               # Options:
               # * :text - Link text (default to the formatted revision)
               def link_to_revision(revision, repository, options={})
                 if repository.is_a?(Project)
                   repository = repository.repository
                 end
                 text = options.delete(:text) || format_revision(revision)
                 rev = revision.respond_to?(:identifier) ? revision.identifier : revision
                 link_to(
                     h(text),
                     {:controller => 'repositories', :action => 'revision', :id => repository.project, :repository_id => repository.identifier_param, :rev => rev},
                     :title => l(:label_revision_id, format_revision(revision))
                   )
               end
               # Generates a link to a message
               def link_to_message(message, options={}, html_options = nil)
                 link_to(
                   h(truncate(message.subject, :length => 60)),
                   { :controller => 'messages', :action => 'show',
                     :board_id => message.board_id,
                     :id => (message.parent_id || message.id),
                     :r => (message.parent_id && message.id),
                     :anchor => (message.parent_id ? "message-#{message.id}" : nil)
                   }.merge(options),
                   html_options
                 )
               end
               # Generates a link to a project if active
               # Examples:
               #
               #   link_to_project(project)                          # => link to the specified project overview
               #   link_to_project(project, :action=>'settings')     # => link to project settings
               #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
               #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
               #
               def link_to_project(project, options={}, html_options = nil)
                 if project.archived?
                   h(project)
                 else
                   url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
                   link_to(h(project), url, html_options)
                 end
               end
               def thumbnail_tag(attachment)
                 link_to image_tag(url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment)),
                   {:controller => 'attachments', :action => 'show', :id => attachment, :filename => attachment.filename},
                   :title => attachment.filename
               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 prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_activity_title(text)
                 h(truncate_single_line(text, :length => 100))
               end
               def format_activity_day(date)
                 date == User.current.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
                 h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')
                    ).gsub(/[\r\n]+/, "<br />").html_safe
               end
               def format_version_name(version)
                 if version.project == @project
                 	h(version)
                 else
                   h("#{version.project} - #{version}")
                 end
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                 end
               end
               def render_page_hierarchy(pages, node=nil, options={})
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title},
                                        :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content.html_safe
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << content_tag('div', v.html_safe, :class => "flash #{k}", :id => "flash_#{k}")
                 end
                 s.html_safe
               end
               # Renders tabs and their content
               def render_tabs(tabs)
                 if tabs.any?
                   render :partial => 'common/tabs', :locals => {:tabs => tabs}
                 else
                   content_tag 'p', l(:label_no_data), :class => "nodata"
                 end
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 return unless User.current.logged?
                 projects = User.current.memberships.collect(&:project).compact.select(&:active?).uniq
                 if projects.any?
                   options =
                     ("<option value=''>#{ l(:label_jump_to_a_project) }</option>" +
                      '<option value="" disabled="disabled">---</option>').html_safe
                   options << project_tree_options_for_select(projects, :selected => @project) do |p|
                     { :value => project_path(:id => p, :jump => current_menu_item) }
                   end
                   select_tag('project_quick_jump_box', options, :onchange => 'if (this.value != \'\') { window.location = this.value; }')
                 end
               end
               def project_tree_options_for_select(projects, options = {})
                 s = ''
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? '&nbsp;' * 2 * level + '&#187; ' : '').html_safe
                   tag_options = {:value => project.id}
                   if project == options[:selected] || (options[:selected].respond_to?(:include?) && options[:selected].include?(project))
                     tag_options[:selected] = 'selected'
                   else
                     tag_options[:selected] = nil
                   end
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s.html_safe
               end
               # Yields the given block for each project with its level in the tree
               #
               # Wrapper for Project#project_tree
               def project_tree(projects, &block)
                 Project.project_tree(projects, &block)
               end
               def project_nested_ul(projects, &block)
                 s = ''
                 if projects.any?
                   ancestors = []
                   projects.sort_by(&:lft).each do |project|
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     s << "<li>"
                     s << yield(project).to_s
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                 end
                 s.html_safe
               end
               def principals_check_box_tags(name, principals)
                 s = ''
                 principals.sort.each do |principal|
                   s << "<label>#{ check_box_tag name, principal.id, false } #{h principal}</label>\n"
                 end
                 s.html_safe
               end
               # Returns a string for users/groups option tags
               def principals_options_for_select(collection, selected=nil)
                 s = ''
                 if collection.include?(User.current)
                   s << content_tag('option', "<< #{l(:label_me)} >>".html_safe, :value => User.current.id)
                 end
                 groups = ''
                 collection.sort.each do |element|
                   selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
                   (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
                 end
                 unless groups.empty?
                   s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
                 end
                 s.html_safe
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               # Truncates at line break after 250 characters or options[:length]
               def truncate_lines(string, options={})
                 length = options[:length] || 250
                 if string.to_s =~ /\A(.{#{length}}.*?)$/m
                   "#{$1}..."
                 else
                   string
                 end
               end
               def anchor(text)
                 text.to_s.gsub(' ', '_')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>').html_safe
               end
               def authoring(created, author, options={})
                 l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created)).html_safe
               end
               def time_tag(time)
                 text = distance_of_time_in_words(Time.now, time)
                 if @project
                   link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time))
                 else
                   content_tag('acronym', text, :title => format_time(time))
                 end
               end
               def syntax_highlight_lines(name, content)
                 lines = []
                 syntax_highlight(name, content).each_line { |line| lines << line }
                 lines
               end
               def syntax_highlight(name, content)
                 Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
               end
               def to_path_param(path)
                 str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/")
                 str.blank? ? nil : str
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 per_page_links = options.delete(:per_page_links)
                 url_param = params.dup
                 html = ''
                 if paginator.current.previous
                   # \xc2\xab(utf-8) = &#171;
                   html << link_to_content_update(
                                "\xc2\xab " + l(:label_previous),
                                url_param.merge(page_param => paginator.current.previous)) + ' '
                 end
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_content_update(n.to_s, url_param.merge(page_param => n))
                 end || '')
                 if paginator.current.next
                   # \xc2\xbb(utf-8) = &#187;
                   html << ' ' + link_to_content_update(
                                   (l(:label_next) + " \xc2\xbb"),
                                   url_param.merge(page_param => paginator.current.next))
                 end
                 unless count.nil?
                   html << " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})"
                   if per_page_links != false && links = per_page_links(paginator.items_per_page, count)
             	      html << " | #{links}"
                   end
                 end
                 html.html_safe
               end
               def per_page_links(selected=nil, item_count=nil)
                 values = Setting.per_page_options_array
                 if item_count && values.any?
                   if item_count > values.first
                     max = values.detect {|value| value >= item_count} || item_count
                   else
                     max = item_count
                   end
                   values = values.select {|value| value <= max || value == selected}
                 end
                 if values.empty? || (values.size == 1 && values.first == selected)
                   return nil
                 end
                 links = values.collect do |n|
                   n == selected ? n : link_to_content_update(n, params.merge(:per_page => n))
                 end
                 l(:label_display_per_page, links.join(', '))
               end
               def reorder_links(name, url, method = :post)
                 link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)),
                         url.merge({"#{name}[move_to]" => 'highest'}),
                         :method => method, :title => l(:label_sort_highest)) +
                 link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),
                         url.merge({"#{name}[move_to]" => 'higher'}),
                        :method => method, :title => l(:label_sort_higher)) +
                 link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),
                         url.merge({"#{name}[move_to]" => 'lower'}),
                         :method => method, :title => l(:label_sort_lower)) +
                 link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),
                         url.merge({"#{name}[move_to]" => 'lowest'}),
                        :method => method, :title => l(:label_sort_lowest))
               end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', (args.join(" \xc2\xbb ") + " \xc2\xbb ").html_safe, :class => 'breadcrumb') : nil
               end
               def other_formats_links(&block)
                 concat('<p class="other-formats">'.html_safe + l(:label_export_to))
                 yield Redmine::Views::OtherFormatsBuilder.new(self)
                 concat('</p>'.html_safe)
               end
               def page_header_title
                 if @project.nil? || @project.new_record?
                   h(Setting.app_title)
                 else
                   b = []
                   ancestors = (@project.root? ? [] : @project.ancestors.visible.all)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << "\xe2\x80\xa6"
                       ancestors = ancestors[-2, 2]
                     end
                     b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << h(@project)
                   b.join(" \xc2\xbb ").html_safe
                 end
               end
               def html_title(*args)
                 if args.empty?
                   title = @html_title || []
                   title << @project.name if @project
                   title << Setting.app_title unless Setting.app_title == title.last
                   title.select {|t| !t.blank? }.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               # Returns the theme, controller name, and action as css classes for the
               # HTML body.
               def body_css_classes
                 css = []
                 if theme = Redmine::Themes.theme(Setting.ui_theme)
                   css << 'theme-' + theme.name
                 end
                 css << 'controller-' + controller_name
                 css << 'action-' + action_name
                 css.join(' ')
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   attr = args.shift
                   text = obj.send(attr).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 only_path = options.delete(:only_path) == false ? false : true
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr)
                 @parsed_headings = []
                 @heading_anchors = {}
                 @current_section = 0 if options[:edit_section_links]
                 parse_sections(text, project, obj, attr, only_path, options)
                 text = parse_non_pre_blocks(text) do |text|
                   [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_macros].each do |method_name|
                     send method_name, text, project, obj, attr, only_path, options
                   end
                 end
                 parse_headings(text, project, obj, attr, only_path, options)
                 if @parsed_headings.any?
                   replace_toc(text, @parsed_headings)
                 end
                 text.html_safe
               end
               def parse_non_pre_blocks(text)
                 s = StringScanner.new(text)
                 tags = []
                 parsed = ''
                 while !s.eos?
                   s.scan(/(.*?)(<(\/)?(pre|code)(.*?)>|\z)/im)
                   text, full_tag, closing, tag = s[1], s[2], s[3], s[4]
                   if tags.empty?
                     yield text
                   end
                   parsed << text
                   if tag
                     if closing
                       if tags.last == tag.downcase
                         tags.pop
                       end
                     else
                       tags << tag.downcase
                     end
                     parsed << full_tag
                   end
                 end
                 # Close any non closing tags
                 while tag = tags.pop
                   parsed << "</#{tag}>"
                 end
                 parsed
               end
               def parse_inline_attachments(text, project, obj, attr, only_path, options)
                 # when using an image link, try to use an attachment, if possible
                 if options[:attachments] || (obj && obj.respond_to?(:attachments))
                   attachments = options[:attachments] || obj.attachments
                   text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
                     filename, ext, alt, alttext = $1.downcase, $2, $3, $4
                     # search for the picture in attachments
                     if found = Attachment.latest_attach(attachments, filename)
                       image_url = url_for :only_path => only_path, :controller => 'attachments',
                                           :action => 'download', :id => found
                       desc = found.description.to_s.gsub('"', '')
                       if !desc.blank? && alttext.blank?
                         alt = " title=\"#{desc}\" alt=\"#{desc}\""
                       end
                       "src=\"#{image_url}\"#{alt}"
                     else
                       m
                     end
                   end
                 end
               end
               # Wiki links
               #
               # Examples:
               #   [[mypage]]
               #   [[mypage|mytext]]
               # wiki links can refer other project wikis, using project name or identifier:
               #   [[project:]] -> wiki starting page
               #   [[project:|mytext]]
               #   [[project:mypage]]
               #   [[project:mypage|mytext]]
               def parse_wiki_links(text, project, obj, attr, only_path, options)
                 text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_identifier($1) || Project.find_by_name($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       anchor = sanitize_anchor_name(anchor) if anchor.present?
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       url = if anchor.present? && wiki_page.present? && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version)) && obj.page == wiki_page
                         "##{anchor}"
                       else
                         case options[:wiki_links]
                         when :local; "#{page.present? ? Wiki.titleize(page) : ''}.html" + (anchor.present? ? "##{anchor}" : '')
                         when :anchor; "##{page.present? ? Wiki.titleize(page) : title}" + (anchor.present? ? "_#{anchor}" : '') # used for single-file wiki export
                         else
                           wiki_page_id = page.present? ? Wiki.titleize(page) : nil
                           parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil
                           url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project,
                            :id => wiki_page_id, :anchor => anchor, :parent => parent)
                         end
                       end
                       link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     end
                   else
                     all
                   end
                 end
               end
               # Redmine links
               #
               # Examples:
               #   Issues:
               #     #52 -> Link to issue #52
               #   Changesets:
               #     r52 -> Link to revision 52
               #     commit:a85130f -> Link to scmid starting with a85130f
               #   Documents:
               #     document#17 -> Link to document with id 17
               #     document:Greetings -> Link to the document with title "Greetings"
               #     document:"Some document" -> Link to the document with title "Some document"
               #   Versions:
               #     version#3 -> Link to version with id 3
               #     version:1.0.0 -> Link to version named "1.0.0"
               #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
               #   Attachments:
               #     attachment:file.zip -> Link to the attachment of the current object named file.zip
               #   Source files:
               #     source:some/file -> Link to the file located at /some/file in the project's repository
               #     source:some/file@52 -> Link to the file's revision 52
               #     source:some/file#L120 -> Link to line 120 of the file
               #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
               #     export:some/file -> Force the download of the file
               #   Forum messages:
               #     message#1218 -> Link to message with id 1218
               #
               #   Links can refer other objects from other projects, using project identifier:
               #     identifier:r52
               #     identifier:document:"Some document"
               #     identifier:version:1.0.0
               #     identifier:source:some/file
               def parse_redmine_links(text, project, obj, attr, only_path, options)
                 text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
                   leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $1, $2, $3, $4, $5, $10, $11, $8 || $12 || $18, $14 || $19, $15, $17
                   link = nil
                   if project_identifier
                     project = Project.visible.find_by_identifier(project_identifier)
                   end
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project
                         repository = nil
                         if repo_identifier
                           repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                         else
                           repository = project.repository
                         end
                         # project.changesets.visible raises an SQL error because of a double join on repositories
                         if repository && (changeset = Changeset.visible.find_by_repository_id_and_revision(repository.id, identifier))
                           link = link_to(h("#{project_prefix}#{repo_prefix}r#{identifier}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.revision},
                                                     :class => 'changeset',
                                                     :title => truncate_single_line(changeset.comments, :length => 100))
                         end
                       end
                     elsif sep == '#'
                       oid = identifier.to_i
                       case prefix
                       when nil
                         if issue = Issue.visible.find_by_id(oid, :include => :status)
                           anchor = comment_id ? "note-#{comment_id}" : nil
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid, :anchor => anchor},
                                                     :class => issue.css_classes,
                                                     :title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})")
                         end
                       when 'document'
                         if document = Document.visible.find_by_id(oid)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.visible.find_by_id(oid)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'message'
                         if message = Message.visible.find_by_id(oid, :include => :parent)
                           link = link_to_message(message, {:only_path => only_path}, :class => 'message')
                         end
                       when 'forum'
                         if board = Board.visible.find_by_id(oid)
                           link = link_to h(board.name), {:only_path => only_path, :controller => 'boards', :action => 'show', :id => board, :project_id => board.project},
                                                          :class => 'board'
                         end
                       when 'news'
                         if news = News.visible.find_by_id(oid)
                           link = link_to h(news.title), {:only_path => only_path, :controller => 'news', :action => 'show', :id => news},
                                                         :class => 'news'
                         end
                       when 'project'
                         if p = Project.visible.find_by_id(oid)
                           link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = identifier.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.visible.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.visible.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'forum'
                         if project && board = project.boards.visible.find_by_name(name)
                           link = link_to h(board.name), {:only_path => only_path, :controller => 'boards', :action => 'show', :id => board, :project_id => board.project},
                                                          :class => 'board'
                         end
                       when 'news'
                         if project && news = project.news.visible.find_by_title(name)
                           link = link_to h(news.title), {:only_path => only_path, :controller => 'news', :action => 'show', :id => news},
                                                         :class => 'news'
                         end
                       when 'commit', 'source', 'export'
                         if project
                           repository = nil
                           if name =~ %r{^(([a-z0-9\-]+)\|)(.+)$}
                             repo_prefix, repo_identifier, name = $1, $2, $3
                             repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                           else
                             repository = project.repository
                           end
                           if prefix == 'commit'
                             if repository && (changeset = Changeset.visible.find(:first, :conditions => ["repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%"]))
                               link = link_to h("#{project_prefix}#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.identifier},
                                                            :class => 'changeset',
                                                            :title => truncate_single_line(h(changeset.comments), :length => 100)
                             end
                           else
                             if repository && User.current.allowed_to?(:browse_repository, project)
                               name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                               path, rev, anchor = $1, $3, $5
                               link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :repository_id => repository.identifier_param,
                                                                       :path => to_path_param(path),
                                                                       :rev => rev,
                                                                       :anchor => anchor,
                                                                       :format => (prefix == 'export' ? 'raw' : nil)},
                                                                      :class => (prefix == 'export' ? 'source download' : 'source')
                             end
                           end
                           repo_prefix = nil
                         end
                       when 'attachment'
                         attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       when 'project'
                         if p = Project.visible.find(:first, :conditions => ["identifier = :s OR LOWER(name) = :s", {:s => name.downcase}])
                           link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                         end
                       end
                     end
                   end
                   (leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}"))
                 end
               end
               HEADING_RE = /(<h(1|2|3|4)( [^>]+)?>(.+?)<\/h(1|2|3|4)>)/i unless const_defined?(:HEADING_RE)
               def parse_sections(text, project, obj, attr, only_path, options)
                 return unless options[:edit_section_links]
                 text.gsub!(HEADING_RE) do
                   heading = $1
                   @current_section += 1
                   if @current_section > 1
                     content_tag('div',
                       link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
                       :class => 'contextual',
                       :title => l(:button_edit_section)) + heading.html_safe
                   else
                     heading
                   end
                 end
               end
               # Headings and TOC
               # Adds ids and links to headings unless options[:headings] is set to false
               def parse_headings(text, project, obj, attr, only_path, options)
                 return if options[:headings] == false
                 text.gsub!(HEADING_RE) do
                   level, attrs, content = $2.to_i, $3, $4
                   item = strip_tags(content).strip
                   anchor = sanitize_anchor_name(item)
                   # used for single-file wiki export
                   anchor = "#{obj.page.title}_#{anchor}" if options[:wiki_links] == :anchor && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version))
                   @heading_anchors[anchor] ||= 0
                   idx = (@heading_anchors[anchor] += 1)
                   if idx > 1
                     anchor = "#{anchor}-#{idx}"
                   end
                   @parsed_headings << [level, anchor, item]
                   "<a name=\"#{anchor}\"></a>\n<h#{level} #{attrs}>#{content}<a href=\"##{anchor}\" class=\"wiki-anchor\">&para;</a></h#{level}>"
                 end
               end
               MACROS_RE = /
                             (!)?                        # escaping
                             (
                             \{\{                        # opening tag
                             ([\w]+)                     # macro name
                             (\(([^\}]*)\))?             # optional arguments
                             \}\}                        # closing tag
                             )
                           /x unless const_defined?(:MACROS_RE)
               # Macros substitution
               def parse_macros(text, project, obj, attr, only_path, options)
                 text.gsub!(MACROS_RE) do
                   esc, all, macro = $1, $2, $3.downcase
                   args = ($5 || '').split(',').each(&:strip)
                   if esc.nil?
                     begin
                       exec_macro(macro, obj, args)
                     rescue => e
                       "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
                     end || all
                   else
                     all
                   end
                 end
               end
               TOC_RE = /<p>\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
               # Renders the TOC with given headings
               def replace_toc(text, headings)
                 text.gsub!(TOC_RE) do
                   if headings.empty?
                     ''
                   else
                     div_class = 'toc'
                     div_class << ' right' if $1 == '>'
                     div_class << ' left' if $1 == '<'
                     out = "<ul class=\"#{div_class}\"><li>"
                     root = headings.map(&:first).min
                     current = root
                     started = false
                     headings.each do |level, anchor, item|
                       if level > current
                         out << '<ul><li>' * (level - current)
                       elsif level < current
                         out << "</li></ul>\n" * (current - level) + "</li><li>"
                       elsif started
                         out << '</li><li>'
                       end
                       out << "<a href=\"##{anchor}\">#{item}</a>"
                       current = level
                       started = true
                     end
                     out << '</li></ul>' * (current - root)
                     out << '</li></ul>'
                   end
                 end
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />'). # 1 newline   -> br
                   html_safe
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               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(*args, &proc)
                 ActiveSupport::Deprecation.warn "ApplicationHelper#labelled_tabular_form_for is deprecated and will be removed in Redmine 1.5. Use #labelled_form_for instead."
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 form_for(*args, &proc)
               end
               def labelled_form_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 if args.first.is_a?(Symbol)
                   options.merge!(:as => args.shift)
                 end
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 form_for(*args, &proc)
               end
               def labelled_fields_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 fields_for(*args, &proc)
               end
               def labelled_remote_form_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder, :remote => true})
                 form_for(*args, &proc)
               end
               def error_messages_for(*objects)
                 html = ""
                 objects = objects.map {|o| o.is_a?(String) ? instance_variable_get("@#{o}") : o}.compact
                 errors = objects.map {|o| o.errors.full_messages}.flatten
                 if errors.any?
                   html << "<div id='errorExplanation'><ul>\n"
                   errors.each do |error|
                     html << "<li>#{h error}</li>\n"
                   end
                   html << "</ul></div>\n"
                 end
                 html.html_safe
               end
+              def delete_link(url, options={})
+                options = {
+                  :method => :delete,
+                  :data => {:confirm => l(:text_are_you_sure)},
+                  :class => 'icon icon-del'
+                }.merge(options)
+                link_to l(:button_delete), url, options
+              end
               def back_url_hidden_field_tag
                 back_url = params[:back_url] || request.env['HTTP_REFERER']
                 back_url = CGI.unescape(back_url.to_s)
                 hidden_field_tag('back_url', CGI.escape(back_url), :id => nil) unless back_url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | ".html_safe +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts = pcts.collect(&:round)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed') : ''.html_safe) +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done') : ''.html_safe) +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo') : ''.html_safe)
                   ), :class => 'progress', :style => "width: #{width};").html_safe +
                   content_tag('p', legend, :class => 'pourcent').html_safe
               end
               def checked_image(checked=true)
                 if checked
                   image_tag 'toggle_check.png'
                 end
               end
               def context_menu(url)
                 unless @context_menu_included
                   content_for :header_tags do
                     javascript_include_tag('context_menu') +
                       stylesheet_link_tag('context_menu')
                   end
                   if l(:direction) == 'rtl'
                     content_for :header_tags do
                       stylesheet_link_tag('context_menu_rtl')
                     end
                   end
                   @context_menu_included = true
                 end
                 javascript_tag "new ContextMenu('#{ url_for(url) }')"
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 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 include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     start_of_week = case Setting.start_of_week.to_i
                     when 1
                       'Calendar._FD = 1;' # Monday
                     when 7
                       'Calendar._FD = 0;' # Sunday
                     when 6
                       'Calendar._FD = 6;' # Saturday
                     else
                       '' # use language
                     end
                     javascript_include_tag('calendar/calendar') +
                     javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
                     javascript_tag(start_of_week) +
                     javascript_include_tag('calendar/calendar-setup') +
                     stylesheet_link_tag('calendar')
                   end
                 end
               end
               # Overrides Rails' stylesheet_link_tag with themes and plugins support.
               # Examples:
               #   stylesheet_link_tag('styles') # => picks styles.css from the current theme or defaults
               #   stylesheet_link_tag('styles', :plugin => 'foo) # => picks styles.css from plugin's assets
               #
               def stylesheet_link_tag(*sources)
                 options = sources.last.is_a?(Hash) ? sources.pop : {}
                 plugin = options.delete(:plugin)
                 sources = sources.map do |source|
                   if plugin
                     "/plugin_assets/#{plugin}/stylesheets/#{source}"
                   elsif current_theme && current_theme.stylesheets.include?(source)
                     current_theme.stylesheet_path(source)
                   else
                     source
                   end
                 end
                 super sources, options
               end
               # Overrides Rails' image_tag with themes and plugins support.
               # Examples:
               #   image_tag('image.png') # => picks image.png from the current theme or defaults
               #   image_tag('image.png', :plugin => 'foo) # => picks image.png from plugin's assets
               #
               def image_tag(source, options={})
                 if plugin = options.delete(:plugin)
                   source = "/plugin_assets/#{plugin}/images/#{source}"
                 elsif current_theme && current_theme.images.include?(source)
                   source = current_theme.image_path(source)
                 end
                 super source, options
               end
               # Overrides Rails' javascript_include_tag with plugins support
               # Examples:
               #   javascript_include_tag('scripts') # => picks scripts.js from defaults
               #   javascript_include_tag('scripts', :plugin => 'foo) # => picks scripts.js from plugin's assets
               #
               def javascript_include_tag(*sources)
                 options = sources.last.is_a?(Hash) ? sources.pop : {}
                 if plugin = options.delete(:plugin)
                   sources = sources.map do |source|
                     if plugin
                       "/plugin_assets/#{plugin}/javascripts/#{source}"
                     else
                       source
                     end
                   end
                 end
                 super sources, options
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
               def sidebar_content?
                 has_content?(:sidebar) || view_layouts_base_sidebar_hook_response.present?
               end
               def view_layouts_base_sidebar_hook_response
                 @view_layouts_base_sidebar_hook_response ||= call_hook(:view_layouts_base_sidebar)
               end
               def email_delivery_enabled?
                 !!ActionMailer::Base.perform_deliveries
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
                   options.merge!({:ssl => (request && request.ssl?), :default => Setting.gravatar_default})
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 else
                   ''
                 end
               end
               def sanitize_anchor_name(anchor)
                 anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
               end
               # Returns the javascript tags that are included in the html layout head
               def javascript_heads
                 tags = javascript_include_tag('prototype', 'effects', 'dragdrop', 'controls', 'rails', 'application')
                 unless User.current.pref.warn_on_leaving_unsaved == '0'
                   tags << "\n".html_safe + javascript_tag("Event.observe(window, 'load', function(){ new WarnLeavingUnsaved('#{escape_javascript( l(:text_warn_on_leaving_unsaved) )}'); });")
                 end
                 tags
               end
               def favicon
                 "<link rel='shortcut icon' href='#{image_path('/favicon.ico')}' />".html_safe
               end
               def robot_exclusion_tag
                 '<meta name="robots" content="noindex,follow,noarchive" />'.html_safe
               end
               # Returns true if arg is expected in the API response
               def include_in_api_response?(arg)
                 unless @included_in_api_response
                   param = params[:include]
                   @included_in_api_response = param.is_a?(Array) ? param.collect(&:to_s) : param.to_s.split(',')
                   @included_in_api_response.collect!(&:strip)
                 end
                 @included_in_api_response.include?(arg.to_s)
               end
               # Returns options or nil if nometa param or X-Redmine-Nometa header
               # was set in the request
               def api_meta(options)
                 if params[:nometa].present? || request.headers['X-Redmine-Nometa']
                   # compatibility mode for activeresource clients that raise
                   # an error when unserializing an array with attributes
                   nil
                 else
                   options
                 end
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
               def link_to_content_update(text, url_params = {}, html_options = {})
                 link_to(text, url_params, html_options)
               end
             end

app/views/admin/projects.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_project_plural)%></h2>
             <%= form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %> :</label>
             <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <label for='name'><%= l(:label_project) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
             <div class="autoscroll">
             <table class="list">
               <thead><tr>
               <th><%=l(:label_project)%></th>
               <th><%=l(:field_is_public)%></th>
               <th><%=l(:field_created_on)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% project_tree(@projects) do |project, level| %>
               <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
               <td class="name"><span><%= link_to_project(project, {:action => (project.active? ? 'settings' : 'show')}, :title => project.short_description) %></span></td>
               <td align="center"><%= checked_image project.is_public? %></td>
               <td align="center"><%= format_date(project.created_on) %></td>
               <td class="buttons">
-                <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') unless project.archived? %>
+                <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
                 <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
                 <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             </div>
             <% html_title(l(:label_project_plural)) -%>

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

             <div class="attachments">
             <% for attachment in attachments %>
             <p><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
               <% if attachment.is_text? %>
                 <%= link_to image_tag('magnifier.png'),
                             :controller => 'attachments', :action => 'show',
                             :id => attachment, :filename => attachment.filename %>
               <% end %>
               <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
               <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
               <% if options[:deletable] %>
                 <%= link_to image_tag('delete.png'), attachment_path(attachment),
-                                                     :confirm => l(:text_are_you_sure),
+                                                     :data => {:confirm => l(:text_are_you_sure)},
                                                      :method => :delete,
                                                      :class => 'delete',
                                                      :title => l(:button_delete) %>
               <% end %>
               <% if options[:author] %>
                 <span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
               <% end %>
               </p>
             <% end %>
             <% if defined?(thumbnails) && thumbnails %>
               <% images = attachments.select(&:thumbnailable?) %>
               <% if images.any? %>
               <div class="thumbnails">
                 <% images.each do |attachment| %>
                   <div><%= thumbnail_tag(attachment) %></div>
                 <% end %>
               </div>
               <% end %>
             <% end %>
             </div>

app/views/auth_sources/index.html.erb +1 -5

             <div class="contextual">
             <%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_auth_source_plural)%></h2>
             <table class="list">
               <thead><tr>
                 <th><%=l(:field_name)%></th>
                 <th><%=l(:field_type)%></th>
                 <th><%=l(:field_host)%></th>
                 <th><%=l(:label_user_plural)%></th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for source in @auth_sources %>
               <tr id="auth-source-<%= source.id %>" class="<%= cycle("odd", "even") %>">
                 <td><%= link_to(h(source.name), :action => 'edit', :id => source)%></td>
                 <td align="center"><%= h source.auth_method_name %></td>
                 <td align="center"><%= h source.host %></td>
                 <td align="center"><%= h source.users.count %></td>
                 <td class="buttons">
                   <%= link_to l(:button_test), {:action => 'test_connection', :id => source}, :class => 'icon icon-test' %>
-                  <%= link_to l(:button_delete), { :action => 'destroy', :id => source },
+                  <%= delete_link auth_source_path(source) %>
-                                                                    :method => :delete,
-                                                                    :confirm => l(:text_are_you_sure),
-                                                                    :class => 'icon icon-del',
-                                                                    :disabled => source.users.any? %>
                 </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @auth_source_pages %></p>

app/views/context_menus/issues.html.erb +1 -1

             <ul>
               <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
             <% if !@issue.nil? -%>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% end %>
               <% if @allowed_statuses.present? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_status) %></a>
                 <ul>
                 <% @allowed_statuses.each do |s| -%>
                     <li><%= context_menu_link h(s.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && s == @issue.status), :disabled => !@can[:update] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% unless @trackers.nil? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_tracker) %></a>
                 <ul>
                 <% @trackers.each do |t| -%>
                     <li><%= context_menu_link h(t.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('priority_id') -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_priority) %></a>
                 <ul>
                 <% @priorities.each do |p| -%>
                     <li><%= context_menu_link h(p.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% #TODO: allow editing versions when multiple projects %>
               <% if @safe_attributes.include?('fixed_version_id') && @project && @project.shared_versions.open.any? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
                 <ul>
                 <% @project.shared_versions.open.sort.each do |v| -%>
                     <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => v}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && v == @issue.fixed_version), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('assigned_to_id') && @assignables.present? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
                 <ul>
                 <% if @assignables.include?(User.current) %>
                     <li><%= context_menu_link "<< #{l(:label_me)} >>", {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => User.current}, :back_url => @back}, :method => :post,
                                               :disabled => !@can[:update] %></li>
                 <% end %>
                 <% @assignables.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @safe_attributes.include?('category_id') && @project && @project.issue_categories.any? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_category) %></a>
                 <ul>
                 <% @project.issue_categories.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'category_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end -%>
               <% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
                 <ul>
                 <% (0..10).map{|x|x*10}.each do |p| -%>
                     <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post,
                                                   :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% @options_by_custom_field.each do |field, options| %>
                 <li class="folder">
                   <a href="#" class="submenu"><%= h(field.name) %></a>
                   <ul>
                   <% options.each do |text, value| %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
                   <% end %>
                   <% unless field.is_required? %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
                   <% end %>
                   </ul>
                 </li>
               <% end %>
             <% if !@issue.nil? %>
               <% if @can[:log_time] -%>
               <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},
                       :class => 'icon-time-add' %></li>
               <% end %>
               <% if User.current.logged? %>
               <li><%= watcher_link(@issue, User.current) %></li>
               <% end %>
             <% end %>
             <% if @issue.present? %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
                       :class => 'icon-copy', :disabled => !@can[:copy] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :copy => '1'},
                                       :class => 'icon-copy', :disabled => !@can[:move] %></li>
             <% end %>
               <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issues.collect(&:id), :back_url => @back),
-                                        :method => :delete, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li>
+                                        :method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon-del', :disabled => !@can[:delete] %></li>
               <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
             </ul>

app/views/context_menus/time_entries.html.erb +1 -1

             <ul>
               <% if !@time_entry.nil? -%>
                 <li><%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => @time_entry},
                         :class => 'icon-edit', :disabled => !@can[:edit] %></li>
               <% else %>
                 <li><%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)},
                         :class => 'icon-edit', :disabled => !@can[:edit] %></li>
               <% end %>
               <%= call_hook(:view_time_entries_context_menu_start, {:time_entries => @time_entries, :can => @can, :back => @back }) %>
               <% if @activities.present? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_activity) %></a>
                 <ul>
                 <% @activities.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@time_entry && u == @time_entry.activity), :disabled => !@can[:edit] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@time_entry && @time_entry.activity.nil?), :disabled => !@can[:edit] %></li>
                 </ul>
               </li>
               <% end %>
               <%= call_hook(:view_time_entries_context_menu_end, {:time_entries => @time_entries, :can => @can, :back => @back }) %>
               <li>
                 <%= context_menu_link l(:button_delete),
                   {:controller => 'timelog', :action => 'destroy', :ids => @time_entries.collect(&:id), :back_url => @back},
-                  :method => :delete, :confirm => l(:text_time_entries_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %>
+                  :method => :delete, :data => {:confirm => l(:text_time_entries_destroy_confirmation)}, :class => 'icon-del', :disabled => !@can[:delete] %>
               </li>
             </ul>

app/views/custom_fields/_index.html.erb +1 -4

             <table class="list">
               <thead><tr>
                 <th width="30%"><%=l(:field_name)%></th>
                 <th><%=l(:field_field_format)%></th>
                 <th><%=l(:field_is_required)%></th>
                 <% if tab[:name] == 'IssueCustomField' %>
                   <th><%=l(:field_is_for_all)%></th>
                   <th><%=l(:label_used_by)%></th>
                 <% end %>
                 <th><%=l(:button_sort)%></th>
                 <th width="10%"></th>
               </tr></thead>
               <tbody>
               <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
                 <tr class="<%= cycle("odd", "even") %>">
                   <td><%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %></td>
                   <td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
                   <td align="center"><%= checked_image custom_field.is_required? %></td>
                   <% if tab[:name] == 'IssueCustomField' %>
                   <td align="center"><%= checked_image custom_field.is_for_all? %></td>
                   <td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
                   <% end %>
                   <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, :put) %></td>
                   <td class="buttons">
-                    <%= link_to(l(:button_delete), custom_field_path(custom_field),
+                    <%= delete_link custom_field_path(custom_field) %>
-                                                   :method => :delete,
-                                                   :confirm => l(:text_are_you_sure),
-                                                   :class => 'icon icon-del') %>
                   </td>
                 </tr>
               <% end; reset_cycle %>
               </tbody>
             </table>
             <p><%= link_to l(:label_custom_field_new), new_custom_field_path(:type => tab[:name]), :class => 'icon icon-add' %></p>

app/views/documents/show.html.erb +1 -1

             <div class="contextual">
             <% if User.current.allowed_to?(:manage_documents, @project) %>
             <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
-            <%= link_to l(:button_delete), document_path(@document), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+            <%= delete_link document_path(@document) %>
             <% end %>
             </div>
             <h2><%=h @document.title %></h2>
             <p><em><%=h @document.category.name %><br />
             <%= format_date @document.created_on %></em></p>
             <div class="wiki">
             <%= textilizable @document.description, :attachments => @document.attachments %>
             </div>
             <h3><%= l(:label_attachment_plural) %></h3>
             <%= link_to_attachments @document %>
             <% if authorize_for('documents', 'add_attachment') %>
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                                          :id => 'attach_files_link' %></p>
               <%= form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
               <div class="box">
               <p><%= render :partial => 'attachments/form' %></p>
               </div>
               <%= submit_tag l(:button_add) %>
               <% end %>
             <% end %>
             <% html_title @document.title -%>
             <% content_for :header_tags do %>
                 <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/enumerations/index.html.erb +1 -4

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration.get_subclasses.each do |klass| %>
             <h3><%= l(klass::OptionName) %></h3>
             <% enumerations = klass.shared %>
             <% if enumerations.any? %>
             <table class="list"><thead>
             <tr>
                 <th><%= l(:field_name) %></th>
                 <th style="width:15%;"><%= l(:field_is_default) %></th>
                 <th style="width:15%;"><%= l(:field_active) %></th>
                 <th style="width:15%;"></th>
                 <th align="center" style="width:10%;"> </th>
             </tr></thead>
             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
                 <td><%= link_to h(enumeration), edit_enumeration_path(enumeration) %></td>
                 <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
                 <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
                 <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %></td>
                 <td class="buttons">
-                <%= link_to l(:button_delete), enumeration_path(enumeration),
+                <%= delete_link enumeration_path(enumeration) %>
-                                               :method => :delete,
-                                               :confirm => l(:text_are_you_sure),
-                                               :class => 'icon icon-del' %>
                 </td>
             </tr>
             <% end %>
             </table>
             <% reset_cycle %>
             <% end %>
             <p><%= link_to l(:label_enumeration_new), new_enumeration_path(:type => klass.name) %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>

app/views/files/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
             </div>
             <h2><%=l(:label_attachment_plural)%></h2>
             <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
             <table class="list files">
               <thead><tr>
                 <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
                 <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
                 <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
                 <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
                 <th>MD5</th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% @containers.each do |container| %>
               <% next if container.attachments.empty? -%>
               <% if container.is_a?(Version) -%>
               <tr>
                 <th colspan="6" align="left">
                   <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
                 </th>
               </tr>
               <% end -%>
               <% container.attachments.each do |file| %>
               <tr class="file <%= cycle("odd", "even") %>">
                 <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
                 <td class="created_on"><%= format_time(file.created_on) %></td>
                 <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
                 <td class="downloads"><%= file.downloads %></td>
                 <td class="digest"><%= file.digest %></td>
                 <td align="center">
                 <%= link_to(image_tag('delete.png'), attachment_path(file),
-                                                     :confirm => l(:text_are_you_sure), :method => :delete) if delete_allowed %>
+                                                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
                 </td>
               </tr>
               <% end
               reset_cycle %>
             <% end %>
               </tbody>
             </table>
             <% html_title(l(:label_attachment_plural)) -%>

app/views/groups/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_group_new), new_group_path, :class => 'icon icon-add' %>
             </div>
             <h2><%= l(:label_group_plural) %></h2>
             <% if @groups.any? %>
             <table class="list groups">
               <thead><tr>
               <th><%=l(:label_group)%></th>
               <th><%=l(:label_user_plural)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% @groups.each do |group| %>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%= link_to h(group), edit_group_path(group) %></td>
                 <td align="center"><%= group.users.size %></td>
-                <td class="buttons"><%= link_to l(:button_delete), group, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %></td>
+                <td class="buttons"><%= delete_link group %></td>
               </tr>
             <% end %>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

app/views/issue_statuses/index.html.erb +2 -5

             <div class="contextual">
             <%= link_to l(:label_issue_status_new), new_issue_status_path, :class => 'icon icon-add' %>
-            <%= link_to(l(:label_update_issue_done_ratios), update_issue_done_ratio_issue_statuses_path, :class => 'icon icon-multiple', :method => 'post', :confirm => l(:text_are_you_sure)) if Issue.use_status_for_done_ratio? %>
+            <%= link_to(l(:label_update_issue_done_ratios), update_issue_done_ratio_issue_statuses_path, :class => 'icon icon-multiple', :method => 'post', :data => {:confirm => l(:text_are_you_sure)}) if Issue.use_status_for_done_ratio? %>
             </div>
             <h2><%=l(:label_issue_status_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:field_status)%></th>
               <% if Issue.use_status_for_done_ratio? %>
               <th><%=l(:field_done_ratio)%></th>
               <% end %>
               <th><%=l(:field_is_default)%></th>
               <th><%=l(:field_is_closed)%></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for status in @issue_statuses %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to h(status.name), edit_issue_status_path(status) %></td>
               <% if Issue.use_status_for_done_ratio? %>
               <td align="center"><%= h status.default_done_ratio %></td>
               <% end %>
               <td align="center"><%= checked_image status.is_default? %></td>
               <td align="center"><%= checked_image status.is_closed? %></td>
               <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td>
               <td class="buttons">
-                <%= link_to(l(:button_delete), issue_status_path(status),
+                <%= delete_link issue_status_path(status) %>
-                                               :method => :delete,
-                                               :confirm => l(:text_are_you_sure),
-                                               :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
             <% html_title(l(:label_issue_status_plural)) -%>

app/views/issues/_action_menu.html.erb +1 -1

             <div class="contextual">
             <%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
             <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
             <%= watcher_tag(@issue, User.current) %>
             <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, :class => 'icon icon-copy' %>
-            <%= link_to l(:button_delete), issue_path(@issue), :confirm => issues_destroy_confirmation_message(@issue), :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
+            <%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
             </div>

app/views/issues/_relations.html.erb +1 -1

             <div class="contextual">
             <% if User.current.allowed_to?(:manage_issue_relations, @project) %>
               <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
             <% end %>
             </div>
             <p><strong><%=l(:label_related_issues)%></strong></p>
             <% if @relations.present? %>
             <form>
             <table class="list issues">
             <% @relations.each do |relation| %>
             <tr class="issue hascontextmenu" id="relation-<%= relation.id %>">
             <td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
             <td class="subject"><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
                 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
                 <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
             </td>
             <td class="status"><%=h relation.other_issue(@issue).status.name %></td>
             <td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
             <td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
             <td class="buttons"><%= link_to_remote(
                                       image_tag('link_break.png'),
                                       { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
                                         :method => :delete,
-                                        :confirm => l(:text_are_you_sure) },
+                                        :data => {:confirm => l(:text_are_you_sure)} },
                                       :title => l(:label_relation_delete)
                                     ) if authorize_for('issue_relations', 'destroy') %></td>
             </tr>
             <% end %>
             </table>
             </form>
             <% end %>
             <%= form_for @relation, {
                              :as => :relation, :remote => true,
                              :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue},
                              :method => :post,
                              :complete => "Form.Element.focus('relation_issue_to_id');",
                              :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}
                            } do |f| %>
             <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
             <% end %>

app/views/issues/index.html.erb +1 -2

             <div class="contextual">
             <% if !@query.new_record? && @query.editable_by?(User.current) %>
               <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
-              <%= link_to l(:button_delete), query_path(@query), :confirm => l(:text_are_you_sure),
+              <%= delete_link query_path(@query) %>
-                          :method => :delete, :class => 'icon icon-del' %>
             <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
             <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
             <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
                         :method => :get, :id => 'query_form') do %>
                 <%= hidden_field_tag 'set_filter', '1' %>
                 <div id="query_form_content" class="hide-when-print">
                 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                   <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                   </div>
                 </fieldset>
                 <fieldset class="collapsible collapsed">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                   <div style="display: none;">
                     <table>
                       <tr>
                         <td><%= l(:field_column_names) %></td>
                         <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
                       </tr>
                       <tr>
                         <td><label for='group_by'><%= l(:field_group_by) %></label></td>
                         <td><%= select_tag('group_by',
                                            options_for_select(
                                              [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
                                              @query.group_by)
                                    ) %></td>
                       </tr>
                     </table>
                   </div>
                 </fieldset>
                 </div>
                 <p class="buttons hide-when-print">
                 <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
                 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
                 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
                     <%= link_to_function l(:button_save),
                                          "$('query_form').action='#{ @project ? new_project_query_path(@project) : new_query_path }'; submit_query_form('query_form')",
                                          :class => 'icon icon-save' %>
                 <% end %>
                 </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
               <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
               <%= f.link_to 'PDF', :url => params %>
             <% end %>
             <div id="csv-export-options" style="display:none;">
               <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
               <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
               <p>
                 <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br />
                 <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
               </p>
               <p>
                 <label><%= check_box_tag 'description', '1' %> <%= l(:field_description) %></label>
               </p>
               <p class="buttons">
                 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
               <% end %>
             </div>
             <% end %>
             <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:controller => 'journals', :action => 'index',
                                              :query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_changes_details)) %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/messages/show.html.erb +2 -2

             <%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)),
                            link_to(h(@board.name), project_board_path(@project, @board)) %>
             <div class="contextual">
                 <%= watcher_tag(@topic, User.current) %>
                 <%= link_to_remote_if_authorized(
                       l(:button_quote),
                       { :url => {:action => 'quote', :id => @topic} },
                       :class => 'icon icon-comment'
                     ) unless @topic.locked? %>
                 <%= link_to(
                       l(:button_edit),
                       {:action => 'edit', :id => @topic},
                       :class => 'icon icon-edit'
                     ) if @message.editable_by?(User.current) %>
                 <%= link_to(
                       l(:button_delete),
                       {:action => 'destroy', :id => @topic},
                       :method => :post,
-                      :confirm => l(:text_are_you_sure),
+                      :data => {:confirm => l(:text_are_you_sure)},
                       :class => 'icon icon-del'
                      ) if @message.destroyable_by?(User.current) %>
             </div>
             <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
             <div class="message">
             <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
             <div class="wiki">
             <%= textilizable(@topic, :content) %>
             </div>
             <%= link_to_attachments @topic, :author => false %>
             </div>
             <br />
             <% unless @replies.empty? %>
             <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
             <% @replies.each do |message| %>
               <div class="message reply" id="<%= "message-#{message.id}" %>">
                 <div class="contextual">
                   <%= link_to_remote_if_authorized(
                         image_tag('comment.png'),
                         { :url => {:action => 'quote', :id => message} },
                         :title => l(:button_quote)
                       ) unless @topic.locked? %>
                   <%= link_to(
                         image_tag('edit.png'),
                         {:action => 'edit', :id => message},
                         :title => l(:button_edit)
                       ) if message.editable_by?(User.current) %>
                   <%= link_to(
                         image_tag('delete.png'),
                         {:action => 'destroy', :id => message},
                         :method => :post,
-                        :confirm => l(:text_are_you_sure),
+                        :data => {:confirm => l(:text_are_you_sure)},
                         :title => l(:button_delete)
                       ) if message.destroyable_by?(User.current) %>
                 </div>
               <h4>
                 <%= avatar(message.author, :size => "24") %>
                 <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
                 -
                 <%= authoring message.created_on, message.author %>
               </h4>
               <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
               <%= link_to_attachments message, :author => false %>
               </div>
             <% end %>
             <p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
             <% end %>
             <% if !@topic.locked? && authorize_for('messages', 'reply') %>
             <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
             <div id="reply" style="display:none;">
             <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
               <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
               <%= submit_tag l(:button_submit) %>
               <%= link_to_remote l(:label_preview),
                                  { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
                                    :method => 'post',
                                    :update => 'preview',
                                    :with => "Form.serialize('message-form')",
                                    :complete => "Element.scrollTo('preview')"
                                  }, :accesskey => accesskey(:preview) %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% html_title @topic.subject %>

app/views/my/blocks/_timelog.html.erb +1 -1

             <h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
             <%
             entries = TimeEntry.find(:all,
                     :conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
                     :include => [:activity, :project, {:issue => [:tracker, :status]}],
                     :order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
             entries_by_day = entries.group_by(&:spent_on)
             %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
             </div>
             <% if entries.any? %>
             <table class="list time-entries">
             <thead><tr>
             <th><%= l(:label_activity) %></th>
             <th><%= l(:label_project) %></th>
             <th><%= l(:field_comments) %></th>
             <th><%= l(:field_hours) %></th>
             <th></th>
             </tr></thead>
             <tbody>
             <% entries_by_day.keys.sort.reverse.each do |day| %>
                 <tr class="odd">
                 <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
                 <td colspan="2"></td>
                 <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
                 <td></td>
                 </tr>
                 <% entries_by_day[day].each do |entry| -%>
                 <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
                 <td class="activity"><%=h entry.activity %></td>
                 <td class="subject"><%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
                 <td class="comments"><%=h entry.comments %></td>
                 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
                 <td align="center">
                 <% if entry.editable_by?(@user) -%>
                     <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
                                                        :title => l(:button_edit) %>
                     <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
-                                                         :confirm => l(:text_are_you_sure),
+                                                         :data => {:confirm => l(:text_are_you_sure)},
                                                          :method => :delete,
                                                          :title => l(:button_delete) %>
                 <% end -%>
                 </td>
                 </tr>
                 <% end -%>
             <% end -%>
             </tbody>
             </table>
             <% end %>

app/views/news/show.html.erb +2 -6

             <div class="contextual">
             <%= watcher_tag(@news, User.current) %>
             <%= link_to(l(:button_edit),
                   edit_news_path(@news),
                   :class => 'icon icon-edit',
                   :accesskey => accesskey(:edit),
                   :onclick => 'Element.show("edit-news"); return false;') if User.current.allowed_to?(:manage_news, @project) %>
-            <%= link_to(l(:button_delete),
+            <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
-                  news_path(@news),
-                  :confirm => l(:text_are_you_sure),
-                  :method => :delete,
-                  :class => 'icon icon-del') if User.current.allowed_to?(:manage_news, @project) %>
             </div>
             <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
             <% if authorize_for('news', 'edit') %>
             <div id="edit-news" style="display:none;">
             <%= labelled_form_for :news, @news, :url => news_path(@news),
                                                        :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <%= link_to_remote l(:label_preview),
                                { :url => preview_news_path(:project_id => @project),
                                  :method => 'get',
                                  :update => 'preview',
                                  :with => "Form.serialize('news-form')"
                                }, :accesskey => accesskey(:preview) %> |
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %>
             <span class="author"><%= authoring @news.created_on, @news.author %></span></p>
             <div class="wiki">
             <%= textilizable(@news, :description) %>
             </div>
             <%= link_to_attachments @news %>
             <br />
             <div id="comments" style="margin-bottom:16px;">
             <h3 class="comments"><%= l(:label_comment_plural) %></h3>
             <% @comments.each do |comment| %>
                 <% next if comment.new_record? %>
                 <div class="contextual">
                 <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                                   :confirm => l(:text_are_you_sure), :method => :delete, :title => l(:button_delete) %>
+                                                                   :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
                 </div>
                 <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
                 <%= textilizable(comment.comments) %>
             <% end if @comments.any? %>
             </div>
             <% if @news.commentable? %>
             <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
             <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
             <div class="box">
                 <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
                 <%= wikitoolbar_for 'comment_comments' %>
             </div>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             <% end %>
             <% html_title @news.title -%>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>

app/views/projects/settings/_activities.html.erb +1 -1

             <%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
             <table class="list">
               <thead><tr>
                 <th><%= l(:field_name) %></th>
                 <th><%= l(:enumeration_system_activity) %></th>
                 <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
                 <th><%= h value.name %></th>
                 <% end %>
                 <th style="width:15%;"><%= l(:field_active) %></th>
               </tr></thead>
               <% @project.activities(true).each do |enumeration| %>
               <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
               <tr class="<%= cycle('odd', 'even') %>">
                 <td>
                   <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
                   <%= h(enumeration) %>
                 </td>
                 <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
                 <% enumeration.custom_field_values.each do |value| %>
                 <td align="center">
                   <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
                 </td>
                 <% end %>
                 <td align="center" style="width:15%;">
                   <%= ff.check_box :active %>
                 </td>
               </tr>
               <% end %>
               <% end %>
             </table>
             <div class="contextual">
             <%= link_to(l(:button_reset), project_enumerations_path(@project),
                         :method => :delete,
-                        :confirm => l(:text_are_you_sure),
+                        :data => {:confirm => l(:text_are_you_sure)},
                         :class => 'icon icon-del') %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/projects/settings/_boards.html.erb +1 -1

             <% if @project.boards.any? %>
             <table class="list">
               <thead><tr>
                 <th><%= l(:label_board) %></th>
                 <th><%= l(:field_description) %></th>
                 <th></th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% @project.boards.each do |board|
               next if board.new_record? %>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%=h board.name %></td>
                 <td><%=h board.description %></td>
                 <td align="center">
                 <% if authorize_for("boards", "edit") %>
                   <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %>
                 <% end %>
                 </td>
                 <td class="buttons">
                 <% if User.current.allowed_to?(:manage_boards, @project) %>
                   <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
-                  <%= link_to l(:button_delete), project_board_path(@project, board), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+                  <%= delete_link project_board_path(@project, board) %>
             		<% end %>
                 </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% if User.current.allowed_to?(:manage_boards, @project) %>
             <p><%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %></p>
             <% end %>

app/views/projects/settings/_issue_categories.html.erb +1 -1

             <% if @project.issue_categories.any? %>
             <table class="list">
               <thead><tr>
                 <th><%= l(:label_issue_category) %></th>
                 <th><%= l(:field_assigned_to) %></th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for category in @project.issue_categories %>
               <% unless category.new_record? %>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%=h(category.name) %></td>
                 <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
                 <td class="buttons">
                 	<% if User.current.allowed_to?(:manage_categories, @project) %>
                     <%= link_to l(:button_edit), edit_issue_category_path(category), :class => 'icon icon-edit' %>
-                    <%= link_to l(:button_delete), issue_category_path(category), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+                    <%= delete_link issue_category_path(category) %>
             		  <% end %>
                 </td>
               </tr>
               <% end %>
             <% end %>
                 </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <p><%= link_to l(:label_issue_category_new), new_project_issue_category_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_categories, @project) %></p>

app/views/projects/settings/_members.html.erb +1 -1

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
                members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
             <table class="list members">
               <thead><tr>
                 <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
                       <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
               </tr></thead>
               <tbody>
               <% members.each do |member| %>
               <% next if member.new_record? %>
               <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
               <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
               <td class="roles">
                 <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
                   <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                                       :method => :put,
                                                       :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
                          ) do |f| %>
                     <p><% roles.each do |role| %>
                     <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                                                    :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
                     <% end %></p>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <p><%= submit_tag l(:button_change), :class => "small" %>
                     <%= link_to_function l(:button_cancel),
                                          "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;"
                          %></p>
                   <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit),
                                        "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;",
                                        :class => 'icon icon-edit' %>
                   <%= link_to_remote(
                         l(:button_delete),
                         { :url => membership_path(member),
                           :method => :delete,
-                          :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil) },
+                          :data => {:confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)} },
                         :title => l(:button_delete),
                         :class => 'icon icon-del'
                       ) if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <% principals = Principal.active.not_member_of(@project).all(:limit => 100, :order => 'type, login, lastname ASC') %>
             <div class="splitcontentright">
             <% if roles.any? && principals.any? %>
               <%= form_for(@member, {:as => :membership, :remote => true,
                                  :url => project_memberships_path(@project), :method => :post,
                                  :loading => '$(\'member-add-submit\').disable();',
                                  :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();'
                               } ) do |f| %>
                 <fieldset><legend><%=l(:label_member_new)%></legend>
                 <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
                 <%= observe_field(:principal_search,
                              :frequency => 0.5,
                              :update => :principals,
                              :url => autocomplete_project_memberships_path(@project),
                              :method => :get,
                              :before => '$("principal_search").addClassName("ajax-loading")',
                              :complete => '$("principal_search").removeClassName("ajax-loading")',
                              :with => 'q')
                               %>
                 <div id="principals">
                   <%= principals_check_box_tags 'membership[user_ids][]', principals %>
                 </div>
                 <p><%= l(:label_role_plural) %>:
                 <% roles.each do |role| %>
                   <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
                  <% end %></p>
                 <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
                 </fieldset>
               <% end %>
             <% end %>
             </div>

app/views/projects/settings/_repositories.html.erb +1 -4

             <% if @project.repositories.any? %>
             <table class="list">
               <thead>
                 <tr>
                   <th><%= l(:label_scm) %></th>
                   <th><%= l(:field_identifier) %></th>
                   <th><%= l(:field_repository_is_default) %></th>
                   <th><%= l(:label_repository) %></th>
                   <th></th>
                 </tr>
               </thead>
               <tbody>
               <% @project.repositories.sort.each do |repository| %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                   <td><%=h repository.scm_name %></td>
                   <td><%=h repository.identifier %></td>
                   <td align="center"><%= checked_image repository.is_default? %></td>
                   <td><%=h repository.url %></td>
                   <td class="buttons">
                   <% if User.current.allowed_to?(:manage_repository, @project) %>
                     <%= link_to(l(:label_user_plural), committers_repository_path(repository),
                          :class => 'icon icon-user') %>
                     <%= link_to(l(:button_edit), edit_repository_path(repository),
                          :class => 'icon icon-edit') %>
-                    <%= link_to(l(:button_delete), repository_path(repository),
+                    <%= delete_link repository_path(repository) %>
-                        :confirm => l(:text_are_you_sure),
-                        :method  => :delete,
-                        :class   => 'icon icon-del') %>
                   <% end %>
                   </td>
                 </tr>
               <% end %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <% if User.current.allowed_to?(:manage_repository, @project) %>
               <p><%= link_to l(:label_repository_new), new_project_repository_path(@project), :class => 'icon icon-add' %></p>
             <% end %>

app/views/projects/settings/_versions.html.erb +1 -1

             <% if @project.shared_versions.any? %>
             <table class="list versions">
               <thead><tr>
                 <th><%= l(:label_version) %></th>
                 <th><%= l(:field_effective_date) %></th>
                 <th><%= l(:field_description) %></th>
                 <th><%= l(:field_status) %></th>
                 <th><%= l(:field_sharing) %></th>
                 <th><%= l(:label_wiki_page) %></th>
                 <th style="width:15%"></th>
                 </tr></thead>
               <tbody>
             <% for version in @project.shared_versions.sort %>
                 <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
                 <td class="name"><%= link_to_version version %></td>
                 <td class="date"><%= format_date(version.effective_date) %></td>
                 <td class="description"><%=h version.description %></td>
                 <td class="status"><%= l("version_status_#{version.status}") %></td>
                 <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
                 <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
                 <td class="buttons">
                   <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
                     <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %>
-                    <%= link_to l(:button_delete), version_path(version), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+                    <%= delete_link version_path(version) %>
                   <% end %>
                  </td>
                 </tr>
             <% end; reset_cycle %>
                 </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <div class="contextual">
             <% if @project.versions.any? %>
               <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
             <% end %>
             </div>
             <p><%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %></p>

app/views/queries/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to_if_authorized l(:label_query_new), new_project_query_path(:project_id => @project), :class => 'icon icon-add' %>
             </div>
             <h2><%= l(:label_query_plural) %></h2>
             <% if @queries.empty? %>
               <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
               <table class="list">
               <% @queries.each do |query| %>
                 <tr class="<%= cycle('odd', 'even') %>">
                   <td>
                     <%= link_to h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
                   </td>
                   <td align="right">
                     <small>
                     <% if query.editable_by?(User.current) %>
                     <%= link_to l(:button_edit), edit_query_path(query), :class => 'icon icon-edit' %>
-                    <%= link_to l(:button_delete), query_path(query), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+                    <%= delete_link query_path(query) %>
                     </small>
                   <% end %>
                   </td>
                 </tr>
               <% end %>
               </table>
             <% end %>

app/views/repositories/_related_issues.html.erb +1 -1

             <% manage_allowed = User.current.allowed_to?(:manage_related_issues, @repository.project) %>
             <div id="related-issues">
             <% if manage_allowed %>
               <div class="contextual">
                 <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'issue_id'} %>
               </div>
             <% end %>
             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.visible.each do |issue| %>
               <li id="<%= "related-issue-#{issue.id}" %>"><%= link_to_issue issue %>
                 <%= link_to_remote(image_tag('link_break.png'),
                   {:url => {:controller => 'repositories', :action => 'remove_related_issue',
                             :id => @project, :repository_id => @repository.identifier_param,
                             :rev => @changeset.identifier, :issue_id => issue},
                    :method => :delete,
-                   :confirm => l(:text_are_you_sure),
+                   :data => {:confirm => l(:text_are_you_sure)},
                   }, :title => l(:label_relation_delete)) if manage_allowed %>
               </li>
             <% end %>
             </ul>
             <% if manage_allowed %>
               <%= form_for(@issue, :as => :issue, :remote => true,
                    :url => {:controller => 'repositories', :action => 'add_related_issue',
                             :id => @project, :repository_id => @repository.identifier_param,
                             :rev => @changeset.identifier},
                    :method => :post,
                    :complete => "Form.Element.focus('issue_id');",
                    :html => {:id => 'new-relation-form', :style => (@issue ? '' : 'display: none;')}) do |f| %>
               <%= l(:label_issue) %> #<%= text_field_tag 'issue_id', '', :size => 10 %>
               <%= submit_tag l(:button_add) %>
               <%= toggle_link l(:button_cancel), 'new-relation-form'%>
               <% end %>
             <% end %>
             </div>

app/views/roles/index.html.erb +1 -4

             <div class="contextual">
             <%= link_to l(:label_role_new), new_role_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_role_plural)%></h2>
             <table class="list">
               <thead><tr>
                 <th><%=l(:label_role)%></th>
                 <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for role in @roles %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td>
               <td align="center" style="width:15%;">
               <% unless role.builtin? %>
                 <%= reorder_links('role', {:action => 'update', :id => role}, :put) %>
               <% end %>
               </td>
               <td class="buttons">
-                <%= link_to(l(:button_delete), role_path(role),
+                <%= delete_link role_path(role) unless role.builtin? %>
-                                              :method => :delete,
-                                              :confirm => l(:text_are_you_sure),
-                                              :class => 'icon icon-del') unless role.builtin? %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @role_pages %></p>
             <p><%= link_to l(:label_permissions_report), :action => 'permissions' %></p>
             <% html_title(l(:label_role_plural)) -%>

app/views/timelog/_list.html.erb +1 -1

             <%= form_tag({}) do -%>
             <%= hidden_field_tag 'back_url', url_for(params) %>
             <div class="autoscroll">
             <table class="list time-entries">
             <thead>
             <tr>
             <th class="checkbox hide-when-print">
               <%= link_to image_tag('toggle_check.png'),
                 {},
                 :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
             </th>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
             <%= sort_header_tag('user', :caption => l(:label_member)) %>
             <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
             <%= sort_header_tag('project', :caption => l(:label_project)) %>
             <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <th></th>
             </tr>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
             <tr class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
             <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
             <td class="spent_on"><%= format_date(entry.spent_on) %></td>
             <td class="user"><%= link_to_user(entry.user) %></td>
             <td class="activity"><%=h entry.activity %></td>
             <td class="project"><%= link_to_project(entry.project) %></td>
             <td class="subject">
             <% if entry.issue -%>
             <%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
             <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>
             <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
             <td align="center">
             <% if entry.editable_by?(User.current) -%>
                 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                                    :title => l(:button_edit) %>
                 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
-                                                     :confirm => l(:text_are_you_sure),
+                                                     :data => {:confirm => l(:text_are_you_sure)},
                                                      :method => :delete,
                                                      :title => l(:button_delete) %>
             <% end -%>
             </td>
             </tr>
             <% end -%>
             </tbody>
             </table>
             </div>
             <% end -%>
             <%= context_menu time_entries_context_menu_path %>

app/views/trackers/index.html.erb +1 -4

             <div class="contextual">
             <%= link_to l(:label_tracker_new), new_tracker_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_tracker_plural)%></h2>
             <table class="list">
               <thead><tr>
               <th><%=l(:label_tracker)%></th>
               <th></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% for tracker in @trackers %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to h(tracker.name), edit_tracker_path(tracker) %></td>
               <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
               <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'update', :id => tracker}, :put) %></td>
               <td class="buttons">
-                <%= link_to(l(:button_delete), tracker_path(tracker),
+                <%= delete_link tracker_path(tracker) %>
-                                               :method => :delete,
-                                               :confirm => l(:text_are_you_sure),
-                                               :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @tracker_pages %></p>
             <% html_title(l(:label_tracker_plural)) -%>

app/views/users/edit.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_profile), user_path(@user), :class => 'icon icon-user' %>
             <%= change_status_link(@user) %>
-            <%= link_to(l(:button_delete), @user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current != @user %>
+            <%= delete_link user_path(@user) if User.current != @user %>
             </div>
             <h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=h @user.login %></h2>
             <%= render_tabs user_settings_tabs %>
             <% html_title(l(:label_user), @user.login, l(:label_administration)) -%>

app/views/users/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
             <%= form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %>:</label>
             <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <% if @groups.present? %>
             <label for='group_id'><%= l(:label_group) %>:</label>
             <%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
             <% end %>
             <label for='name'><%= l(:label_user) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
             <div class="autoscroll">
             <table class="list">
               <thead><tr>
               <%= sort_header_tag('login', :caption => l(:field_login)) %>
               <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
               <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
               <%= sort_header_tag('mail', :caption => l(:field_mail)) %>
               <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
               <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
               <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
               <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
               <td class="firstname"><%= h(user.firstname) %></td>
               <td class="lastname"><%= h(user.lastname) %></td>
               <td class="email"><%= mail_to(h(user.mail)) %></td>
               <td align="center"><%= checked_image user.admin? %></td>
               <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
               <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td class="buttons">
                   <%= change_status_link(user) %>
-                  <%= link_to(l(:button_delete), user_path(user), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
+                  <%= delete_link user_path(user) unless User.current == user %>
                 </td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             </div>
             <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
             <% html_title(l(:label_user_plural)) -%>

app/views/versions/show.html.erb +1 -2

             <div class="contextual">
             <%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %>
             <%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
-            <%= link_to(l(:button_delete), version_path(@version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)),
+            <%= delete_link version_path(@version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)) if User.current.allowed_to?(:manage_versions, @version.project) %>
-              :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current.allowed_to?(:manage_versions, @version.project) %>
             <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
             </div>
             <h2><%= h(@version.name) %></h2>
             <div id="roadmap">
             <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
             <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
             <div id="version-summary">
             <% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
             <fieldset class="time-tracking"><legend><%= l(:label_time_tracking) %></legend>
             <table>
             <tr>
                 <th><%= l(:field_estimated_hours) %></th>
                 <td class="total-hours"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
             </tr>
             <% if User.current.allowed_to?(:view_time_entries, @project) %>
             <tr>
                 <th><%= l(:label_spent_time) %></th>
                 <td class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
             </tr>
             <% end %>
             </table>
             </fieldset>
             <% end %>
             <div id="status_by">
             <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
             </div>
             </div>
             <% if @issues.present? %>
             <%= form_tag({}) do -%>
               <table class="list related-issues">
               <caption><%= l(:label_related_issues) %></caption>
               <%- @issues.each do |issue| -%>
                 <tr class="hascontextmenu">
                   <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
                   <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
                 </tr>
               <% end %>
               </table>
             <% end %>
             <%= context_menu issues_context_menu_path %>
             <% end %>
             </div>
             <%= call_hook :view_versions_show_bottom, :version => @version %>
             <% html_title @version.name %>

app/views/wiki/show.html.erb +1 -1

             <div class="contextual">
             <% if @editable %>
             <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.current_version? %>
             <%= watcher_tag(@page, User.current) %>
             <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
             <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
             <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.current_version? %>
-            <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+            <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del') %>
             <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') unless @content.current_version? %>
             <% end %>
             <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
             <%= wiki_page_breadcrumb(@page) %>
             <% unless @content.current_version? %>
                 <p>
                 <%= link_to(("\xc2\xab " + l(:label_previous)),
                             :action => 'show', :id => @page.title, :project_id => @page.project,
                             :version => (@content.version - 1)) + " - " if @content.version > 1 %>
                 <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
                 <%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
                                   :id => @page.title, :project_id => @page.project,
                                   :version => @content.version) + ')'.html_safe if @content.version > 1 %> -
                 <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
                             :id => @page.title, :project_id => @page.project,
                             :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
                 <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
                 <br />
                 <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)
                      %>, <%= format_time(@content.updated_on) %> </em><br />
                 <%=h @content.comments %>
                 </p>
                 <hr />
             <% end %>
             <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
             <%= link_to_attachments @page %>
             <% if @editable && authorize_for('wiki', 'add_attachment') %>
             <div id="wiki_add_attachment">
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                                          :id => 'attach_files_link' %></p>
             <%= form_tag({:controller => 'wiki', :action => 'add_attachment',
                           :project_id => @project, :id => @page.title},
                          :multipart => true, :id => "add_attachment_form",
                          :style => "display:none;") do %>
               <div class="box">
               <p><%= render :partial => 'attachments/form' %></p>
               </div>
             <%= submit_tag l(:button_add) %>
             <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
             <% end %>
             </div>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>
               <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>
               <%= f.link_to 'TXT', :url => {:id => @page.title, :version => params[:version]} %>
             <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% content_for :sidebar do %>
               <%= render :partial => 'sidebar' %>
             <% end %>
             <% html_title @page.pretty_title %>

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