kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix display of floatable TOCs in wikis

Browse Source
This commit is contained in:
Holger Just 2011-12-17 22:13:02 +01:00
parent e2c57fd12d
commit 34fef9d8fc
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/application_helper.rb
View File

@ -748,11 +748,14 @@ module ApplicationHelper
if headings.empty? if headings.empty?
'' ''
else else
div_class = 'toc' toc_class = 'toc'
div_class << ' right' if $1 == '_right' toc_class << ' right' if $1 == '_right'
div_class << ' left' if $1 == '_left' toc_class << ' left' if $1 == '_left'
out = "<fieldset class='header_collapsible collapsible'><legend onclick='toggleFieldset(this);'></legend><div>"
out << "<ul class=\"#{div_class}\"><li>" out = "<fieldset class=\"header_collapsible collapsible #{toc_class}\">"
out << "<legend onclick=\"toggleFieldset(this);\"><span>#{l(:label_toc)}</span></legend>"
out << "<div>"
out << "<ul class=\"toc\"><li>"
root = headings.map(&:first).min root = headings.map(&:first).min
current = root current = root
started = false started = false

1
config/locales/de.yml
View File

@ -1001,3 +1001,4 @@ de:
description_date_range_interval: Zeitraum durch Start- und Enddatum festlegen description_date_range_interval: Zeitraum durch Start- und Enddatum festlegen
description_date_from: Startdatum eintragen description_date_from: Startdatum eintragen
description_date_to: Enddatum eintragen description_date_to: Enddatum eintragen
label_toc: "Inhaltsverzeichnis"

1
config/locales/en.yml
View File

@ -814,6 +814,7 @@ en:
label_notify_member_plural: Email issue updates label_notify_member_plural: Email issue updates
label_path_encoding: Path encoding label_path_encoding: Path encoding
label_deleted_custom_field: '(deleted custom field)' label_deleted_custom_field: '(deleted custom field)'
label_toc: "Contents"
button_login: Login button_login: Login
button_submit: Submit button_submit: Submit

15
public/stylesheets/application.css
View File

@ -780,16 +780,19 @@ div.wiki pre {
} }
div.wiki ul.toc { div.wiki ul.toc {
margin-bottom: 12px; margin: 0;
margin-right: 12px; padding: 0 12px;
margin-left: 0;
display: table display: table
} }
* html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */ * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
div.wiki ul.toc {font-size: 0.8em;} div.wiki fieldset {padding: 0}
div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; } div.wiki fieldset.collapsible.header_collapsible legend {background-position: 95% 50%}
div.wiki ul.toc.left { float: left; margin-right: 12px; margin-left: 0; width: auto; } div.wiki fieldset legend span { padding-right: 20px}
div.wiki fieldset.toc div {background-color: #fff}
div.wiki fieldset.toc.right { float: right; padding-left: 12px; width: auto; position: relative; }
div.wiki fieldset.toc.left { float: left; padding-right: 12px; width: auto; position: relative;}
div.wiki ul.toc ul { margin: 0; padding: 0; } div.wiki ul.toc ul { margin: 0; padding: 0; }
div.wiki ul.toc li { list-style-type:none; margin: 0;} div.wiki ul.toc li { list-style-type:none; margin: 0;}
div.wiki ul.toc li li { margin-left: 1.5em; } div.wiki ul.toc li li { margin-left: 1.5em; }