diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb deleted file mode 100644 index 8070c841a..000000000 --- a/app/controllers/help_controller.rb +++ /dev/null @@ -1,44 +0,0 @@ -# redMine - project management software -# Copyright (C) 2006 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. - -class HelpController < ApplicationController - - skip_before_filter :check_if_login_required - before_filter :load_help_config - - # displays help page for the requested controller/action - def index - # select help page to display - if params[:ctrl] and @help_config['pages'][params[:ctrl]] - if params[:page] and @help_config['pages'][params[:ctrl]][params[:page]] - template = @help_config['pages'][params[:ctrl]][params[:page]] - else - template = @help_config['pages'][params[:ctrl]]['index'] - end - end - # choose language according to available help translations - lang = (@help_config['langs'].include? current_language.to_s) ? current_language.to_s : @help_config['langs'].first - - url = "/manual/#{lang}/" + (template || "index.html") - redirect_to(request.relative_url_root + url) - end - -private - def load_help_config - @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml")) - end -end diff --git a/app/helpers/help_helper.rb b/app/helpers/help_helper.rb deleted file mode 100644 index 41fc5917c..000000000 --- a/app/helpers/help_helper.rb +++ /dev/null @@ -1,19 +0,0 @@ -# redMine - project management software -# Copyright (C) 2006 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 HelpHelper -end diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index d0115a6d3..2b25820d9 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -33,6 +33,7 @@ <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'} if User.current.logged? %> <%= link_to l(:label_project_plural), { :controller => 'projects' } %> <%= link_to l(:label_administration), { :controller => 'admin' } if User.current.admin? %> + <%= link_to l(:label_help), Redmine::Info.help_url %>