Custom themes are now loaded from "/themes" directory from project root. The themes...

git-svn-id: https://svn.redmine.org/redmine/trunk@22708 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/assets/themes/README b/app/assets/themes/README
deleted file mode 100644 (file)
index 1af3d19..0000000
--- a/app/assets/themes/README
+++ /dev/null
@@ -1 +0,0 @@
-Put your Redmine themes here.

diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index 57fcd80d7efe4b4469b7ef73595a7e1db8c4de92..873409d1eb25d723827d647f0589e1d50e6b71c6 100644 (file)
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -148,7 +148,7 @@ module Redmine
     end
 
     def self.scan_themes
-      dirs = Dir.glob("#{Rails.root}/app/assets/themes/*").select do |f|
+      dirs = Dir.glob(["#{Rails.root}/app/assets/themes/*", "#{Rails.root}/themes/*"]).select do |f|
         # A theme should at least override application.css
         File.directory?(f) && File.exist?("#{f}/stylesheets/application.css")
       end

diff --git a/themes/README b/themes/README
new file mode 100644 (file)
index 0000000..1af3d19
--- /dev/null
+++ b/themes/README
@@ -0,0 +1 @@
+Put your Redmine themes here.