diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-10-27 11:08:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-10-27 11:08:29 +0000 |
| commit | a3b9a5aa5fe344cf33a47ccbf1d26a95fbe4e255 (patch) | |
| tree | 6b19387c81e2d865a57cf3357340deffdbc5e858 /app/views | |
| parent | 9b624fd1d6f66bbe60d738522d9fc5fd547ef3af (diff) | |
| download | redmine-a3b9a5aa5fe344cf33a47ccbf1d26a95fbe4e255.tar.gz redmine-a3b9a5aa5fe344cf33a47ccbf1d26a95fbe4e255.zip | |
Makes wiki text formatter pluggable.
Original patch #2025 by Yuki Sonoda slightly edited.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1955 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/base.rhtml | 2 | ||||
| -rw-r--r-- | app/views/mailer/layout.text.html.rhtml | 2 | ||||
| -rw-r--r-- | app/views/settings/_general.rhtml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 86d23d62f..8cdfcb8e6 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -7,7 +7,7 @@ <meta name="keywords" content="issue,bug,tracker" /> <%= stylesheet_link_tag 'application', :media => 'all' %> <%= javascript_include_tag :defaults %> -<%= stylesheet_link_tag 'jstoolbar' %> +<%= heads_for_wiki_formatter %> <!--[if IE]> <style type="text/css"> * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); } diff --git a/app/views/mailer/layout.text.html.rhtml b/app/views/mailer/layout.text.html.rhtml index c95c94501..12fb654d6 100644 --- a/app/views/mailer/layout.text.html.rhtml +++ b/app/views/mailer/layout.text.html.rhtml @@ -32,6 +32,6 @@ hr { <body> <%= yield %> <hr /> -<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.emails_footer) %></span> +<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span> </body> </html> diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml index bb56c43db..f8d4e67fb 100644 --- a/app/views/settings/_general.rhtml +++ b/app/views/settings/_general.rhtml @@ -39,7 +39,7 @@ <%= select_tag 'settings[protocol]', options_for_select(['http', 'https'], Setting.protocol) %></p> <p><label><%= l(:setting_text_formatting) %></label> -<%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), "0"], ["textile", "textile"]], Setting.text_formatting) %></p> +<%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), "0"], *Redmine::WikiFormatting.format_names.collect{|name| [name, name]} ], Setting.text_formatting.to_sym) %></p> <p><label><%= l(:setting_wiki_compression) %></label> <%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p> |