Fixed TOC positionning in wiki pages.

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

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index c5d4253f0fed935c47f09fed4cf9bcadd578cccd..6f2aea0aec09711390360978b5a0278873b559c9 100644 (file)
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -60,6 +60,7 @@ module Redmine
         text.gsub!(/<p>\{\{([<>]?)toc\}\}<\/p>/i) do
           div_class = 'toc'
           div_class << ' right' if $1 == '>'
+          div_class << ' left' if $1 == '<'
           out = "<div class=\"#{div_class}\">"
           @toc.each_with_index do |heading, index|
             # remove wiki links from the item

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2eef7ffe34b2045a84427a16816651ae477d1c21..d31e3a3202c608ec772c04706cb40708cda85fd1 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -310,14 +310,12 @@ div.wiki div.toc {
     line-height: 1.2em;
     margin-bottom: 12px;
     margin-right: 12px;
-    float: left;
+    display: table
 }
+* html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
 
-div.wiki div.toc.right {
-    float: right;
-    margin-left: 12px;
-    margin-right: 0;
-}
+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 div.toc a {
     display: block;