Revision 441:cbce1fd3b1b7 lib/redmine/wiki_formatting/textile

View differences:

lib/redmine/wiki_formatting/textile/.svn/all-wcprops
1 1
K 25
2 2
svn:wc:ra_dav:version-url
3
V 60
4
/svn/!svn/ver/4376/trunk/lib/redmine/wiki_formatting/textile
3
V 74
4
/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting/textile
5 5
END
6 6
helper.rb
7 7
K 25
8 8
svn:wc:ra_dav:version-url
9
V 70
10
/svn/!svn/ver/3025/trunk/lib/redmine/wiki_formatting/textile/helper.rb
9
V 84
10
/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting/textile/helper.rb
11 11
END
12 12
formatter.rb
13 13
K 25
14 14
svn:wc:ra_dav:version-url
15
V 73
16
/svn/!svn/ver/4376/trunk/lib/redmine/wiki_formatting/textile/formatter.rb
15
V 87
16
/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting/textile/formatter.rb
17 17
END
lib/redmine/wiki_formatting/textile/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/lib/redmine/wiki_formatting/textile
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/wiki_formatting/textile
6 6
http://redmine.rubyforge.org/svn
7 7

  
8 8

  
9 9

  
10
2010-11-06T17:47:27.890964Z
11
4376
10
2011-03-28T20:16:05.752041Z
11
5242
12 12
jplang
13 13

  
14 14

  
......
32 32

  
33 33

  
34 34

  
35
2011-03-03T11:05:14.000000Z
36
dec83b1d0d7f682d1ebf1f172fe3c90b
37
2009-11-11T10:55:19.574870Z
38
3025
35
2011-06-06T13:20:53.000000Z
36
e4c07fbafae7798129e133c528e1eec8
37
2011-03-28T20:16:05.752041Z
38
5242
39 39
jplang
40 40
has-props
41 41

  
......
58 58

  
59 59

  
60 60

  
61
1936
61
2123
62 62

63 63
formatter.rb
64 64
file
......
66 66

  
67 67

  
68 68

  
69
2011-03-03T11:05:14.000000Z
70
b8052f700ecb0991fabdd3a5b684a412
71
2010-11-06T17:47:27.890964Z
72
4376
69
2011-06-06T13:20:53.000000Z
70
aeba307e1011ac3f15b25fd91065ae2e
71
2011-03-14T20:35:36.619571Z
72
5133
73 73
jplang
74 74
has-props
75 75

  
......
92 92

  
93 93

  
94 94

  
95
4724
95
4722
96 96

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
lib/redmine/wiki_formatting/textile/formatter.rb
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/helper.rb
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