TOC rendered as an unordered list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1693 e93f8b46-1217-0410-a6f0-8f06a7374b81

TOC rendered as an unordered list.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1693 e93f8b46-1217-0410-a6f0-8f06a7374b81
5564dfbb · Jean-Philippe Lang · a17b62b4 · 5564dfbb · 5564dfbb · 5564dfbb
Commit 5564dfbb authored Jul 22, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 13 deletions

export.rhtml app/views/wiki/export.rhtml +4 -0

wiki_formatting.rb lib/redmine/wiki_formatting.rb +3 -3

application.css public/stylesheets/application.css +10 -10

No files found.
--- a/app/views/wiki/export.rhtml
+++ b/app/views/wiki/export.rhtml
@@ -6,6 +6,10 @@
 <style>
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
 h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+ul.toc { padding: 4px; margin-left: 0; }
+ul.toc li { list-style-type:none; }
+ul.toc li.heading2 { margin-left: 1em; }
+ul.toc li.heading3 { margin-left: 2em; }
 </style>
 </head>
 <body>

--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -81,16 +81,16 @@ module Redmine
          div_class = 'toc'
          div_class << ' right' if $1 == '>'
          div_class << ' left' if $1 == '<'
-          out = "<div class=\"#{div_class}\">"
+          out = "<ul class=\"#{div_class}\">"
          @toc.each_with_index do |heading, index|
            # remove wiki links from the item
            toc_item = heading.last.gsub(/(\[\[|\]\])/, '')
            # remove styles
            # eg. %{color:red}Triggers% => Triggers
            toc_item.gsub! %r[%\{[^\}]*\}([^%]+)%], '\\1'
-            out << "<a href=\"##{index+1}\" class=\"heading#{heading.first}\">#{toc_item}</a>"
+            out << "<li class=\"heading#{heading.first}\"><a href=\"##{index+1}\">#{toc_item}</a></li>\n"
          end
-          out << '</div>'
+          out << '</ul>'
          out
        end
      end

--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -461,31 +461,31 @@ div.wiki pre {
    overflow-x: auto;
 }

-div.wiki div.toc {
+div.wiki ul.toc {
    background-color: #ffffdd;
    border: 1px solid #e4e4e4;
    padding: 4px;
    line-height: 1.2em;
    margin-bottom: 12px;
    margin-right: 12px;
+    margin-left: 0;
    display: table
 }
-* html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
+* html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */

-div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
-div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
+div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
+div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
+div.wiki ul.toc li { list-style-type:none;}
+div.wiki ul.toc li.heading2 { margin-left: 6px; }
+div.wiki ul.toc li.heading3 { margin-left: 12px; font-size: 0.8em; }

-div.wiki div.toc a {
-    display: block;
+div.wiki ul.toc a {
    font-size: 0.9em;
    font-weight: normal;
    text-decoration: none;
    color: #606060;
 }
-div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
-
-div.wiki div.toc a.heading2 { margin-left: 6px; }
-div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
+div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}

 /***** My page layout *****/
 .block-receiver {