jro_apps/redmine Commit - r1939:ff449b197f28

Fixed: textile footnotes no longer work after r1113 (#974)....

Jean-Philippe Lang -

r1939:ff449b197f28

parent child

Context file:

r1939:ff449b197f28

lib/redcloth3.rb +3 -3

                     @shelf = []
                     textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
                                      :block_textile_prefix, :inline_textile_image, :inline_textile_link,
-                                     :inline_textile_code, :inline_textile_span]
+                                     :inline_textile_code, :inline_textile_span, :glyphs_textile]
                     markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
                                       :block_markdown_bq, :block_markdown_lists,
                                       :inline_markdown_reflink, :inline_markdown_link]
                 alias textile_h6 textile_p
                 def textile_fn_( tag, num, atts, cite, content )
-                    atts << " id=\"fn#{ num }\""
+                    atts << " id=\"fn#{ num }\" class=\"footnote\""
                     content = "<sup>#{ num }</sup> #{ content }"
                     atts = shelve( atts ) if atts
                     "\t<p#{ atts }>#{ content }</p>"
                 def glyphs_textile( text, level = 0 )
                     if text !~ HASTAG_MATCH
-                        pgl text
+                        #pgl text
                         footnote_ref text
                     else
                         codepre = 0

public/stylesheets/application.css +2 0

             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
+            p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             fieldset#filters, fieldset#date-range { padding: 0.7em; margin-bottom: 8px; }
             fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
             #attachments_fields input[type=text] {margin-left: 8px; }
+            div.attachments { margin-top: 12px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }

test/unit/helpers/application_helper_test.rb +15 0

@@ -219,6 +219,21 class ApplicationHelperTest < HelperTestCase
219	assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')	219	assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
220	end	220	end
221		221
		222	def test_footnotes
		223	raw = <<-RAW
		224	This is some text[1].
		225
		226	fn1. This is the foot note
		227	RAW
		228
		229	expected = <<-EXPECTED
		230	<p>This is some text<sup><a href=\"#fn1\">1</a></sup>.</p>
		231	<p id="fn1" class="footnote"><sup>1</sup> This is the foot note</p>
		232	EXPECTED
		233
		234	assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
		235	end
		236
222	def test_table_of_content	237	def test_table_of_content
223	raw = <<-RAW	238	raw = <<-RAW
224	{{toc}}	239	{{toc}}

General Comments 0

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

No TODOs yet

	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