Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-03 11:56:18 +01:00
Code Issues Packages Projects Releases Activity

Updates JS toolbar help button to use the new route (#39111, #40137).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22722 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2024-02-19 20:58:13 +00:00
parent 56f3a4dac3
commit 4607e90b43
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/routes.rb
View File

@@ -407,7 +407,7 @@ Rails.application.routes.draw do
get 'robots.:format', :to => 'welcome#robots', :constraints => {:format => 'txt'}
match 'help/wiki_syntax/(:type)', :controller => 'help', :action => 'show_wiki_syntax', :via => :get, :constraints => { :type => /detailed/ }
get 'help/wiki_syntax/(:type)', :controller => 'help', :action => 'show_wiki_syntax', :constraints => { :type => /detailed/ }, as: 'help_wiki_syntax'
Redmine::Plugin.directory.glob("*/config/routes.rb").sort.each do |plugin_routes_path|
instance_eval(plugin_routes_path.read, plugin_routes_path.to_s)

13
lib/redmine/wiki_formatting/common_mark/helper.rb
View File

@@ -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

4
lib/redmine/wiki_formatting/markdown/helper.rb
View File

@@ -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();"
)

5
lib/redmine/wiki_formatting/textile/helper.rb
View File

@@ -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