From 23cf761b9c2b7445f1819656958c626a130a4a0e Mon Sep 17 00:00:00 2001 From: jplang Date: Sat, 13 Oct 2007 10:30:24 +0000 Subject: [PATCH] Removed inconsistent user manual stuff (html/docbook content and controller). Help link now points to the Redmine guide which will be more easy to maintain. Also removed the useless components directory. git-svn-id: https://svn.redmine.org/redmine/trunk@835 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/help_controller.rb | 44 - app/helpers/help_helper.rb | 19 - app/views/layouts/base.rhtml | 1 + config/help.yml | 84 -- doc/docbook/en/images/arrow_bw.png | Bin 208 -> 0 bytes doc/docbook/en/images/arrow_from.png | Bin 209 -> 0 bytes doc/docbook/en/images/arrow_to.png | Bin 211 -> 0 bytes doc/docbook/en/images/gantt.png | Bin 15589 -> 0 bytes doc/docbook/en/images/issues_list.png | Bin 13313 -> 0 bytes doc/docbook/en/images/locked.png | Bin 437 -> 0 bytes doc/docbook/en/images/roles_edit.png | Bin 26838 -> 0 bytes doc/docbook/en/images/user_new.png | Bin 258 -> 0 bytes doc/docbook/en/images/users_list.png | Bin 8440 -> 0 bytes doc/docbook/en/images/workflow.png | Bin 6503 -> 0 bytes doc/docbook/en/redmine-userdoc-en.xml | 1130 ------------------ doc/docbook/fr/images/arrow_bw.png | Bin 208 -> 0 bytes doc/docbook/fr/images/arrow_from.png | Bin 209 -> 0 bytes doc/docbook/fr/images/arrow_to.png | Bin 211 -> 0 bytes doc/docbook/fr/images/gantt.png | Bin 15589 -> 0 bytes doc/docbook/fr/images/issues_list.png | Bin 13313 -> 0 bytes doc/docbook/fr/images/locked.png | Bin 437 -> 0 bytes doc/docbook/fr/images/roles_edit.png | Bin 26838 -> 0 bytes doc/docbook/fr/images/user_new.png | Bin 258 -> 0 bytes doc/docbook/fr/images/users_list.png | Bin 8440 -> 0 bytes doc/docbook/fr/images/workflow.png | Bin 6503 -> 0 bytes doc/docbook/fr/redmine-userdoc-fr.xml | 1245 -------------------- doc/docbook/ja/images/arrow_bw.png | Bin 208 -> 0 bytes doc/docbook/ja/images/arrow_from.png | Bin 209 -> 0 bytes doc/docbook/ja/images/arrow_to.png | Bin 211 -> 0 bytes doc/docbook/ja/images/gantt.png | Bin 15589 -> 0 bytes doc/docbook/ja/images/issues_list.png | Bin 13313 -> 0 bytes doc/docbook/ja/images/locked.png | Bin 437 -> 0 bytes doc/docbook/ja/images/roles_edit.png | Bin 26838 -> 0 bytes doc/docbook/ja/images/user_new.png | Bin 258 -> 0 bytes doc/docbook/ja/images/users_list.png | Bin 8440 -> 0 bytes doc/docbook/ja/images/workflow.png | Bin 6503 -> 0 bytes doc/docbook/ja/redmine-userdoc-ja.xml | 820 ------------- lib/redmine/info.rb | 1 + public/manual/en/ch01.html | 3 - public/manual/en/ch01s01.html | 3 - public/manual/en/ch01s02.html | 3 - public/manual/en/ch01s03.html | 3 - public/manual/en/ch01s04.html | 3 - public/manual/en/ch01s05.html | 3 - public/manual/en/ch01s06.html | 3 - public/manual/en/ch01s07.html | 3 - public/manual/en/ch01s08.html | 3 - public/manual/en/ch01s09.html | 3 - public/manual/en/ch01s10.html | 3 - public/manual/en/ch01s11.html | 3 - public/manual/en/ch01s12.html | 3 - public/manual/en/ch02.html | 3 - public/manual/en/ch02s01.html | 3 - public/manual/en/ch02s02.html | 3 - public/manual/en/ch02s03.html | 3 - public/manual/en/ch02s04.html | 3 - public/manual/en/ch02s05.html | 3 - public/manual/en/ch02s06.html | 3 - public/manual/en/ch02s07.html | 3 - public/manual/en/ch02s08.html | 3 - public/manual/en/ch02s09.html | 3 - public/manual/en/ch02s10.html | 3 - public/manual/en/ch02s11.html | 3 - public/manual/en/ch03.html | 3 - public/manual/en/ch03s01.html | 3 - public/manual/en/ch03s02.html | 3 - public/manual/en/ch03s03.html | 3 - public/manual/en/ch03s04.html | 3 - public/manual/en/html.css | 75 -- public/manual/en/index.html | 3 - public/manual/en/resources/arrow_bw.png | Bin 208 -> 0 bytes public/manual/en/resources/arrow_from.png | Bin 209 -> 0 bytes public/manual/en/resources/arrow_to.png | Bin 211 -> 0 bytes public/manual/en/resources/gantt.png | Bin 15589 -> 0 bytes public/manual/en/resources/issues_list.png | Bin 13313 -> 0 bytes public/manual/en/resources/locked.png | Bin 437 -> 0 bytes public/manual/en/resources/user_new.png | Bin 258 -> 0 bytes public/manual/en/resources/users_list.png | Bin 8440 -> 0 bytes public/manual/en/resources/workflow.png | Bin 6503 -> 0 bytes public/manual/en/wiki_syntax.html | 32 - public/manual/fr/ch01.html | 3 - public/manual/fr/ch01s01.html | 3 - public/manual/fr/ch01s02.html | 3 - public/manual/fr/ch01s03.html | 3 - public/manual/fr/ch01s04.html | 3 - public/manual/fr/ch01s05.html | 3 - public/manual/fr/ch01s06.html | 3 - public/manual/fr/ch01s07.html | 3 - public/manual/fr/ch01s08.html | 3 - public/manual/fr/ch01s09.html | 3 - public/manual/fr/ch01s10.html | 3 - public/manual/fr/ch01s11.html | 3 - public/manual/fr/ch01s12.html | 3 - public/manual/fr/ch02.html | 3 - public/manual/fr/ch02s01.html | 3 - public/manual/fr/ch02s02.html | 3 - public/manual/fr/ch02s03.html | 3 - public/manual/fr/ch02s04.html | 3 - public/manual/fr/ch02s05.html | 3 - public/manual/fr/ch02s06.html | 3 - public/manual/fr/ch02s07.html | 3 - public/manual/fr/ch02s08.html | 3 - public/manual/fr/ch02s09.html | 3 - public/manual/fr/ch02s10.html | 3 - public/manual/fr/ch02s11.html | 3 - public/manual/fr/ch03.html | 3 - public/manual/fr/ch03s01.html | 3 - public/manual/fr/ch03s02.html | 3 - public/manual/fr/ch03s03.html | 3 - public/manual/fr/ch03s04.html | 3 - public/manual/fr/html.css | 75 -- public/manual/fr/index.html | 3 - public/manual/fr/resources/arrow_bw.png | Bin 208 -> 0 bytes public/manual/fr/resources/arrow_from.png | Bin 209 -> 0 bytes public/manual/fr/resources/arrow_to.png | Bin 211 -> 0 bytes public/manual/fr/resources/gantt.png | Bin 15589 -> 0 bytes public/manual/fr/resources/issues_list.png | Bin 13313 -> 0 bytes public/manual/fr/resources/locked.png | Bin 437 -> 0 bytes public/manual/fr/resources/roles_edit.png | Bin 26838 -> 0 bytes public/manual/fr/resources/user_new.png | Bin 258 -> 0 bytes public/manual/fr/resources/users_list.png | Bin 8440 -> 0 bytes public/manual/fr/resources/workflow.png | Bin 6503 -> 0 bytes public/manual/fr/wiki_syntax.html | 32 - public/manual/ja/ch01.html | 3 - public/manual/ja/ch01s01.html | 3 - public/manual/ja/ch01s02.html | 3 - public/manual/ja/ch01s03.html | 3 - public/manual/ja/ch01s04.html | 3 - public/manual/ja/ch01s05.html | 3 - public/manual/ja/ch01s06.html | 3 - public/manual/ja/ch01s07.html | 3 - public/manual/ja/ch01s08.html | 3 - public/manual/ja/ch01s09.html | 3 - public/manual/ja/ch01s10.html | 3 - public/manual/ja/ch01s11.html | 3 - public/manual/ja/ch01s12.html | 3 - public/manual/ja/ch02.html | 3 - public/manual/ja/ch02s01.html | 3 - public/manual/ja/ch02s02.html | 3 - public/manual/ja/ch02s03.html | 3 - public/manual/ja/ch02s04.html | 3 - public/manual/ja/ch02s05.html | 3 - public/manual/ja/ch02s06.html | 3 - public/manual/ja/ch02s07.html | 3 - public/manual/ja/ch02s08.html | 3 - public/manual/ja/ch02s09.html | 3 - public/manual/ja/ch03.html | 3 - public/manual/ja/ch03s01.html | 3 - public/manual/ja/ch03s02.html | 3 - public/manual/ja/ch03s03.html | 3 - public/manual/ja/ch03s04.html | 3 - public/manual/ja/html.css | 69 -- public/manual/ja/index.html | 3 - public/manual/ja/resources/arrow_bw.png | Bin 208 -> 0 bytes public/manual/ja/resources/arrow_from.png | Bin 209 -> 0 bytes public/manual/ja/resources/arrow_to.png | Bin 211 -> 0 bytes public/manual/ja/resources/gantt.png | Bin 15589 -> 0 bytes public/manual/ja/resources/issues_list.png | Bin 13313 -> 0 bytes public/manual/ja/resources/locked.png | Bin 437 -> 0 bytes public/manual/ja/resources/user_new.png | Bin 258 -> 0 bytes public/manual/ja/resources/users_list.png | Bin 8440 -> 0 bytes public/manual/ja/resources/workflow.png | Bin 6503 -> 0 bytes public/manual/ja/wiki_syntax.html | 32 - public/manual/redmine.png | Bin 1578 -> 0 bytes 164 files changed, 2 insertions(+), 3930 deletions(-) delete mode 100644 app/controllers/help_controller.rb delete mode 100644 app/helpers/help_helper.rb delete mode 100644 config/help.yml delete mode 100644 doc/docbook/en/images/arrow_bw.png delete mode 100644 doc/docbook/en/images/arrow_from.png delete mode 100644 doc/docbook/en/images/arrow_to.png delete mode 100644 doc/docbook/en/images/gantt.png delete mode 100644 doc/docbook/en/images/issues_list.png delete mode 100644 doc/docbook/en/images/locked.png delete mode 100644 doc/docbook/en/images/roles_edit.png delete mode 100644 doc/docbook/en/images/user_new.png delete mode 100644 doc/docbook/en/images/users_list.png delete mode 100644 doc/docbook/en/images/workflow.png delete mode 100644 doc/docbook/en/redmine-userdoc-en.xml delete mode 100644 doc/docbook/fr/images/arrow_bw.png delete mode 100644 doc/docbook/fr/images/arrow_from.png delete mode 100644 doc/docbook/fr/images/arrow_to.png delete mode 100644 doc/docbook/fr/images/gantt.png delete mode 100644 doc/docbook/fr/images/issues_list.png delete mode 100644 doc/docbook/fr/images/locked.png delete mode 100644 doc/docbook/fr/images/roles_edit.png delete mode 100644 doc/docbook/fr/images/user_new.png delete mode 100644 doc/docbook/fr/images/users_list.png delete mode 100644 doc/docbook/fr/images/workflow.png delete mode 100644 doc/docbook/fr/redmine-userdoc-fr.xml delete mode 100644 doc/docbook/ja/images/arrow_bw.png delete mode 100644 doc/docbook/ja/images/arrow_from.png delete mode 100644 doc/docbook/ja/images/arrow_to.png delete mode 100644 doc/docbook/ja/images/gantt.png delete mode 100644 doc/docbook/ja/images/issues_list.png delete mode 100644 doc/docbook/ja/images/locked.png delete mode 100644 doc/docbook/ja/images/roles_edit.png delete mode 100644 doc/docbook/ja/images/user_new.png delete mode 100644 doc/docbook/ja/images/users_list.png delete mode 100644 doc/docbook/ja/images/workflow.png delete mode 100644 doc/docbook/ja/redmine-userdoc-ja.xml delete mode 100644 public/manual/en/ch01.html delete mode 100644 public/manual/en/ch01s01.html delete mode 100644 public/manual/en/ch01s02.html delete mode 100644 public/manual/en/ch01s03.html delete mode 100644 public/manual/en/ch01s04.html delete mode 100644 public/manual/en/ch01s05.html delete mode 100644 public/manual/en/ch01s06.html delete mode 100644 public/manual/en/ch01s07.html delete mode 100644 public/manual/en/ch01s08.html delete mode 100644 public/manual/en/ch01s09.html delete mode 100644 public/manual/en/ch01s10.html delete mode 100644 public/manual/en/ch01s11.html delete mode 100644 public/manual/en/ch01s12.html delete mode 100644 public/manual/en/ch02.html delete mode 100644 public/manual/en/ch02s01.html delete mode 100644 public/manual/en/ch02s02.html delete mode 100644 public/manual/en/ch02s03.html delete mode 100644 public/manual/en/ch02s04.html delete mode 100644 public/manual/en/ch02s05.html delete mode 100644 public/manual/en/ch02s06.html delete mode 100644 public/manual/en/ch02s07.html delete mode 100644 public/manual/en/ch02s08.html delete mode 100644 public/manual/en/ch02s09.html delete mode 100644 public/manual/en/ch02s10.html delete mode 100644 public/manual/en/ch02s11.html delete mode 100644 public/manual/en/ch03.html delete mode 100644 public/manual/en/ch03s01.html delete mode 100644 public/manual/en/ch03s02.html delete mode 100644 public/manual/en/ch03s03.html delete mode 100644 public/manual/en/ch03s04.html delete mode 100644 public/manual/en/html.css delete mode 100644 public/manual/en/index.html delete mode 100644 public/manual/en/resources/arrow_bw.png delete mode 100644 public/manual/en/resources/arrow_from.png delete mode 100644 public/manual/en/resources/arrow_to.png delete mode 100644 public/manual/en/resources/gantt.png delete mode 100644 public/manual/en/resources/issues_list.png delete mode 100644 public/manual/en/resources/locked.png delete mode 100644 public/manual/en/resources/user_new.png delete mode 100644 public/manual/en/resources/users_list.png delete mode 100644 public/manual/en/resources/workflow.png delete mode 100644 public/manual/en/wiki_syntax.html delete mode 100644 public/manual/fr/ch01.html delete mode 100644 public/manual/fr/ch01s01.html delete mode 100644 public/manual/fr/ch01s02.html delete mode 100644 public/manual/fr/ch01s03.html delete mode 100644 public/manual/fr/ch01s04.html delete mode 100644 public/manual/fr/ch01s05.html delete mode 100644 public/manual/fr/ch01s06.html delete mode 100644 public/manual/fr/ch01s07.html delete mode 100644 public/manual/fr/ch01s08.html delete mode 100644 public/manual/fr/ch01s09.html delete mode 100644 public/manual/fr/ch01s10.html delete mode 100644 public/manual/fr/ch01s11.html delete mode 100644 public/manual/fr/ch01s12.html delete mode 100644 public/manual/fr/ch02.html delete mode 100644 public/manual/fr/ch02s01.html delete mode 100644 public/manual/fr/ch02s02.html delete mode 100644 public/manual/fr/ch02s03.html delete mode 100644 public/manual/fr/ch02s04.html delete mode 100644 public/manual/fr/ch02s05.html delete mode 100644 public/manual/fr/ch02s06.html delete mode 100644 public/manual/fr/ch02s07.html delete mode 100644 public/manual/fr/ch02s08.html delete mode 100644 public/manual/fr/ch02s09.html delete mode 100644 public/manual/fr/ch02s10.html delete mode 100644 public/manual/fr/ch02s11.html delete mode 100644 public/manual/fr/ch03.html delete mode 100644 public/manual/fr/ch03s01.html delete mode 100644 public/manual/fr/ch03s02.html delete mode 100644 public/manual/fr/ch03s03.html delete mode 100644 public/manual/fr/ch03s04.html delete mode 100644 public/manual/fr/html.css delete mode 100644 public/manual/fr/index.html delete mode 100644 public/manual/fr/resources/arrow_bw.png delete mode 100644 public/manual/fr/resources/arrow_from.png delete mode 100644 public/manual/fr/resources/arrow_to.png delete mode 100644 public/manual/fr/resources/gantt.png delete mode 100644 public/manual/fr/resources/issues_list.png delete mode 100644 public/manual/fr/resources/locked.png delete mode 100644 public/manual/fr/resources/roles_edit.png delete mode 100644 public/manual/fr/resources/user_new.png delete mode 100644 public/manual/fr/resources/users_list.png delete mode 100644 public/manual/fr/resources/workflow.png delete mode 100644 public/manual/fr/wiki_syntax.html delete mode 100644 public/manual/ja/ch01.html delete mode 100644 public/manual/ja/ch01s01.html delete mode 100644 public/manual/ja/ch01s02.html delete mode 100644 public/manual/ja/ch01s03.html delete mode 100644 public/manual/ja/ch01s04.html delete mode 100644 public/manual/ja/ch01s05.html delete mode 100644 public/manual/ja/ch01s06.html delete mode 100644 public/manual/ja/ch01s07.html delete mode 100644 public/manual/ja/ch01s08.html delete mode 100644 public/manual/ja/ch01s09.html delete mode 100644 public/manual/ja/ch01s10.html delete mode 100644 public/manual/ja/ch01s11.html delete mode 100644 public/manual/ja/ch01s12.html delete mode 100644 public/manual/ja/ch02.html delete mode 100644 public/manual/ja/ch02s01.html delete mode 100644 public/manual/ja/ch02s02.html delete mode 100644 public/manual/ja/ch02s03.html delete mode 100644 public/manual/ja/ch02s04.html delete mode 100644 public/manual/ja/ch02s05.html delete mode 100644 public/manual/ja/ch02s06.html delete mode 100644 public/manual/ja/ch02s07.html delete mode 100644 public/manual/ja/ch02s08.html delete mode 100644 public/manual/ja/ch02s09.html delete mode 100644 public/manual/ja/ch03.html delete mode 100644 public/manual/ja/ch03s01.html delete mode 100644 public/manual/ja/ch03s02.html delete mode 100644 public/manual/ja/ch03s03.html delete mode 100644 public/manual/ja/ch03s04.html delete mode 100644 public/manual/ja/html.css delete mode 100644 public/manual/ja/index.html delete mode 100644 public/manual/ja/resources/arrow_bw.png delete mode 100644 public/manual/ja/resources/arrow_from.png delete mode 100644 public/manual/ja/resources/arrow_to.png delete mode 100644 public/manual/ja/resources/gantt.png delete mode 100644 public/manual/ja/resources/issues_list.png delete mode 100644 public/manual/ja/resources/locked.png delete mode 100644 public/manual/ja/resources/user_new.png delete mode 100644 public/manual/ja/resources/users_list.png delete mode 100644 public/manual/ja/resources/workflow.png delete mode 100644 public/manual/ja/wiki_syntax.html delete mode 100644 public/manual/redmine.png 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 %>