From 958d93edbc6530962f369cc5525a0fd5aa43b609 2015-04-20 12:14:04 From: Toshi MARUYAMA Date: 2015-04-20 12:14:04 Subject: [PATCH] add markdown wiki syntax help to tool bar (#16373) Contributed by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@14191 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/wiki_formatting/markdown/helper.rb b/lib/redmine/wiki_formatting/markdown/helper.rb index a4234fe..ee4b30f 100644 --- a/lib/redmine/wiki_formatting/markdown/helper.rb +++ b/lib/redmine/wiki_formatting/markdown/helper.rb @@ -21,7 +21,8 @@ module Redmine module Helper def wikitoolbar_for(field_id) heads_for_wiki_formatter - javascript_tag("var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}')); wikiToolbar.draw();") + 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.draw();") end def initial_page_content(page) diff --git a/public/javascripts/jstoolbar/markdown.js b/public/javascripts/jstoolbar/markdown.js index 8a9935a..f2258af 100644 --- a/public/javascripts/jstoolbar/markdown.js +++ b/public/javascripts/jstoolbar/markdown.js @@ -192,3 +192,11 @@ jsToolBar.prototype.elements.img = { // spacer jsToolBar.prototype.elements.space5 = {type: 'space'} +// help +jsToolBar.prototype.elements.help = { + type: 'button', + title: 'Help', + fn: { + wiki: function() { window.open(this.help_link, '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes') } + } +}