diff -ur -x .svn -x .git -x .bzr -x CVS -Nur dokuwiki-2009-02-14/lib/tpl/default/_admin.css dokuwiki-2010-11-07/lib/tpl/default/_admin.css --- dokuwiki-2009-02-14/lib/tpl/default/_admin.css 1970-01-01 02:00:00.000000000 +0200 +++ dokuwiki-2010-11-07/lib/tpl/default/_admin.css 2010-11-07 18:43:04.000000000 +0200 @@ -0,0 +1,48 @@ +#admin__version { + clear:left; + float: right; + color: __text_neu__; +} + +.dokuwiki ul.admin_tasks { + font-size: 115%; + float: left; + width: 40%; + list-style-type: none; +} + +.dokuwiki ul.admin_tasks li { + line-height: 22px; + padding-left: 35px; + margin: 1em 0; + background: transparent none no-repeat scroll 0 0; + text-align: left; +} + +.dokuwiki ul.admin_tasks li div.li { + font-weight: bold; +} + +.dokuwiki ul.admin_tasks li.admin_acl { + background-image: url(../../images/admin/acl.png); +} + +.dokuwiki ul.admin_tasks li.admin_usermanager { + background-image: url(../../images/admin/usermanager.png); +} + +.dokuwiki ul.admin_tasks li.admin_plugin { + background-image: url(../../images/admin/plugin.png); +} + +.dokuwiki ul.admin_tasks li.admin_config { + background-image: url(../../images/admin/config.png); +} + +.dokuwiki ul.admin_tasks li.admin_revert { + background-image: url(../../images/admin/revert.png); +} + +.dokuwiki ul.admin_tasks li.admin_popularity { + background-image: url(../../images/admin/popularity.png); +} diff -ur -x .svn -x .git -x .bzr -x CVS -Nur dokuwiki-2009-02-14/lib/tpl/default/design.css dokuwiki-2010-11-07/lib/tpl/default/design.css --- dokuwiki-2009-02-14/lib/tpl/default/design.css 2009-02-14 14:13:25.000000000 +0200 +++ dokuwiki-2010-11-07/lib/tpl/default/design.css 2010-11-07 18:43:04.000000000 +0200 @@ -91,7 +91,10 @@ background-color: __background__; border: 1px solid __border__; padding: 0.3em 0 0 0.3em; - width: 100%; + /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ + width: 700px; + min-width: 100%; + max-width: 100%; } /* nice alphatransparency background except for IE <7 */ @@ -137,6 +140,7 @@ div.dokuwiki textarea.edit[readonly], div.dokuwiki input.edit[disabled], div.dokuwiki input.edit[readonly], +div.dokuwiki input.button[disabled], div.dokuwiki select.edit[disabled] { background-color: __background_neu__!important; color: __text_neu__!important; @@ -404,11 +408,11 @@ div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;} /* indent different sections */ -div.dokuwiki div.level1 {margin-left: 3px;} -div.dokuwiki div.level2 {margin-left: 23px;} -div.dokuwiki div.level3 {margin-left: 43px;} -div.dokuwiki div.level4 {margin-left: 63px;} -div.dokuwiki div.level5 {margin-left: 83px;} +div.dokuwiki div.level1 { margin-left: 3px; } +div.dokuwiki div.level2 { margin-left: 23px; } +div.dokuwiki div.level3 { margin-left: 43px; } +div.dokuwiki div.level4 { margin-left: 63px; } +div.dokuwiki div.level5 { margin-left: 83px; } /* unordered lists */ div.dokuwiki ul { @@ -428,12 +432,10 @@ font-weight: bold; } -/* no gap in between nested lists */ -div.dokuwiki li ul { - margin-bottom: 0; -} +/* no bottom gap in between and smaller left margin for nested lists */ +div.dokuwiki li ul, div.dokuwiki li ol { - margin-bottom: 0; + margin: 0 0 0 1.5em; } /* the list items overriding the ul/ol definition */ @@ -442,10 +444,10 @@ font-weight: normal; } -div.dokuwiki ol {list-style-type: decimal} -div.dokuwiki ol ol {list-style-type: upper-roman} -div.dokuwiki ol ol ol {list-style-type: lower-alpha} -div.dokuwiki ol ol ol ol {list-style-type: lower-greek} +div.dokuwiki ol { list-style-type: decimal; } +div.dokuwiki ol ol { list-style-type: upper-roman; } +div.dokuwiki ol ol ol { list-style-type: lower-alpha; } +div.dokuwiki ol ol ol ol { list-style-type: lower-greek; } div.dokuwiki li.open { list-style-image: url(images/open.gif); @@ -463,6 +465,7 @@ } div.dokuwiki pre { + font-family: monospace; font-size: 120%; padding: 0.5em; border: 1px dashed __border__; @@ -480,16 +483,47 @@ background-color: __background_other__; } -/* inline code words */ -div.dokuwiki code { - font-size: 120%; -} - /* code blocks by file tag */ div.dokuwiki pre.file { background-color: __background_alt__; } +/* filenames for file and code blocks */ +div.dokuwiki dl.file, +div.dokuwiki dl.code { + margin-top: 2em; + margin-bottom: 2.5em; +} + +div.dokuwiki dl.file dt, +div.dokuwiki dl.code dt { + border: 1px dashed __border__; + display: inline; + padding: 0.1em 1em; + margin-left: 2em; +} + +div.dokuwiki dl.code dt a, +div.dokuwiki dl.file dt a { + color: __text__; +} + +div.dokuwiki dl.code dt { + background-color: __background_other__; + border-bottom: 1px solid __background_other__; +} + +div.dokuwiki dl.file dt { + background-color: __background_alt__; + border-bottom: 1px solid __background_alt__; +} + + +/* inline code words */ +div.dokuwiki code { + font-size: 120%; +} + /* inline tables */ div.dokuwiki table.inline { background-color: __background__; @@ -658,6 +692,7 @@ text-align: left; padding: 4px; max-width: 40%; /* IE's width is handled in javascript */ + min-width: 5em; } /* overcome IE issue with one line code or file boxes which require h. scrolling */ @@ -707,10 +742,14 @@ div.dokuwiki ul.search_quickhits li { margin: 0 1.0em 0 1.0em; - float:left; + float: left; width: 30%; } +div.dokuwiki .section_highlight { + background-color: __background_alt__ !important; +} + /* ------------------ Additional ---------------------- */ div.footerinc { @@ -761,6 +800,10 @@ background-color: __background_alt__; } +div.pk_hl { + width: 125px; +} + button.pickerbutton { padding: 0px; margin: 0 1px 1px 0; @@ -792,6 +835,7 @@ } div.dokuwiki div.imagemeta img.thumb { - float:left; + float: left; margin-right: 0.1em; } + diff -ur -x .svn -x .git -x .bzr -x CVS -Nur dokuwiki-2009-02-14/lib/tpl/default/detail.php dokuwiki-2010-11-07/lib/tpl/default/detail.php --- dokuwiki-2009-02-14/lib/tpl/default/detail.php 2009-02-14 14:13:25.000000000 +0200 +++ dokuwiki-2010-11-07/lib/tpl/default/detail.php 2010-11-07 18:43:04.000000000 +0200 @@ -53,7 +53,7 @@