diff options
Diffstat (limited to 'lib/redmine')
| -rw-r--r-- | lib/redmine/wiki_formatting/common_mark/helper.rb | 13 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting/markdown/helper.rb | 4 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/helper.rb | 5 |
3 files changed, 5 insertions, 17 deletions
diff --git a/lib/redmine/wiki_formatting/common_mark/helper.rb b/lib/redmine/wiki_formatting/common_mark/helper.rb index cfd2510ed..3cf3208ff 100644 --- a/lib/redmine/wiki_formatting/common_mark/helper.rb +++ b/lib/redmine/wiki_formatting/common_mark/helper.rb @@ -23,26 +23,15 @@ module Redmine module Helper def wikitoolbar_for(field_id, preview_url = preview_text_path) heads_for_wiki_formatter - url = help_path(current_language) javascript_tag( "var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}')); " \ - "wikiToolbar.setHelpLink('#{escape_javascript url}'); " \ + "wikiToolbar.setHelpLink('#{escape_javascript help_wiki_syntax_path }'); " \ "wikiToolbar.setPreviewUrl('#{escape_javascript preview_url}'); " \ "wikiToolbar.draw();" ) end - def help_path(lang) - help_file = "help/#{lang.to_s.downcase}/wiki_syntax_common_mark.html" - # fall back to the english help page if there is none for the current - # language - unless Rails.public_path.join(help_file).readable? - help_file = "help/en/wiki_syntax_common_mark.html" - end - File.join(Redmine::Utils.relative_url_root, help_file) - end - def initial_page_content(page) "# #{@page.pretty_title}" end diff --git a/lib/redmine/wiki_formatting/markdown/helper.rb b/lib/redmine/wiki_formatting/markdown/helper.rb index a3efbb04d..333671dd1 100644 --- a/lib/redmine/wiki_formatting/markdown/helper.rb +++ b/lib/redmine/wiki_formatting/markdown/helper.rb @@ -23,10 +23,10 @@ module Redmine module Helper def wikitoolbar_for(field_id, preview_url = preview_text_path) heads_for_wiki_formatter - url = "#{Redmine::Utils.relative_url_root}/help/#{current_language.to_s.downcase}/wiki_syntax_markdown.html" + javascript_tag( "var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}')); " \ - "wikiToolbar.setHelpLink('#{escape_javascript url}'); " \ + "wikiToolbar.setHelpLink('#{escape_javascript help_wiki_syntax_path}'); " \ "wikiToolbar.setPreviewUrl('#{escape_javascript preview_url}'); " \ "wikiToolbar.draw();" ) diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb index c4057673a..3b00abe6d 100644 --- a/lib/redmine/wiki_formatting/textile/helper.rb +++ b/lib/redmine/wiki_formatting/textile/helper.rb @@ -23,11 +23,10 @@ module Redmine module Helper def wikitoolbar_for(field_id, preview_url = preview_text_path) heads_for_wiki_formatter - # Is there a simple way to link to a public resource? - url = "#{Redmine::Utils.relative_url_root}/help/#{current_language.to_s.downcase}/wiki_syntax_textile.html" + javascript_tag( "var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}')); " \ - "wikiToolbar.setHelpLink('#{escape_javascript url}'); " \ + "wikiToolbar.setHelpLink('#{escape_javascript help_wiki_syntax_path}'); " \ "wikiToolbar.setPreviewUrl('#{escape_javascript preview_url}'); wikiToolbar.draw();" ) end |