jro_apps/redmine Commit - r14686:7467c145c03c

Replace uses of image_tag() with CSS (#21256)....

Jean-Philippe Lang -

r14686:7467c145c03c

parent child

Context file:

r14686:7467c145c03c

Expand all files

The requested changes are too big and content was truncated. Show full diff

app/helpers/application_helper.rb +18 -16

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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
               include Redmine::Pagination::Helper
               include Redmine::SudoMode::Helper
               include Redmine::Themes::Helper
               include Redmine::Hook::Helper
               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
               # 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? || (User.current.admin? && user.logged?)
                     link_to name, user_path(user), :class => user.css_classes
                   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
               #   link_to_issue(issue, :subject => false, :tracker => false)     # => #6
               #
               def link_to_issue(issue, options={})
                 title = nil
                 subject = nil
                 text = options[:tracker] == false ? "##{issue.id}" : "#{issue.tracker} ##{issue.id}"
                 if options[:subject] == false
                   title = issue.subject.truncate(60)
                 else
                   subject = issue.subject
                   if truncate_length = options[:truncate]
                     subject = subject.truncate(truncate_length)
                   end
                 end
                 only_path = options[:only_path].nil? ? true : options[:only_path]
                 s = link_to(text, issue_url(issue, :only_path => only_path),
                             :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
                 route_method = options.delete(:download) ? :download_named_attachment_url : :named_attachment_url
                 html_options = options.slice!(:only_path)
                 options[:only_path] = true unless options.key?(:only_path)
                 url = send(route_method, attachment, attachment.filename, options)
                 link_to text, url, html_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)),
                     :accesskey => options[:accesskey]
                   )
               end
               # Generates a link to a message
               def link_to_message(message, options={}, html_options = nil)
                 link_to(
                   message.subject.truncate(60),
                   board_message_url(message.board_id, message.parent_id || message.id, {
                     :r => (message.parent_id && message.id),
                     :anchor => (message.parent_id ? "message-#{message.id}" : nil),
                     :only_path => true
                   }.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, {: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.name)
                 else
                   link_to project.name,
                     project_url(project, {:only_path => true}.merge(options)),
                     html_options
                 end
               end
               # Generates a link to a project settings if active
               def link_to_project_settings(project, options={}, html_options=nil)
                 if project.active?
                   link_to project.name, settings_project_path(project, options), html_options
                 elsif project.archived?
                   h(project.name)
                 else
                   link_to project.name, project_path(project, options), html_options
                 end
               end
               # Generates a link to a version
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 options = {:title => format_date(version.effective_date)}.merge(options)
                 link_to_if version.visible?, format_version_name(version), version_path(version), options
               end
               # Helper that formats object for html or text rendering
               def format_object(object, html=true, &block)
                 if block_given?
                   object = yield object
                 end
                 case object.class.name
                 when 'Array'
                   object.map {|o| format_object(o, html)}.join(', ').html_safe
                 when 'Time'
                   format_time(object)
                 when 'Date'
                   format_date(object)
                 when 'Fixnum'
                   object.to_s
                 when 'Float'
                   sprintf "%.2f", object
                 when 'User'
                   html ? link_to_user(object) : object.to_s
                 when 'Project'
                   html ? link_to_project(object) : object.to_s
                 when 'Version'
                   html ? link_to_version(object) : object.to_s
                 when 'TrueClass'
                   l(:general_text_Yes)
                 when 'FalseClass'
                   l(:general_text_No)
                 when 'Issue'
                   object.visible? && html ? link_to_issue(object) : "##{object.id}"
                 when 'CustomValue', 'CustomFieldValue'
                   if object.custom_field
                     f = object.custom_field.format.formatted_custom_value(self, object, html)
                     if f.nil? || f.is_a?(String)
                       f
                     else
                       format_object(f, html, &block)
                     end
                   else
                     object.value.to_s
                   end
                 else
                   html ? h(object) : object.to_s
                 end
               end
               def wiki_page_path(page, options={})
                 url_for({:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title}.merge(options))
               end
               def thumbnail_tag(attachment)
                 link_to image_tag(thumbnail_path(attachment)),
                   named_attachment_path(attachment, attachment.filename),
                   :title => attachment.filename
               end
               def toggle_link(name, id, options={})
                 onclick = "$('##{id}').toggle(); "
                 onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def format_activity_title(text)
                 h(truncate_single_line_raw(text, 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(text.to_s.truncate(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
               # Renders a tree of projects as a nested set of unordered lists
               # The given collection may be a subset of the whole project tree
               # (eg. some intermediate nodes are private and can not be seen)
               def render_project_nested_lists(projects, &block)
                 s = ''
                 if projects.any?
                   ancestors = []
                   original_project = @project
                   projects.sort_by(&:lft).each do |project|
                     # set the project environment to please macros.
                     @project = project
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>"
                     s << h(block_given? ? capture(project, &block) : project.name)
                     s << "</div>\n"
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                   @project = original_project
                 end
                 s.html_safe
               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, :version => nil},
                                        :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, selected=params[:tab])
                 if tabs.any?
                   unless tabs.detect {|tab| tab[:name] == selected}
                     selected = nil
                   end
                   selected ||= tabs.first[:name]
                   render :partial => 'common/tabs', :locals => {:tabs => tabs, :selected_tab => selected}
                 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.projects.active.select(:id, :name, :identifier, :lft, :rgt).to_a
                 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
                   content_tag( :span, nil, :class => 'jump-box-arrow') +
                   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 = ''.html_safe
                 if blank_text = options[:include_blank]
                   if blank_text == true
                     blank_text = '&nbsp;'.html_safe
                   end
                   s << content_tag('option', blank_text, :value => '')
                 end
                 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 principals_check_box_tags(name, principals)
                 s = ''
                 principals.each do |principal|
                   s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{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)} >>", :value => User.current.id)
                 end
                 groups = ''
                 collection.sort.each do |element|
                   selected_attribute = ' selected="selected"' if option_value_selected?(element, selected) || element.id.to_s == 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
               def option_tag(name, text, value, selected=nil, options={})
                 content_tag 'option', value, options.merge(:value => value, :selected => (value == selected))
               end
               def truncate_single_line_raw(string, length)
                 string.to_s.truncate(length).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, project_activity_path(@project, :from => User.current.time_to_date(time)), :title => format_time(time))
                 else
                   content_tag('abbr', 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 reorder_links(name, url, method = :post)
-                link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)),
+                link_to('',
-                        url.merge({"#{name}[move_to]" => 'highest'}),
+                        url.merge({"#{name}[move_to]" => 'highest'}), :method => method,
-                        :method => method, :title => l(:label_sort_highest)) +
+                        :title => l(:label_sort_highest), :class => 'icon-only icon-move-top') +
-                link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),
+                link_to('',
-                        url.merge({"#{name}[move_to]" => 'higher'}),
+                        url.merge({"#{name}[move_to]" => 'higher'}), :method => method,
-                       :method => method, :title => l(:label_sort_higher)) +
+                        :title => l(:label_sort_higher), :class => 'icon-only icon-move-up') +
-                link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),
+                link_to('',
-                        url.merge({"#{name}[move_to]" => 'lower'}),
+                        url.merge({"#{name}[move_to]" => 'lower'}), :method => method,
-                        :method => method, :title => l(:label_sort_lower)) +
+                        :title => l(:label_sort_lower), :class => 'icon-only icon-move-down') +
-                link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),
+                link_to('',
-                        url.merge({"#{name}[move_to]" => 'lowest'}),
+                        url.merge({"#{name}[move_to]" => 'lowest'}), :method => method,
-                       :method => method, :title => l(:label_sort_lowest))
+                        :title => l(:label_sort_lowest), :class => 'icon-only icon-move-bottom')
               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.to_a)
                   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
               # Returns a h2 tag and sets the html title with the given arguments
               def title(*args)
                 strings = args.map do |arg|
                   if arg.is_a?(Array) && arg.size >= 2
                     link_to(*arg)
                   else
                     h(arg.to_s)
                   end
                 end
                 html_title args.reverse.map {|s| (s.is_a?(Array) ? s.first : s).to_s}
                 content_tag('h2', strings.join(' &#187; ').html_safe)
               end
               # Sets the html title
               # Returns the html title when called without arguments
               # Current project name and app_title and automatically appended
               # Exemples:
               #   html_title 'Foo', 'Bar'
               #   html_title # => 'Foo - Bar - My Project - Redmine'
               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.reject(&: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 << 'project-' + @project.identifier if @project && @project.identifier.present?
                 css << 'controller-' + controller_name
                 css << 'action-' + action_name
                 css.join(' ')
               end
               def accesskey(s)
                 @used_accesskeys ||= []
                 key = Redmine::AccessKeys.key_for(s)
                 return nil if @used_accesskeys.include?(key)
                 @used_accesskeys << key
                 key
               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 = only_path = options.delete(:only_path) == false ? false : true
                 text = text.dup
                 macros = catch_macros(text)
                 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, obj, macros) do |text|
                   [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].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, obj, macros)
                 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
                     inject_macros(text, obj, macros) if macros.any?
                   else
                     inject_macros(text, obj, macros, false) if macros.any?
                   end
                   parsed << text
                   if tag
                     if closing
                       if tags.last && tags.last.casecmp(tag) == 0
                         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)
                 return if options[:inline_attachments] == false
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || []
                 attachments += obj.attachments if obj.respond_to?(:attachments)
                 if attachments.present?
                   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, CGI.unescape(filename))
                       image_url = download_named_attachment_url(found, found.filename, :only_path => only_path)
                       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 =~ /^([^\:]+)\:(.*)$/
                       identifier, page = $1, $2
                       link_project = Project.find_by_identifier(identifier) || Project.find_by_name(identifier)
                       title ||= identifier 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, :version => nil, :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
               #  Projects:
               #     project:someproject -> Link to project named "someproject"
               #     project#3 -> Link to project with id 3
               #
               #   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, default_project, obj, attr, only_path, options)
                 text.gsub!(%r{<a( [^>]+?)?>(.*?)</a>|([\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|
                   tag_content, leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $2, $3, $4, $5, $6, $7, $12, $13, $10 || $14 || $20, $16 || $21, $17, $19
                   if tag_content
                     $&
                   else
                     link = nil
                     project = default_project
                     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_raw(changeset.comments, 100))
                           end
                         end
                       elsif sep == '#'
                         oid = identifier.to_i
                         case prefix
                         when nil
                           if oid.to_s == identifier &&
                             issue = Issue.visible.find_by_id(oid)
                             anchor = comment_id ? "note-#{comment_id}" : nil
                             link = link_to("##{oid}#{comment_suffix}",
                                            issue_url(issue, :only_path => only_path, :anchor => anchor),
                                            :class => issue.css_classes,
                                            :title => "#{issue.tracker.name}: #{issue.subject.truncate(100)} (#{issue.status.name})")
                           end
                         when 'document'
                           if document = Document.visible.find_by_id(oid)
                             link = link_to(document.title, document_url(document, :only_path => only_path), :class => 'document')
                           end
                         when 'version'
                           if version = Version.visible.find_by_id(oid)
                             link = link_to(version.name, version_url(version, :only_path => only_path), :class => 'version')
                           end
                         when 'message'
                           if message = Message.visible.find_by_id(oid)
                             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(board.name, project_board_url(board.project, board, :only_path => only_path), :class => 'board')
                           end
                         when 'news'
                           if news = News.visible.find_by_id(oid)
                             link = link_to(news.title, news_url(news, :only_path => only_path), :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")
                         name = CGI.unescapeHTML(name)
                         case prefix
                         when 'document'
                           if project && document = project.documents.visible.find_by_title(name)
                             link = link_to(document.title, document_url(document, :only_path => only_path), :class => 'document')
                           end
                         when 'version'
                           if project && version = project.versions.visible.find_by_name(name)
                             link = link_to(version.name, version_url(version, :only_path => only_path), :class => 'version')
                           end
                         when 'forum'
                           if project && board = project.boards.visible.find_by_name(name)
                             link = link_to(board.name, project_board_url(board.project, board, :only_path => only_path), :class => 'board')
                           end
                         when 'news'
                           if project && news = project.news.visible.find_by_title(name)
                             link = link_to(news.title, news_url(news, :only_path => only_path), :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.where("repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%").first)
                                 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_raw(changeset.comments, 100)
                               end
                             else
                               if repository && User.current.allowed_to?(:browse_repository, project)
                                 name =~ %r{^[/\\]*(.*?)(@([^/\\@]+?))?(#(L\d+))?$}
                                 path, rev, anchor = $1, $3, $5
                                 link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
                                                                         :path => to_path_param(path),
                                                                         :rev => rev,
                                                                         :anchor => anchor},
                                                                        :class => (prefix == 'export' ? 'source download' : 'source')
                               end
                             end
                             repo_prefix = nil
                           end
                         when 'attachment'
                           attachments = options[:attachments] || []
                           attachments += obj.attachments if obj.respond_to?(:attachments)
                           if attachments && attachment = Attachment.latest_attach(attachments, name)
                             link = link_to_attachment(attachment, :only_path => only_path, :download => true, :class => 'attachment')
                           end
                         when 'project'
                           if p = Project.visible.where("identifier = :s OR LOWER(name) = :s", :s => name.downcase).first
                             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
               end
               HEADING_RE = /(<h(\d)( [^>]+)?>(.+?)<\/h(\d)>)/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)),
+                      link_to('', options[:edit_section_links].merge(:section => @current_section),
+                              :class => 'icon-only icon-edit'),
                       :class => 'contextual',
                       :title => l(:button_edit_section),
                       :id => "section-#{@current_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
                             (\(([^\n\r]*?)\))?          # optional arguments
                             ([\n\r].*?[\n\r])?          # optional block of text
                             \}\}                        # closing tag
                             )
                            )/mx unless const_defined?(:MACROS_RE)
               MACRO_SUB_RE = /(
                               \{\{
                               macro\((\d+)\)
                               \}\}
                               )/x unless const_defined?(:MACRO_SUB_RE)
               # Extracts macros from text
               def catch_macros(text)
                 macros = {}
                 text.gsub!(MACROS_RE) do
                   all, macro = $1, $4.downcase
                   if macro_exists?(macro) || all =~ MACRO_SUB_RE
                     index = macros.size
                     macros[index] = all
                     "{{macro(#{index})}}"
                   else
                     all
                   end
                 end
                 macros
               end
               # Executes and replaces macros in text
               def inject_macros(text, obj, macros, execute=true)
                 text.gsub!(MACRO_SUB_RE) do
                   all, index = $1, $2.to_i
                   orig = macros.delete(index)
                   if execute && orig && orig =~ MACROS_RE
                     esc, all, macro, args, block = $2, $3, $4.downcase, $6.to_s, $7.try(:strip)
                     if esc.nil?
                       h(exec_macro(macro, obj, args, block) || all)
                     else
                       h(all)
                     end
                   elsif orig
                     h(orig)
                   else
                     h(all)
                   end
                 end
               end
               TOC_RE = /<p>\{\{((<|&lt;)|(>|&gt;))?toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
               # Renders the TOC with given headings
               def replace_toc(text, headings)
                 text.gsub!(TOC_RE) do
                   left_align, right_align = $2, $3
                   # Keep only the 4 first levels
                   headings = headings.select{|level, anchor, item| level <= 4}
                   if headings.empty?
                     ''
                   else
                     div_class = 'toc'
                     div_class << ' right' if right_align
                     div_class << ' left' if left_align
                     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)", ""]] : []) + languages_options
               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 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 preview_link(url, form, target='preview', options={})
                 content_tag 'a', l(:label_preview), {
                     :href => "#",
                     :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|,
                     :accesskey => accesskey(:preview)
                   }.merge(options)
               end
               def link_to_function(name, function, html_options={})
                 content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(html_options))
               end
               # Helper to render JSON in views
               def raw_json(arg)
                 arg.to_json.to_s.gsub('/', '\/').html_safe
               end
               def back_url
                 url = params[:back_url]
                 if url.nil? && referer = request.env['HTTP_REFERER']
                   url = CGI.unescape(referer.to_s)
                 end
                 url
               end
               def back_url_hidden_field_tag
                 url = back_url
                 hidden_field_tag('back_url', url, :id => nil) unless 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 toggle_checkboxes_link(selector)
-                link_to_function image_tag('toggle_check.png'),
+                link_to_function '',
                   "toggleCheckboxesBySelector('#{selector}')",
-                  :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}"
+                  :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
+                  :class => 'toggle-checkboxes'
               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])
                 titles = options[:titles].to_a
                 titles[0] = "#{pcts[0]}%" if titles[0].blank?
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed', :title => titles[0]) : ''.html_safe) +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done', :title => titles[1]) : ''.html_safe) +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo', :title => titles[2]) : ''.html_safe)
                   ), :class => "progress progress-#{pcts[0]}").html_safe +
                   content_tag('p', legend, :class => 'percent').html_safe
               end
               def checked_image(checked=true)
                 if checked
-                  @checked_image_tag ||= image_tag('toggle_check.png')
+                  @checked_image_tag ||= content_tag(:span, nil, :class => 'icon-only icon-checked')
                 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 "contextMenuInit('#{ url_for(url) }')"
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 javascript_tag("$(function() { $('##{field_id}').addClass('date').datepicker(datepickerOptions); });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   tags = ''.html_safe
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     start_of_week = Setting.start_of_week
                     start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
                     # Redmine uses 1..7 (monday..sunday) in settings and locales
                     # JQuery uses 0..6 (sunday..saturday), 7 needs to be changed to 0
                     start_of_week = start_of_week.to_i % 7
                     tags << javascript_tag(
                                "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
                                  "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
                                  path_to_image('/images/calendar.png') +
                                  "', showButtonPanel: true, showWeek: true, showOtherMonths: true, " +
                                  "selectOtherMonths: true, changeMonth: true, changeYear: true, " +
                                  "beforeShow: beforeShowDatePicker};")
                     jquery_locale = l('jquery.locale', :default => current_language.to_s)
                     unless jquery_locale == 'en'
                       tags << javascript_include_tag("i18n/datepicker-#{jquery_locale}.js")
                     end
                     tags
                   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 sidebar_content?
                 content_for?(: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
               # Returns a link to edit user's avatar if avatars are enabled
               def avatar_edit_link(user, options={})
                 if Setting.gravatar_enabled?
                   url = "https://gravatar.com"
                   link_to avatar(user, {:title => l(:button_edit)}.merge(options)), url, :target => '_blank'
                 end
               end
               def sanitize_anchor_name(anchor)
                 anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
               end
               # Returns the javascript tags that are included in the html layout head
               def javascript_heads
                 tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.4', 'application', 'responsive')
                 unless User.current.pref.warn_on_leaving_unsaved == '0'
                   tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
                 end
                 tags
               end
               def favicon
                 "<link rel='shortcut icon' href='#{favicon_path}' />".html_safe
               end
               # Returns the path to the favicon
               def favicon_path
                 icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico'
                 image_path(icon)
               end
               # Returns the full URL to the favicon
               def favicon_url
                 # TODO: use #image_url introduced in Rails4
                 path = favicon_path
                 base = url_for(:controller => 'welcome', :action => 'index', :only_path => false)
                 base.sub(%r{/+$},'') + '/' + path.sub(%r{^/+},'')
               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 deserializing an array with attributes
                   nil
                 else
                   options
                 end
               end
               def generate_csv(&block)
                 decimal_separator = l(:general_csv_decimal_separator)
                 encoding = l(:general_csv_encoding)
               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/helpers/email_addresses_helper.rb +6 -6

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module EmailAddressesHelper
               # Returns a link to enable or disable notifications for the address
               def toggle_email_address_notify_link(address)
                 if address.notify?
-                  link_to image_tag('email.png'),
+                  link_to '',
                     user_email_address_path(address.user, address, :notify => '0'),
-                    :method => :put,
+                    :method => :put, :remote => true,
                     :title => l(:label_disable_notifications),
-                    :remote => true
+                    :class => 'icon icon-email'
                 else
-                  link_to image_tag('email_disabled.png'),
+                  link_to '',
                     user_email_address_path(address.user, address, :notify => '1'),
-                    :method => :put,
+                    :method => :put, :remote => true,
                     :title => l(:label_enable_notifications),
-                    :remote => true
+                    :class => 'icon icon-email-disabled'
                 end
               end
             end

app/helpers/issues_helper.rb +4 -5

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module IssuesHelper
               include ApplicationHelper
               include Redmine::Export::PDF::IssuesPdfHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               def grouped_issue_list(issues, query, issue_count_by_group, &block)
                 previous_group, first = false, true
                 totals_by_group = query.totalable_columns.inject({}) do |h, column|
                   h[column] = query.total_by_group_for(column)
                   h
                 end
                 issue_list(issues) do |issue, level|
                   group_name = group_count = nil
                   if query.grouped?
                     group = query.group_by_column.value(issue)
                     if first || group != previous_group
                       if group.blank? && group != false
                         group_name = "(#{l(:label_blank_value)})"
                       else
                         group_name = format_object(group)
                       end
                       group_name ||= ""
                       group_count = issue_count_by_group[group]
                       group_totals = totals_by_group.map {|column, t| total_tag(column, t[group] || 0)}.join(" ").html_safe
                     end
                   end
                   yield issue, level, group_name, group_count, group_totals
                   previous_group, first = group, false
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.preload(:status, :priority, :tracker).sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu #{issue.css_classes}"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio)),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               def issue_estimated_hours_details(issue)
                 if issue.total_estimated_hours.present?
                   if issue.total_estimated_hours == issue.estimated_hours
                     l_hours_short(issue.estimated_hours)
                   else
                     s = issue.estimated_hours.present? ? l_hours_short(issue.estimated_hours) : ""
                     s << " (#{l(:label_total)}: #{l_hours_short(issue.total_estimated_hours)})"
                     s.html_safe
                   end
                 end
               end
               def issue_spent_hours_details(issue)
                 if issue.total_spent_hours > 0
                   if issue.total_spent_hours == issue.spent_hours
                     link_to(l_hours_short(issue.spent_hours), issue_time_entries_path(issue))
                   else
                     s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
                     s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), issue_time_entries_path(issue)})"
                     s.html_safe
                   end
                 end
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :tracker_id => issue.tracker,
                   :parent_issue_id => issue
                 }
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   content =
                     content_tag('div', @left.reduce(&:+), :class => 'splitcontentleft') +
                     content_tag('div', @right.reduce(&:+), :class => 'splitcontentleft')
                   content_tag('div', content, :class => 'splitcontent')
                 end
                 def cells(label, text, options={})
                   options[:class] = [options[:class] || "", 'attribute'].join(' ')
                   content_tag 'div',
                     content_tag('div', label + ":", :class => 'label') + content_tag('div', text, :class => 'value'),
                     options
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 half = (values.size / 2.0).ceil
                 issue_fields_rows do |rows|
                   values.each_with_index do |value, i|
                     css = "cf_#{value.custom_field.id}"
                     m = (i < half ? :left : :right)
                     rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css
                   end
                 end
               end
               # Returns the path for updating the issue form
               # with project as the current project
               def update_issue_form_path(project, issue)
                 options = {:format => 'js'}
                 if issue.new_record?
                   if project
                     new_project_issue_path(project, options)
                   else
                     new_issue_path(options)
                   end
                 else
                   edit_issue_path(issue, options)
                 end
               end
               # Returns the number of descendants for an array of issues
               def issues_descendant_count(issues)
                 ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq
                 ids -= issues.map(&:id)
                 ids.size
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues_descendant_count(issues)
                 if descendant_count > 0
                   message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                 end
                 message
               end
               # Returns an array of users that are proposed as watchers
               # on the new issue form
               def users_for_new_issue_watchers(issue)
                 users = issue.watcher_users
                 if issue.project.users.count <= 20
                   users = (users + issue.project.users.sort).uniq
                 end
                 users
               end
               def sidebar_queries
                 unless @sidebar_queries
                   @sidebar_queries = IssueQuery.visible.
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
                     to_a
                 end
                 @sidebar_queries
               end
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               def render_sidebar_queries
                 out = ''.html_safe
                 out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
                 out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
                 out
               end
               def email_issue_attributes(issue, user)
                 items = []
                 %w(author status priority assigned_to category fixed_version).each do |attribute|
                   unless issue.disabled_core_fields.include?(attribute+"_id")
                     items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
                   end
                 end
                 issue.visible_custom_field_values(user).each do |value|
                   items << "#{value.custom_field.name}: #{show_value(value, false)}"
                 end
                 items
               end
               def render_email_issue_attributes(issue, user, html=false)
                 items = email_issue_attributes(issue, user)
                 if html
                   content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
                 else
                   items.map{|s| "* #{s}"}.join("\n")
                 end
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field = detail.custom_field
                     if field && field.multiple?
                       values_by_field[field] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 if values_by_field.present?
                   multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value)
                   values_by_field.each do |field, changes|
                     if changes[:added].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.value = changes[:added]
                       strings << show_detail(detail, no_html, options)
                     end
                     if changes[:deleted].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.old_value = changes[:deleted]
                       strings << show_detail(detail, no_html, options)
                     end
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   when 'description'
                     show_diff = true
                   end
                 when 'cf'
                   custom_field = detail.custom_field
                   if custom_field
                     label = custom_field.name
                     if custom_field.format.class.change_as_diff
                       show_diff = true
                     else
                       multiple = custom_field.multiple?
                       value = format_value(detail.value, custom_field) if detail.value
                       old_value = format_value(detail.old_value, custom_field) if detail.old_value
                     end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   end
                   relation_type = IssueRelation::TYPES[detail.prop_key]
                   label = l(relation_type[:name]) if relation_type
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && value.present? &&
                       atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i}
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && atta.is_text?
-                      value += link_to(
+                      value += link_to('',
-                                   image_tag('magnifier.png'),
+                                       { :controller => 'attachments', :action => 'show',
-                                   :controller => 'attachments', :action => 'show',
+                                         :id => atta, :filename => atta.filename },
-                                   :id => atta, :filename => atta.filename
+                                       :class => 'icon icon-magnifier')
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                        :detail_id => detail.id, :only_path => options[:only_path]},
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 @detail_value_name_by_reflection ||= Hash.new do |hash, key|
                   association = Issue.reflect_on_association(key.first.to_sym)
                   name = nil
                   if association
                     record = association.klass.find_by_id(key.last)
                     if record
                       name = record.name.force_encoding('UTF-8')
                     end
                   end
                   hash[key] = name
                 end
                 @detail_value_name_by_reflection[[field, id]]
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/helpers/journals_helper.rb +8 -4

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module JournalsHelper
               # Returns the attachments of a journal that are displayed as thumbnails
               def journal_thumbnail_attachments(journal)
                 ids = journal.details.select {|d| d.property == 'attachment' && d.value.present?}.map(&:prop_key)
                 ids.any? ? Attachment.where(:id => ids).select(&:thumbnailable?) : []
               end
               def render_notes(issue, journal, options={})
                 content = ''
                 editable = User.current.logged? && (User.current.allowed_to?(:edit_issue_notes, issue.project) || (journal.user == User.current && User.current.allowed_to?(:edit_own_issue_notes, issue.project)))
                 links = []
                 if !journal.notes.blank?
-                  links << link_to(image_tag('comment.png'),
+                  links << link_to('',
                                    {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal},
                                    :remote => true,
                                    :method => 'post',
-                                   :title => l(:button_quote)) if options[:reply_links]
+                                   :title => l(:button_quote),
-                  links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes",
+                                   :class => 'icon-only icon-comment'
+                                  ) if options[:reply_links]
+                  links << link_to_in_place_notes_editor('', "journal-#{journal.id}-notes",
                                                          { :controller => 'journals', :action => 'edit', :id => journal, :format => 'js' },
-                                                            :title => l(:button_edit)) if editable
+                                                         :title => l(:button_edit),
+                                                         :class => 'icon-only icon-edit'
+                                                        ) if editable
                 end
                 content << content_tag('div', links.join(' ').html_safe, :class => 'contextual') unless links.empty?
                 content << textilizable(journal, :notes)
                 css_classes = "wiki"
                 css_classes << " editable" if editable
                 content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
               end
               def link_to_in_place_notes_editor(text, field_id, url, options={})
                 onclick = "$.ajax({url: '#{url_for(url)}', type: 'get'}); return false;"
                 link_to text, '#', options.merge(:onclick => onclick)
               end
             end

app/helpers/watchers_helper.rb +4 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module WatchersHelper
               def watcher_link(objects, user)
                 return '' unless user && user.logged?
                 objects = Array.wrap(objects)
                 return '' unless objects.any?
                 watched = Watcher.any_watched?(objects, user)
                 css = [watcher_css(objects), watched ? 'icon icon-fav' : 'icon icon-fav-off'].join(' ')
                 text = watched ? l(:button_unwatch) : l(:button_watch)
                 url = watch_path(
                   :object_type => objects.first.class.to_s.underscore,
                   :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)
                 )
                 method = watched ? 'delete' : 'post'
                 link_to text, url, :remote => true, :method => method, :class => css
               end
               # Returns the css class used to identify watch links for a given +object+
               def watcher_css(objects)
                 objects = Array.wrap(objects)
                 id = (objects.size == 1 ? objects.first.id : 'bulk')
                 "#{objects.first.class.to_s.underscore}-#{id}-watcher"
               end
               # Returns a comma separated list of users watching the given object
               def watchers_list(object)
                 remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project)
                 content = ''.html_safe
                 lis = object.watcher_users.collect do |user|
                   s = ''.html_safe
                   s << avatar(user, :size => "16").to_s
                   s << link_to_user(user, :class => 'user')
                   if remove_allowed
                     url = {:controller => 'watchers',
                            :action => 'destroy',
                            :object_type => object.class.to_s.underscore,
                            :object_id => object.id,
                            :user_id => user}
                     s << ' '
-                    s << link_to(image_tag('delete.png'), url,
+                    s << link_to('', url,
-                                 :remote => true, :method => 'delete', :class => "delete")
+                                 :remote => true, :method => 'delete',
+                                 :class => "delete icon-only icon-del",
+                                 :title => l(:button_delete))
                   end
                   content << content_tag('li', s, :class => "user-#{user.id}")
                 end
                 content.present? ? content_tag('ul', content, :class => 'watchers') : content
               end
               def watchers_checkboxes(object, users, checked=nil)
                 users.map do |user|
                   c = checked.nil? ? object.watched_by?(user) : checked
                   tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil
                   content_tag 'label', "#{tag} #{h(user)}".html_safe,
                               :id => "issue_watcher_user_ids_#{user.id}",
                               :class => "floating"
                 end.join.html_safe
               end
             end

app/views/admin/info.html.erb +1 -2

             <h2><%=l(:label_information_plural)%></h2>
             <p><strong><%= Redmine::Info.versioned_name %></strong></p>
             <table class="list">
             <% @checklist.each do |label, result| %>
               <tr class="<%= cycle 'odd', 'even' %>">
                 <td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td>
-                <td class="tick"><%= image_tag((result ? 'true.png' : 'exclamation.png'),
+                <td class="tick"><span class="icon-only <%= (result ? 'icon-ok' : 'icon-error') %>"></span></td>
-                                                :style => "vertical-align:bottom;") %></td>
               </tr>
             <% end %>
             </table>
             <br />
             <div class="box">
             <pre><%= Redmine::Info.environment %></pre>
             </div>
             <% html_title(l(:label_information_plural)) -%>

app/views/admin/plugins.html.erb +2 -2

             <%= title l(:label_plugins) %>
             <% if @plugins.any? %>
             <table class="list plugins">
                 <% @plugins.each do |plugin| %>
                     <tr id="plugin-<%= plugin.id %>" class="<%= cycle('odd', 'even') %>">
                     <td class="name"><span class="name"><%= plugin.name %></span>
                         <%= content_tag('span', plugin.description, :class => 'description') unless plugin.description.blank? %>
                         <%= content_tag('span', link_to(plugin.url, plugin.url), :class => 'url') unless plugin.url.blank? %>
                     </td>
                     <td class="author"><%= plugin.author_url.blank? ? plugin.author : link_to(plugin.author, plugin.author_url) %></td>
                     <td class="version"><span class="icon"><%= plugin.version %></span></td>
                     <td class="configure"><%= link_to(l(:button_configure), plugin_settings_path(plugin)) if plugin.configurable? %></td>
                     </tr>
                 <% end %>
             </table>
             <p><a href="#" id="check-for-updates"><%= l(:label_check_for_updates) %></a></p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <%= javascript_tag do %>
             $(document).ready(function(){
               $("#check-for-updates").click(function(e){
                 e.preventDefault();
                 $.ajax({
                   dataType: "jsonp",
                   url: "https://www.redmine.org/plugins/check_updates",
                   data: <%= raw_json plugin_data_for_updates(@plugins) %>,
                   timeout: 3000,
                   beforeSend: function(){
                     $('#ajax-indicator').show();
                   },
                   success: function(data){
                     $('#ajax-indicator').hide();
                     $("table.plugins td.version span").addClass("unknown");
                     $.each(data, function(plugin_id, plugin_data){
                       var s = $("tr#plugin-"+plugin_id+" td.version span");
-                      s.removeClass("icon-checked icon-warning unknown");
+                      s.removeClass("icon-ok icon-warning unknown");
                       if (plugin_data.url) {
                         if (s.parent("a").length>0) {
                           s.unwrap();
                         }
                         s.addClass("found");
                         s.wrap($("<a></a>").attr("href", plugin_data.url).attr("target", "_blank"));
                       }
                       if (plugin_data.c == s.text()) {
-                        s.addClass("icon-checked");
+                        s.addClass("icon-ok");
                       } else if (plugin_data.c) {
                         s.addClass("icon-warning");
                         s.attr("title", "<%= escape_javascript l(:label_latest_compatible_version) %>: "+plugin_data.c);
                       }
                     });
                     $("table.plugins td.version span.unknown").addClass("icon-help").attr("title", "<%= escape_javascript l(:label_unknown_plugin) %>");
                   },
                   error: function(){
                     $('#ajax-indicator').hide();
                     alert("Unable to retrieve plugin informations from www.redmine.org");
                   }
                 });
               });
             });
             <% end if @plugins.any? %>

app/views/attachments/_links.html.erb +15 -11

             <div class="attachments">
             <div class="contextual">
-              <%= link_to image_tag('edit.png'),
+              <%= link_to('',
-                    container_attachments_edit_path(container),
+                          container_attachments_edit_path(container),
-                    :title => l(:label_edit_attachments) if options[:editable] %>
+                          :title => l(:label_edit_attachments),
+                          :class => 'icon-only icon-edit'
+                         ) if options[:editable] %>
             </div>
             <% 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'),
+                <%= link_to '',
-                            :controller => 'attachments', :action => 'show',
+                            { :controller => 'attachments', :action => 'show',
-                            :id => attachment, :filename => attachment.filename %>
+                              :id => attachment, :filename => attachment.filename },
+                            :class => 'icon icon-magnifier',
+                            :title => l(:button_view) %>
               <% end %>
               <%= " - #{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),
+                <%= link_to '', attachment_path(attachment),
-                                                     :data => {:confirm => l(:text_are_you_sure)},
+                            :data => {:confirm => l(:text_are_you_sure)},
-                                                     :method => :delete,
+                            :method => :delete,
-                                                     :class => 'delete',
+                            :class => 'delete icon-only icon-del',
-                                                     :title => l(:button_delete) %>
+                            :title => l(:button_delete) %>
               <% end %>
               <% if options[:author] %>
                 <span class="author"><%= 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/issues/_attributes.html.erb +8 -4

             <%= labelled_fields_for :issue, @issue do |f| %>
             <div class="splitcontent">
             <div class="splitcontentleft">
             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
                             :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
             <% end %>
             <% if @issue.safe_attribute? 'priority_id' %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true} %></p>
             <% end %>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
             <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
             <% end %>
             <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
             <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %>
-            <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
+            <%= link_to('',
                         new_project_issue_category_path(@issue.project),
                         :remote => true,
                         :method => 'get',
                         :title => l(:label_issue_category_new),
-                        :tabindex => 200) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
+                        :tabindex => 200,
+                        :class => 'icon-only icon-add'
+                       ) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
             <% end %>
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
             <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
-            <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
+            <%= link_to('',
                         new_project_version_path(@issue.project),
                         :remote => true,
                         :method => 'get',
                         :title => l(:label_version_new),
-                        :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
+                        :tabindex => 200,
+                        :class => 'icon-only icon-add'
+                       ) if User.current.allowed_to?(:manage_versions, @issue.project) %>
             </p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
             <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks)}')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>
             <p id="start_date_area">
               <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
               <%= calendar_for('issue_start_date') %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'due_date' %>
             <p id="due_date_area">
               <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
               <%= calendar_for('issue_due_date') %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'estimated_hours' %>
             <p><%= f.text_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
             <% end %>
             <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
             <% end %>
             </div>
             </div>
             <% if @issue.safe_attribute? 'custom_field_values' %>
             <%= render :partial => 'issues/form_custom_fields' %>
             <% end %>
             <% end %>
             <% include_calendar_headers_tags %>

app/views/issues/_relations.html.erb +4 -2

             <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| %>
               <% other_issue = relation.other_issue(@issue) -%>
               <tr class="issue hascontextmenu <%= other_issue.css_classes %>" id="relation-<%= relation.id %>">
               <td class="checkbox"><%= check_box_tag("ids[]", other_issue.id, false, :id => nil) %></td>
               <td class="subject" style="width: 50%">
                 <%= relation.to_s(@issue) {|other| link_to_issue(other, :project => Setting.cross_project_issue_relations?)}.html_safe %>
               </td>
               <td class="status"><%= other_issue.status.name %></td>
               <td class="start_date"><%= format_date(other_issue.start_date) %></td>
               <td class="due_date"><%= format_date(other_issue.due_date) %></td>
-              <td class="buttons"><%= link_to image_tag('link_break.png'),
+              <td class="buttons"><%= link_to('',
                                               relation_path(relation),
                                               :remote => true,
                                               :method => :delete,
                                               :data => {:confirm => l(:text_are_you_sure)},
-                                              :title => l(:label_relation_delete) if User.current.allowed_to?(:manage_issue_relations, @project) %></td>
+                                              :title => l(:label_relation_delete),
+                                              :class => 'icon-only icon-link-break'
+                                             ) if User.current.allowed_to?(:manage_issue_relations, @project) %></td>
               </tr>
             <% end %>
             </table>
             </form>
             <% end %>
             <%= form_for @relation, {
                              :as => :relation, :remote => true,
                              :url => issue_relations_path(@issue),
                              :method => :post,
                              :html => {:id => 'new-relation-form', :style => 'display: none;'}
                            } do |f| %>
             <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
             <% end %>

app/views/messages/show.html.erb +10 -6

             <%= board_breadcrumb(@message) %>
             <div class="contextual">
                 <%= watcher_link(@topic, User.current) %>
                 <%= link_to(
                       l(:button_quote),
                       {:action => 'quote', :id => @topic},
                       :method => 'get',
                       :class => 'icon icon-comment',
                       :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
                 <%= 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,
                       :data => {:confirm => l(:text_are_you_sure)},
                       :class => 'icon icon-del'
                      ) if @message.destroyable_by?(User.current) %>
             </div>
             <h2><%= avatar(@topic.author, :size => "24") %><%= @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(
-                        image_tag('comment.png'),
+                        '',
                         {:action => 'quote', :id => message},
                         :remote => true,
                         :method => 'get',
-                        :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
+                        :title => l(:button_quote),
+                        :class => 'icon icon-comment'
+                      ) if !@topic.locked? && authorize_for('messages', 'reply') %>
                   <%= link_to(
-                        image_tag('edit.png'),
+                        '',
                         {:action => 'edit', :id => message},
-                        :title => l(:button_edit)
+                        :title => l(:button_edit),
+                        :class => 'icon icon-edit'
                       ) if message.editable_by?(User.current) %>
                   <%= link_to(
-                        image_tag('delete.png'),
+                        '',
                         {:action => 'destroy', :id => message},
                         :method => :post,
                         :data => {:confirm => l(:text_are_you_sure)},
-                        :title => l(:button_delete)
+                        :title => l(:button_delete),
+                        :class => 'icon icon-del'
                       ) if message.destroyable_by?(User.current) %>
                 </div>
               <h4>
                 <%= avatar(message.author, :size => "24") %>
                 <%= link_to 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 %>
             <span class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></span>
             <% 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) %>
               <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <% html_title @topic.subject %>

app/views/my/blocks/_timelog.html.erb +7 -6

             <h3>
               <%= link_to l(:label_spent_time), time_entries_path(:user_id => 'me') %>
               (<%= l(:label_last_n_days, 7) %>)
             </h3>
             <%
             entries = timelog_items
             entries_by_day = entries.group_by(&:spent_on)
             %>
             <% if User.current.allowed_to?(:log_time, nil, :global => true) %>
             <div class="contextual">
               <%= link_to l(:button_log_time), new_time_entry_path, :class => "icon icon-add" %>
             </div>
             <% end %>
             <div class="total-hours">
             <p><%= l(:label_total_time) %>: <%= 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"><%= entry.activity %></td>
                 <td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
                 <td class="comments"><%= entry.comments %></td>
                 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
                 <td class="buttons">
                 <% if entry.editable_by?(@user) -%>
-                    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+                    <%= link_to '', {:controller => 'timelog', :action => 'edit', :id => entry},
-                                                       :title => l(:button_edit) %>
+                                :title => l(:button_edit),
-                    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+                                :class => 'icon-only icon-edit' %>
-                                                         :data => {:confirm => l(:text_are_you_sure)},
+                    <%= link_to '', {:controller => 'timelog', :action => 'destroy', :id => entry},
-                                                         :method => :delete,
+                                :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,
-                                                         :title => l(:button_delete) %>
+                                :title => l(:button_delete),
+                                :class => 'icon-only icon-del' %>
                 <% end -%>
                 </td>
                 </tr>
                 <% end -%>
             <% end -%>
             </tbody>
             </table>
             <% end %>

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

             <div class="contextual">
             <%= watcher_link(@news, User.current) %>
             <%= link_to(l(:button_edit),
                   edit_news_path(@news),
                   :class => 'icon icon-edit',
                   :accesskey => accesskey(:edit),
                   :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
             <%= delete_link news_path(@news) 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) %>
             <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |
             <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <p><% unless @news.summary.blank? %><em><%= @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},
+                <%= link_to_if_authorized '', {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                                   :data => {: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),
+                                          :class => 'icon-only icon-del' %>
                 </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/reports/issue_report.html.erb +28 -7

             <h2><%=l(:label_report_plural)%></h2>
             <div class="splitcontentleft">
-            <h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'tracker') %></h3>
+            <h3>
+              <%=l(:field_tracker)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'tracker'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
             <br />
-            <h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'priority') %></h3>
+            <h3>
+              <%=l(:field_priority)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'priority'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
             <br />
-            <h3><%=l(:field_assigned_to)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'assigned_to') %></h3>
+            <h3>
+              <%=l(:field_assigned_to)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'assigned_to'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %>
             <br />
-            <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'author') %></h3>
+            <h3>
+              <%=l(:field_author)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'author'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
             <br />
             <%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
             </div>
             <div class="splitcontentright">
-            <h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'version') %></h3>
+            <h3>
+              <%=l(:field_version)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'version'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
             <br />
             <% if @project.children.any? %>
-            <h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'subproject') %></h3>
+            <h3>
+              <%=l(:field_subproject)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'subproject'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %>
             <br />
             <% end %>
-            <h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'category') %></h3>
+            <h3>
+              <%=l(:field_category)%>&nbsp;
+              <%= link_to '', project_issues_report_details_path(@project, :detail => 'category'), :class => 'icon-only icon-zoom-in' %>
+            </h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
             <br />
             <%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
             </div>

app/views/repositories/_related_issues.html.erb +4 -2

             <% 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(image_tag('link_break.png'),
+                <%= link_to('',
                             {:controller => 'repositories', :action => 'remove_related_issue',
                               :id => @project, :repository_id => @repository.identifier_param,
                               :rev => @changeset.identifier, :issue_id => issue},
                             :remote => true,
                             :method => :delete,
                             :data => {:confirm => l(:text_are_you_sure)},
-                            :title => l(:label_relation_delete)) if manage_allowed %>
+                            :title => l(:label_relation_delete),
+                            :class => 'icon-only icon-link-break'
+                           ) if manage_allowed %>
               </li>
             <% end %>
             </ul>
             <% if manage_allowed %>
               <%= form_tag({:controller => 'repositories', :action => 'add_related_issue',
                             :id => @project, :repository_id => @repository.identifier_param,
                             :rev => @changeset.identifier},
                    :remote => true,
                    :method => :post,
                    :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>
             <%= javascript_tag "observeAutocompleteField('issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => 'all')}')" %>

app/views/roles/permissions.html.erb +8 -4

             <%= title [l(:label_role_plural), roles_path], l(:label_permissions_report) %>
             <%= form_tag(permissions_roles_path, :id => 'permissions_form') do %>
             <%= hidden_field_tag 'permissions[0]', '', :id => nil %>
             <div class="autoscroll">
             <table class="list permissions">
             <thead>
                 <tr>
                 <th><%=l(:label_permissions)%></th>
                 <% @roles.each do |role| %>
                 <th>
+                    <%= link_to_function('',
+                                         "toggleCheckboxesBySelector('input.role-#{role.id}')",
+                                         :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                         :class => 'icon-only icon-checked') %>
                     <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %>
-                    <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')",
-                                                                        :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                 </th>
                 <% end %>
                 </tr>
             </thead>
             <tbody>
             <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
             <% perms_by_module.keys.sort.each do |mod| %>
                 <% unless mod.blank? %>
                     <tr class="group open">
                       <td>
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l_or_humanize(mod, :prefix => 'project_module_') %>
                       </td>
                       <% @roles.each do |role| %>
                       <td class="role"><%= role.name %></td>
                       <% end %>
                     </tr>
                 <% end %>
                 <% perms_by_module[mod].each do |permission| %>
                     <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
                     <td class="name">
-                        <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                        <%= link_to_function('',
-                                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                                             "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                             :class => 'icon-only icon-checked') %>
                         <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
                     </td>
                     <% @roles.each do |role| %>
                     <td>
                     <% if role.setable_permissions.include? permission %>
                       <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
                     <% end %>
                     </td>
                     <% end %>
                     </tr>
                 <% end %>
             <% end %>
             </tbody>
             </table>
             </div>
             <p><%= check_all_links 'permissions_form' %></p>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/settings/_repositories.html.erb +7 -8

             <%= form_tag({:action => 'edit', :tab => 'repositories'}) do %>
             <fieldset class="box settings enabled_scm">
             <legend><%= l(:setting_enabled_scm) %></legend>
             <%= hidden_field_tag 'settings[enabled_scm][]', '' %>
             <table>
               <tr>
                 <th></th>
                 <th><%= l(:text_scm_command)         %></th>
                 <th><%= l(:text_scm_command_version) %></th>
               </tr>
               <% Redmine::Scm::Base.all.collect do |choice| %>
                 <% scm_class = "Repository::#{choice}".constantize %>
                 <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
                 <% setting = :enabled_scm %>
                 <% enabled = Setting.send(setting).include?(value) %>
                 <tr>
                   <td class="scm_name">
                     <label>
                       <%= check_box_tag("settings[#{setting}][]", value, enabled, :id => nil) %>
                       <%= text.to_s %>
                     </label>
                   </td>
                   <td>
                     <% if enabled %>
-                      <%=
+                      <span class="icon <%= (scm_class.scm_available ? 'icon-ok' : 'icon-error') %>"></span>
-                        image_tag(
-                          (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
-                          :style => "vertical-align:bottom;"
-                       %>
                       <%= scm_class.scm_command %>
                     <% end %>
                   </td>
                   <td>
                     <%= scm_class.scm_version_string if enabled %>
                   </td>
                 </tr>
               <% end %>
             </table>
             <p><em class="info"><%= l(:text_scm_config) %></em></p>
             </fieldset>
             <div class="box tabular settings">
             <p><%= setting_check_box :autofetch_changesets %></p>
             <p><%= setting_check_box :sys_api_enabled,
                                      :onclick =>
                                          "if (this.checked) { $('#settings_sys_api_key').removeAttr('disabled'); } else { $('#settings_sys_api_key').attr('disabled', true); }" %></p>
             <p><%= setting_text_field :sys_api_key,
                                       :size     => 30,
                                       :id       => 'settings_sys_api_key',
                                       :disabled => !Setting.sys_api_enabled?,
                                       :label    => :setting_mail_handler_api_key %>
               <%= link_to_function l(:label_generate_key),
                                    "if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %>
             </p>
             <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
             </div>
             <fieldset class="box tabular settings">
             <legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
             <p><%= setting_text_field :commit_ref_keywords, :size => 30 %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <p><%= setting_check_box :commit_cross_project_ref %></p>
             <p><%= setting_check_box :commit_logtime_enabled,
                                      :onclick =>
                                         "if (this.checked) { $('#settings_commit_logtime_activity_id').removeAttr('disabled'); } else { $('#settings_commit_logtime_activity_id').attr('disabled', true); }"%></p>
             <p><%= setting_select :commit_logtime_activity_id,
                                   [[l(:label_default), 0]] +
                                       TimeEntryActivity.shared.active.collect{|activity| [activity.name, activity.id.to_s]},
                                   :disabled => !Setting.commit_logtime_enabled?%></p>
             </fieldset>
             <table class="list" id="commit-keywords">
               <thead>
                 <tr>
                   <th><%= l(:label_tracker) %></th>
                   <th><%= l(:setting_commit_fix_keywords) %></th>
                   <th><%= l(:label_applied_status) %></th>
                   <th><%= l(:field_done_ratio) %></th>
                   <th class="buttons"></th>
                 </tr>
               </thead>
               <tbody>
                 <% @commit_update_keywords.each do |rule| %>
                 <tr class="commit-keywords">
                   <td>
                     <%= select_tag(
                             "settings[commit_update_keywords][if_tracker_id][]",
                             options_for_select(
                               [[l(:label_all), ""]] +
                                 Tracker.sorted.map {|t| [t.name, t.id.to_s]},
                             rule['if_tracker_id']),
                             :id => nil
                            ) %>
                   </td>
                   <td>
                     <%= text_field_tag("settings[commit_update_keywords][keywords][]",
                                        rule['keywords'], :id => nil, :size => 30) %>
                   </td>
                   <td>
                     <%= select_tag("settings[commit_update_keywords][status_id][]",
                                    options_for_select(
                                      [["", 0]] +
                                      IssueStatus.sorted.
                                        collect{|status| [status.name, status.id.to_s]},
                                      rule['status_id']),
                                    :id => nil
                                ) %>
                   </td>
                   <td>
                     <%= select_tag("settings[commit_update_keywords][done_ratio][]",
                                    options_for_select(
                                       [["", ""]] +
                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
                                    rule['done_ratio']),
                                    :id => nil
                                 ) %>
                   </td>
                   <td class="buttons">
-                    <%= link_to(image_tag('delete.png'), '#', :class => 'delete-commit-keywords') %>
+                    <%= link_to('', '#',
+                                :class => 'delete-commit-keywords icon-only icon-del') %>
                   </td>
                 </tr>
                 <% end %>
                 <tr>
                   <td></td>
                   <td><em class="info"><%= l(:text_comma_separated) %></em></td>
                   <td></td>
                   <td></td>
-                  <td class="buttons"><%= link_to(image_tag('add.png'), '#', :class => 'add-commit-keywords') %></td>
+                  <td class="buttons">
+                    <%= link_to('', '#',
+                                :class => 'add-commit-keywords icon-only icon-add') %>
+                  </td>
                 </tr>
               </tbody>
             </table>
             <p><%= submit_tag l(:button_save) %></p>
             <% end %>
             <%= javascript_tag do %>
             $('#commit-keywords').on('click', 'a.delete-commit-keywords', function(e){
               e.preventDefault();
               if ($('#commit-keywords tbody tr.commit-keywords').length > 1) {
                 $(this).parents('#commit-keywords tr').remove();
               } else {
                 $('#commit-keywords tbody tr.commit-keywords').find('input, select').val('');
               }
             });
             $('#commit-keywords').on('click', 'a.add-commit-keywords', function(e){
               e.preventDefault();
               var row = $('#commit-keywords tr.commit-keywords:last');
               row.clone().insertAfter(row).find('input, select').val('');
             });
             <% end %>

app/views/timelog/_list.html.erb +8 -6

             <%= 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">
                   <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                 </th>
                 <% @query.inline_columns.each do |column| %>
                   <%= column_header(column) %>
                 <% end %>
                 <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>
                 <%= raw @query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, entry)}</td>"}.join %>
                 <td class="buttons">
                 <% if entry.editable_by?(User.current) -%>
-                    <%= link_to image_tag('edit.png'), edit_time_entry_path(entry),
+                    <%= link_to '', edit_time_entry_path(entry),
-                                                       :title => l(:button_edit) %>
+                                :title => l(:button_edit),
-                    <%= link_to image_tag('delete.png'), time_entry_path(entry),
+                                :class => 'icon icon-edit' %>
-                                                         :data => {:confirm => l(:text_are_you_sure)},
+                    <%= link_to '', time_entry_path(entry),
-                                                         :method => :delete,
+                                :data => {:confirm => l(:text_are_you_sure)},
-                                                         :title => l(:button_delete) %>
+                                :method => :delete,
+                                :title => l(:button_delete),
+                                :class => 'icon-only icon-del' %>
                 <% end -%>
                 </td>
               </tr>
             <% end -%>
             </tbody>
             </table>
             </div>
             <% end -%>
             <%= context_menu time_entries_context_menu_path %>

app/views/trackers/fields.html.erb +9 -6

             <%= title [l(:label_tracker_plural), trackers_path], l(:field_summary) %>
             <% if @trackers.any? %>
               <%= form_tag fields_trackers_path do %>
                 <div class="autoscroll">
                 <table class="list">
                 <thead>
                   <tr>
                     <th></th>
                     <% @trackers.each do |tracker| %>
                     <th>
+                      <%= link_to_function('', "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')",
+                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                           :class => 'icon-only icon-checked') %>
                       <%= tracker.name %>
-                      <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')",
-                                                                          :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
                     </th>
                     <% end %>
                   </tr>
                 </thead>
                 <tbody>
                   <tr class="group open">
                     <td colspan="<%= @trackers.size + 1 %>">
                       <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                       <%= l(:field_core_fields) %>
                     </td>
                   </tr>
                   <% Tracker::CORE_FIELDS.each do |field| %>
                   <tr class="<%= cycle("odd", "even") %>">
                     <td class="name">
-                      <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.core-field-#{field}')",
+                      <%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')",
-                                                                          :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                           :class => 'icon-only icon-checked') %>
                       <%= l("field_#{field}".sub(/_id$/, '')) %>
                     </td>
                     <% @trackers.each do |tracker| %>
                     <td>
                       <%= check_box_tag "trackers[#{tracker.id}][core_fields][]", field, tracker.core_fields.include?(field),
                                         :class => "tracker-#{tracker.id} core-field-#{field}", :id => nil %>
                     </td>
                     <% end %>
                   </tr>
                   <% end %>
                   <% if @custom_fields.any? %>
                     <tr class="group open">
                       <td colspan="<%= @trackers.size + 1 %>">
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l(:label_custom_field_plural) %>
                       </td>
                     </tr>
                     <% @custom_fields.each do |field| %>
                     <tr class="<%= cycle("odd", "even") %>">
                       <td class="name">
-                        <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.custom-field-#{field.id}')",
+                        <%= link_to_function('', "toggleCheckboxesBySelector('input.custom-field-#{field.id}')",
-                                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                             :class => 'icon-only icon-checked') %>
                         <%= field.name %>
                       </td>
                       <% @trackers.each do |tracker| %>
                       <td>
                         <%= check_box_tag "trackers[#{tracker.id}][custom_field_ids][]", field.id, tracker.custom_fields.include?(field),
                                           :class => "tracker-#{tracker.id} custom-field-#{field.id}", :id => nil %>
                       </td>
                       <% end %>
                     </tr>
                     <% end %>
                   <% end %>
                 </tbody>
                 </table>
                 </div>
                 <p><%= submit_tag l(:button_save) %></p>
                 <% @trackers.each do |tracker| %>
                   <%= hidden_field_tag "trackers[#{tracker.id}][core_fields][]", '' %>
                   <%= hidden_field_tag "trackers[#{tracker.id}][custom_field_ids][]", '' %>
                 <% end %>
               <% end %>
             <% else %>
               <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

app/views/workflows/_form.html.erb +9 -6

             <table class="list workflows transitions transitions-<%= name %>">
             <thead>
               <tr>
                 <th>
-                  <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input')",
+                  <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input')",
-                                                                      :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                                       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                       :class => 'icon-only icon-checked') %>
                   <%=l(:label_current_status)%>
                 </th>
                 <th colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
               </tr>
               <tr>
                 <td></td>
                 <% for new_status in @statuses %>
                 <td style="width:<%= 75 / @statuses.size %>%;">
-                  <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
+                  <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
-                                                                  :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                                       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                       :class => 'icon-only icon-checked') %>
                   <%= new_status.name %>
                 </td>
                 <% end %>
               </tr>
             </thead>
             <tbody>
               <% for old_status in [nil] + @statuses %>
               <% next if old_status.nil? && name != 'always' %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td class="name">
-                  <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')",
+                  <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')",
-                                                                      :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+                                       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                       :class => 'icon-only icon-checked') %>
                   <%= old_status ? old_status.name : content_tag('em', l(:label_issue_new)) %>
                 </td>
                 <% for new_status in @statuses -%>
                 <% checked = workflows.detect {|w| w.old_status == old_status && w.new_status == new_status} %>
                 <td class="<%= checked ? 'enabled' : '' %>">
                   <%= transition_tag workflows, old_status, new_status, name %>
                 </td>
                 <% end -%>
               </tr>
               <% end %>
             </tbody>
             </table>

app/views/workflows/edit.html.erb +2 -2

             <%= render :partial => 'action_menu' %>
             <%= title l(:label_workflow) %>
             <div class="tabs">
               <ul>
                 <li><%= link_to l(:label_status_transitions), workflows_edit_path(:role_id => @roles, :tracker_id => @trackers), :class => 'selected' %></li>
                 <li><%= link_to l(:label_fields_permissions), workflows_permissions_path(:role_id => @roles, :tracker_id => @trackers) %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
               <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
               </label>
-              <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
+              <a href="#" data-expands="#role_id"><span class="toggle-multiselect"></span></a>
               <label><%=l(:label_tracker)%>:
               <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
               </label>
-              <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
+              <a href="#" data-expands="#tracker_id"><span class="toggle-multiselect"></span></a>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
             <% if @trackers && @roles && @statuses.any? %>
               <%= form_tag({}, :id => 'workflow_form' ) do %>
                 <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %>
                 <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %>
                 <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %>
                 <div class="autoscroll">
                   <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
                   <fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_author) %></legend>
                     <div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
                       <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('#author_workflows'))" unless @workflows['author'].present? %>
                   <fieldset class="collapsible" style="padding: 0;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_assignee) %></legend>
                     <div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
                   <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('#assignee_workflows'))" unless @workflows['assignee'].present? %>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
             <%= javascript_tag do %>
             $("a[data-expands]").click(function(e){
               e.preventDefault();
               var target = $($(this).attr("data-expands"));
               if (target.attr("multiple")) {
                 target.attr("multiple", false);
                 target.find("option[value=all]").show();
               } else {
                 target.attr("multiple", true);
                 target.find("option[value=all]").attr("selected", false).hide();
               }
             });
             <% end %>

app/views/workflows/index.html.erb +3 -1

             <%= title [l(:label_workflow), workflows_edit_path], l(:field_summary) %>
             <% if @roles.empty? || @trackers.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <div class="autoscroll">
             <table class="list">
             <thead>
                 <tr>
                 <th></th>
                 <% @roles.each do |role| %>
                 <th>
                     <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %>
                 </th>
                 <% end %>
                 </tr>
             </thead>
             <tbody>
             <% @trackers.each do |tracker| -%>
             <tr class="<%= cycle('odd', 'even') %>">
               <td class="name"><%= tracker.name %></td>
               <% @roles.each do |role| -%>
               <% count = @workflow_counts[[tracker.id, role.id]] || 0 %>
                 <td>
-                  <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %>
+                  <%= link_to((count > 0 ? count : content_tag(:span, nil, :class => 'icon-only icon-not-ok')),
+                              {:action => 'edit', :role_id => role, :tracker_id => tracker},
+                              :title => l(:button_edit)) %>
                 </td>
               <% end -%>
             </tr>
             <% end -%>
             </tbody>
             </table>
             </div>
             <% end %>

app/views/workflows/permissions.html.erb +2 -2

             <%= render :partial => 'action_menu' %>
             <%= title l(:label_workflow) %>
             <div class="tabs">
               <ul>
                 <li><%= link_to l(:label_status_transitions), workflows_edit_path(:role_id => @roles, :tracker_id => @trackers) %></li>
                 <li><%= link_to l(:label_fields_permissions), workflows_permissions_path(:role_id => @roles, :tracker_id => @trackers), :class => 'selected' %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
               <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
               </label>
-              <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
+              <a href="#" data-expands="#role_id"><span class="toggle-multiselect"></a>
               <label><%=l(:label_tracker)%>:
               <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
               </label>
-              <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
+              <a href="#" data-expands="#tracker_id"><span class="toggle-multiselect"></a>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
             <% if @trackers && @roles && @statuses.any? %>
               <%= form_tag({}, :id => 'workflow_form' ) do %>
                 <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %>
                 <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %>
                 <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %>
                 <div class="autoscroll">
                 <table class="list workflows fields_permissions">
                 <thead>
                   <tr>
                     <th>
                     </th>
                     <th colspan="<%= @statuses.length %>"><%=l(:label_issue_status)%></th>
                   </tr>
                   <tr>
                     <td></td>
                     <% for status in @statuses %>
                     <td style="width:<%= 75 / @statuses.size %>%;">
                       <%= status.name %>
                     </td>
                     <% end %>
                   </tr>
                 </thead>
                 <tbody>
                   <tr class="group open">
                     <td colspan="<%= @statuses.size + 1 %>">
                       <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                       <%= l(:field_core_fields) %>
                     </td>
                   </tr>
                   <% @fields.each do |field, name| %>
                   <tr class="<%= cycle("odd", "even") %>">
                     <td class="name">
                       <%= name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
                     </td>
                     <% for status in @statuses -%>
                     <td class="<%= @permissions[status.id][field].try(:join, ' ') %>">
                       <%= field_permission_tag(@permissions, status, field, @roles) %>
                       <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
                     </td>
                     <% end -%>
                   </tr>
                   <% end %>
                   <% if @custom_fields.any? %>
                     <tr class="group open">
                       <td colspan="<%= @statuses.size + 1 %>">
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l(:label_custom_field_plural) %>
                       </td>
                     </tr>
                     <% @custom_fields.each do |field| %>
                     <tr class="<%= cycle("odd", "even") %>">
                       <td class="name">
                         <%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
                       </td>
                       <% for status in @statuses -%>
                       <td class="<%= @permissions[status.id][field.id.to_s] %>">
                         <%= field_permission_tag(@permissions, status, field, @roles) %>
                         <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
                       </td>
                       <% end -%>
                     </tr>
                     <% end %>
                   <% end %>
                 </tbody>
                 </table>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
             <%= javascript_tag do %>
             $("a.repeat-value").click(function(e){
               e.preventDefault();
               var td = $(this).closest('td');
               var selected = td.find("select").find(":selected").val();
               td.nextAll('td').find("select").val(selected);
             });
             $("a[data-expands]").click(function(e){
               e.preventDefault();
               var target = $($(this).attr("data-expands"));
               if (target.attr("multiple")) {
                 target.attr("multiple", false);
                 target.find("option[value=all]").show();
               } else {
                 target.attr("multiple", true);
                 target.find("option[value=all]").attr("selected", false).hide();
               }
             });
             <% end %>

public/stylesheets/application.css +23 -3

             html {overflow-y:scroll;}
             body { font-family: Verdana, sans-serif; font-size: 12px; color:#333; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 {font-family: "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;}
             #content h1, h2, h3, h4 {color: #555;}
             h2, .wiki h1 {font-size: 20px;}
             h3, .wiki h2 {font-size: 16px;}
             h4, .wiki h3 {font-size: 13px;}
             h4 {border-bottom: 1px dotted #bbb;}
             pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
             /***** Layout *****/
             #wrapper {background: white;overflow: hidden;}
             #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #header h1 a.ancestor { font-size: 80%; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px; width: 100%;}
             #main-menu ul {margin: 0;  padding: 0; width: 100%; white-space: nowrap;}
             #main-menu li {
               float:none;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
               display:inline-block;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #main-menu .tabs-buttons {
               right: 6px;
               background-color: transparent;
               border-bottom-color: transparent;
             }
             #admin-menu ul {margin: 0;  padding: 0;}
             #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
             #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
             #admin-menu a.projects { background-image: url(../images/projects.png); }
             #admin-menu a.users { background-image: url(../images/user.png); }
             #admin-menu a.groups { background-image: url(../images/group.png); }
             #admin-menu a.roles { background-image: url(../images/database_key.png); }
             #admin-menu a.trackers { background-image: url(../images/ticket.png); }
             #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
             #admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
             #admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
             #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
             #admin-menu a.settings { background-image: url(../images/changeset.png); }
             #admin-menu a.plugins { background-image: url(../images/plugin.png); }
             #admin-menu a.info { background-image: url(../images/help.png); }
             #admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
             * html #sidebar{ width: 22%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #sidebar .contextual { margin-right: 1em; }
             #sidebar ul, ul.flat {margin: 0;  padding: 0;}
             #sidebar ul li, ul.flat li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
             #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
             * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { min-height: 600px; }
             * html body #content { height: 600px; } /* IE */
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             #login-form input#username, #login-form input#password { width: 300px; }
             div.modal { border-radius:5px; background:#fff; z-index:50; padding:4px;}
             div.modal h3.title {display:none;}
             div.modal p.buttons {text-align:right; margin-bottom:0;}
             div.modal .box p {margin: 0.3em 0;}
             input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             .mobile-show {display: none;}
             /***** Links *****/
             a, a:link, a:visited{ color: #169; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
             a.project.closed, a.project.closed:link, a.project.closed:visited { color: #999; }
             a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
             #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
             #sidebar a.selected:hover {text-decoration:none;}
             #admin-menu a {line-height:1.7em;}
             #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
             a.collapsible {padding-left: 12px; background: url(../images/arrow_expanded.png) no-repeat -3px 40%;}
             a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repeat -5px 40%;}
             a#toggle-completed-versions {color:#999;}
+            a.toggle-checkboxes { margin-left: 5px; padding-left: 12px; background: url(../images/toggle_check.png) no-repeat 0% 50%; }
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td {text-align:center; vertical-align:top; padding-right:10px;}
             table.list td.id { width: 2%; text-align: center;}
             table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles {text-align: left;}
             table.list td.tick {width:15%}
             table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
             table.list td.checkbox input {padding:0px;}
             table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
             table.list td.buttons a { padding-right: 0.6em; }
             table.list td.buttons img {vertical-align:middle;}
             table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.closed, tr.project.archived { color: #aaa; }
             tr.project.closed a, tr.project.archived a { color: #aaa; }
             tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.project.idnt-1 td.name {padding-left: 0.5em;}
             tr.project.idnt-2 td.name {padding-left: 2em;}
             tr.project.idnt-3 td.name {padding-left: 3.5em;}
             tr.project.idnt-4 td.name {padding-left: 5em;}
             tr.project.idnt-5 td.name {padding-left: 6.5em;}
             tr.project.idnt-6 td.name {padding-left: 8em;}
             tr.project.idnt-7 td.name {padding-left: 9.5em;}
             tr.project.idnt-8 td.name {padding-left: 11em;}
             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text, tr.issue td.relations, tr.issue td.parent { white-space: normal; }
             tr.issue td.relations { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.issue td.relations span {white-space: nowrap;}
             table.issues td.description {color:#777; font-size:90%; padding:4px 4px 4px 24px; text-align:left; white-space:normal;}
             table.issues td.description pre {white-space:normal;}
             tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
             tr.issue.idnt-2 td.subject {padding-left: 2em;}
             tr.issue.idnt-3 td.subject {padding-left: 3.5em;}
             tr.issue.idnt-4 td.subject {padding-left: 5em;}
             tr.issue.idnt-5 td.subject {padding-left: 6.5em;}
             tr.issue.idnt-6 td.subject {padding-left: 8em;}
             tr.issue.idnt-7 td.subject {padding-left: 9.5em;}
             tr.issue.idnt-8 td.subject {padding-left: 11em;}
             tr.issue.idnt-9 td.subject {padding-left: 12.5em;}
             table.issue-report {table-layout:fixed;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename {width:30%; text-align:left;}
             tr.entry td.filename_no_report {width:70%; text-align:left;}
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry.file td.filename a { margin-left: 16px; }
             tr.entry.file td.filename_no_report a { margin-left: 16px; }
             tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.changeset { height: 20px }
             tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; }
             tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; }
             tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;}
             tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;}
             table.files tbody th {text-align:left;}
             table.files tr.file td.filename { text-align: left; padding-left: 24px; }
             table.files tr.file td.digest { font-size: 80%; }
             table.members td.roles, table.memberships td.roles { width: 45%; }
             tr.message { height: 2.6em; }
             tr.message td.subject { padding-left: 20px; }
             tr.message td.created_on { white-space: nowrap; }
             tr.message td.last_message { font-size: 80%; white-space: nowrap; }
             tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
             tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
             tr.version.closed, tr.version.closed a { color: #999; }
             tr.version td.name { padding-left: 20px; }
             tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
             tr.user td {width:13%;white-space: nowrap;}
             td.username, td.firstname, td.lastname, td.email {text-align:left !important;}
             tr.user td.email { width:18%; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
             tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.issue, tr.time-entry td.comments, tr.time-entry td.subject, tr.time-entry td.activity { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.plugins td { vertical-align: middle; }
             table.plugins td.configure { text-align: right; padding-right: 1em; }
             table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
             table.plugins span.description { display: block; font-size: 0.9em; }
             table.plugins span.url { display: block; font-size: 0.9em; }
             tr.group td { padding: 0.8em 0 0.5em 0.3em; border-bottom: 1px solid #ccc; text-align:left; }
             tr.group span.name {font-weight:bold;}
             tr.group span.count {font-weight:bold; position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;}
             tr.group span.totals {color: #aaa; font-size: 80%;}
             tr.group span.totals .value {font-weight:bold; color:#777;}
             tr.group a.toggle-all { color: #aaa; font-size: 80%; display:none; float:right; margin-right:4px;}
             tr.group:hover a.toggle-all { display:inline;}
             a.toggle-all:hover {text-decoration:none;}
             table.list tbody tr:hover { background-color:#ffffdd; }
             table.list tbody tr.group:hover { background-color:inherit; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             tr.builtin td.name {font-style:italic;}
             a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
             a.sort.asc  { background-image: url(../images/sort_asc.png); }
             a.sort.desc { background-image: url(../images/sort_desc.png); }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             table.boards td.last-message {text-align:left;font-size:80%;}
             table.messages td.last_message {text-align:left;}
             #query_form_content {font-size:90%;}
             .query_sort_criteria_count {
               display: inline-block;
               min-width: 1em;
             }
             table.query-columns {
               border-collapse: collapse;
               border: 0;
             }
             table.query-columns td.buttons {
               vertical-align: middle;
               text-align: center;
             }
             table.query-columns td.buttons input[type=button] {width:35px;}
             .query-totals {text-align:right; margin-top:-2.3em;}
             .query-totals>span {margin-left:0.6em;}
             .query-totals .value {font-weight:bold;}
             td.center {text-align:center;}
             h3.version { background: url(../images/package.png) no-repeat 0% 50%; padding-left: 20px; }
             div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-left: 20px; }
             div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
             #watchers select {width: 95%; display: block;}
-            #watchers a.delete {opacity: 0.4; vertical-align: middle;}
+            #watchers a.delete {opacity: 0.4; margin-left: 5px;}
             #watchers a.delete:hover {opacity: 1;}
             #watchers img.gravatar {margin: 0 4px 2px 0;}
             span#watchers_inputs {overflow:auto; display:block;}
             span.search_for_watchers {display:block;}
             span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
             span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
               padding:6px;
               margin-bottom: 10px;
               background-color:#f6f6f6;
               color:#505050;
               line-height:1.5em;
               border: 1px solid #e4e4e4;
               word-wrap: break-word;
               border-radius: 3px;
             }
             .pagination .per-page span.selected {
               font-weight: bold;
             }
             div.square {
               border: 1px solid #999;
               float: left;
               margin: .3em .4em 0 .4em;
               overflow: hidden;
               width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .splitcontent {overflow:auto;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #333;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             abbr, span.field-description[title] { border-bottom: 1px dotted #aaa; cursor: help; }
             textarea.wiki-edit {width:99%; resize:vertical;}
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px; border: 1px solid #d7d7d7; border-radius:3px;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             .ltr {direction:ltr !important; unicode-bidi:bidi-override;}
             .rtl {direction:rtl !important; unicode-bidi:bidi-override;}
             div.issue div.subject div div { padding-left: 16px; }
             div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: #999;}
             div.issue div.subject>div>p { margin-top: 0.5em; }
             div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
             div.issue span.private, div.journal span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
             div.issue .next-prev-links {color:#999;}
             div.issue .attributes {margin-top: 2em;}
             div.issue .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
             div.issue .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left;}
             div.issue.overdue .due-date .value { color: #c22; }
             #issue_tree table.issues, #relations table.issues { border: 0; }
             #issue_tree td.checkbox, #relations td.checkbox {display:none;}
             #relations td.buttons {padding:0;}
             fieldset.collapsible {border-width: 1px 0 0 0;}
             fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
             fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_collapsed.png); }
             fieldset#date-range p { margin: 2px 0 2px 0; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2.1em; }
             fieldset#filters td.field { width:230px; }
             fieldset#filters td.operator { width:180px; }
             fieldset#filters td.operator select {max-width:170px;}
             fieldset#filters td.values { white-space:nowrap; }
             fieldset#filters td.values select {min-width:130px;}
             fieldset#filters td.values input {height:1em;}
             #filters-table {width:60%; float:left;}
             .add-filter {width:35%; float:right; text-align: right; vertical-align: top;}
             #issue_is_private_wrap {float:right; margin-right:1em;}
-            .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
+            .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:16px; margin-left:0; margin-right:5px; cursor:pointer;}
             .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets div.changeset { padding: 4px;}
             div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             .journal ul.details img {margin:0 0 -3px 4px;}
             div.journal {overflow:auto;}
             div.journal.private-notes {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
             div.journal ul.details {color:#959595; margin-bottom: 1.5em;}
             div.journal ul.details a {color:#70A7CD;}
             div.journal ul.details a:hover {color:#D14848;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
             div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
             div#activity dt.grouped {margin-left:5em;}
             div#activity dd.grouped {margin-left:9em;}
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap .related-issues { margin-bottom: 1em; }
             div#roadmap .related-issues td.checkbox { display: none; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
             div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary fieldset.time-tracking table { width:100%; }
             div#version-summary th, div#version-summary td.total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr.subtotal { font-style: italic; color:#777;}
             table#time-report tbody tr.subtotal td.hours { color:#b0b0b0; }
             table#time-report tbody tr.total { font-weight: bold; background-color:#EEEEEE; border-top:1px solid #e4e4e4;}
             table#time-report .hours-dec { font-size: 0.9em; }
             div.wiki-page .contextual a {opacity: 0.4}
             div.wiki-page .contextual a:hover {opacity: 1}
             form .attributes select { width: 60%; }
+            form .attributes select + a.icon-only { vertical-align: middle; margin-left: 4px; }
             input#issue_subject, input#document_title { width: 99%; }
             select#issue_done_ratio { width: 95px; }
             ul.projects {margin:0; padding-left:1em;}
             ul.projects ul {padding-left:1.6em;}
             ul.projects.root {margin:0; padding:0;}
             ul.projects li {list-style-type:none;}
             #projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; padding-left:1em;}
             #projects-index ul.projects li.root {margin-bottom: 1em;}
             #projects-index ul.projects li.child {margin-top: 1em;}
             #projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
             .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
             #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
             #related-issues li img {vertical-align:middle;}
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 90%; }
             #workflow_copy_form select { width: 200px; }
             table.transitions td.enabled {background: #bfb;}
             #workflow_form table select {font-size:90%; max-width:100px;}
             table.fields_permissions td.readonly {background:#ddd;}
             table.fields_permissions td.required {background:#d88;}
             select.expandable {vertical-align:top;}
             textarea#custom_field_possible_values {width: 95%; resize:vertical}
             textarea#custom_field_default_value {width: 95%; resize:vertical}
             .sort-handle {display:inline-block; vertical-align:middle;}
             input#content_comments {width: 99%}
             span.pagination {margin-left:3px; color:#888;}
             .pagination ul.pages {
               margin: 0 5px 0 0;
               padding: 0;
               display: inline;
             }
             .pagination ul.pages li {
               display: inline-block;
               padding: 0;
               border: 1px solid #ccc;
               margin-left: -1px;
               line-height: 2em;
               margin-bottom: 1em;
               white-space: nowrap;
               text-align: center;
             }
             .pagination ul.pages li a,
             .pagination ul.pages li span {
               padding: 3px 8px;
             }
             .pagination ul.pages li:first-child {
               border-top-left-radius: 4px;
               border-bottom-left-radius: 4px;
             }
             .pagination ul.pages li:last-child {
               border-top-right-radius: 4px;
               border-bottom-right-radius: 4px;
             }
             .pagination ul.pages li.current {
               color: white;
               background-color: #628DB6;
               border-color: #628DB6;
             }
             .pagination ul.pages li.page:hover {
               background-color: #EEE;
             }
             .pagination ul.pages li.page a:hover,
             .pagination ul.pages li.page a:active {
               color: inherit;
               text-decoration: inherit;
             }
             span.pagination>span {white-space:nowrap;}
             #search-form fieldset p {margin:0.2em 0;}
             /***** Tabular forms ******/
             .tabular p{
               margin: 0;
               padding: 3px 0 3px 0;
               padding-left: 180px; /* width of left column containing the label elements */
               min-height: 1.8em;
               clear:left;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular input, .tabular select {max-width:95%}
             .tabular textarea {width:95%; resize:vertical;}
             .tabular label{
               font-weight: bold;
               float: left;
               text-align: right;
               /* width of left column */
               margin-left: -180px;
               /* width of labels. Should be smaller than left column to create some right margin */
               width: 175px;
             }
             .tabular label.floating{
               font-weight: normal;
               margin-left: 0px;
               text-align: left;
               width: 270px;
             }
             .tabular label.block{
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto !important;
             }
             .tabular label.inline{
               font-weight: normal;
               float:none;
               margin-left: 5px !important;
               width: auto;
             }
             label.no-css {
               font-weight: inherit;
               float:none;
               text-align:left;
               margin-left:0px;
               width:auto;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .tabular.settings textarea { width: 99%; }
             .settings.enabled_scm table {width:100%}
             .settings.enabled_scm td.scm_name{ font-weight: bold; }
             fieldset.settings label { display: block; }
             fieldset#notified_events .parent { padding-left: 20px; }
             span.required {color: #bb0000;}
             .summary {font-style: italic;}
             .check_box_group {
               display:block;
               width:95%;
               max-height:300px;
               overflow-y:auto;
               padding:2px 4px 4px 2px;
               background:#fff;
               border:1px solid #9EB1C2;
               border-radius:2px
             }
             .check_box_group label {
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto;
             }
             .check_box_group.bool_cf {border:0; background:inherit;}
             .check_box_group.bool_cf label {display: inline;}
             #attachments_fields input.description {margin-left:4px; width:340px;}
             #attachments_fields span {display:block; white-space:nowrap;}
             #attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
             #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
             #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
             #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
             a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
             a.remove-upload:hover {text-decoration:none !important;}
             div.fileover { background-color: lavender; }
             div.attachments { margin-top: 12px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             div.thumbnails {margin-top:0.6em;}
             div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;}
             div.thumbnails img {margin: 3px; vertical-align: middle;}
             #history div.thumbnails {margin-left: 2em;}
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             em.info {font-style:normal;font-size:90%;color:#888;display:block;}
             em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
             textarea.text_cf {width:95%; resize:vertical;}
             input.string_cf, input.link_cf {width:95%;}
             select.bool_cf {width:auto !important;}
             #tab-content-modules fieldset p {margin:3px 0 4px 0;}
             #tab-content-users .splitcontentleft {width: 64%;}
             #tab-content-users .splitcontentright {width: 34%;}
             #tab-content-users fieldset {padding:1em; margin-bottom: 1em;}
             #tab-content-users fieldset legend {font-weight: bold;}
             #tab-content-users fieldset label {display: block;}
             #tab-content-users #principals {max-height: 400px; overflow: auto;}
             #users_for_watcher {height: 200px; overflow:auto;}
             #users_for_watcher label {display: block;}
             table.members td.name {padding-left: 20px;}
             table.members td.group, table.members td.groupnonmember, table.members td.groupanonymous {background: url(../images/group.png) no-repeat 0% 1px;}
             input#principal_search, input#user_search {width:90%}
             .roles-selection label {display:inline-block; width:210px;}
             input.autocomplete {
               background: #fff url(../images/magnifier.png) no-repeat 2px 50%; padding-left:20px !important;
               border:1px solid #9EB1C2; border-radius:2px; height:1.5em;
             }
             input.autocomplete.ajax-loading {
               background-image: url(../images/loading.gif);
             }
             .role-visibility {padding-left:2em;}
             .objects-selection {
               height: 300px;
               overflow: auto;
               margin-bottom: 1em;
             }
             .objects-selection label {
               display: block;
             }
             .objects-selection>div {
               column-count: auto;
               column-width: 200px;
               -webkit-column-count: auto;
               -webkit-column-width: 200px;
               -webkit-column-gap : 0.5rem;
               -webkit-column-rule: 1px solid #ccc;
               -moz-column-count: auto;
               -moz-column-width: 200px;
               -moz-column-gap : 0.5rem;
               -moz-column-rule: 1px solid #ccc;
             }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning, .conflict {
               padding: 4px 4px 4px 30px;
               margin-bottom: 12px;
               font-size: 1.1em;
               border: 2px solid;
               border-radius: 3px;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
               background: url(../images/exclamation.png) 8px 50% no-repeat;
               background-color: #ffe3e3;
               border-color: #dd0000;
               color: #880000;
             }
             div.flash.notice {
               background: url(../images/true.png) 8px 5px no-repeat;
               background-color: #dfffdf;
               border-color: #9fcf9f;
               color: #005f00;
             }
             div.flash.warning, .conflict {
               background: url(../images/warning.png) 8px 5px no-repeat;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
               text-align: left;
             }
             .nodata, .warning {
               text-align: center;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             #errorExplanation h2, #errorExplanation p { display: none; }
             .conflict-details {font-size:80%;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
             table.cal thead th.week-number {width: auto;}
             table.cal tbody tr {height: 100px;}
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
             p.cal.legend span {display:block;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             img.ui-datepicker-trigger {
               cursor: pointer;
               vertical-align: middle;
               margin-left: 4px;
             }
             /***** Progress bar *****/
             table.progress {
               border-collapse: collapse;
               border-spacing: 0pt;
               empty-cells: show;
               text-align: center;
               float:left;
               margin: 1px 6px 1px 0px;
             }
             table.progress {width:80px;}
             table.progress td { height: 1em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #D3EDD3 none repeat scroll 0%; }
             table.progress td.todo { background: #eee none repeat scroll 0%; }
             p.percent {font-size: 80%; margin:0;}
             p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
             .version-overview table.progress {width:40em;}
             .version-overview table.progress td { height: 1.2em; }
             /***** Tabs *****/
             #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
             #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
             #content .tabs ul li {
               float:left;
               list-style-type:none;
               white-space:nowrap;
               margin-right:4px;
               background:#fff;
               position:relative;
               margin-bottom:-1px;
             }
             #content .tabs ul li a{
               display:block;
               font-size: 0.9em;
               text-decoration:none;
               line-height:1.3em;
               padding:4px 6px 4px 6px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               background-color: #f6f6f6;
               color:#999;
               font-weight:bold;
               border-top-left-radius:3px;
               border-top-right-radius:3px;
             }
             #content .tabs ul li a:hover {
               background-color: #ffffdd;
               text-decoration:none;
             }
             #content .tabs ul li a.selected {
               background-color: #fff;
               border: 1px solid #bbbbbb;
               border-bottom: 1px solid #fff;
               color:#444;
             }
             #content .tabs ul li a.selected:hover {background-color: #fff;}
             div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
             button.tab-left, button.tab-right {
               font-size: 0.9em;
               cursor: pointer;
               height:24px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               position:absolute;
               padding:4px;
               width: 20px;
               bottom: -1px;
             }
             button.tab-left {
               right: 20px;
               background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
               border-top-left-radius:3px;
             }
             button.tab-right {
               right: 0;
               background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
               border-top-right-radius:3px;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_out span { background: #faa; }
             .diff_in { background: #cfc; }
             .diff_in span { background: #afa; }
             .text-diff {
               padding: 1em;
               background-color:#f6f6f6;
               color:#505050;
               border: 1px solid #e4e4e4;
             }
             /***** Wiki *****/
             div.wiki table {
               border-collapse: collapse;
               margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
               border: 1px solid #bbb;
               padding: 4px;
             }
             div.wiki .noborder, div.wiki .noborder td, div.wiki .noborder th {border:0;}
             div.wiki .external {
               background-position: 0% 60%;
               background-repeat: no-repeat;
               padding-left: 12px;
               background-image: url(../images/external.png);
             }
             div.wiki a {word-wrap: break-word;}
             div.wiki a.new {color: #b73535;}
             div.wiki ul, div.wiki ol {margin-bottom:1em;}
             div.wiki li>ul, div.wiki li>ol {margin-bottom: 0;}
             div.wiki pre {
               margin: 1em 1em 1em 1.6em;
               padding: 8px;
               background-color: #fafafa;
               border: 1px solid #e2e2e2;
               border-radius: 3px;
               width:auto;
               overflow-x: auto;
               overflow-y: hidden;
             }
             div.wiki ul.toc {
               background-color: #ffffdd;
               border: 1px solid #e4e4e4;
               padding: 4px;
               line-height: 1.2em;
               margin-bottom: 12px;
               margin-right: 12px;
               margin-left: 0;
               display: table
             }
             * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li {list-style-type:none; margin: 0; font-size:12px;}
             div.wiki ul.toc li li {margin-left: 1.5em; font-size:10px;}
             div.wiki ul.toc a {
               font-size: 0.9em;
               font-weight: normal;
               text-decoration: none;
               color: #606060;
             }
             div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
             a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
             a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
             h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
             div.wiki img {vertical-align:middle; max-width:100%;}
             /***** My page layout *****/
             .block-receiver {
               border:1px dashed #c0c0c0;
               margin-bottom: 20px;
               padding: 15px 0 15px 0;
             }
             .mypage-box {
               margin:0 0 20px 0;
               color:#505050;
               line-height:1.5em;
             }
             .handle {cursor: move;}
             a.close-icon {
               display:block;
               margin-top:3px;
               overflow:hidden;
               width:12px;
               height:12px;
               background-repeat: no-repeat;
               cursor:pointer;
               background-image:url('../images/close.png');
             }
             a.close-icon:hover {background-image:url('../images/close_hl.png');}
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .gantt_hdr.nwday {background-color:#f1f1f1; color:#999;}
             .gantt_subjects { font-size: 0.8em; }
             .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:16px;
               white-space:nowrap;
             }
             .task.label {width:100%;}
             .task.label.project, .task.label.version { font-weight: bold; }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .task_todo.parent { background: #888; border: 1px solid #888; height: 3px;}
             .task_late.parent, .task_done.parent { height: 3px;}
             .task.parent.marker.starting  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; left: 0px; top: -1px;}
             .task.parent.marker.ending { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; right: 0px; top: -1px;}
             .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .project.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .project.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .project.marker { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}
             /***** Icons *****/
             .icon {
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 20px;
               padding-top: 2px;
               padding-bottom: 3px;
             }
+            .icon-only {
+              background-position: 0% 50%;
+              background-repeat: no-repeat;
+              padding-left: 16px;
+            }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-duplicate { background-image: url(../images/duplicate.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-multiple { background-image: url(../images/table_multiple.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-time-add  { background-image: url(../images/time_add.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
+            .icon-error { background-image: url(../images/exclamation.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
-            .icon-checked  { background-image: url(../images/true.png); }
+            .icon-checked  { background-image: url(../images/toggle_check.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon-comment  { background-image: url(../images/comment.png); }
             .icon-summary  { background-image: url(../images/lightning.png); }
             .icon-server-authentication { background-image: url(../images/server_key.png); }
             .icon-issue { background-image: url(../images/ticket.png); }
             .icon-zoom-in { background-image: url(../images/zoom_in.png); }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
+            .icon-magnifier { background-image: url(../images/magnifier.png); }
             .icon-passwd { background-image: url(../images/textfield_key.png); }
             .icon-test { background-image: url(../images/bullet_go.png); }
+            .icon-email { background-image: url(../images/email.png); }
+            .icon-email-disabled { background-image: url(../images/email_disabled.png); }
             .icon-email-add { background-image: url(../images/email_add.png); }
+            .icon-move-up { background-image: url(../images/1uparrow.png); }
+            .icon-move-top { background-image: url(../images/2uparrow.png); }
+            .icon-move-down { background-image: url(../images/1downarrow.png); }
+            .icon-move-bottom { background-image: url(../images/2downarrow.png); }
+            .icon-ok { background-image: url(../images/true.png); }
+            .icon-not-ok { background-image: url(../images/false.png); }
+            .icon-link-break { background-image: url(../images/link_break.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .icon-file.text-x-c { background-image: url(../images/files/c.png); }
             .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
             .icon-file.text-x-java { background-image: url(../images/files/java.png); }
             .icon-file.text-x-javascript { background-image: url(../images/files/js.png); }
             .icon-file.text-x-php { background-image: url(../images/files/php.png); }
             .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
             .icon-file.text-xml { background-image: url(../images/files/xml.png); }
             .icon-file.text-css { background-image: url(../images/files/css.png); }
             .icon-file.text-html { background-image: url(../images/files/html.png); }
             .icon-file.image-gif { background-image: url(../images/files/image.png); }
             .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
             .icon-file.image-png { background-image: url(../images/files/image.png); }
             .icon-file.image-tiff { background-image: url(../images/files/image.png); }
             .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
             .icon-file.application-zip { background-image: url(../images/files/zip.png); }
             .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
             img.gravatar {
               padding: 2px;
               border: solid 1px #d5d5d5;
               background: #fff;
               vertical-align: middle;
             }
             div.issue img.gravatar {
               float: left;
               margin: 0 6px 0 0;
               padding: 5px;
             }
             div.issue .attributes img.gravatar {
               height: 14px;
               width: 14px;
               padding: 2px;
               float: left;
               margin: 0 0.5em 0 0;
             }
             h2 img.gravatar {margin: -2px 4px -4px 0;}
             h3 img.gravatar {margin: -4px 4px -4px 0;}
             h4 img.gravatar {margin: -6px 4px -4px 0;}
             td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
             #activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
             /* Used on 12px Gravatar img tags without the icon background */
             .icon-gravatar {float: left; margin-right: 4px;}
             #activity dt, .journal {clear: left;}
             .journal-link {float: right;}
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }
             .sample-data {border:1px solid #ccc; border-collapse:collapse; background-color:#fff; margin:0.5em;}
             .sample-data td {border:1px solid #ccc; padding: 2px 4px; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
             .sample-data tr:first-child td {font-weight:bold; text-align:center;}
             .ui-progressbar {position: relative;}
             #progress-label {
             position: absolute; left: 50%; top: 4px;
             font-weight: bold;
             color: #555; text-shadow: 1px 1px 0 #fff;
             }
             /* Custom JQuery styles */
             .ui-datepicker-title select {width:70px !important; margin-top:-2px !important; margin-right:4px !important;}
             /************* CodeRay styles *************/
             .syntaxhl div {display: inline;}
             .syntaxhl .code pre { overflow: auto }
             .syntaxhl .annotation { color:#007 }
             .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .attribute-value { color:#700 }
             .syntaxhl .binary { color:#549 }
             .syntaxhl .binary .char { color:#325 }
             .syntaxhl .binary .delimiter { color:#325 }
             .syntaxhl .char { color:#D20 }
             .syntaxhl .char .content { color:#D20 }
             .syntaxhl .char .delimiter { color:#710 }
             .syntaxhl .class { color:#258; font-weight:bold }
             .syntaxhl .class-variable { color:#369 }
             .syntaxhl .color { color:#0A0 }
             .syntaxhl .comment { color:#385 }
             .syntaxhl .comment .char { color:#385 }
             .syntaxhl .comment .delimiter { color:#385 }
             .syntaxhl .constant { color:#258; font-weight:bold }
             .syntaxhl .decorator { color:#B0B }
             .syntaxhl .definition { color:#099; font-weight:bold }
             .syntaxhl .delimiter { color:black }
             .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .docstring { color:#D42; }
             .syntaxhl .doctype { color:#34b }
             .syntaxhl .done { text-decoration: line-through; color: gray }
             .syntaxhl .entity { color:#800; font-weight:bold }
             .syntaxhl .error { color:#F00; background-color:#FAA }
             .syntaxhl .escape  { color:#666 }
             .syntaxhl .exception { color:#C00; font-weight:bold }
             .syntaxhl .float { color:#06D }
             .syntaxhl .function { color:#06B; font-weight:bold }
             .syntaxhl .function .delimiter { color:#024; font-weight:bold }
             .syntaxhl .global-variable { color:#d70 }
             .syntaxhl .hex { color:#02b }
             .syntaxhl .id { color:#33D; font-weight:bold }
             .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
             .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
             .syntaxhl .instance-variable { color:#33B }
             .syntaxhl .integer  { color:#06D }
             .syntaxhl .imaginary { color:#f00 }
             .syntaxhl .important { color:#D00 }
             .syntaxhl .key { color: #606 }
             .syntaxhl .key .char { color: #60f }
             .syntaxhl .key .delimiter { color: #404 }
             .syntaxhl .keyword { color:#939; font-weight:bold }
             .syntaxhl .label { color:#970; font-weight:bold }
             .syntaxhl .local-variable { color:#950 }
             .syntaxhl .map .content { color:#808 }
             .syntaxhl .map .delimiter { color:#40A}
             .syntaxhl .map { background-color:hsla(200,100%,50%,0.06); }
             .syntaxhl .namespace { color:#707; font-weight:bold }
             .syntaxhl .octal { color:#40E }
             .syntaxhl .operator { }
             .syntaxhl .predefined { color:#369; font-weight:bold }
             .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined-type { color:#0a8; font-weight:bold }
             .syntaxhl .preprocessor { color:#579 }
             .syntaxhl .pseudo-class { color:#00C; font-weight:bold }
             .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
             .syntaxhl .regexp .content { color:#808 }
             .syntaxhl .regexp .delimiter { color:#404 }
             .syntaxhl .regexp .modifier { color:#C2C }
             .syntaxhl .reserved { color:#080; font-weight:bold }
             .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
             .syntaxhl .shell .content { color:#2B2 }
             .syntaxhl .shell .delimiter { color:#161 }
             .syntaxhl .string .char { color: #46a }
             .syntaxhl .string .content { color: #46a }
             .syntaxhl .string .delimiter { color: #46a }
             .syntaxhl .string .modifier { color: #46a }
             .syntaxhl .symbol { color:#d33 }
             .syntaxhl .symbol .content { color:#d33 }
             .syntaxhl .symbol .delimiter { color:#d33 }
             .syntaxhl .tag { color:#070; font-weight:bold }
             .syntaxhl .type { color:#339; font-weight:bold }
             .syntaxhl .value { color: #088 }
             .syntaxhl .variable { color:#037 }
             .syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
             .syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
             .syntaxhl .change { color: #bbf; background: #007 }
             .syntaxhl .head { color: #f8f; background: #505 }
             .syntaxhl .head .filename { color: white; }
             .syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
             .syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
             .syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
             .syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
             .syntaxhl .change .change { color: #88f }
             .syntaxhl .head .head { color: #f4f }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
               #wiki_add_attachment { display:none; }
               .hide-when-print { display: none; }
               .autoscroll {overflow-x: visible;}
               table.list {margin-top:0.5em;}
               table.list th, table.list td {border: 1px solid #aaa;}
             }
             /* Accessibility specific styles */
             .hidden-for-sighted {
               position:absolute;
               left:-10000px;
               top:auto;
               width:1px;
               height:1px;
               overflow:hidden;
             }

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/unit/helpers/application_helper_test.rb +2 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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 File.expand_path('../../../test_helper', __FILE__)
             class ApplicationHelperTest < ActionView::TestCase
               include Redmine::I18n
               include ERB::Util
               include Rails.application.routes.url_helpers
               fixtures :projects, :roles, :enabled_modules, :users,
                        :email_addresses,
                        :repositories, :changesets,
                        :projects_trackers,
                        :trackers, :issue_statuses, :issues, :versions, :documents,
                        :wikis, :wiki_pages, :wiki_contents,
                        :boards, :messages, :news,
                        :attachments, :enumerations
               def setup
                 super
                 set_tmp_attachments_directory
                 @russian_test = "\xd1\x82\xd0\xb5\xd1\x81\xd1\x82".force_encoding('UTF-8')
               end
               test "#link_to_if_authorized for authorized user should allow using the :controller and :action for the target link" do
                 User.current = User.find_by_login('admin')
                 @project = Issue.first.project # Used by helper
                 response = link_to_if_authorized('By controller/actionr',
                                                 {:controller => 'issues', :action => 'edit', :id => Issue.first.id})
                 assert_match /href/, response
               end
               test "#link_to_if_authorized for unauthorized user should display nothing if user isn't authorized" do
                 User.current = User.find_by_login('dlopper')
                 @project = Project.find('private-child')
                 issue = @project.issues.first
                 assert !issue.visible?
                 response = link_to_if_authorized('Never displayed',
                                                 {:controller => 'issues', :action => 'show', :id => issue})
                 assert_nil response
               end
               def test_auto_links
                 to_test = {
                   'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
                   'http://foo.bar/~user' => '<a class="external" href="http://foo.bar/~user">http://foo.bar/~user</a>',
                   'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'https://foo.bar.' => '<a class="external" href="https://foo.bar">https://foo.bar</a>.',
                   'This is a link: http://foo.bar.' => 'This is a link: <a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'A link (eg. http://foo.bar).' => 'A link (eg. <a class="external" href="http://foo.bar">http://foo.bar</a>).',
                   'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
                   'http://www.foo.bar/Test_(foobar)' => '<a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>',
                   '(see inline link : http://www.foo.bar/Test_(foobar))' => '(see inline link : <a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>)',
                   '(see inline link : http://www.foo.bar/Test)' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>)',
                   '(see inline link : http://www.foo.bar/Test).' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>).',
                   '(see "inline link":http://www.foo.bar/Test_(foobar))' => '(see <a href="http://www.foo.bar/Test_(foobar)" class="external">inline link</a>)',
                   '(see "inline link":http://www.foo.bar/Test)' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>)',
                   '(see "inline link":http://www.foo.bar/Test).' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>).',
                   'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
                   'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
                   'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
                   'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
                   'http://foo:bar@www.bar.com' => '<a class="external" href="http://foo:bar@www.bar.com">http://foo:bar@www.bar.com</a>',
                   'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
                   'ftps://foo.bar' => '<a class="external" href="ftps://foo.bar">ftps://foo.bar</a>',
                   'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>',
                   # two exclamation marks
                   'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
                   # escaping
                   'http://foo"bar' => '<a class="external" href="http://foo&quot;bar">http://foo&quot;bar</a>',
                   # wrap in angle brackets
                   '<http://foo.bar>' => '&lt;<a class="external" href="http://foo.bar">http://foo.bar</a>&gt;',
                   # invalid urls
                   'http://' => 'http://',
                   'www.' => 'www.',
                   'test-www.bar.com' => 'test-www.bar.com',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_auto_links_with_non_ascii_characters
                 to_test = {
                   "http://foo.bar/#{@russian_test}" =>
                     %|<a class="external" href="http://foo.bar/#{@russian_test}">http://foo.bar/#{@russian_test}</a>|
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_auto_mailto
                 to_test = {
                   'test@foo.bar' => '<a class="email" href="mailto:test@foo.bar">test@foo.bar</a>',
                   'test@www.foo.bar' => '<a class="email" href="mailto:test@www.foo.bar">test@www.foo.bar</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_inline_images
                 to_test = {
                   '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
                   'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
                   'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
                   'with style !{width:100px;height:100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height:100px;" alt="" />',
                   'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',
                   'with title !http://foo.bar/image.jpg(This is a double-quoted "title")!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a double-quoted &quot;title&quot;" alt="This is a double-quoted &quot;title&quot;" />',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_inline_images_inside_tags
                 raw = <<-RAW
             h1. !foo.png! Heading
             Centered image:
             p=. !bar.gif!
             RAW
                 assert textilizable(raw).include?('<img src="foo.png" alt="" />')
                 assert textilizable(raw).include?('<img src="bar.gif" alt="" />')
               end
               def test_attached_images
                 to_test = {
                   'Inline image: !logo.gif!' => 'Inline image: <img src="/attachments/download/3/logo.gif" title="This is a logo" alt="This is a logo" />',
                   'Inline image: !logo.GIF!' => 'Inline image: <img src="/attachments/download/3/logo.gif" title="This is a logo" alt="This is a logo" />',
                   'No match: !ogo.gif!' => 'No match: <img src="ogo.gif" alt="" />',
                   'No match: !ogo.GIF!' => 'No match: <img src="ogo.GIF" alt="" />',
                   # link image
                   '!logo.gif!:http://foo.bar/' => '<a href="http://foo.bar/"><img src="/attachments/download/3/logo.gif" title="This is a logo" alt="This is a logo" /></a>',
                 }
                 attachments = Attachment.all
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
               end
               def test_attached_images_with_textile_and_non_ascii_filename
                 attachment = Attachment.generate!(:filename => 'café.jpg')
                 with_settings :text_formatting => 'textile' do
                   assert_include %(<img src="/attachments/download/#{attachment.id}/caf%C3%A9.jpg" alt="" />),
                     textilizable("!café.jpg!)", :attachments => [attachment])
                 end
               end
               def test_attached_images_with_markdown_and_non_ascii_filename
                 skip unless Object.const_defined?(:Redcarpet)
                 attachment = Attachment.generate!(:filename => 'café.jpg')
                 with_settings :text_formatting => 'markdown' do
                   assert_include %(<img src="/attachments/download/#{attachment.id}/caf%C3%A9.jpg" alt="">),
                     textilizable("![](café.jpg)", :attachments => [attachment])
                 end
               end
               def test_attached_images_filename_extension
                 set_tmp_attachments_directory
                 a1 = Attachment.new(
                         :container => Issue.find(1),
                         :file => mock_file_with_options({:original_filename => "testtest.JPG"}),
                         :author => User.find(1))
                 assert a1.save
                 assert_equal "testtest.JPG", a1.filename
                 assert_equal "image/jpeg", a1.content_type
                 assert a1.image?
                 a2 = Attachment.new(
                         :container => Issue.find(1),
                         :file => mock_file_with_options({:original_filename => "testtest.jpeg"}),
                         :author => User.find(1))
                 assert a2.save
                 assert_equal "testtest.jpeg", a2.filename
                 assert_equal "image/jpeg", a2.content_type
                 assert a2.image?
                 a3 = Attachment.new(
                         :container => Issue.find(1),
                         :file => mock_file_with_options({:original_filename => "testtest.JPE"}),
                         :author => User.find(1))
                 assert a3.save
                 assert_equal "testtest.JPE", a3.filename
                 assert_equal "image/jpeg", a3.content_type
                 assert a3.image?
                 a4 = Attachment.new(
                         :container => Issue.find(1),
                         :file => mock_file_with_options({:original_filename => "Testtest.BMP"}),
                         :author => User.find(1))
                 assert a4.save
                 assert_equal "Testtest.BMP", a4.filename
                 assert_equal "image/x-ms-bmp", a4.content_type
                 assert a4.image?
                 to_test = {
                   'Inline image: !testtest.jpg!' =>
                     'Inline image: <img src="/attachments/download/' + a1.id.to_s + '/testtest.JPG" alt="" />',
                   'Inline image: !testtest.jpeg!' =>
                     'Inline image: <img src="/attachments/download/' + a2.id.to_s + '/testtest.jpeg" alt="" />',
                   'Inline image: !testtest.jpe!' =>
                     'Inline image: <img src="/attachments/download/' + a3.id.to_s + '/testtest.JPE" alt="" />',
                   'Inline image: !testtest.bmp!' =>
                     'Inline image: <img src="/attachments/download/' + a4.id.to_s + '/Testtest.BMP" alt="" />',
                 }
                 attachments = [a1, a2, a3, a4]
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
               end
               def test_attached_images_should_read_later
                 set_fixtures_attachments_directory
                 a1 = Attachment.find(16)
                 assert_equal "testfile.png", a1.filename
                 assert a1.readable?
                 assert (! a1.visible?(User.anonymous))
                 assert a1.visible?(User.find(2))
                 a2 = Attachment.find(17)
                 assert_equal "testfile.PNG", a2.filename
                 assert a2.readable?
                 assert (! a2.visible?(User.anonymous))
                 assert a2.visible?(User.find(2))
                 assert a1.created_on < a2.created_on
                 to_test = {
                   'Inline image: !testfile.png!' =>
                     'Inline image: <img src="/attachments/download/' + a2.id.to_s + '/testfile.PNG" alt="" />',
                   'Inline image: !Testfile.PNG!' =>
                     'Inline image: <img src="/attachments/download/' + a2.id.to_s + '/testfile.PNG" alt="" />',
                 }
                 attachments = [a1, a2]
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
                 set_tmp_attachments_directory
               end
               def test_textile_external_links
                 to_test = {
                   'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
                   'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
                   '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
                   '"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with &quot;double-quotes&quot;" class="external">link</a>',
                   "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
                   # no multiline link text
                   "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />and another on a second line\":test",
                   # mailto link
                   "\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>",
                   # two exclamation marks
                   '"a link":http://example.net/path!602815048C7B5C20!302.html' => '<a href="http://example.net/path!602815048C7B5C20!302.html" class="external">a link</a>',
                   # escaping
                   '"test":http://foo"bar' => '<a href="http://foo&quot;bar" class="external">test</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_textile_external_links_with_non_ascii_characters
                 to_test = {
                   %|This is a "link":http://foo.bar/#{@russian_test}| =>
                     %|This is a <a href="http://foo.bar/#{@russian_test}" class="external">link</a>|
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_redmine_links
                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
                                            :class => Issue.find(3).css_classes, :title => 'Bug: Error 281 when updating a recipe (New)')
                 note_link = link_to('#3-14', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'},
                                            :class => Issue.find(3).css_classes, :title => 'Bug: Error 281 when updating a recipe (New)')
                 note_link2 = link_to('#3#note-14', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'},
                                            :class => Issue.find(3).css_classes, :title => 'Bug: Error 281 when updating a recipe (New)')
                 revision_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                                :class => 'changeset', :title => 'My very first commit do not escaping #<>&')
                 revision_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
                                                 :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
                 changeset_link2 = link_to('691322a8eb01e11fd7',
                                           {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                            :class => 'changeset', :title => 'My very first commit do not escaping #<>&')
                 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                                          :class => 'document')
                 version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                               :class => 'version')
                 board_url = {:controller => 'boards', :action => 'show', :id => 2, :project_id => 'ecookbook'}
                 message_url = {:controller => 'messages', :action => 'show', :board_id => 1, :id => 4}
                 news_url = {:controller => 'news', :action => 'show', :id => 1}
                 project_url = {:controller => 'projects', :action => 'show', :id => 'subproject1'}
                 source_url = '/projects/ecookbook/repository/entry/some/file'
                 source_url_with_rev = '/projects/ecookbook/repository/revisions/52/entry/some/file'
                 source_url_with_ext = '/projects/ecookbook/repository/entry/some/file.ext'
                 source_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/entry/some/file.ext'
                 source_url_with_branch = '/projects/ecookbook/repository/revisions/branch/entry/some/file'
                 export_url = '/projects/ecookbook/repository/raw/some/file'
                 export_url_with_rev = '/projects/ecookbook/repository/revisions/52/raw/some/file'
                 export_url_with_ext = '/projects/ecookbook/repository/raw/some/file.ext'
                 export_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/raw/some/file.ext'
                 export_url_with_branch = '/projects/ecookbook/repository/revisions/branch/raw/some/file'
                 to_test = {
                   # tickets
                   '#3, [#3], (#3) and #3.'      => "#{issue_link}, [#{issue_link}], (#{issue_link}) and #{issue_link}.",
                   # ticket notes
                   '#3-14'                       => note_link,
                   '#3#note-14'                  => note_link2,
                   # should not ignore leading zero
                   '#03'                         => '#03',
                   # changesets
                   'r1'                          => revision_link,
                   'r1.'                         => "#{revision_link}.",
                   'r1, r2'                      => "#{revision_link}, #{revision_link2}",
                   'r1,r2'                       => "#{revision_link},#{revision_link2}",
                   'commit:691322a8eb01e11fd7'   => changeset_link2,
                   # documents
                   'document#1'                  => document_link,
                   'document:"Test document"'    => document_link,
                   # versions
                   'version#2'                   => version_link,
                   'version:1.0'                 => version_link,
                   'version:"1.0"'               => version_link,
                   # source
                   'source:some/file'            => link_to('source:some/file', source_url, :class => 'source'),
                   'source:/some/file'           => link_to('source:/some/file', source_url, :class => 'source'),
                   'source:/some/file.'          => link_to('source:/some/file', source_url, :class => 'source') + ".",
                   'source:/some/file.ext.'      => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                   'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
                   'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                   'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
                   'source:/some/file@52'        => link_to('source:/some/file@52', source_url_with_rev, :class => 'source'),
                   'source:/some/file@branch'    => link_to('source:/some/file@branch', source_url_with_branch, :class => 'source'),
                   'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_rev_and_ext, :class => 'source'),
                   'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url + "#L110", :class => 'source'),
                   'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext + "#L110", :class => 'source'),
                   'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url_with_rev + "#L110", :class => 'source'),
                   # export
                   'export:/some/file'           => link_to('export:/some/file', export_url, :class => 'source download'),
                   'export:/some/file.ext'       => link_to('export:/some/file.ext', export_url_with_ext, :class => 'source download'),
                   'export:/some/file@52'        => link_to('export:/some/file@52', export_url_with_rev, :class => 'source download'),
                   'export:/some/file.ext@52'    => link_to('export:/some/file.ext@52', export_url_with_rev_and_ext, :class => 'source download'),
                   'export:/some/file@branch'    => link_to('export:/some/file@branch', export_url_with_branch, :class => 'source download'),
                   # forum
                   'forum#2'                     => link_to('Discussion', board_url, :class => 'board'),
                   'forum:Discussion'            => link_to('Discussion', board_url, :class => 'board'),
                   # message
                   'message#4'                   => link_to('Post 2', message_url, :class => 'message'),
                   'message#5'                   => link_to('RE: post 2', message_url.merge(:anchor => 'message-5', :r => 5), :class => 'message'),
                   # news
                   'news#1'                      => link_to('eCookbook first release !', news_url, :class => 'news'),
                   'news:"eCookbook first release !"'        => link_to('eCookbook first release !', news_url, :class => 'news'),
                   # project
                   'project#3'                   => link_to('eCookbook Subproject 1', project_url, :class => 'project'),
                   'project:subproject1'         => link_to('eCookbook Subproject 1', project_url, :class => 'project'),
                   'project:"eCookbook subProject 1"'        => link_to('eCookbook Subproject 1', project_url, :class => 'project'),
                   # not found
                   '#0123456789'                 => '#0123456789',
                   # invalid expressions
                   'source:'                     => 'source:',
                   # url hash
                   "http://foo.bar/FAQ#3"       => '<a class="external" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a>',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text), "#{text} failed" }
               end
               def test_should_not_parse_redmine_links_inside_link
                 raw = "r1 should not be parsed in http://example.com/url-r1/"
                 assert_match %r{<p><a class="changeset".*>r1</a> should not be parsed in <a class="external" href="http://example.com/url-r1/">http://example.com/url-r1/</a></p>},
                   textilizable(raw, :project => Project.find(1))
               end
               def test_redmine_links_with_a_different_project_before_current_project
                 vp1 = Version.generate!(:project_id => 1, :name => '1.4.4')
                 vp3 = Version.generate!(:project_id => 3, :name => '1.4.4')
                 @project = Project.find(3)
                 result1 = link_to("1.4.4", "/versions/#{vp1.id}", :class => "version")
                 result2 = link_to("1.4.4", "/versions/#{vp3.id}", :class => "version")
                 assert_equal "<p>#{result1} #{result2}</p>",
                              textilizable("ecookbook:version:1.4.4 version:1.4.4")
               end
               def test_escaped_redmine_links_should_not_be_parsed
                 to_test = [
                   '#3.',
                   '#3-14.',
                   '#3#-note14.',
                   'r1',
                   'document#1',
                   'document:"Test document"',
                   'version#2',
                   'version:1.0',
                   'version:"1.0"',
                   'source:/some/file'
                 ]
                 @project = Project.find(1)
                 to_test.each { |text| assert_equal "<p>#{text}</p>", textilizable("!" + text), "#{text} failed" }
               end
               def test_cross_project_redmine_links
                 source_link = link_to('ecookbook:source:/some/file',
                                       {:controller => 'repositories', :action => 'entry',
                                        :id => 'ecookbook', :path => ['some', 'file']},
                                       :class => 'source')
                 changeset_link = link_to('ecookbook:r2',
                                          {:controller => 'repositories', :action => 'revision',
                                           :id => 'ecookbook', :rev => 2},
                                          :class => 'changeset',
                                          :title => 'This commit fixes #1, #2 and references #1 & #3')
                 to_test = {
                   # documents
                   'document:"Test document"'              => 'document:"Test document"',
                   'ecookbook:document:"Test document"'    =>
                       link_to("Test document", "/documents/1", :class => "document"),
                   'invalid:document:"Test document"'      => 'invalid:document:"Test document"',
                   # versions
                   'version:"1.0"'                         => 'version:"1.0"',
                   'ecookbook:version:"1.0"'               =>
                       link_to("1.0", "/versions/2", :class => "version"),
                   'invalid:version:"1.0"'                 => 'invalid:version:"1.0"',
                   # changeset
                   'r2'                                    => 'r2',
                   'ecookbook:r2'                          => changeset_link,
                   'invalid:r2'                            => 'invalid:r2',
                   # source
                   'source:/some/file'                     => 'source:/some/file',
                   'ecookbook:source:/some/file'           => source_link,
                   'invalid:source:/some/file'             => 'invalid:source:/some/file',
                 }
                 @project = Project.find(3)
                 to_test.each do |text, result|
                   assert_equal "<p>#{result}</p>", textilizable(text), "#{text} failed"
                 end
               end
               def test_redmine_links_by_name_should_work_with_html_escaped_characters
                 v = Version.generate!(:name => "Test & Show.txt", :project_id => 1)
                 link = link_to("Test & Show.txt", "/versions/#{v.id}", :class => "version")
                 @project = v.project
                 assert_equal "<p>#{link}</p>", textilizable('version:"Test & Show.txt"')
               end
               def test_link_to_issue_subject
                 issue = Issue.generate!(:subject => "01234567890123456789")
                 str = link_to_issue(issue, :truncate => 10)
                 result = link_to("Bug ##{issue.id}", "/issues/#{issue.id}", :class => issue.css_classes)
                 assert_equal "#{result}: 0123456...", str
                 issue = Issue.generate!(:subject => "<&>")
                 str = link_to_issue(issue)
                 result = link_to("Bug ##{issue.id}", "/issues/#{issue.id}", :class => issue.css_classes)
                 assert_equal "#{result}: &lt;&amp;&gt;", str
                 issue = Issue.generate!(:subject => "<&>0123456789012345")
                 str = link_to_issue(issue, :truncate => 10)
                 result = link_to("Bug ##{issue.id}", "/issues/#{issue.id}", :class => issue.css_classes)
                 assert_equal "#{result}: &lt;&amp;&gt;0123...", str
               end
               def test_link_to_issue_title
                 long_str = "0123456789" * 5
                 issue = Issue.generate!(:subject => "#{long_str}01234567890123456789")
                 str = link_to_issue(issue, :subject => false)
                 result = link_to("Bug ##{issue.id}", "/issues/#{issue.id}",
                                  :class => issue.css_classes,
                                  :title => "#{long_str}0123456...")
                 assert_equal result, str
                 issue = Issue.generate!(:subject => "<&>#{long_str}01234567890123456789")
                 str = link_to_issue(issue, :subject => false)
                 result = link_to("Bug ##{issue.id}", "/issues/#{issue.id}",
                                  :class => issue.css_classes,
                                  :title => "<&>#{long_str}0123...")
                 assert_equal result, str
               end
               def test_multiple_repositories_redmine_links
                 svn = Repository::Subversion.create!(:project_id => 1, :identifier => 'svn_repo-1', :url => 'file:///foo/hg')
                 Changeset.create!(:repository => svn, :committed_on => Time.now, :revision => '123')
                 hg = Repository::Mercurial.create!(:project_id => 1, :identifier => 'hg1', :url => '/foo/hg')
                 Changeset.create!(:repository => hg, :committed_on => Time.now, :revision => '123', :scmid => 'abcd')
                 changeset_link = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
                                                 :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
                 svn_changeset_link = link_to('svn_repo-1|r123', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'svn_repo-1', :rev => 123},
                                                 :class => 'changeset', :title => '')
                 hg_changeset_link = link_to('hg1|abcd', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'hg1', :rev => 'abcd'},
                                                 :class => 'changeset', :title => '')
                 source_link = link_to('source:some/file', {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}, :class => 'source')
                 hg_source_link = link_to('source:hg1|some/file', {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :repository_id => 'hg1', :path => ['some', 'file']}, :class => 'source')
                 to_test = {
                   'r2'                          => changeset_link,
                   'svn_repo-1|r123'             => svn_changeset_link,
                   'invalid|r123'                => 'invalid|r123',
                   'commit:hg1|abcd'             => hg_changeset_link,
                   'commit:invalid|abcd'         => 'commit:invalid|abcd',
                   # source
                   'source:some/file'            => source_link,
                   'source:hg1|some/file'        => hg_source_link,
                   'source:invalid|some/file'    => 'source:invalid|some/file',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text), "#{text} failed" }
               end
               def test_cross_project_multiple_repositories_redmine_links
                 svn = Repository::Subversion.create!(:project_id => 1, :identifier => 'svn1', :url => 'file:///foo/hg')
                 Changeset.create!(:repository => svn, :committed_on => Time.now, :revision => '123')
                 hg = Repository::Mercurial.create!(:project_id => 1, :identifier => 'hg1', :url => '/foo/hg')
                 Changeset.create!(:repository => hg, :committed_on => Time.now, :revision => '123', :scmid => 'abcd')
                 changeset_link = link_to('ecookbook:r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
                                                 :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
                 svn_changeset_link = link_to('ecookbook:svn1|r123', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'svn1', :rev => 123},
                                                 :class => 'changeset', :title => '')
                 hg_changeset_link = link_to('ecookbook:hg1|abcd', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :repository_id => 'hg1', :rev => 'abcd'},
                                                 :class => 'changeset', :title => '')
                 source_link = link_to('ecookbook:source:some/file', {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}, :class => 'source')
                 hg_source_link = link_to('ecookbook:source:hg1|some/file', {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :repository_id => 'hg1', :path => ['some', 'file']}, :class => 'source')
                 to_test = {
                   'ecookbook:r2'                           => changeset_link,
                   'ecookbook:svn1|r123'                    => svn_changeset_link,
                   'ecookbook:invalid|r123'                 => 'ecookbook:invalid|r123',
                   'ecookbook:commit:hg1|abcd'              => hg_changeset_link,
                   'ecookbook:commit:invalid|abcd'          => 'ecookbook:commit:invalid|abcd',
                   'invalid:commit:invalid|abcd'            => 'invalid:commit:invalid|abcd',
                   # source
                   'ecookbook:source:some/file'             => source_link,
                   'ecookbook:source:hg1|some/file'         => hg_source_link,
                   'ecookbook:source:invalid|some/file'     => 'ecookbook:source:invalid|some/file',
                   'invalid:source:invalid|some/file'       => 'invalid:source:invalid|some/file',
                 }
                 @project = Project.find(3)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text), "#{text} failed" }
               end
               def test_redmine_links_git_commit
                 changeset_link = link_to('abcd',
                                            {
                                              :controller => 'repositories',
                                              :action     => 'revision',
                                              :id         => 'subproject1',
                                              :rev        => 'abcd',
                                             },
                                           :class => 'changeset', :title => 'test commit')
                 to_test = {
                   'commit:abcd' => changeset_link,
                  }
                 @project = Project.find(3)
                 r = Repository::Git.create!(:project => @project, :url => '/tmp/test/git')
                 assert r
                 c = Changeset.new(:repository => r,
                                   :committed_on => Time.now,
                                   :revision => 'abcd',
                                   :scmid => 'abcd',
                                   :comments => 'test commit')
                 assert( c.save )
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               # TODO: Bazaar commit id contains mail address, so it contains '@' and '_'.
               def test_redmine_links_darcs_commit
                 changeset_link = link_to('20080308225258-98289-abcd456efg.gz',
                                            {
                                              :controller => 'repositories',
                                              :action     => 'revision',
                                              :id         => 'subproject1',
                                              :rev        => '123',
                                             },
                                           :class => 'changeset', :title => 'test commit')
                 to_test = {
                   'commit:20080308225258-98289-abcd456efg.gz' => changeset_link,
                  }
                 @project = Project.find(3)
                 r = Repository::Darcs.create!(
                         :project => @project, :url => '/tmp/test/darcs',
                         :log_encoding => 'UTF-8')
                 assert r
                 c = Changeset.new(:repository => r,
                                   :committed_on => Time.now,
                                   :revision => '123',
                                   :scmid => '20080308225258-98289-abcd456efg.gz',
                                   :comments => 'test commit')
                 assert( c.save )
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_redmine_links_mercurial_commit
                 changeset_link_rev = link_to('r123',
                                               {
                                                  :controller => 'repositories',
                                                  :action     => 'revision',
                                                  :id         => 'subproject1',
                                                  :rev        => '123' ,
                                               },
                                           :class => 'changeset', :title => 'test commit')
                 changeset_link_commit = link_to('abcd',
                                               {
                                                     :controller => 'repositories',
                                                     :action     => 'revision',
                                                     :id         => 'subproject1',
                                                     :rev        => 'abcd' ,
                                               },
                                           :class => 'changeset', :title => 'test commit')
                 to_test = {
                   'r123' => changeset_link_rev,
                   'commit:abcd' => changeset_link_commit,
                  }
                 @project = Project.find(3)
                 r = Repository::Mercurial.create!(:project => @project, :url => '/tmp/test')
                 assert r
                 c = Changeset.new(:repository => r,
                                   :committed_on => Time.now,
                                   :revision => '123',
                                   :scmid => 'abcd',
                                   :comments => 'test commit')
                 assert( c.save )
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_attachment_links
                 text = 'attachment:error281.txt'
                 result = link_to("error281.txt", "/attachments/download/1/error281.txt",
                                  :class => "attachment")
                 assert_equal "<p>#{result}</p>",
                              textilizable(text,
                                           :attachments => Issue.find(3).attachments),
                              "#{text} failed"
               end
               def test_attachment_link_should_link_to_latest_attachment
                 set_tmp_attachments_directory
                 a1 = Attachment.generate!(:filename => "test.txt", :created_on => 1.hour.ago)
                 a2 = Attachment.generate!(:filename => "test.txt")
                 result = link_to("test.txt", "/attachments/download/#{a2.id}/test.txt",
                                  :class => "attachment")
                 assert_equal "<p>#{result}</p>",
                              textilizable('attachment:test.txt', :attachments => [a1, a2])
               end
               def test_wiki_links
                 russian_eacape = CGI.escape(@russian_test)
                 to_test = {
                   '[[CookBook documentation]]' =>
                       link_to("CookBook documentation",
                               "/projects/ecookbook/wiki/CookBook_documentation",
                               :class => "wiki-page"),
                   '[[Another page|Page]]' =>
                       link_to("Page",
                               "/projects/ecookbook/wiki/Another_page",
                               :class => "wiki-page"),
                   # title content should be formatted
                   '[[Another page|With _styled_ *title*]]' =>
                       link_to("With <em>styled</em> <strong>title</strong>".html_safe,
                               "/projects/ecookbook/wiki/Another_page",
                               :class => "wiki-page"),
                   '[[Another page|With title containing <strong>HTML entities &amp; markups</strong>]]' =>
                       link_to("With title containing &lt;strong&gt;HTML entities &amp; markups&lt;/strong&gt;".html_safe,
                               "/projects/ecookbook/wiki/Another_page",
                               :class => "wiki-page"),
                   # link with anchor
                   '[[CookBook documentation#One-section]]' =>
                       link_to("CookBook documentation",
                               "/projects/ecookbook/wiki/CookBook_documentation#One-section",
                               :class => "wiki-page"),
                   '[[Another page#anchor|Page]]' =>
                       link_to("Page",
                               "/projects/ecookbook/wiki/Another_page#anchor",
                               :class => "wiki-page"),
                   # UTF8 anchor
                   "[[Another_page##{@russian_test}|#{@russian_test}]]" =>
                       link_to(@russian_test,
                               "/projects/ecookbook/wiki/Another_page##{russian_eacape}",
                               :class => "wiki-page"),
                   # page that doesn't exist
                   '[[Unknown page]]' =>
                       link_to("Unknown page",
                               "/projects/ecookbook/wiki/Unknown_page",
                               :class => "wiki-page new"),
                   '[[Unknown page|404]]' =>
                       link_to("404",
                               "/projects/ecookbook/wiki/Unknown_page",
                               :class => "wiki-page new"),
                   # link to another project wiki
                   '[[onlinestore:]]' =>
                       link_to("onlinestore",
                               "/projects/onlinestore/wiki",
                               :class => "wiki-page"),
                   '[[onlinestore:|Wiki]]' =>
                       link_to("Wiki",
                               "/projects/onlinestore/wiki",
                               :class => "wiki-page"),
                   '[[onlinestore:Start page]]' =>
                       link_to("Start page",
                               "/projects/onlinestore/wiki/Start_page",
                               :class => "wiki-page"),
                   '[[onlinestore:Start page|Text]]' =>
                       link_to("Text",
                               "/projects/onlinestore/wiki/Start_page",
                               :class => "wiki-page"),
                   '[[onlinestore:Unknown page]]' =>
                       link_to("Unknown page",
                               "/projects/onlinestore/wiki/Unknown_page",
                               :class => "wiki-page new"),
                   # struck through link
                   '-[[Another page|Page]]-' =>
                       "<del>".html_safe +
                         link_to("Page",
                                 "/projects/ecookbook/wiki/Another_page",
                                 :class => "wiki-page").html_safe +
                         "</del>".html_safe,
                   '-[[Another page|Page]] link-' =>
                       "<del>".html_safe +
                         link_to("Page",
                                 "/projects/ecookbook/wiki/Another_page",
                                 :class => "wiki-page").html_safe +
                         " link</del>".html_safe,
                   # escaping
                   '![[Another page|Page]]' => '[[Another page|Page]]',
                   # project does not exist
                   '[[unknowproject:Start]]' => '[[unknowproject:Start]]',
                   '[[unknowproject:Start|Page title]]' => '[[unknowproject:Start|Page title]]',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_links_within_local_file_generation_context
                 to_test = {
                   # link to a page
                   '[[CookBook documentation]]' =>
                      link_to("CookBook documentation", "CookBook_documentation.html",
                              :class => "wiki-page"),
                   '[[CookBook documentation|documentation]]' =>
                      link_to("documentation", "CookBook_documentation.html",
                              :class => "wiki-page"),
                   '[[CookBook documentation#One-section]]' =>
                      link_to("CookBook documentation", "CookBook_documentation.html#One-section",
                              :class => "wiki-page"),
                   '[[CookBook documentation#One-section|documentation]]' =>
                      link_to("documentation", "CookBook_documentation.html#One-section",
                              :class => "wiki-page"),
                   # page that doesn't exist
                   '[[Unknown page]]' =>
                      link_to("Unknown page", "Unknown_page.html",
                              :class => "wiki-page new"),
                   '[[Unknown page|404]]' =>
                      link_to("404", "Unknown_page.html",
                              :class => "wiki-page new"),
                   '[[Unknown page#anchor]]' =>
                      link_to("Unknown page", "Unknown_page.html#anchor",
                              :class => "wiki-page new"),
                   '[[Unknown page#anchor|404]]' =>
                      link_to("404", "Unknown_page.html#anchor",
                              :class => "wiki-page new"),
                 }
                 @project = Project.find(1)
                 to_test.each do |text, result|
                   assert_equal "<p>#{result}</p>", textilizable(text, :wiki_links => :local)
                 end
               end
               def test_wiki_links_within_wiki_page_context
                 page = WikiPage.find_by_title('Another_page' )
                 to_test = {
                   '[[CookBook documentation]]' =>
                      link_to("CookBook documentation",
                              "/projects/ecookbook/wiki/CookBook_documentation",
                              :class => "wiki-page"),
                   '[[CookBook documentation|documentation]]' =>
                      link_to("documentation",
                              "/projects/ecookbook/wiki/CookBook_documentation",
                              :class => "wiki-page"),
                   '[[CookBook documentation#One-section]]' =>
                      link_to("CookBook documentation",
                              "/projects/ecookbook/wiki/CookBook_documentation#One-section",
                              :class => "wiki-page"),
                   '[[CookBook documentation#One-section|documentation]]' =>
                      link_to("documentation",
                              "/projects/ecookbook/wiki/CookBook_documentation#One-section",
                              :class => "wiki-page"),
                   # link to the current page
                   '[[Another page]]' =>
                      link_to("Another page",
                              "/projects/ecookbook/wiki/Another_page",
                              :class => "wiki-page"),
                   '[[Another page|Page]]' =>
                      link_to("Page",
                              "/projects/ecookbook/wiki/Another_page",
                              :class => "wiki-page"),
                   '[[Another page#anchor]]' =>
                      link_to("Another page",
                              "#anchor",
                              :class => "wiki-page"),
                   '[[Another page#anchor|Page]]' =>
                      link_to("Page",
                              "#anchor",
                              :class => "wiki-page"),
                   # page that doesn't exist
                   '[[Unknown page]]' =>
                      link_to("Unknown page",
                              "/projects/ecookbook/wiki/Unknown_page?parent=Another_page",
                              :class => "wiki-page new"),
                   '[[Unknown page|404]]' =>
                      link_to("404",
                              "/projects/ecookbook/wiki/Unknown_page?parent=Another_page",
                              :class => "wiki-page new"),
                   '[[Unknown page#anchor]]' =>
                      link_to("Unknown page",
                              "/projects/ecookbook/wiki/Unknown_page?parent=Another_page#anchor",
                              :class => "wiki-page new"),
                   '[[Unknown page#anchor|404]]' =>
                      link_to("404",
                              "/projects/ecookbook/wiki/Unknown_page?parent=Another_page#anchor",
                              :class => "wiki-page new"),
                 }
                 @project = Project.find(1)
                 to_test.each do |text, result|
                   assert_equal "<p>#{result}</p>",
                                textilizable(WikiContent.new( :text => text, :page => page ), :text)
                 end
               end
               def test_wiki_links_anchor_option_should_prepend_page_title_to_href
                 to_test = {
                   # link to a page
                   '[[CookBook documentation]]' =>
                       link_to("CookBook documentation",
                               "#CookBook_documentation",
                               :class => "wiki-page"),
                   '[[CookBook documentation|documentation]]' =>
                       link_to("documentation",
                               "#CookBook_documentation",
                               :class => "wiki-page"),
                   '[[CookBook documentation#One-section]]' =>
                       link_to("CookBook documentation",
                               "#CookBook_documentation_One-section",
                               :class => "wiki-page"),
                   '[[CookBook documentation#One-section|documentation]]' =>
                       link_to("documentation",
                               "#CookBook_documentation_One-section",
                               :class => "wiki-page"),
                   # page that doesn't exist
                   '[[Unknown page]]' =>
                       link_to("Unknown page",
                               "#Unknown_page",
                               :class => "wiki-page new"),
                   '[[Unknown page|404]]' =>
                       link_to("404",
                               "#Unknown_page",
                               :class => "wiki-page new"),
                   '[[Unknown page#anchor]]' =>
                       link_to("Unknown page",
                               "#Unknown_page_anchor",
                               :class => "wiki-page new"),
                   '[[Unknown page#anchor|404]]' =>
                       link_to("404",
                               "#Unknown_page_anchor",
                               :class => "wiki-page new"),
                 }
                 @project = Project.find(1)
                 to_test.each do |text, result|
                   assert_equal "<p>#{result}</p>", textilizable(text, :wiki_links => :anchor)
                 end
               end
               def test_html_tags
                 to_test = {
                   "<div>content</div>" => "<p>&lt;div&gt;content&lt;/div&gt;</p>",
                   "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
                   "<script>some script;</script>" => "<p>&lt;script&gt;some script;&lt;/script&gt;</p>",
                   # do not escape pre/code tags
                   "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
                   "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
                   "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
                   "HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>",
                   "<!-- opening comment" => "<p>&lt;!-- opening comment</p>",
                   # remove attributes except class
                   "<pre class='foo'>some text</pre>" => "<pre class='foo'>some text</pre>",
                   '<pre class="foo">some text</pre>' => '<pre class="foo">some text</pre>',
                   "<pre class='foo bar'>some text</pre>" => "<pre class='foo bar'>some text</pre>",
                   '<pre class="foo bar">some text</pre>' => '<pre class="foo bar">some text</pre>',
                   "<pre onmouseover='alert(1)'>some text</pre>" => "<pre>some text</pre>",
                   # xss
                   '<pre><code class=""onmouseover="alert(1)">text</code></pre>' => '<pre><code>text</code></pre>',
                   '<pre class=""onmouseover="alert(1)">text</pre>' => '<pre>text</pre>',
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
               def test_allowed_html_tags
                 to_test = {
                   "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
                   "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
                   "<notextile>this is <tag>a tag</tag></notextile>" => "this is &lt;tag&gt;a tag&lt;/tag&gt;"
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
               def test_pre_tags
                 raw = <<-RAW
             Before
             <pre>
             <prepared-statement-cache-size>32</prepared-statement-cache-size>
             </pre>
             After
             RAW
                 expected = <<-EXPECTED
             <p>Before</p>
             <pre>
             &lt;prepared-statement-cache-size&gt;32&lt;/prepared-statement-cache-size&gt;
             </pre>
             <p>After</p>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_pre_content_should_not_parse_wiki_and_redmine_links
                 raw = <<-RAW
             [[CookBook documentation]]
             #1
             <pre>
             [[CookBook documentation]]
             #1
             </pre>
             RAW
                 result1 = link_to("CookBook documentation",
                                   "/projects/ecookbook/wiki/CookBook_documentation",
                                   :class => "wiki-page")
                 result2 = link_to('#1',
                                   "/issues/1",
                                   :class => Issue.find(1).css_classes,
                                   :title => "Bug: Cannot print recipes (New)")
                 expected = <<-EXPECTED
             <p>#{result1}</p>
             <p>#{result2}</p>
             <pre>
             [[CookBook documentation]]
             #1
             </pre>
             EXPECTED
                 @project = Project.find(1)
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_non_closing_pre_blocks_should_be_closed
                 raw = <<-RAW
             <pre><code>
             RAW
                 expected = <<-EXPECTED
             <pre><code>
             </code></pre>
             EXPECTED
                 @project = Project.find(1)
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_unbalanced_closing_pre_tag_should_not_error
                 assert_nothing_raised do
                   textilizable("unbalanced</pre>")
                 end
               end
               def test_syntax_highlight
                 raw = <<-RAW
             <pre><code class="ruby">
             # Some ruby code here
             </code></pre>
             RAW
                 expected = <<-EXPECTED
             <pre><code class="ruby syntaxhl"><span class=\"CodeRay\"><span class="comment"># Some ruby code here</span></span>
             </code></pre>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_to_path_param
                 assert_equal 'test1/test2', to_path_param('test1/test2')
                 assert_equal 'test1/test2', to_path_param('/test1/test2/')
                 assert_equal 'test1/test2', to_path_param('//test1/test2/')
                 assert_equal nil, to_path_param('/')
               end
               def test_wiki_links_in_tables
                 text = "|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|"
                 link1 = link_to("Link title", "/projects/ecookbook/wiki/Page", :class => "wiki-page new")
                 link2 = link_to("Other title", "/projects/ecookbook/wiki/Other_Page", :class => "wiki-page new")
                 link3 = link_to("Last page", "/projects/ecookbook/wiki/Last_page", :class => "wiki-page new")
                 result = "<tr><td>#{link1}</td>" +
                            "<td>#{link2}</td>" +
                            "</tr><tr><td>Cell 21</td><td>#{link3}</td></tr>"
                 @project = Project.find(1)
                 assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '')
               end
               def test_text_formatting
                 to_test = {'*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
                            '(_text within parentheses_)' => '(<em>text within parentheses</em>)',
                            'a *Humane Web* Text Generator' => 'a <strong>Humane Web</strong> Text Generator',
                            'a H *umane* W *eb* T *ext* G *enerator*' => 'a H <strong>umane</strong> W <strong>eb</strong> T <strong>ext</strong> G <strong>enerator</strong>',
                            'a *H* umane *W* eb *T* ext *G* enerator' => 'a <strong>H</strong> umane <strong>W</strong> eb <strong>T</strong> ext <strong>G</strong> enerator',
                           }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_horizontal_rule
                 assert_equal '<hr />', textilizable('---')
                 assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
               end
               def test_footnotes
                 raw = <<-RAW
             This is some text[1].
             fn1. This is the foot note
             RAW
                 expected = <<-EXPECTED
             <p>This is some text<sup><a href=\"#fn1\">1</a></sup>.</p>
             <p id="fn1" class="footnote"><sup>1</sup> This is the foot note</p>
             EXPECTED
                 assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
               end
               def test_headings
                 raw = 'h1. Some heading'
                 expected = %|<a name="Some-heading"></a>\n<h1 >Some heading<a href="#Some-heading" class="wiki-anchor">&para;</a></h1>|
                 assert_equal expected, textilizable(raw)
               end
               def test_headings_with_special_chars
                 # This test makes sure that the generated anchor names match the expected
                 # ones even if the heading text contains unconventional characters
                 raw = 'h1. Some heading related to version 0.5'
                 anchor = sanitize_anchor_name("Some-heading-related-to-version-0.5")
                 expected = %|<a name="#{anchor}"></a>\n<h1 >Some heading related to version 0.5<a href="##{anchor}" class="wiki-anchor">&para;</a></h1>|
                 assert_equal expected, textilizable(raw)
               end
               def test_headings_in_wiki_single_page_export_should_be_prepended_with_page_title
                 page = WikiPage.new( :title => 'Page Title', :wiki_id => 1 )
                 content = WikiContent.new( :text => 'h1. Some heading', :page => page )
                 expected = %|<a name="Page_Title_Some-heading"></a>\n<h1 >Some heading<a href="#Page_Title_Some-heading" class="wiki-anchor">&para;</a></h1>|
                 assert_equal expected, textilizable(content, :text, :wiki_links => :anchor )
               end
               def test_table_of_content
                 raw = <<-RAW
             {{toc}}
             h1. Title
             Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             h2. Subtitle with a [[Wiki]] link
             Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
             h2. Subtitle with [[Wiki|another Wiki]] link
             h2. Subtitle with %{color:red}red text%
             <pre>
             some code
             </pre>
             h3. Subtitle with *some* _modifiers_
             h3. Subtitle with @inline code@
             h1. Another title
             h3. An "Internet link":http://www.redmine.org/ inside subtitle
             h2. "Project Name !/attachments/1234/logo_small.gif! !/attachments/5678/logo_2.png!":/projects/projectname/issues
             RAW
                 expected =  '<ul class="toc">' +
                               '<li><a href="#Title">Title</a>' +
                                 '<ul>' +
                                   '<li><a href="#Subtitle-with-a-Wiki-link">Subtitle with a Wiki link</a></li>' +
                                   '<li><a href="#Subtitle-with-another-Wiki-link">Subtitle with another Wiki link</a></li>' +
                                   '<li><a href="#Subtitle-with-red-text">Subtitle with red text</a>' +
                                     '<ul>' +
                                       '<li><a href="#Subtitle-with-some-modifiers">Subtitle with some modifiers</a></li>' +
                                       '<li><a href="#Subtitle-with-inline-code">Subtitle with inline code</a></li>' +
                                     '</ul>' +
                                   '</li>' +
                                 '</ul>' +
                               '</li>' +
                               '<li><a href="#Another-title">Another title</a>' +
                                 '<ul>' +
                                   '<li>' +
                                     '<ul>' +
                                       '<li><a href="#An-Internet-link-inside-subtitle">An Internet link inside subtitle</a></li>' +
                                     '</ul>' +
                                   '</li>' +
                                   '<li><a href="#Project-Name">Project Name</a></li>' +
                                 '</ul>' +
                               '</li>' +
                            '</ul>'
                 @project = Project.find(1)
                 assert textilizable(raw).gsub("\n", "").include?(expected)
               end
               def test_table_of_content_should_generate_unique_anchors
                 raw = <<-RAW
             {{toc}}
             h1. Title
             h2. Subtitle
             h2. Subtitle
             RAW
                 expected =  '<ul class="toc">' +
                               '<li><a href="#Title">Title</a>' +
                                 '<ul>' +
                                   '<li><a href="#Subtitle">Subtitle</a></li>' +
                                   '<li><a href="#Subtitle-2">Subtitle</a></li>'
                                 '</ul>'
                               '</li>' +
                            '</ul>'
                 @project = Project.find(1)
                 result = textilizable(raw).gsub("\n", "")
                 assert_include expected, result
                 assert_include '<a name="Subtitle">', result
                 assert_include '<a name="Subtitle-2">', result
               end
               def test_table_of_content_should_contain_included_page_headings
                 raw = <<-RAW
             {{toc}}
             h1. Included
             {{include(Child_1)}}
             RAW
                 expected = '<ul class="toc">' +
                            '<li><a href="#Included">Included</a></li>' +
                            '<li><a href="#Child-page-1">Child page 1</a></li>' +
                            '</ul>'
                 @project = Project.find(1)
                 assert textilizable(raw).gsub("\n", "").include?(expected)
               end
               def test_toc_with_textile_formatting_should_be_parsed
                 with_settings :text_formatting => 'textile' do
                   assert_select_in textilizable("{{toc}}\n\nh1. Heading"), 'ul.toc li', :text => 'Heading'
                   assert_select_in textilizable("{{<toc}}\n\nh1. Heading"), 'ul.toc.left li', :text => 'Heading'
                   assert_select_in textilizable("{{>toc}}\n\nh1. Heading"), 'ul.toc.right li', :text => 'Heading'
                 end
               end
               if Object.const_defined?(:Redcarpet)
               def test_toc_with_markdown_formatting_should_be_parsed
                 with_settings :text_formatting => 'markdown' do
                   assert_select_in textilizable("{{toc}}\n\n# Heading"), 'ul.toc li', :text => 'Heading'
                   assert_select_in textilizable("{{<toc}}\n\n# Heading"), 'ul.toc.left li', :text => 'Heading'
                   assert_select_in textilizable("{{>toc}}\n\n# Heading"), 'ul.toc.right li', :text => 'Heading'
                 end
               end
               end
               def test_section_edit_links
                 raw = <<-RAW
             h1. Title
             Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
             h2. Subtitle with a [[Wiki]] link
             h2. Subtitle with *some* _modifiers_
             h2. Subtitle with @inline code@
             <pre>
             some code
             h2. heading inside pre
             <h2>html heading inside pre</h2>
             </pre>
             h2. Subtitle after pre tag
             RAW
                 @project = Project.find(1)
                 set_language_if_valid 'en'
                 result = textilizable(raw, :edit_section_links => {:controller => 'wiki', :action => 'edit', :project_id => '1', :id => 'Test'}).gsub("\n", "")
                 # heading that contains inline code
                 assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-4">' +
-                  '<a href="/projects/1/wiki/Test/edit\?section=4"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' +
+                  '<a class="icon-only icon-edit" href="/projects/1/wiki/Test/edit\?section=4"></a></div>' +
                   '<a name="Subtitle-with-inline-code"></a>' +
                   '<h2 >Subtitle with <code>inline code</code><a href="#Subtitle-with-inline-code" class="wiki-anchor">&para;</a></h2>'),
                   result
                 # last heading
                 assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-5">' +
-                  '<a href="/projects/1/wiki/Test/edit\?section=5"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' +
+                  '<a class="icon-only icon-edit" href="/projects/1/wiki/Test/edit\?section=5"></a></div>' +
                   '<a name="Subtitle-after-pre-tag"></a>' +
                   '<h2 >Subtitle after pre tag<a href="#Subtitle-after-pre-tag" class="wiki-anchor">&para;</a></h2>'),
                   result
               end
               def test_default_formatter
                 with_settings :text_formatting => 'unknown' do
                   text = 'a *link*: http://www.example.net/'
                   assert_equal '<p>a *link*: <a class="external" href="http://www.example.net/">http://www.example.net/</a></p>', textilizable(text)
                 end
               end
               def test_parse_redmine_links_should_handle_a_tag_without_attributes
                 text = '<a>http://example.com</a>'
                 expected = text.dup
                 parse_redmine_links(text, nil, nil, nil, true, {})
                 assert_equal expected, text
               end
               def test_due_date_distance_in_words
                 to_test = { Date.today => 'Due in 0 days',
                             Date.today + 1 => 'Due in 1 day',
                             Date.today + 100 => 'Due in about 3 months',
                             Date.today + 20000 => 'Due in over 54 years',
                             Date.today - 1 => '1 day late',
                             Date.today - 100 => 'about 3 months late',
                             Date.today - 20000 => 'over 54 years late',
                            }
                 ::I18n.locale = :en
                 to_test.each do |date, expected|
                   assert_equal expected, due_date_distance_in_words(date)
                 end
               end
               def test_avatar_enabled
                 with_settings :gravatar_enabled => '1' do
                   assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
                   assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
                   # Default size is 50
                   assert avatar('jsmith <jsmith@somenet.foo>').include?('size=50')
                   assert avatar('jsmith <jsmith@somenet.foo>', :size => 24).include?('size=24')
                   # Non-avatar options should be considered html options
                   assert avatar('jsmith <jsmith@somenet.foo>', :title => 'John Smith').include?('title="John Smith"')
                   # The default class of the img tag should be gravatar
                   assert avatar('jsmith <jsmith@somenet.foo>').include?('class="gravatar"')
                   assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"')
                   assert_nil avatar('jsmith')
                   assert_nil avatar(nil)
                 end
               end
               def test_avatar_disabled
                 with_settings :gravatar_enabled => '0' do
                   assert_equal '', avatar(User.find_by_mail('jsmith@somenet.foo'))
                 end
               end
               def test_link_to_user
                 user = User.find(2)
                 result = link_to("John Smith", "/users/2", :class => "user active")
                 assert_equal result, link_to_user(user)
               end
               def test_link_to_user_should_not_link_to_locked_user
                 with_current_user nil do
                   user = User.find(5)
                   assert user.locked?
                   assert_equal 'Dave2 Lopper2', link_to_user(user)
                 end
               end
               def test_link_to_user_should_link_to_locked_user_if_current_user_is_admin
                 with_current_user User.find(1) do
                   user = User.find(5)
                   assert user.locked?
                   result = link_to("Dave2 Lopper2", "/users/5", :class => "user locked")
                   assert_equal result, link_to_user(user)
                 end
               end
               def test_link_to_user_should_not_link_to_anonymous
                 user = User.anonymous
                 assert user.anonymous?
                 t = link_to_user(user)
                 assert_equal ::I18n.t(:label_user_anonymous), t
               end
               def test_link_to_attachment
                 a = Attachment.find(3)
                 assert_equal '<a href="/attachments/3/logo.gif">logo.gif</a>',
                   link_to_attachment(a)
                 assert_equal '<a href="/attachments/3/logo.gif">Text</a>',
                   link_to_attachment(a, :text => 'Text')
                 result = link_to("logo.gif", "/attachments/3/logo.gif", :class => "foo")
                 assert_equal result,
                   link_to_attachment(a, :class => 'foo')
                 assert_equal '<a href="/attachments/download/3/logo.gif">logo.gif</a>',
                   link_to_attachment(a, :download => true)
                 assert_equal '<a href="http://test.host/attachments/3/logo.gif">logo.gif</a>',
                   link_to_attachment(a, :only_path => false)
               end
               def test_thumbnail_tag
                 a = Attachment.find(3)
                 assert_select_in thumbnail_tag(a),
                   'a[href=?][title=?] img[alt="3"][src=?]',
                   "/attachments/3/logo.gif", "logo.gif", "/attachments/thumbnail/3"
               end
               def test_link_to_project
                 project = Project.find(1)
                 assert_equal %(<a href="/projects/ecookbook">eCookbook</a>),
                              link_to_project(project)
                 assert_equal %(<a href="http://test.host/projects/ecookbook?jump=blah">eCookbook</a>),
                              link_to_project(project, {:only_path => false, :jump => 'blah'})
               end
               def test_link_to_project_settings
                 project = Project.find(1)
                 assert_equal '<a href="/projects/ecookbook/settings">eCookbook</a>', link_to_project_settings(project)
                 project.status = Project::STATUS_CLOSED
                 assert_equal '<a href="/projects/ecookbook">eCookbook</a>', link_to_project_settings(project)
                 project.status = Project::STATUS_ARCHIVED
                 assert_equal 'eCookbook', link_to_project_settings(project)
               end
               def test_link_to_legacy_project_with_numerical_identifier_should_use_id
                 # numeric identifier are no longer allowed
                 Project.where(:id => 1).update_all(:identifier => 25)
                 assert_equal '<a href="/projects/1">eCookbook</a>',
                              link_to_project(Project.find(1))
               end
               def test_principals_options_for_select_with_users
                 User.current = nil
                 users = [User.find(2), User.find(4)]
                 assert_equal %(<option value="2">John Smith</option><option value="4">Robert Hill</option>),
                   principals_options_for_select(users)
               end
               def test_principals_options_for_select_with_selected
                 User.current = nil
                 users = [User.find(2), User.find(4)]
                 assert_equal %(<option value="2">John Smith</option><option value="4" selected="selected">Robert Hill</option>),
                   principals_options_for_select(users, User.find(4))
               end
               def test_principals_options_for_select_with_users_and_groups
                 User.current = nil
                 set_language_if_valid 'en'
                 users = [User.find(2), Group.find(11), User.find(4), Group.find(10)]
                 assert_equal %(<option value="2">John Smith</option><option value="4">Robert Hill</option>) +
                   %(<optgroup label="Groups"><option value="10">A Team</option><option value="11">B Team</option></optgroup>),
                   principals_options_for_select(users)
               end
               def test_principals_options_for_select_with_empty_collection
                 assert_equal '', principals_options_for_select([])
               end
               def test_principals_options_for_select_should_include_me_option_when_current_user_is_in_collection
                 set_language_if_valid 'en'
                 users = [User.find(2), User.find(4)]
                 User.current = User.find(4)
                 assert_include '<option value="4">&lt;&lt; me &gt;&gt;</option>', principals_options_for_select(users)
               end
               def test_stylesheet_link_tag_should_pick_the_default_stylesheet
                 assert_match 'href="/stylesheets/styles.css"', stylesheet_link_tag("styles")
               end
               def test_stylesheet_link_tag_for_plugin_should_pick_the_plugin_stylesheet
                 assert_match 'href="/plugin_assets/foo/stylesheets/styles.css"', stylesheet_link_tag("styles", :plugin => :foo)
               end
               def test_image_tag_should_pick_the_default_image
                 assert_match 'src="/images/image.png"', image_tag("image.png")
               end
               def test_image_tag_should_pick_the_theme_image_if_it_exists
                 theme = Redmine::Themes.themes.last
                 theme.images << 'image.png'
                 with_settings :ui_theme => theme.id do
                   assert_match %|src="/themes/#{theme.dir}/images/image.png"|, image_tag("image.png")
                   assert_match %|src="/images/other.png"|, image_tag("other.png")
                 end
               ensure
                 theme.images.delete 'image.png'
               end
               def test_image_tag_sfor_plugin_should_pick_the_plugin_image
                 assert_match 'src="/plugin_assets/foo/images/image.png"', image_tag("image.png", :plugin => :foo)
               end
               def test_javascript_include_tag_should_pick_the_default_javascript
                 assert_match 'src="/javascripts/scripts.js"', javascript_include_tag("scripts")
               end
               def test_javascript_include_tag_for_plugin_should_pick_the_plugin_javascript
                 assert_match 'src="/plugin_assets/foo/javascripts/scripts.js"', javascript_include_tag("scripts", :plugin => :foo)
               end
               def test_raw_json_should_escape_closing_tags
                 s = raw_json(["<foo>bar</foo>"])
                 assert_include '\/foo', s
               end
               def test_raw_json_should_be_html_safe
                 s = raw_json(["foo"])
                 assert s.html_safe?
               end
               def test_html_title_should_app_title_if_not_set
                 assert_equal 'Redmine', html_title
               end
               def test_html_title_should_join_items
                 html_title 'Foo', 'Bar'
                 assert_equal 'Foo - Bar - Redmine', html_title
               end
               def test_html_title_should_append_current_project_name
                 @project = Project.find(1)
                 html_title 'Foo', 'Bar'
                 assert_equal 'Foo - Bar - eCookbook - Redmine', html_title
               end
               def test_title_should_return_a_h2_tag
                 assert_equal '<h2>Foo</h2>', title('Foo')
               end
               def test_title_should_set_html_title
                 title('Foo')
                 assert_equal 'Foo - Redmine', html_title
               end
               def test_title_should_turn_arrays_into_links
                 assert_equal '<h2><a href="/foo">Foo</a></h2>', title(['Foo', '/foo'])
                 assert_equal 'Foo - Redmine', html_title
               end
               def test_title_should_join_items
                 assert_equal '<h2>Foo &#187; Bar</h2>', title('Foo', 'Bar')
                 assert_equal 'Bar - Foo - Redmine', html_title
               end
               def test_favicon_path
                 assert_match %r{^/favicon\.ico}, favicon_path
               end
               def test_favicon_path_with_suburi
                 Redmine::Utils.relative_url_root = '/foo'
                 assert_match %r{^/foo/favicon\.ico}, favicon_path
               ensure
                 Redmine::Utils.relative_url_root = ''
               end
               def test_favicon_url
                 assert_match %r{^http://test\.host/favicon\.ico}, favicon_url
               end
               def test_favicon_url_with_suburi
                 Redmine::Utils.relative_url_root = '/foo'
                 assert_match %r{^http://test\.host/foo/favicon\.ico}, favicon_url
               ensure
                 Redmine::Utils.relative_url_root = ''
               end
               def test_truncate_single_line
                 str = "01234"
                 result = truncate_single_line_raw("#{str}\n#{str}", 10)
                 assert_equal "01234 0...", result
                 assert !result.html_safe?
                 result = truncate_single_line_raw("#{str}<&#>\n#{str}#{str}", 16)
                 assert_equal "01234<&#> 012...", result
                 assert !result.html_safe?
               end
               def test_truncate_single_line_non_ascii
                 ja = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e".force_encoding('UTF-8')
                 result = truncate_single_line_raw("#{ja}\n#{ja}\n#{ja}", 10)
                 assert_equal "#{ja} #{ja}...", result
                 assert !result.html_safe?
               end
             end

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