Makes image_tag pick the image from the current theme if it exists.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9560 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index 5e5261927..c8b711090 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -67,6 +67,10 @@ module Redmine
         @stylesheets ||= assets("stylesheets", "css")
       end
 
+      def images
+        @images ||= assets("images")
+      end
+
       def javascripts
         @javascripts ||= assets("javascripts", "js")
       end
@@ -75,14 +79,22 @@ module Redmine
         "/themes/#{dir}/stylesheets/#{source}"
       end
 
+      def image_path(source)
+        "/themes/#{dir}/images/#{source}"
+      end
+
       def javascript_path(source)
         "/themes/#{dir}/javascripts/#{source}"
       end
 
       private
 
-      def assets(dir, ext)
-        Dir.glob("#{path}/#{dir}/*.#{ext}").collect {|f| File.basename(f).gsub(/\.#{ext}$/, '')}
+      def assets(dir, ext=nil)
+        if ext
+          Dir.glob("#{path}/#{dir}/*.#{ext}").collect {|f| File.basename(f).gsub(/\.#{ext}$/, '')}
+        else
+          Dir.glob("#{path}/#{dir}/*").collect {|f| File.basename(f)}
+        end
       end
     end