Revision 442:753f1380d6bc lib/redmine/wiki_formatting/textile/.svn/text-base

View differences:

lib/redmine/wiki_formatting/textile/.svn/text-base/formatter.rb.svn-base
43 43 
        # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
44 44 
        # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
45 45 
        def hard_break( text )
46 
          text.gsub!( /(.)\n(?!\n|\Z|>| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
46 
          text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
47 47 
        end
48 48
49 49 
        # Patch to add code highlighting support to RedCloth
lib/redmine/wiki_formatting/textile/.svn/text-base/helper.rb.svn-base
1 1 
# Redmine - project management software
2 
# Copyright (C) 2006-2008  Jean-Philippe Lang
2 
# Copyright (C) 2006-2011  Jean-Philippe Lang
3 3 
#
4 4 
# This program is free software; you can redistribute it and/or
5 5 
# modify it under the terms of the GNU General Public License
......
20 20 
    module Textile
21 21 
      module Helper
22 22 
        def wikitoolbar_for(field_id)
23 
          heads_for_wiki_formatter
23 24 
          # Is there a simple way to link to a public resource?
24 25 
          url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
25
26 
          help_link = l(:setting_text_formatting) + ': ' +
27 
            link_to(l(:label_help), url,
28 
                    :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
26 
          help_link = link_to(l(:setting_text_formatting), url,
27 
            :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
29 28
30 
          javascript_include_tag('jstoolbar/jstoolbar') +
31 
            javascript_include_tag('jstoolbar/textile') +
32 
            javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
33 
          javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();")
29 
          javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{escape_javascript help_link}'); wikiToolbar.draw();")
34 30 
        end
35 31
36 32 
        def initial_page_content(page)
......
38 34 
        end
39 35
40 36 
        def heads_for_wiki_formatter
41 
          stylesheet_link_tag 'jstoolbar'
37 
          unless @heads_for_wiki_formatter_included
38 
            content_for :header_tags do
39 
              javascript_include_tag('jstoolbar/jstoolbar') +
40 
              javascript_include_tag('jstoolbar/textile') +
41 
              javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
42 
              stylesheet_link_tag('jstoolbar')
43 
            end
44 
            @heads_for_wiki_formatter_included = true
45 
          end
42 46 
        end
43 47 
      end
44 48 
    end

Also available in: Unified diff