jro_apps/redmine Commit - r1176:c61424e57a0f

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

Jean-Philippe Lang -

r1176:c61424e57a0f

parent child

Context file:

r1176:c61424e57a0f

Collapse all files

app/helpers/application_helper.rb +6 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue)
                 link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def show_and_goto_link(name, id, options={})
                 onclick = "Element.show('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "Element.scrollTo('#{id}'); "
                 onclick << "return false;"
                 link_to(name, "#", options.merge(:onclick => onclick))
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_date(date)
                 return nil unless date
                 # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 date.strftime(@date_format)
               end
               def format_time(time, include_date = true)
                 return nil unless time
                 time = time.to_time if time.is_a?(String)
                 zone = User.current.time_zone
                 if time.utc?
                   local = zone ? zone.adjust(time) : time.getlocal
                 else
                   local = zone ? zone.adjust(time.getutc) : time
                 end
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
                 include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
               def authoring(created, author)
                 time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
                 l(:label_added_time_by, author || 'Anonymous', time_tag)
               end
               def l_or_humanize(s)
                 l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 url_param = params.dup
                 # don't reuse params if filters are present
                 url_param.clear if url_param.has_key?(:set_filter)
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => 'content',
                                          :url => url_param.merge(page_param => paginator.current.previous),
                                          :complete => 'window.scrollTo(0,0)'},
                                         {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
                                   {:url => {:params => url_param.merge(page_param => n)},
                                    :update => 'content',
                                    :complete => 'window.scrollTo(0,0)'},
                                   {:href => url_for(:params => url_param.merge(page_param => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => 'content',
                                               :url => url_param.merge(page_param => paginator.current.next),
                                               :complete => 'window.scrollTo(0,0)'},
                                              {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
                 unless count.nil?
                   html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
                 end
                 html
               end
               def per_page_links(selected=nil)
                 url_param = params.dup
                 url_param.clear if url_param.has_key?(:set_filter)
                 links = Setting.per_page_options_array.collect do |n|
                   n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
                                                         {:href => url_for(url_param.merge(:per_page => n))})
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
               def html_title(*args)
                 if args.empty?
                   title = []
                   title << @project.name if @project
                   title += @html_title if @html_title
                   title << Setting.app_title
                   title.compact.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = nil
                   text = args.shift
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
                     style = $1
                     filename = $6
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found.id
                       "!#{style}#{image_url}!"
                     else
                       "!#{style}#{filename}!"
                     end
                   end
                 end
                 text = (Setting.text_formatting == 'textile') ?
                   Redmine::WikiFormatting.to_html(text) { |macro, args| exec_macro(macro, obj, args) } :
                   simple_format(auto_link(h(text)))
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                 # Examples:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/(!)?(\[\[([^\]\|]+)(\|([^\]\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       title || page
                     end
                   else
                     all
                   end
                 end
                 # Redmine links
                 #
                 # Examples:
                 #   Issues:
                 #     #52 -> Link to issue #52
                 #   Changesets:
                 #     r52 -> Link to revision 52
                 #   Documents:
                 #     document#17 -> Link to document with id 17
                 #     document:Greetings -> Link to the document with title "Greetings"
                 #     document:"Some document" -> Link to the document with title "Some document"
                 #   Versions:
                 #     version#3 -> Link to version with id 3
                 #     version:1.0.0 -> Link to version named "1.0.0"
                 #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                 #   Attachments:
                 #     attachment:file.zip -> Link to the attachment of the current object named file.zip
                 text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid},
                                                   :class => 'changeset',
                                                   :title => truncate(changeset.comments, 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                     :class => 'issue',
                                                     :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = oid.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       end
                     end
                   end
                   leading + (link || "#{prefix}#{sep}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :width => "#{pcts[0].floor}%;", :class => 'closed') : '') +
                     (pcts[1] > 0 ? content_tag('td', '', :width => "#{pcts[1].floor}%;", :class => 'done') : '') +
                     (pcts[2] > 0 ? content_tag('td', '', :width => "#{pcts[2].floor}%;", :class => 'todo') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               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)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
             end

app/views/wiki/edit.rhtml +1 -5

             <h2><%= @page.pretty_title %></h2>
             <% 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) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %></p>
             <%= wikitoolbar_for 'content_text' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% html_title @page.pretty_title %>

public/help/wiki_syntax.html +7 -2

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
             <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
             <meta http-equiv="Content-Style-Type" content="text/css" />
             <title>Wiki formatting</title>
-            <link rel="stylesheet" href="html.css" type="text/css" />
             <style type="text/css">
             h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
-            table { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
+            body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
+            table th { padding-top: 1em; }
             table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
             table td code { font-size: 1.2em; }
             table td h1 { font-size: 1.8em; text-align: left; }
             table td h2 { font-size: 1.4em; text-align: left; }
             table td h3 { font-size: 1.2em; text-align: left; }
             </style>
             </head>
             <body>
             <h1>Wiki Syntax Quick Reference</h1>
             <table width="100%">
             <tr><th colspan="3">Font Styles</th></tr>
             <tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
             <tr><th></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>&lt;pre><br />&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
             <pre>
              lines
              of code
             </pre>
             </td></tr>
             <tr><th colspan="3">Lists</th></tr>
             <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
             <tr><th colspan="3">Headings</th></tr>
             <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
             <tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
             <tr><th colspan="3">Links</th></tr>
             <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
+            <tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
+            <tr><th colspan="3">Redmine links</th></tr>
             <tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
             <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
             <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
             <tr><th colspan="3">Inline images</th></tr>
             <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
             <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
             </table>
+            <p><a href="http://www.redmine.org/wiki/redmine/RedmineWikiFormatting" onclick="window.open('http://www.redmine.org/wiki/redmine/RedmineWikiFormatting', '', ''); return false;">More Information</a></p>
             </body>
             </html>

public/javascripts/jstoolbar/jstoolbar.js +12 -1

             /* ***** BEGIN LICENSE BLOCK *****
              * This file is part of DotClear.
              * Copyright (c) 2005 Nicolas Martin & Olivier Meunier and contributors. All
              * rights reserved.
              *
              * DotClear is free software; you can redistribute it and/or modify
              * it under the terms of the GNU General Public License as published by
              * the Free Software Foundation; either version 2 of the License, or
              * (at your option) any later version.
              *
              * DotClear is distributed in the hope that it will be useful,
              * but WITHOUT ANY WARRANTY; without even the implied warranty of
              * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              * GNU General Public License for more details.
              *
              * You should have received a copy of the GNU General Public License
              * along with DotClear; if not, write to the Free Software
              * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
              *
              * ***** END LICENSE BLOCK *****
             */
             /* Modified by JP LANG for textile formatting */
             function jsToolBar(textarea) {
             	if (!document.createElement) { return; }
             	if (!textarea) { return; }
             	if ((typeof(document["selection"]) == "undefined")
             	&& (typeof(textarea["setSelectionRange"]) == "undefined")) {
             		return;
             	}
             	this.textarea = textarea;
             	this.editor = document.createElement('div');
             	this.editor.className = 'jstEditor';
             	this.textarea.parentNode.insertBefore(this.editor,this.textarea);
             	this.editor.appendChild(this.textarea);
             	this.toolbar = document.createElement("div");
             	this.toolbar.className = 'jstElements';
             	this.editor.parentNode.insertBefore(this.toolbar,this.editor);
             	// Dragable resizing (only for gecko)
             	if (this.editor.addEventListener)
             	{
             		this.handle = document.createElement('div');
             		this.handle.className = 'jstHandle';
             		var dragStart = this.resizeDragStart;
             		var This = this;
             		this.handle.addEventListener('mousedown',function(event) { dragStart.call(This,event); },false);
             		// fix memory leak in Firefox (bug #241518)
             		window.addEventListener('unload',function() {
             				var del = This.handle.parentNode.removeChild(This.handle);
             				delete(This.handle);
             		},false);
             		this.editor.parentNode.insertBefore(this.handle,this.editor.nextSibling);
             	}
             	this.context = null;
             	this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni
             					// de raccourcis vers les éléments DOM correspondants aux outils.
             }
             function jsButton(title, fn, scope, className) {
                 if(typeof jsToolBar.strings == 'undefined') {
                   this.title = title || null;
                 } else {
                   this.title = jsToolBar.strings[title] || title || null;
                 }
             	this.fn = fn || function(){};
             	this.scope = scope || null;
             	this.className = className || null;
             }
             jsButton.prototype.draw = function() {
             	if (!this.scope) return null;
             	var button = document.createElement('button');
             	button.setAttribute('type','button');
             	button.tabIndex = 200;
             	if (this.className) button.className = this.className;
             	button.title = this.title;
             	var span = document.createElement('span');
             	span.appendChild(document.createTextNode(this.title));
             	button.appendChild(span);
             	if (this.icon != undefined) {
             		button.style.backgroundImage = 'url('+this.icon+')';
             	}
             	if (typeof(this.fn) == 'function') {
             		var This = this;
             		button.onclick = function() { try { This.fn.apply(This.scope, arguments) } catch (e) {} return false; };
             	}
             	return button;
             }
             function jsSpace(id) {
             	this.id = id || null;
             	this.width = null;
             }
             jsSpace.prototype.draw = function() {
             	var span = document.createElement('span');
             	if (this.id) span.id = this.id;
             	span.appendChild(document.createTextNode(String.fromCharCode(160)));
             	span.className = 'jstSpacer';
             	if (this.width) span.style.marginRight = this.width+'px';
             	return span;
             }
             function jsCombo(title, options, scope, fn, className) {
             	this.title = title || null;
             	this.options = options || null;
             	this.scope = scope || null;
             	this.fn = fn || function(){};
             	this.className = className || null;
             }
             jsCombo.prototype.draw = function() {
             	if (!this.scope || !this.options) return null;
             	var select = document.createElement('select');
             	if (this.className) select.className = className;
             	select.title = this.title;
             	for (var o in this.options) {
             		//var opt = this.options[o];
             		var option = document.createElement('option');
             		option.value = o;
             		option.appendChild(document.createTextNode(this.options[o]));
             		select.appendChild(option);
             	}
             	var This = this;
             	select.onchange = function() {
             		try {
             			This.fn.call(This.scope, this.value);
             		} catch (e) { alert(e); }
             		return false;
             	}
             	return select;
             }
             jsToolBar.prototype = {
             	base_url: '',
             	mode: 'wiki',
             	elements: {},
+            	help_link: '',
             	getMode: function() {
             		return this.mode;
             	},
             	setMode: function(mode) {
             		this.mode = mode || 'wiki';
             	},
             	switchMode: function(mode) {
             		mode = mode || 'wiki';
             		this.draw(mode);
             	},
+            	setHelpLink: function(link) {
+            		this.help_link = link;
+            	},
             	button: function(toolName) {
             		var tool = this.elements[toolName];
             		if (typeof tool.fn[this.mode] != 'function') return null;
             		var b = new jsButton(tool.title, tool.fn[this.mode], this, 'jstb_'+toolName);
             		if (tool.icon != undefined) b.icon = tool.icon;
             		return b;
             	},
             	space: function(toolName) {
             		var tool = new jsSpace(toolName)
             		if (this.elements[toolName].width !== undefined)
             			tool.width = this.elements[toolName].width;
             		return tool;
             	},
             	combo: function(toolName) {
             		var tool = this.elements[toolName];
             		var length = tool[this.mode].list.length;
             		if (typeof tool[this.mode].fn != 'function' || length == 0) {
             			return null;
             		} else {
             			var options = {};
             			for (var i=0; i < length; i++) {
             				var opt = tool[this.mode].list[i];
             				options[opt] = tool.options[opt];
             			}
             			return new jsCombo(tool.title, options, this, tool[this.mode].fn);
             		}
             	},
             	draw: function(mode) {
             		this.setMode(mode);
             		// Empty toolbar
             		while (this.toolbar.hasChildNodes()) {
             			this.toolbar.removeChild(this.toolbar.firstChild)
             		}
             		this.toolNodes = {}; // vide les raccourcis DOM/**/
+            		var h = document.createElement('div');
+            		h.className = 'help'
+            		h.innerHTML = this.help_link;
+            		'<a href="/help/wiki_syntax.html" onclick="window.open(\'/help/wiki_syntax.html\', \'\', \'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\'); return false;">Aide</a>';
+            		this.toolbar.appendChild(h);
             		// Draw toolbar elements
             		var b, tool, newTool;
             		for (var i in this.elements) {
             			b = this.elements[i];
             			var disabled =
             			b.type == undefined || b.type == ''
             			|| (b.disabled != undefined && b.disabled)
             			|| (b.context != undefined && b.context != null && b.context != this.context);
             			if (!disabled && typeof this[b.type] == 'function') {
             				tool = this[b.type](i);
             				if (tool) newTool = tool.draw();
             				if (newTool) {
             					this.toolNodes[i] = newTool; //mémorise l'accès DOM pour usage éventuel ultérieur
             					this.toolbar.appendChild(newTool);
             				}
             			}
             		}
             	},
             	singleTag: function(stag,etag) {
             		stag = stag || null;
             		etag = etag || stag;
             		if (!stag || !etag) { return; }
             		this.encloseSelection(stag,etag);
             	},
             	encloseLineSelection: function(prefix, suffix, fn) {
             		this.textarea.focus();
             		prefix = prefix || '';
             		suffix = suffix || '';
             		var start, end, sel, scrollPos, subst, res;
             		if (typeof(document["selection"]) != "undefined") {
             			sel = document.selection.createRange().text;
             		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
             			start = this.textarea.selectionStart;
             			end = this.textarea.selectionEnd;
             			scrollPos = this.textarea.scrollTop;
             			// go to the start of the line
             			start = this.textarea.value.substring(0, start).replace(/[^\r\n]*$/g,'').length;
             			// go to the end of the line
                         end = this.textarea.value.length - this.textarea.value.substring(end, this.textarea.value.length).replace(/^[^\r\n]*/, '').length;
             			sel = this.textarea.value.substring(start, end);
             		}
             		if (sel.match(/ $/)) { // exclude ending space char, if any
             			sel = sel.substring(0, sel.length - 1);
             			suffix = suffix + " ";
             		}
             		if (typeof(fn) == 'function') {
             			res = (sel) ? fn.call(this,sel) : fn('');
             		} else {
             			res = (sel) ? sel : '';
             		}
             		subst = prefix + res + suffix;
             		if (typeof(document["selection"]) != "undefined") {
             			document.selection.createRange().text = subst;
             			var range = this.textarea.createTextRange();
             			range.collapse(false);
             			range.move('character', -suffix.length);
             			range.select();
             		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
             			this.textarea.value = this.textarea.value.substring(0, start) + subst +
             			this.textarea.value.substring(end);
             			if (sel) {
             				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
             			} else {
             				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
             			}
             			this.textarea.scrollTop = scrollPos;
             		}
             	},
             	encloseSelection: function(prefix, suffix, fn) {
             		this.textarea.focus();
             		prefix = prefix || '';
             		suffix = suffix || '';
             		var start, end, sel, scrollPos, subst, res;
             		if (typeof(document["selection"]) != "undefined") {
             			sel = document.selection.createRange().text;
             		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
             			start = this.textarea.selectionStart;
             			end = this.textarea.selectionEnd;
             			scrollPos = this.textarea.scrollTop;
             			sel = this.textarea.value.substring(start, end);
             		}
             		if (sel.match(/ $/)) { // exclude ending space char, if any
             			sel = sel.substring(0, sel.length - 1);
             			suffix = suffix + " ";
             		}
             		if (typeof(fn) == 'function') {
             			res = (sel) ? fn.call(this,sel) : fn('');
             		} else {
             			res = (sel) ? sel : '';
             		}
             		subst = prefix + res + suffix;
             		if (typeof(document["selection"]) != "undefined") {
             			document.selection.createRange().text = subst;
             			var range = this.textarea.createTextRange();
             			range.collapse(false);
             			range.move('character', -suffix.length);
             			range.select();
             //			this.textarea.caretPos -= suffix.length;
             		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
             			this.textarea.value = this.textarea.value.substring(0, start) + subst +
             			this.textarea.value.substring(end);
             			if (sel) {
             				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
             			} else {
             				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
             			}
             			this.textarea.scrollTop = scrollPos;
             		}
             	},
             	stripBaseURL: function(url) {
             		if (this.base_url != '') {
             			var pos = url.indexOf(this.base_url);
             			if (pos == 0) {
             				url = url.substr(this.base_url.length);
             			}
             		}
             		return url;
             	}
             };
             /** Resizer
             -------------------------------------------------------- */
             jsToolBar.prototype.resizeSetStartH = function() {
             	this.dragStartH = this.textarea.offsetHeight + 0;
             };
             jsToolBar.prototype.resizeDragStart = function(event) {
             	var This = this;
             	this.dragStartY = event.clientY;
             	this.resizeSetStartH();
             	document.addEventListener('mousemove', this.dragMoveHdlr=function(event){This.resizeDragMove(event);}, false);
             	document.addEventListener('mouseup', this.dragStopHdlr=function(event){This.resizeDragStop(event);}, false);
             };
             jsToolBar.prototype.resizeDragMove = function(event) {
             	this.textarea.style.height = (this.dragStartH+event.clientY-this.dragStartY)+'px';
             };
             jsToolBar.prototype.resizeDragStop = function(event) {
             	document.removeEventListener('mousemove', this.dragMoveHdlr, false);
             	document.removeEventListener('mouseup', this.dragStopHdlr, false);
             };
             // Elements definition ------------------------------------
             // strong
             jsToolBar.prototype.elements.strong = {
             	type: 'button',
             	title: 'Strong',
             	fn: {
             		wiki: function() { this.singleTag('*') }
             	}
             }
             // em
             jsToolBar.prototype.elements.em = {
             	type: 'button',
             	title: 'Italic',
             	fn: {
             		wiki: function() { this.singleTag("_") }
             	}
             }
             // ins
             jsToolBar.prototype.elements.ins = {
             	type: 'button',
             	title: 'Underline',
             	fn: {
             		wiki: function() { this.singleTag('+') }
             	}
             }
             // del
             jsToolBar.prototype.elements.del = {
             	type: 'button',
             	title: 'Deleted',
             	fn: {
             		wiki: function() { this.singleTag('-') }
             	}
             }
             // code
             jsToolBar.prototype.elements.code = {
             	type: 'button',
             	title: 'Code',
             	fn: {
             		wiki: function() { this.singleTag('@') }
             	}
             }
             // spacer
             jsToolBar.prototype.elements.space1 = {type: 'space'}
             // headings
             jsToolBar.prototype.elements.h1 = {
             	type: 'button',
             	title: 'Heading 1',
             	fn: {
             		wiki: function() {
             		  this.encloseLineSelection('h1. ', '',function(str) {
             		    str = str.replace(/^h\d+\.\s+/, '')
             		    return str;
             		  });
             		}
             	}
             }
             jsToolBar.prototype.elements.h2 = {
             	type: 'button',
             	title: 'Heading 2',
             	fn: {
             		wiki: function() {
             		  this.encloseLineSelection('h2. ', '',function(str) {
             		    str = str.replace(/^h\d+\.\s+/, '')
             		    return str;
             		  });
             		}
             	}
             }
             jsToolBar.prototype.elements.h3 = {
             	type: 'button',
             	title: 'Heading 3',
             	fn: {
             		wiki: function() {
             		  this.encloseLineSelection('h3. ', '',function(str) {
             		    str = str.replace(/^h\d+\.\s+/, '')
             		    return str;
             		  });
             		}
             	}
             }
             // spacer
             jsToolBar.prototype.elements.space2 = {type: 'space'}
             // ul
             jsToolBar.prototype.elements.ul = {
             	type: 'button',
             	title: 'Unordered list',
             	fn: {
             		wiki: function() {
             			this.encloseLineSelection('','',function(str) {
             				str = str.replace(/\r/g,'');
             				return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
             			});
             		}
             	}
             }
             // ol
             jsToolBar.prototype.elements.ol = {
             	type: 'button',
             	title: 'Ordered list',
             	fn: {
             		wiki: function() {
             			this.encloseLineSelection('','',function(str) {
             				str = str.replace(/\r/g,'');
             				return str.replace(/(\n|^)[*-]?\s*/g,"$1# ");
             			});
             		}
             	}
             }
             // pre
             jsToolBar.prototype.elements.pre = {
             	type: 'button',
             	title: 'Preformatted text',
             	fn: {
             		wiki: function() { this.encloseLineSelection('<pre>\n', '\n</pre>') }
             	}
             }
             // spacer
             jsToolBar.prototype.elements.space3 = {type: 'space'}
             // wiki page
             jsToolBar.prototype.elements.link = {
             	type: 'button',
             	title: 'Wiki link',
             	fn: {
             		wiki: function() { this.encloseSelection("[[", "]]") }
             	}
             }
             // image
             jsToolBar.prototype.elements.img = {
             	type: 'button',
             	title: 'Image',
             	fn: {
             		wiki: function() { this.encloseSelection("!", "!") }
             	}
             }

public/stylesheets/jstoolbar.css +2 0

             .jstEditor {
             	padding-left: 0px;
             }
             .jstEditor textarea, .jstEditor iframe {
               margin: 0;
             }
             .jstHandle {
             	height: 10px;
             	font-size: 0.1em;
             	cursor: s-resize;
             	/*background: transparent url(img/resizer.png) no-repeat 45% 50%;*/
             }
             .jstElements {
             	padding: 3px 3px;
             }
             .jstElements button {
             	margin-right : 6px;
             	width : 24px;
             	height: 24px;
             	padding: 4px;
             	border-style: solid;
             	border-width: 1px;
             	border-color: #ddd;
             	background-color : #f7f7f7;
             	background-position : 50% 50%;
             	background-repeat: no-repeat;
             }
             .jstElements button:hover {
             	border-color : #000;
             }
             .jstElements button span {
             	display : none;
             }
             .jstElements span {
             	display : inline;
             }
             .jstSpacer {
             	width : 0px;
             	font-size: 1px;
             	margin-right: 4px;
             }
+            .jstElements .help { float: right; margin-right: 1em; padding-top: 8px; font-size: 0.9em; }
             /* Buttons
             -------------------------------------------------------- */
             .jstb_strong {
             	background-image: url(../images/jstoolbar/bt_strong.png);
             }
             .jstb_em {
             	background-image: url(../images/jstoolbar/bt_em.png);
             }
             .jstb_ins {
             	background-image: url(../images/jstoolbar/bt_ins.png);
             }
             .jstb_del {
             	background-image: url(../images/jstoolbar/bt_del.png);
             }
             .jstb_quote {
             	background-image: url(../images/jstoolbar/bt_quote.png);
             }
             .jstb_code {
             	background-image: url(../images/jstoolbar/bt_code.png);
             }
             .jstb_br {
             	background-image: url(../images/jstoolbar/bt_br.png);
             }
             .jstb_h1 {
             	background-image: url(../images/jstoolbar/bt_h1.png);
             }
             .jstb_h2 {
             	background-image: url(../images/jstoolbar/bt_h2.png);
             }
             .jstb_h3 {
             	background-image: url(../images/jstoolbar/bt_h3.png);
             }
             .jstb_ul {
             	background-image: url(../images/jstoolbar/bt_ul.png);
             }
             .jstb_ol {
             	background-image: url(../images/jstoolbar/bt_ol.png);
             }
             .jstb_pre {
             	background-image: url(../images/jstoolbar/bt_pre.png);
             }
             .jstb_link {
             	background-image: url(../images/jstoolbar/bt_link.png);
             }
             .jstb_img {
             	background-image: url(../images/jstoolbar/bt_img.png);
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages