diff options
Diffstat (limited to 'lib/tpl/default')
-rw-r--r-- | lib/tpl/default/_mediamanager.css | 51 | ||||
-rw-r--r-- | lib/tpl/default/_tabs.css | 13 | ||||
-rw-r--r-- | lib/tpl/default/detail.php | 3 | ||||
-rw-r--r-- | lib/tpl/default/main.php | 3 | ||||
-rw-r--r-- | lib/tpl/default/media.css | 11 | ||||
-rw-r--r-- | lib/tpl/default/mediamanager.php | 7 | ||||
-rw-r--r-- | lib/tpl/default/rtl.css | 12 | ||||
-rw-r--r-- | lib/tpl/default/style.ini | 5 | ||||
-rw-r--r-- | lib/tpl/default/template.info.txt | 7 |
9 files changed, 92 insertions, 20 deletions
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 8c605f69a..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; @@ -62,6 +66,10 @@ /*____________ Namespaces tree ____________*/ +[dir=rtl] #mediamanager__page .namespaces { + text-align: right; +} + #mediamanager__page .namespaces h2 { font-size: 1em; display: inline-block; @@ -78,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__; @@ -143,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__; @@ -179,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; @@ -201,6 +234,7 @@ #mediamanager__page .filelist .thumbs li .date { display: block; overflow: hidden; + text-overflow: ellipsis; width: 90px; white-space: nowrap; } @@ -253,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; @@ -325,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%; @@ -373,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; @@ -405,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; @@ -426,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/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 9a14f29a2..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> */ 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 2b3e6e7db..35b526a32 100644 --- a/lib/tpl/default/mediamanager.php +++ b/lib/tpl/default/mediamanager.php @@ -1,14 +1,9 @@ -<!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> */ @@ -17,6 +12,8 @@ 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/rtl.css b/lib/tpl/default/rtl.css index 8b2837874..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 { diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 7d27381c9..0706303d0 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -1,6 +1,11 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forget to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and rtl are supported. rtl styles are loaded additionally 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 |