jro_apps/redmine Commit - r15610:af29408e831d

Add "Table of contents" heading to toc macro (#23179)....

Jean-Philippe Lang -

r15610:af29408e831d

parent child

Context file:

r15610:af29408e831d

Collapse all files

app/helpers/application_helper.rb +1 -1

                     div_class = 'toc'
                     div_class << ' right' if right_align
                     div_class << ' left' if left_align
-                    out = "<ul class=\"#{div_class}\"><li>"
+                    out = "<ul class=\"#{div_class}\"><li><strong>#{l :label_table_of_contents}</strong></li><li>"
                     root = headings.map(&:first).min
                     current = root
                     started = false

config/locales/de.yml +1 0

               label_new_project_issue_tab_enabled: Tab "Neues Ticket" anzeigen
               setting_new_item_menu_tab: Menü zum Anlegen neuer Objekte
               label_new_object_tab_enabled: Dropdown-Menü "+" anzeigen
+              label_table_of_contents: Inhaltsverzeichnis
               error_no_projects_with_tracker_allowed_for_new_issue: There are no projects with trackers
                 for which you can create an issue
               field_textarea_font: Font used for text areas

config/locales/en.yml +1 0

               label_relations: Relations
               label_new_project_issue_tab_enabled: Display the "New issue" tab
               label_new_object_tab_enabled: Display the "+" drop-down
+              label_table_of_contents: Table of contents
               label_font_default: Default font
               label_font_monospace: Monospaced font
               label_font_proportional: Proportional font

config/locales/fr.yml +1 0

               label_relations: Relations
               label_new_project_issue_tab_enabled: Afficher l'onglet "Nouvelle demande"
               label_new_object_tab_enabled: Afficher le menu déroulant "+"
+              label_table_of_contents: Contenu
               label_font_default: Police par défaut
               label_font_monospace: Police non proportionnelle
               label_font_proportional: Police proportionnelle

public/stylesheets/application.css +1 0

             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li {list-style-type:none; margin: 0; font-size:12px;}
+            div.wiki ul.toc>li:first-child {margin-bottom: .5em; color: #777;}
             div.wiki ul.toc li li {margin-left: 1.5em; font-size:10px;}
             div.wiki ul.toc a {
               font-size: 0.9em;

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

               end
               def test_table_of_content
+                set_language_if_valid 'en'
                 raw = <<-RAW
             {{toc}}
             RAW
                 expected =  '<ul class="toc">' +
+                              '<li><strong>Table of contents</strong></li>' +
                               '<li><a href="#Title">Title</a>' +
                                 '<ul>' +
                                   '<li><a href="#Subtitle-with-a-Wiki-link">Subtitle with a Wiki link</a></li>' +
               end
               def test_table_of_content_should_generate_unique_anchors
+                set_language_if_valid 'en'
                 raw = <<-RAW
             {{toc}}
             RAW
                 expected =  '<ul class="toc">' +
+                              '<li><strong>Table of contents</strong></li>' +
                               '<li><a href="#Title">Title</a>' +
                                 '<ul>' +
                                   '<li><a href="#Subtitle">Subtitle</a></li>' +
               end
               def test_table_of_content_should_contain_included_page_headings
+                set_language_if_valid 'en'
                 raw = <<-RAW
             {{toc}}
             RAW
                 expected = '<ul class="toc">' +
+                           '<li><strong>Table of contents</strong></li>' +
                            '<li><a href="#Included">Included</a></li>' +
                            '<li><a href="#Child-page-1">Child page 1</a></li>' +
                            '</ul>'

test/unit/lib/redmine/wiki_formatting/macros_test.rb +3 -1

               end
               def test_macro_collapse_should_not_break_toc
+                set_language_if_valid 'en'
                 text =  <<-RAW
             {{toc}}
             }}"
             RAW
-                expected_toc = '<ul class="toc"><li><a href="#Title">Title</a><ul><li><a href="#Heading">Heading</a></li></ul></li></ul>'
+                expected_toc = '<ul class="toc"><li><strong>Table of contents</strong></li><li><a href="#Title">Title</a><ul><li><a href="#Heading">Heading</a></li></ul></li></ul>'
                 assert_include expected_toc, textilizable(text).gsub(/[\r\n]/, '')
               end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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