mirror of
				https://github.com/redmine/redmine.git
				synced 2025-11-03 20:06:24 +01:00 
			
		
		
		
	Adds support for :plugin option to image_tag helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9559 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
		@@ -1065,6 +1065,18 @@ module ApplicationHelper
 | 
				
			|||||||
    super sources, options
 | 
					    super sources, options
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  # Overrides Rails' image_tag with plugins support.
 | 
				
			||||||
 | 
					  # Examples:
 | 
				
			||||||
 | 
					  #   image_tag('image.png') # => picks defaults image.png
 | 
				
			||||||
 | 
					  #   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}"
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
 | 
					    super source, options
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Overrides Rails' javascript_include_tag with plugins support
 | 
					  # Overrides Rails' javascript_include_tag with plugins support
 | 
				
			||||||
  # Examples:
 | 
					  # Examples:
 | 
				
			||||||
  #   javascript_include_tag('scripts') # => picks scripts.js from defaults
 | 
					  #   javascript_include_tag('scripts') # => picks scripts.js from defaults
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1054,6 +1054,14 @@ RAW
 | 
				
			|||||||
    assert_match 'href="/plugin_assets/foo/stylesheets/styles.css"', stylesheet_link_tag("styles", :plugin => :foo)
 | 
					    assert_match 'href="/plugin_assets/foo/stylesheets/styles.css"', stylesheet_link_tag("styles", :plugin => :foo)
 | 
				
			||||||
  end
 | 
					  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_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
 | 
					  def test_javascript_include_tag_should_pick_the_default_javascript
 | 
				
			||||||
    assert_match 'src="/javascripts/scripts.js"', javascript_include_tag("scripts")
 | 
					    assert_match 'src="/javascripts/scripts.js"', javascript_include_tag("scripts")
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user