Display wiki syntax quick ref link within the jstoolbar (closes #629, #767).

Added named links syntax on quick ref (closes #766, #778).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1190 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/application_helper.rb

@@ -444,9 +444,14 @@ module ApplicationHelper
   
   def wikitoolbar_for(field_id)
     return '' unless Setting.text_formatting == 'textile'
+    
+    help_link = l(:setting_text_formatting) + ': ' +
+      link_to(l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
+                              :onclick => "window.open(\"#{ compute_public_path('wiki_syntax', 'help', 'html') }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
+
     javascript_include_tag('jstoolbar/jstoolbar') +
       javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") +
-      javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
+      javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.setHelpLink('#{help_link}'); toolbar.draw();")
   end
   
   def content_for(name, content = nil, &block)

app/views/wiki/edit.rhtml

@@ -3,11 +3,7 @@
 <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
 <%= f.hidden_field :version %>
 <%= error_messages_for 'content' %>
-<div class="contextual">
-<%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
-                            :onclick => "window.open('#{ compute_public_path('wiki_syntax', 'help', 'html') }', '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes'); return false;" %>
-</div>
+
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
 <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
 <p><%= submit_tag l(:button_save) %>