diff options
Diffstat (limited to 'lib/tpl/default')
| -rw-r--r-- | lib/tpl/default/_mediamanager.css | 58 | ||||
| -rw-r--r-- | lib/tpl/default/_tabs.css | 13 | ||||
| -rw-r--r-- | lib/tpl/default/design.css | 56 | ||||
| -rw-r--r-- | lib/tpl/default/detail.php | 3 | ||||
| -rw-r--r-- | lib/tpl/default/main.php | 7 | ||||
| -rw-r--r-- | lib/tpl/default/media.css | 11 | ||||
| -rw-r--r-- | lib/tpl/default/mediamanager.php | 11 | ||||
| -rw-r--r-- | lib/tpl/default/print.css | 4 | ||||
| -rw-r--r-- | lib/tpl/default/rtl.css | 30 | ||||
| -rw-r--r-- | lib/tpl/default/template.info.txt | 7 |
10 files changed, 140 insertions, 60 deletions
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 198c7f440..2ce345e40 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -36,6 +36,10 @@ min-height: 20px; overflow: hidden; } +[dir=rtl] #mediamanager__page .panelContent { + text-align: right; +} + #mediamanager__page .panelContent { overflow-y: auto; @@ -59,8 +63,13 @@ background-color: __background_alt__; } + /*____________ Namespaces tree ____________*/ +[dir=rtl] #mediamanager__page .namespaces { + text-align: right; +} + #mediamanager__page .namespaces h2 { font-size: 1em; display: inline-block; @@ -77,14 +86,32 @@ *+html #mediamanager__page .namespaces h2 { display: inline; } +[dir=rtl] #mediamanager__page .namespaces h2 { + margin-right: 10px; +} #mediamanager__page .namespaces ul { margin-left: .2em; + margin-bottom: 0; + padding: 0; list-style: none; } +[dir=rtl] #mediamanager__page .namespaces ul { + margin-left: 0; + margin-right: .2em; +} + #mediamanager__page .namespaces ul ul { margin-left: 1em; } +[dir=rtl] #mediamanager__page .namespaces ul ul { + margin-left: 0; + margin-right: 1em; +} +#mediamanager__page .namespaces ul ul li { + margin: 0; +} + #mediamanager__page .namespaces ul .selected { background-color: __highlight__; @@ -142,6 +169,9 @@ padding: 0; margin: 0; } +[dir=rtl] #mediamanager__page .filelist ul.tabs { + margin-right: 10px; +} #mediamanager__page .filelist .panelContent ul li:hover { background-color: __background_alt__; @@ -178,6 +208,10 @@ position: relative; line-height: 1.2; } +[dir=rtl] #mediamanager__page .filelist .thumbs li { + margin-right: 0; + margin-left: 6px; +} * html #mediamanager__page .filelist .thumbs li, *+html #mediamanager__page .filelist .thumbs li { display: inline; @@ -200,6 +234,7 @@ #mediamanager__page .filelist .thumbs li .date { display: block; overflow: hidden; + text-overflow: ellipsis; width: 90px; white-space: nowrap; } @@ -252,6 +287,7 @@ #mediamanager__page .filelist .rows li .filesize, #mediamanager__page .filelist .rows li .date { overflow: hidden; + text-overflow: ellipsis; float: left; margin-left: 1%; white-space: nowrap; @@ -324,6 +360,9 @@ #mediamanager__page form.meta label span { display: block; } +[dir=rtl] #mediamanager__page form.meta label span { + text-align: right; +} #mediamanager__page form.meta input { width: 50%; @@ -342,18 +381,18 @@ /*____________ Revisions form ____________*/ -#mediamanager__page #page__revisions ul { +#mediamanager__page form.changes ul { margin-left: 10px; list-style-type: none; } -#mediamanager__page #page__revisions ul li div.li div { +#mediamanager__page form.changes ul li div.li div { font-size: 90%; color: __text_neu__; padding-left: 18px; } -#mediamanager__page #page__revisions ul li div.li input { +#mediamanager__page form.changes ul li div.li input { position: relative; top: 1px; } @@ -372,6 +411,10 @@ vertical-align: top; text-align: left; } +[dir=rtl] #mediamanager__diff td, +[dir=rtl] #mediamanager__diff th { + text-align: right; +} #mediamanager__diff th { font-weight: normal; @@ -404,10 +447,6 @@ #mediamanager__diff .imageDiff { position: relative; } -#mediamanager__diff .imageDiff .image1, -#mediamanager__diff .imageDiff .image2 { - width: 97%; -} #mediamanager__diff .imageDiff .image2 { position: absolute; top: 0; @@ -425,7 +464,12 @@ overflow: hidden; } +#mediamanager__diff .imageDiff.portions img { + float: left; +} + #mediamanager__diff .imageDiff img { width: 100%; + max-width: none; } diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css index 8bfb676a0..a39b43441 100644 --- a/lib/tpl/default/_tabs.css +++ b/lib/tpl/default/_tabs.css @@ -10,6 +10,9 @@ margin: 0; list-style: none; } +[dir=rtl] .dokuwiki ul.tabs li { + float: right; +} .dokuwiki ul.tabs li strong, .dokuwiki ul.tabs li a { @@ -20,6 +23,16 @@ color: __text__; border-radius: .5em .5em 0 0; } +[dir=rtl] .dokuwiki ul.tabs li strong, +[dir=rtl] .dokuwiki ul.tabs li a { + float: right; + margin: 0 0 0 .3em; +} +*+html[dir=rtl] .dokuwiki ul.tabs li strong, +*+html[dir=rtl] .dokuwiki ul.tabs li a { + float: none; + display: inline-block; +} .dokuwiki ul.tabs li strong { font-weight: normal; } diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index a94f814aa..3405ec258 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -265,11 +265,6 @@ div.dokuwiki a:active { text-decoration: underline; } -div.dokuwiki h1 a, -div.dokuwiki h2 a, -div.dokuwiki h3 a, -div.dokuwiki h4 a, -div.dokuwiki h5 a, div.dokuwiki a.nolink { color: __text__ !important; text-decoration: none !important; @@ -383,11 +378,11 @@ div.dokuwiki img.mediacenter { } /* smileys */ -div.dokuwiki img.middle { +div.dokuwiki img.icon { vertical-align: middle; } -div.dokuwiki acronym { +div.dokuwiki abbr { cursor: help; border-bottom: 1px dotted __text__; } @@ -552,7 +547,7 @@ div.dokuwiki table.inline td { /* ---------- table of contents ------------------- */ -div.dokuwiki div.toc { +div.dokuwiki #dw__toc { margin: 1.2em 0 0 2em; float: right; width: 200px; @@ -560,46 +555,45 @@ div.dokuwiki div.toc { clear: both; } -div.dokuwiki div.tocheader { +div.dokuwiki #dw__toc h3 { border: 1px solid __border__; background-color: __background_alt__; text-align: left; font-weight: bold; padding: 3px; - margin-bottom: 2px; + margin: 0 0 2px 0; + font-size: 1em; } -div.dokuwiki span.toc_open, -div.dokuwiki span.toc_close { +div.dokuwiki .toggle strong { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki span.toc_open span, -div.dokuwiki span.toc_close span { +div.dokuwiki .toggle span { display: none; } -div.dokuwiki span.toc_open { +div.dokuwiki .toggle.closed strong { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki span.toc_close { +div.dokuwiki .toggle.open strong { margin-top: 0; border-bottom: 0.4em solid __text__; } -div.dokuwiki #toc__inside { +div.dokuwiki #dw__toc > div { border: 1px solid __border__; background-color: __background__; text-align: left; padding: 0.5em 0 0.7em 0; } -div.dokuwiki ul.toc { +div.dokuwiki #dw__toc ul { list-style-type: none; list-style-image: none; line-height: 1.2em; @@ -607,23 +601,23 @@ div.dokuwiki ul.toc { margin: 0; } -div.dokuwiki ul.toc li { +div.dokuwiki #dw__toc ul li { background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat; padding-left: 0.4em; } -div.dokuwiki ul.toc li.clear { +div.dokuwiki #dw__toc ul li.clear { background-image: none; padding-left: 0.4em; } -div.dokuwiki a.toc:link, -div.dokuwiki a.toc:visited { +div.dokuwiki #dw__toc a:link, +div.dokuwiki #dw__toc a:visited { color: __extern__; } -div.dokuwiki a.toc:hover, -div.dokuwiki a.toc:active { +div.dokuwiki #dw__toc a:hover, +div.dokuwiki #dw__toc a:active { color: __text__; } @@ -712,12 +706,20 @@ div.insitu-footnote { } /* --------------- search result formating --------------- */ -div.dokuwiki .search_result { - margin-bottom: 6px; +#dw__loading { + text-align: center; + margin-bottom: 1em; +} + +div.dokuwiki .search_results { padding: 0 10px 0 30px; } -div.dokuwiki .search_snippet { +div.dokuwiki .search_results dt { + margin-bottom: 3px; +} +div.dokuwiki .search_results dd { + margin-bottom: 6px; color: __text_other__; font-size: 12px; margin-left: 20px; diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php index 503c0ef71..1c8042e15 100644 --- a/lib/tpl/default/detail.php +++ b/lib/tpl/default/detail.php @@ -4,9 +4,6 @@ * * This is the template for displaying image details * - * You should leave the doctype at the very top - It should - * always be the very first line of a document. - * * @link http://dokuwiki.org/templates * @author Andreas Gohr <andi@splitbrain.org> */ diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 3e85c58f2..851afde6c 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -5,9 +5,6 @@ * This is the template you need to change for the overall look * of DokuWiki. * - * You should leave the doctype at the very top - It should - * always be the very first line of a document. - * * @link http://dokuwiki.org/templates * @author Andreas Gohr <andi@splitbrain.org> */ @@ -61,7 +58,7 @@ if (!defined('DOKU_INC')) die(); <div class="bar-right" id="bar__topright"> <?php tpl_button('recent')?> - <?php tpl_searchform()?> + <?php tpl_searchform()?>  </div> <div class="clearer"></div> @@ -121,7 +118,7 @@ if (!defined('DOKU_INC')) die(); <?php tpl_button('profile')?> <?php tpl_button('login')?> <?php tpl_button('index')?> - <?php tpl_button('top')?> + <?php tpl_button('top')?>  </div> <div class="clearer"></div> </div> diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 37369fe2f..640ad3162 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -42,18 +42,29 @@ float: left; padding: 0.5em 0.3em 0 0; } +[dir=rtl] #media__tree img { + float: right; + padding: 0.5em 0 0 0.3em; +} #media__tree ul { list-style-type: none; list-style-image: none; margin-left: 1.5em; } +[dir=rtl] #media__tree ul { + margin-left: 0; + margin-right: 1.5em; +} #media__tree li { clear: left; list-style-type: none; list-style-image: none; } +[dir=rtl] #media__tree li { + clear: right; +} *+html #media__tree li, * html #media__tree li { border: 1px solid __background__; diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php index 7b7fe8675..35b526a32 100644 --- a/lib/tpl/default/mediamanager.php +++ b/lib/tpl/default/mediamanager.php @@ -1,18 +1,19 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <?php /** * DokuWiki Default Template * * This is the template for the media manager popup * - * You should leave the doctype at the very top - It should - * always be the very first line of a document. - * * @link http://dokuwiki.org/templates * @author Andreas Gohr <andi@splitbrain.org> */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); + ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 45b60aad2..f83e8c97c 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -200,7 +200,7 @@ a.fn_bot { font-weight: bold; } -acronym { +abbr { border: 0; } @@ -224,5 +224,5 @@ table.inline td { border: 1px solid #000000; } -.toc, .footerinc, .header, .bar, .user { display: none; } +#dw__toc, .footerinc, .header, .bar, .user { display: none; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 82c85839b..f16ba101b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -54,15 +54,17 @@ div.dokuwiki li ol { div.dokuwiki a.urlextern, div.dokuwiki a.interwiki, +div.dokuwiki a.mediafile, div.dokuwiki a.windows, div.dokuwiki a.mail { - /* should work but doesn't - so we just disable icons here*/ - /* background-position: right 1px; padding-right: 16px; - */ - background-image: none !important; - padding: 0px 0px 0px 0px; + padding-left: 0; + display: inline-block; /* needed for IE7 */ +} + +div.dokuwiki a.mediafile { + padding-right: 18px; } div.dokuwiki div.secedit input.button { @@ -89,30 +91,36 @@ div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; } div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; } /* TOC control */ -div.dokuwiki div.toc { +div.dokuwiki #dw__toc { float: left; + margin: 1.2em 2em 0 0; } -div.dokuwiki div.tocheader { +div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki #toc__inside { +div.dokuwiki .toggle strong { + float: left; + margin: 0.4em 0 0 3px; +} + +div.dokuwiki #dw__toc > div { text-align: right; } -div.dokuwiki ul.toc { +div.dokuwiki #dw__toc ul { padding: 0; padding-right: 1em; } -div.dokuwiki ul.toc li { +div.dokuwiki #dw__toc ul li { background-position: right 0.6em; padding-right: 0.4em; direction: rtl; } -div.dokuwiki ul.toc li.clear { +div.dokuwiki #dw__toc ul li.clear { padding-right: 0.4em; } diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt new file mode 100644 index 000000000..a77289e58 --- /dev/null +++ b/lib/tpl/default/template.info.txt @@ -0,0 +1,7 @@ +base default +author Andreas Gohr +email andi@splitbrain.org +date 2012-09-08 +name DokuWiki Default Template +desc DokuWiki's default template until 2012 +url http://www.dokuwiki.org/template:default |