+<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %>
+<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %>
diff --git a/config/settings.yml b/config/settings.yml index b5ed26a1..e2897775 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -92,4 +92,6 @@ issue_list_default_columns: # multiple values accepted, comma separated repositories_encodings: default: '' +ui_theme: + default: '' \ No newline at end of file diff --git a/lang/en.yml b/lang/en.yml index af3faf49..d4845617 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -431,6 +431,8 @@ label_changeset_plural: Changesets label_default_columns: Default columns label_no_change_option: (No change) label_bulk_edit_selected_issues: Bulk edit selected issues +label_theme: Theme +label_default: Default button_login: Login button_submit: Submit diff --git a/lang/fr.yml b/lang/fr.yml index a42ead91..03c77b6b 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -431,6 +431,8 @@ label_changeset_plural: Révisions label_default_columns: Colonnes par défaut label_no_change_option: (Pas de changement) label_bulk_edit_selected_issues: Modifier les demandes sélectionnées +label_theme: Thème +label_default: Défaut button_login: Connexion button_submit: Soumettre diff --git a/lib/redmine.rb b/lib/redmine.rb index cb6af8ae..ceb53155 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -1,6 +1,7 @@ require 'redmine/access_control' require 'redmine/menu_manager' require 'redmine/mime_type' +require 'redmine/themes' require 'redmine/plugin' begin diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb new file mode 100644 index 00000000..abbd34cd --- /dev/null +++ b/lib/redmine/themes.rb @@ -0,0 +1,72 @@ +# redMine - project management software +# Copyright (C) 2006-2007 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 Redmine + module Themes + + # Return an array of installed themes + def self.themes + @@installed_themes ||= scan_themes + end + + # Rescan themes directory + def self.rescan + @@installed_themes = scan_themes + end + + # Return theme for given id, or nil if it's not found + def self.theme(id) + themes.find {|t| t.id == id} + end + + # Class used to represent a theme + class Theme + attr_reader :name, :dir, :stylesheets + + def initialize(path) + @dir = File.basename(path) + @name = @dir.humanize + @stylesheets = Dir.glob("#{path}/stylesheets/*.css").collect {|f| File.basename(f).gsub(/\.css$/, '')} + end + + # Directory name used as the theme id + def id; dir end + + def <=>(theme) + name <=> theme.name + end + end + + private + + def self.scan_themes + dirs = Dir.glob('public/themes/*').select do |f| + # A theme should at least override application.css + File.directory?(f) && File.exist?("#{f}/stylesheets/application.css") + end + dirs.collect {|dir| Theme.new(dir)}.sort + end + end +end + +module ApplicationHelper + def stylesheet_path(source) + @current_theme ||= Redmine::Themes.theme(Setting.ui_theme) + super((@current_theme && @current_theme.stylesheets.include?(source)) ? + "/themes/#{@current_theme.dir}/stylesheets/#{source}" : source) + end +end diff --git a/public/themes/README b/public/themes/README new file mode 100644 index 00000000..1af3d199 --- /dev/null +++ b/public/themes/README @@ -0,0 +1 @@ +Put your Redmine themes here.