Merge pull request #4175 from HDinger/fix/22716-2-arrows-displayed-for-table-of-content

[22716] 2 arrows displayed for table of content
pull/4179/head
Oliver Günther 9 years ago
commit f383ced474
  1. 2
      lib/open_project/text_formatting.rb
  2. 2
      lib/redmine/wiki_formatting.rb
  3. 4
      spec/lib/open_project/text_formatting_spec.rb

@ -431,7 +431,7 @@ module OpenProject
out << "<legend class='form--fieldset-legend' title='" +
l(:description_toc_toggle) +
"' onclick='toggleFieldset(this);'>
<a class='icon-context icon-pulldown' href='javascript:'>
<a href='javascript:'>
#{l(:label_table_of_contents)}
</a>
</legend><div>"

@ -99,7 +99,7 @@ module Redmine
text.gsub!(MACROS_RE) do
esc = $1
all = $2
macro = $3.downcase
macro = $3
args = ($5 || '').split(',').each(&:strip!)
if esc.nil?
begin

@ -587,7 +587,7 @@ WIKI_TEXT
expect(html).to be_html_eql(%{
<fieldset class='form--fieldset -collapsible'>
<legend class='form--fieldset-legend' title='Show/Hide table of contents' onclick='toggleFieldset(this);'>
<a class="icon-context icon-pulldown" href='javascript:'>Table of Contents</a>
<a href='javascript:'>Table of Contents</a>
</legend>
<div>
<ul class="toc">
@ -626,7 +626,7 @@ WIKI_TEXT
expect(html).to be_html_eql(%{
<fieldset class='form--fieldset -collapsible'>
<legend class='form--fieldset-legend' title='Show/Hide table of contents' onclick='toggleFieldset(this);'>
<a class="icon-context icon-pulldown" href='javascript:'>Table of Contents</a>
<a href='javascript:'>Table of Contents</a>
</legend>
<div>
<ul class="toc">

Loading…
Cancel
Save