From b7c1dceda3dab1eafe049ff460a653719cb474aa Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Thu, 31 Aug 2017 11:40:30 +0200 Subject: [PATCH] Convert file from Dos format (dos2unix) --- README.rdoc | 82 +++++++++++++++++++++--------------------- init.rb | 102 ++++++++++++++++++++++++++-------------------------- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/README.rdoc b/README.rdoc index 895d34c..d397f5b 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,41 +1,41 @@ -= Redmine Wiki Notes Plugin - -== Plugin installation - -1. Copy the plugin directory into the vendor/plugins directory -2. Restart Redmine - -== Usage - -The following macros are added: - -* note -* tip -* important -* warning - -which can be used in one of three ways: - - {{note(text with *wiki formatting*)}} - - {{note - Alternately, you can put blocks of *wiki-formatted* text here. - }} - - {{note(Or if you really want) - You can do both... - }} - -This displays a block in the wiki page with a corresponding -icon and the specified text. - -== Credits - -The icons and the stylesheet were taken from the DokuWiki Note-Plugin ((c) Olivier -Cortès and others, http://www.dokuwiki.org/plugin:note (GPLv2)). - -For the contributors, please see the git commit log. - -== License - -This plugin is released under the GPLv2. += Redmine Wiki Notes Plugin + +== Plugin installation + +1. Copy the plugin directory into the vendor/plugins directory +2. Restart Redmine + +== Usage + +The following macros are added: + +* note +* tip +* important +* warning + +which can be used in one of three ways: + + {{note(text with *wiki formatting*)}} + + {{note + Alternately, you can put blocks of *wiki-formatted* text here. + }} + + {{note(Or if you really want) + You can do both... + }} + +This displays a block in the wiki page with a corresponding +icon and the specified text. + +== Credits + +The icons and the stylesheet were taken from the DokuWiki Note-Plugin ((c) Olivier +Cortès and others, http://www.dokuwiki.org/plugin:note (GPLv2)). + +For the contributors, please see the git commit log. + +== License + +This plugin is released under the GPLv2. diff --git a/init.rb b/init.rb index 3421484..8911f9b 100644 --- a/init.rb +++ b/init.rb @@ -1,51 +1,51 @@ -# Wiki Notes plugin for Redmine -# Copyright (C) 2010 Daniel Seifert -# -# 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. - -require 'redmine' -begin - require 'config/initializers/session_store.rb' - rescue LoadError -end - -def init_redmine_wiki_notes - Dir::foreach(File.join(File.dirname(__FILE__), 'lib')) do |file| - next unless /\.rb$/ =~ file - require_dependency file - end -end - -if Rails::VERSION::MAJOR >= 3 - ActionDispatch::Callbacks.to_prepare do - init_redmine_wiki_notes - end -else - Dispatcher.to_prepare :redmine_wiki_notes do - init_redmine_wiki_notes - end -end - -require 'redcloth3' -Redmine::Plugin.register :redmine_wiki_notes do - name 'Redmine Wiki Notes plugin' - author 'Daniel Seifert' - description 'Allows adding different kinds of notes into a wiki page' - url "http://www.github.com/dseifert/redmine_wiki_notes" if respond_to?(:url) - version '0.0.2' - requires_redmine :version_or_higher => '2.3.0' - - RedCloth3::ALLOWED_TAGS << "div" -end +# Wiki Notes plugin for Redmine +# Copyright (C) 2010 Daniel Seifert +# +# 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. + +require 'redmine' +begin + require 'config/initializers/session_store.rb' + rescue LoadError +end + +def init_redmine_wiki_notes + Dir::foreach(File.join(File.dirname(__FILE__), 'lib')) do |file| + next unless /\.rb$/ =~ file + require_dependency file + end +end + +if Rails::VERSION::MAJOR >= 3 + ActionDispatch::Callbacks.to_prepare do + init_redmine_wiki_notes + end +else + Dispatcher.to_prepare :redmine_wiki_notes do + init_redmine_wiki_notes + end +end + +require 'redcloth3' +Redmine::Plugin.register :redmine_wiki_notes do + name 'Redmine Wiki Notes plugin' + author 'Daniel Seifert' + description 'Allows adding different kinds of notes into a wiki page' + url "http://www.github.com/dseifert/redmine_wiki_notes" if respond_to?(:url) + version '0.0.2' + requires_redmine :version_or_higher => '2.3.0' + + RedCloth3::ALLOWED_TAGS << "div" +end