jro_apps/redmine Commit - r14840:985634ef9e64

Merged r15136 to r15138 (#21593)....

Jean-Philippe Lang -

r14840:985634ef9e64

parent child

Context file:

r14840:985634ef9e64

app/helpers/application_helper.rb +2 -2

               def parse_sections(text, project, obj, attr, only_path, options)
                 return unless options[:edit_section_links]
                 text.gsub!(HEADING_RE) do
-                  heading = $1
+                  heading, level = $1, $2
                   @current_section += 1
                   if @current_section > 1
                     content_tag('div',
                       link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
-                      :class => 'contextual',
+                      :class => "contextual heading-#{level}",
                       :title => l(:button_edit_section),
                       :id => "section-#{@current_section}") + heading.html_safe
                   else

test/unit/helpers/application_helper_test.rb +2 -2

                 result = textilizable(raw, :edit_section_links => {:controller => 'wiki', :action => 'edit', :project_id => '1', :id => 'Test'}).gsub("\n", "")
                 # heading that contains inline code
-                assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-4">' +
+                assert_match Regexp.new('<div class="contextual heading-2" title="Edit this section" id="section-4">' +
                   '<a href="/projects/1/wiki/Test/edit\?section=4"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' +
                   '<a name="Subtitle-with-inline-code"></a>' +
                   '<h2 >Subtitle with <code>inline code</code><a href="#Subtitle-with-inline-code" class="wiki-anchor">&para;</a></h2>'),
                   result
                 # last heading
-                assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-5">' +
+                assert_match Regexp.new('<div class="contextual heading-2" title="Edit this section" id="section-5">' +
                   '<a href="/projects/1/wiki/Test/edit\?section=5"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' +
                   '<a name="Subtitle-after-pre-tag"></a>' +
                   '<h2 >Subtitle after pre tag<a href="#Subtitle-after-pre-tag" class="wiki-anchor">&para;</a></h2>'),

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