diff options
| -rwxr-xr-x | conf/default.php | 2 | ||||
| -rwxr-xr-x | conf/metadata.php | 2 | ||||
| -rwxr-xr-x | css/_toc.css | 16 | ||||
| -rwxr-xr-x | css/basic.css | 45 | ||||
| -rwxr-xr-x | css/content.css | 29 | ||||
| -rw-r--r-- | css/default.css | 376 | ||||
| -rwxr-xr-x | css/design.css | 207 | ||||
| -rwxr-xr-x | css/structure.css | 12 | ||||
| -rw-r--r-- | designs/edit_highlighting.png | bin | 0 -> 244935 bytes | |||
| -rw-r--r-- | designs/edit_highlighting.psd | bin | 0 -> 1952650 bytes | |||
| -rw-r--r-- | designs/edit_hightlight+toc.png | bin | 0 -> 237593 bytes | |||
| -rwxr-xr-x | lang/en/lang.php | 4 | ||||
| -rwxr-xr-x | lang/en/settings.php | 2 | ||||
| -rwxr-xr-x | main.php | 39 | ||||
| -rwxr-xr-x | style.ini | 6 | ||||
| -rw-r--r-- | todo.txt | 8 | ||||
| -rwxr-xr-x | tpl_functions.php | 111 |
17 files changed, 274 insertions, 585 deletions
diff --git a/conf/default.php b/conf/default.php index 57b7bd581..378e61909 100755 --- a/conf/default.php +++ b/conf/default.php @@ -5,7 +5,5 @@ */ $conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['discussionPage'] = 'discussion:@ID@'; -$conf['userPage'] = 'user:@USER@:'; $conf['sidebarID'] = 'sidebar'; $conf['hideTools'] = 0; diff --git a/conf/metadata.php b/conf/metadata.php index 88583bcd0..ac0fdf142 100755 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -5,7 +5,5 @@ */ $meta['tagline'] = array('string'); -$meta['discussionPage'] = array('string'); -$meta['userPage'] = array('string'); $meta['sidebarID'] = array('string'); $meta['hideTools'] = array('onoff'); diff --git a/css/_toc.css b/css/_toc.css index fcccf4fc1..5bff9f648 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -9,14 +9,18 @@ /* toc container */ .dokuwiki div.toc { float: right; - margin: 0 0 1.4em 1.4em; - width: 12em; + margin: -0.3em 0 .5em 1.4em; + /* @todo: possible to make calculation sort of automatic? */ + width: 200px; /* __sidebar_width__ - margin-left */ + margin-left: 20px; + /*width: 12em;*/ + font-size: 0.75em; } /*____________ toc header ____________*/ .dokuwiki div.tocheader { - padding: .2em .5em; + padding: 0.5em 1em; margin-bottom: .2em; font-weight: bold; background-color: __background_alt__; @@ -47,16 +51,16 @@ /*____________ toc list ____________*/ .dokuwiki #toc__inside { - padding: .2em .5em; + padding: 0.75em 1em 1.5em; background-color: __background_alt__; color: __text__; } .dokuwiki #toc__inside ul { - padding: 0; + padding: 0 0 0 1.5em; margin: 0; } .dokuwiki #toc__inside ul li { - list-style: none; + list-style: disc; padding: 0; margin: 0; } diff --git a/css/basic.css b/css/basic.css index ef209d54a..fc0b99efc 100755 --- a/css/basic.css +++ b/css/basic.css @@ -19,7 +19,7 @@ html, body { padding: 0; } body { - font: normal 100%/1.4 Frutiger, "Frutiger Linotype", Univers, Calibri, Myriad, "Liberation Sans", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + font: normal 87.5%/1.4 Arial, sans-serif; /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ } @@ -28,15 +28,22 @@ body { h1, h2, h3, h4, h5, h6, caption, legend { - font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, serif; - font-weight: bold; - color: __text_neu__; + font-family: Arial, sans-serif; + font-weight: normal; + color: #000;/* @todo: style.ini */ background-color: inherit; padding: 0; clear: left; /* ideally 'both', but problems with toc */ } -h1 { font-size: 2.25em; margin: 0 0 0.444em; } +h1 { + font-size: 2em; + margin: 0 0 0.444em; + letter-spacing: -0.035em; + /*2 lines below makes ascenders of h1 be at the top of block*/ + line-height: 0.75; + padding-bottom: 0.3em; +} h2 { font-size: 1.5em; margin: 0 0 0.666em; } h3 { font-size: 1.125em; margin: 0 0 0.888em; } h4 { font-size: 1em; margin: 0 0 1.0em; } @@ -243,6 +250,34 @@ input[readonly], button[readonly] { optgroup { font-style: italic; font-weight: bold; } option { font-style: normal; font-weight: normal; } +/* @todo: either make input.edit and buttons more generic or put into design.css */ +.dokuwiki input.edit { + border: 1px solid __border__; + padding: 0.41em 0; + -moz-box-shadow: inset 0 0 1px __background_alt__; + -webkit-box-shadow: inset 0 0 1px __background_alt__; + box-shadow: inset 0 0 1px __background_alt__; + border-radius: 2px; + vertical-align: middle; +} +.dokuwiki input.button, +.dokuwiki button.button, +.dokuwiki div.toolbar button.toolbutton { + /* @todo: make style.ini colours any sense here? */ + vertical-align: middle; + color: inherit; + background-color: #eee; + background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); + border: 1px solid #ccc; + border-radius: 2px; +} + /*____________ general classes ____________*/ diff --git a/css/content.css b/css/content.css index 57c313d6c..60b1d6771 100755 --- a/css/content.css +++ b/css/content.css @@ -3,6 +3,7 @@ * * @author Anika Henke <anika@selfthinker.org> * @author Andreas Gohr <andi@splitbrain.org> + * @author Clarence Lee <spicynoodles@gmail.com> */ @@ -35,14 +36,15 @@ .dokuwiki table.inline { min-width: 50%; + border-width: 0; } .dokuwiki table.inline th, .dokuwiki table.inline td { - border: 1px solid __text_alt__; + border: 1px solid __border__; } .dokuwiki table.inline th { color: inherit; - background-color: __background_neu__; + background-color: __background_alt__; } .dokuwiki table.inline td { } @@ -70,7 +72,7 @@ } .dokuwiki pre { border: 1px solid __border__; - padding: 0 .2em; + padding: .75em 1em; } /* for code in <file> */ .dokuwiki pre.file { @@ -84,19 +86,28 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_alt__; - border: solid __border__; - border-width: 1px 1px 0; + /* @todo: add gradients for other browsers */ + background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); color: inherit; - display: inline; - padding: 0 .5em; - margin-left: 1em; + border: 1px solid __border__; + border-bottom-color: __background_alt__; + border-top-left-radius: .3em; + border-top-right-radius: .3em; + padding: .3em .6em .1em; + margin-bottom: -1px; + float: left; } .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { + background-color: transparent; + /* @todo: those 19px should better be in exe/css.php for all media icons */ + padding: 0.2em 0 0.1em 19px; + font-size: 0.875em; + font-weight: normal; } - .dokuwiki dl.code dd, .dokuwiki dl.file dd { margin: 0; + clear: left; } diff --git a/css/default.css b/css/default.css index 69bc59b26..f402cbdde 100644 --- a/css/default.css +++ b/css/default.css @@ -1,131 +1,39 @@ -body{ - font: 0.875em/1.45 'Arial', sans-serif; +#dokuwiki__header h1 a{ + font-size: 24px; } -h1, h2, h3, h4, h5{ - font-family: 'Arial', sans-serif; - font-weight: normal; - color: black; +#dokuwiki__header{ + padding-top: 3.5em; + padding-bottom: 1em; } -h1{ - font-size: 2em; - letter-spacing: -0.035em; +#page_id{ + font-size: 0.875em; + padding-bottom: 1em; + color: #888; } -h1{ - /*2 lines below makes ascenders of h1 be at the top of block*/ - line-height: 0.75em; - padding-bottom: 0.3em; +.breadcrumbs{ + margin-bottom: 0 !important; + padding-bottom: 0 !important; + color: #888; } -table{ - border: none; +#dokuwiki__content .page{ + position: relative; } +/*____________ basic ____________*/ + a:link{ color: #06d; } - a:visited{ color: #2E5E94; border-bottom: 1px dotted #09d; } -.button{ - background-color: #eee; - background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - border: 1px solid #ccc; -} - -.dokuwiki pre{ - padding: 0.75em 1em; -} - -#dokuwiki__site{ - max-width: 1024px; - padding: 1.4em 20px; /* don't like mixing units, but with max-width set in px, I don't have another solution? */ -} - -#dokuwiki__header{ - padding-top: 1em; - padding-bottom: 1.4em; -} - -#dokuwiki__header #dokuwiki__sitetools, -#dokuwiki__header .headings{ - z-index: 12; - position: relative; -} - -.header_background{ - background: #eee; - //background: #85AAE2; - position: absolute; - top: 0; - height: 145px; - width: 100%; - z-index: 1; -} - -#dokuwiki__header .tools{ - text-align: left; -} - -#dokuwiki__header .tools, -#dokuwiki__header .headings{ - margin-bottom: 1em; -} - -#dokuwiki__header h1 a{ - font-size: 1.25em; - font-weight: bold; - text-shadow: 1px 1px 0px #fff; -} - -#dokuwiki__header h1 a{ - color: black; -} - -#dokuwiki__header .claim{ - color: #888; - font-style: italic; - font-size: 0.875em; -} - -#dokuwiki__header form.search{ - margin-top: 0; - font-size: 0.875em; -} - -.wrapper{ - padding-top: 30px; -} - -.wrapper div.breadcrumbs{ - /*border: 1px solid #ccc;*/ - border-left: 0; - border-right: 0; - border-bottom: 0; - padding: 0.2em 0 0 0; - margin-bottom: 0.2em; - font-size: 0.875em; -} - -div.breadcrumbs .bcsep{ - font-size: 0.75em; -} - -.mode_show #dokuwiki__content{ - float: right; - width: 99%; /* 99% of what? */ -} +/*____________ content ____________*/ .mode_show #dokuwiki__content h1{ line-height: 1.175em; @@ -133,9 +41,8 @@ div.breadcrumbs .bcsep{ .mode_show #dokuwiki__aside{ /*border-top: 1px solid #ccc;*/ - float: left; - width: 220px; font-size: 0.87em; + /* @todo: is 1.5 intentional? shouldn't it be less? */ line-height: 1.5; } @@ -149,243 +56,16 @@ div.breadcrumbs .bcsep{ } -#dokuwiki__usertools, -#dokuwiki__pagetools{ - padding: 10px; - padding-left: 0; - padding-right: 0; - background: #eee; - border: none; -} - -#dokuwiki__usertools{ - padding: 0; - z-index: 11; - background: transparent; -} - -#dokuwiki__usertools .inner{ - margin: 0 auto; - width: 1024px; -} +/*____________ _edit ____________*/ -#dokuwiki__usertools .inner ul{ - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); - border: 1px solid #ddd; - border-top: none; - padding: 0.5em 1em !important; +.dokuwiki .secedit { + float: none; + margin: -1em 0 1.4em 0; + text-align: right; } - -.wrapper #dokuwiki__pagetools ul, /* making a mess :P */ -.tools #dokuwiki__usertools ul{ - padding: 0 20px; +.dokuwiki div.secedit { } - -.wrapper #dokuwiki__pagetools ul li:first-child{ - margin-left: 224px; +.dokuwiki .secedit input.button { + padding: 0.5em 0.9em; + color: #555; } - - -#dokuwiki__pagetools{ - background: #dbdfe0; - background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdfe0), color-stop(12%,#eaeaea), color-stop(100%,#edf1f2)); - background: -webkit-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - background: -o-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - background: -ms-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdfe0', endColorstr='#edf1f2',GradientType=0 ); - background: linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); -} - -#dokuwiki__sitetools{ - width: 220px; -} - -#dokuwiki__sitetools ul, -#dokuwiki__usertools ul, -#dokuwiki__pagetools ul{ - max-width: 1004px; - font-size: 0.875em; - padding-left: 0; -} - -#dokuwiki__sitetools li, -#dokuwiki__usertools li, -#dokuwiki__pagetools li{ - margin-left: 1em; -} - -#dokuwiki__sitetools ul{ - margin-top: 0.5em; -} - -#dokuwiki__header form.search #qsearch__in{ - border: 1px solid #ccc; - border-right: none; - padding: 0.41em 0; - margin-right: 0; - -webkit-border-bottom-left-radius: 2px; - -webkit-border-top-left-radius: 2px; - -moz-border-radius-bottomleft: 2px; - -moz-border-radius-topleft: 2px; - border-bottom-left-radius: 2px; - border-top-left-radius: 2px; - -moz-box-shadow:inset 0 0 1px #eee; - -webkit-box-shadow:inset 0 0 1px #eee; - box-shadow:inset 0 0 1px #eee; -} - -#dokuwiki__header #dokuwiki__sitetools ul, -#dokuwiki__header form.search{ - text-align: right; -} - -#dokuwiki__sitetools .button{ - border: 1px solid #ddd; - -webkit-border-bottom-right-radius: 2px; - -webkit-border-top-right-radius: 2px; - -moz-border-radius-bottomright: 2px; - -moz-border-radius-topright: 2px; - border-bottom-right-radius: 2px; - border-top-right-radius: 2px; - padding: 0.5em 0.75em; -} - -#dokuwiki__pagetools a, -#dokuwiki__usertools a{ -} - -#dokuwiki__pagetools a.wikilink1, -#dokuwiki__pagetools a.wikilink2, -#dokuwiki__usertools a.wikilink1, -#dokuwiki__usertools a.wikilink2{ - color: #06d; -} - -.dokuwiki div.toc{ - font-size: 0.75em; - line-height: 1.4em; - width: 200px; - margin-bottom: 0.5em; - margin-left: 20px; - margin-top: -0.3em; -} - -.dokuwiki div.tocheader{ - padding: 0.5em 1em; - background-color: #eee; - /* - background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - */ - border-bottom: 1px solid #fff; - border-radius: 4px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - margin-bottom:0; -} - -.dokuwiki #toc__inside{ - padding: 0.75em 1em 1.5em; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; -} - -.dokuwiki #toc__inside ul li{ - list-style: disc; - margin-left: 1.5em; -} - -.dokuwiki .secedit{ - float: none; - margin: 0 ; - text-align: right; -} - -.dokuwiki div.secedit{ -} - -.dokuwiki .secedit input.button{ - -webkit-border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; - border-radius: 2px; - padding: 0.5em 0.9em; - color: #555; -} - -.dokuwiki dl.code dt, .dokuwiki dl.file dt{ - padding: 5px 8px 2px; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - border-bottom: 1px dashed #ccc; - background: -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 100%); - margin-left: 0; -} - -.dokuwiki dl.code dt, .dokuwiki dl.file dt a{ - background-color: transparent; - padding: 0.2em 0 0.1em 1.6em; - font-size: 0.875em; - font-weight: normal; -} - -.dokuwiki table.inline th, .dokuwiki table.inline td{ - border: 1px solid #ccc; -} - -.dokuwiki table.inline th{ - background: #eee; -} - -.dokuwiki div.toolbar button.toolbutton{ - background: none; - background-color: #eee; - background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc)); - background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%); - border: 1px solid #ccc; - border-right: none; -} - -.dokuwiki div.toolbar button.toolbutton:first-child{ - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} - -.dokuwiki div.toolbar button.toolbutton:last-child{ - border-left: 1px solid #eee; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} - -#dokuwiki__usertools .inner ul{ - padding-left: 0; -} - -#dokuwiki__usertools .inner li{ - margin-left: 0; - margin-right: 1em; -} - diff --git a/css/design.css b/css/design.css index cfed4f078..751631afc 100755 --- a/css/design.css +++ b/css/design.css @@ -4,6 +4,7 @@ * * @author Anika Henke <anika@selfthinker.org> * @author Andreas Gohr <andi@splitbrain.org> + * @author Clarence Lee <spicynoodles@gmail.com> */ @@ -11,34 +12,42 @@ ********************************************************************/ #dokuwiki__header { - margin: 1em 0 0; + padding: 4em 0 2em; + background-color: __background_alt__; + /* @todo: add gradients for other browsers */ + background: -webkit-linear-gradient(top, __background_alt__ 98%, __background_neu__ 100%); } #IE7 #dokuwiki__header { - margin-top: 2em; +} +#dokuwiki__header .pad { + padding: 0 1em; /* @pad */ } #dokuwiki__header .headings { - margin-bottom: 2.1em; + margin-bottom: 1em; } #dokuwiki__header h1 { margin-bottom: 0; - font-size: 1.5em; + font-size: 2.25em; + font-weight: bold; + text-shadow: 1px 1px 0px #fff; } #dokuwiki__header h1 a { text-decoration: none; - color: #00c; + /* @todo: style.ini */ + color: #000; background-color: inherit; } #dokuwiki__header p.claim { margin-bottom: 0; -} -#dokuwiki__header h2 { - margin-bottom: 0; - font-size: 1.125em; + /* @todo: style.ini */ + color: #888; + font-style: italic; + font-size: 0.875em; } #dokuwiki__header .tools { - margin-bottom: 2.1em; + margin-bottom: 1em; } #dokuwiki__header .tools ul { margin-bottom: 0; @@ -47,44 +56,10 @@ display: inline; } -#dokuwiki__header form.search { - margin: .5em 0 0; - display: block; -} -#dokuwiki__header form.search #qsearch__in { - width: 12em; - margin-right: .5em; -} - -#dokuwiki__header div.breadcrumbs { - margin-bottom: .3em; -} -#dokuwiki__header div.breadcrumbs a { - color: __existing__; - background-color: inherit; -} - /* tools ********************************************************************/ -/* make wiki links look the same as tool links in tool bars */ -#dokuwiki__usertools a.wikilink1, -#dokuwiki__pagetools a.wikilink1, -#dokuwiki__usertools a.wikilink2, -#dokuwiki__pagetools a.wikilink2 { - color: #00c; - border-bottom-width: 0; -} -#dokuwiki__usertools a.wikilink2:hover, -#dokuwiki__pagetools a.wikilink2:hover, -#dokuwiki__usertools a.wikilink2:active, -#dokuwiki__pagetools a.wikilink2:active, -#dokuwiki__usertools a.wikilink2:focus, -#dokuwiki__pagetools a.wikilink2:focus { - text-decoration: underline; -} - /* highlight selected tool */ .mode_admin a.action.admin, .mode_login a.action.login, @@ -98,29 +73,62 @@ font-weight: bold; } +#dokuwiki__usertools ul, +#dokuwiki__sitetools ul, +#dokuwiki__pagetools ul { + padding-left: 0; +} +#dokuwiki__usertools ul li, +#dokuwiki__sitetools ul li, +#dokuwiki__pagetools ul li { + font-size: 0.875em; + margin-left: 1em; +} +#dokuwiki__usertools ul li, +#dokuwiki__pagetools ul li { + margin-top: .7em; + margin-bottom: .7em; + float: left; + list-style: none; +} + /*____________ user tools ____________*/ #dokuwiki__usertools { position: absolute; top: 0; - right: 0; - border-bottom: 1px solid __border__; - background-color: __background_alt__; + left: 0; + text-align: left; width: 100%; } -#dokuwiki__usertools ul, -#dokuwiki__pagetools ul { - /* imitate #dokuwiki__site */ +#dokuwiki__usertools ul { + /* @todo: style.ini colours for gradients? */ + background-color: __background__; + background: -moz-linear-gradient(top, #ffffff 0%, #f2f2f2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f2f2f2)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + background: -o-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + background: -ms-linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f2f2f2',GradientType=0 ); + background: linear-gradient(top, #ffffff 0%,#f2f2f2 100%); + border: solid __background_neu__; + border-width: 0 1px 1px; + border-bottom-left-radius: .3em; + border-bottom-right-radius: .3em; margin: 0 auto; - max-width: 64em; - padding: 0 1em; + padding: 0; + max-width: __site_width__; + overflow: hidden; } #IE6 #dokuwiki__usertools ul { width: 100%; } -#dokuwiki__usertools ul li.user { +#dokuwiki__usertools ul li { + margin: .7em 0 .7em 1em; float: left; - margin-left: 0; + list-style: none; +} +#dokuwiki__usertools ul li.user { } /*____________ page tools ____________*/ @@ -129,32 +137,68 @@ position: fixed; bottom: 0; left: 0; - border-top: 1px solid __border__; - background-color: __background_alt__; width: 100%; z-index: 10; + background: #dbdfe0; + background: -moz-linear-gradient(top, #dbdfe0 0%, #eaeaea 12%, #edf1f2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdfe0), color-stop(12%,#eaeaea), color-stop(100%,#edf1f2)); + background: -webkit-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + background: -o-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + background: -ms-linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdfe0', endColorstr='#edf1f2',GradientType=0 ); + background: linear-gradient(top, #dbdfe0 0%,#eaeaea 12%,#edf1f2 100%); } #IE6 #dokuwiki__content { margin-bottom: 1.4em; } -#dokuwiki__pagetools ul li { - display: inline; - margin: 0 1.5em 0 0; +#dokuwiki__pagetools ul { + margin: 0 auto; + max-width: __site_width__; + padding: 0 1em; /* @pad */ } -#dokuwiki__pagetools ul li a.action.top { - float: right; +#dokuwiki__pagetools ul li { + margin: .7em 1em .7em 0; } -#IE6 #dokuwiki__pagetools ul, -#IE7 #dokuwiki__pagetools ul { +#dokuwiki__pagetools ul { position: relative; } -#IE6 #dokuwiki__pagetools ul li a.action.top, -#IE7 #dokuwiki__pagetools ul li a.action.top { +#dokuwiki__pagetools ul li a.action.top { position: absolute; - top: 0; + top: .7em; right: 0; } +/*____________ site tools ____________*/ + +#dokuwiki__sitetools { + /* @todo: is the width still needed? */ + width: __sidebar_width__; + text-align: right; +} + +#dokuwiki__sitetools form.search { + display: block; + font-size: 0.875em; +} +#dokuwiki__sitetools form.search input.edit { + /* @todo: em doesn't fit with px value for sitetools div */ + width: 12em; + border-right: none; + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +#dokuwiki__sitetools form.search input.button { + border-bottom-left-radius: 0; + border-top-left-radius: 0; + padding: 0.5em 0.75em; +} + +#dokuwiki__sitetools ul { + margin-top: 0.5em; +} +#dokuwiki__sitetools li { +} + /* sidebar ********************************************************************/ @@ -192,6 +236,23 @@ .dokuwiki .page { } +/*____________ breadcrumbs ____________*/ + +.dokuwiki div.breadcrumbs { + /*border-top: 1px solid #ccc;*/ + padding: 0.2em 0 0.75em 0; + margin-bottom: 0.6em; + font-size: 0.875em; +} +.dokuwiki div.breadcrumbs a { + /* @todo: wiki page colour or external link colour? */ + color: __existing__; + background-color: inherit; +} +.dokuwiki div.breadcrumbs .bcsep { + font-size: 0.75em; +} + /*____________ misc ____________*/ /* license note in footer and under edit window */ @@ -204,6 +265,20 @@ line-height: 1.4; } +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-right-width: 0; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-right-width: 1px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + /*____________ JS popup ____________*/ .JSpopup { diff --git a/css/structure.css b/css/structure.css index 14490a0b0..638d882b4 100755 --- a/css/structure.css +++ b/css/structure.css @@ -8,16 +8,16 @@ body { margin: 0 auto; } #dokuwiki__site { - margin: 0 auto; - max-width: 64em; - padding: 1.4em 1em; } #dokuwiki__site .site { } #dokuwiki__header { + width: 100%; } #dokuwiki__header .pad { + margin: 0 auto; + max-width: __site_width__; } #dokuwiki__header .headings { float: left; @@ -35,6 +35,9 @@ body { #dokuwiki__site .wrapper { position: relative; + margin: 0 auto; + max-width: __site_width__; + padding: 1.4em 1em; /* @pad */ } #IE6 #dokuwiki__site .wrapper, #IE7 #dokuwiki__site .wrapper { @@ -67,6 +70,9 @@ body { #dokuwiki__footer { clear: both; + margin: 0 auto; + max-width: __site_width__; + padding: 0 1em 2.4em; /* @pad */ } #dokuwiki__footer .pad { } diff --git a/designs/edit_highlighting.png b/designs/edit_highlighting.png Binary files differnew file mode 100644 index 000000000..159efd196 --- /dev/null +++ b/designs/edit_highlighting.png diff --git a/designs/edit_highlighting.psd b/designs/edit_highlighting.psd Binary files differnew file mode 100644 index 000000000..056bcbed9 --- /dev/null +++ b/designs/edit_highlighting.psd diff --git a/designs/edit_hightlight+toc.png b/designs/edit_hightlight+toc.png Binary files differnew file mode 100644 index 000000000..e8e16088f --- /dev/null +++ b/designs/edit_hightlight+toc.png diff --git a/lang/en/lang.php b/lang/en/lang.php index 91b04b177..a19601ef9 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -4,10 +4,6 @@ * */ -$lang['discussion'] = 'Discussion'; -$lang['back_to_article'] = 'Back to article'; -$lang['userpage'] = 'User page'; - /* accessibility headlines */ $lang['user_tools'] = 'User Tools'; $lang['site_tools'] = 'Site Tools'; diff --git a/lang/en/settings.php b/lang/en/settings.php index 356e95234..da01d290f 100755 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -5,7 +5,5 @@ */ $lang['tagline'] = 'Tagline'; -$lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)'; -$lang['userPage'] = 'User page (leave empty to disable user pages)'; $lang['sidebarID'] = 'page name of page included in sidebar'; $lang['hideTools'] = 'Hide tools when not logged in?'; @@ -18,7 +18,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title> <?php tpl_metaheaders() ?> - <link rel="shortcut icon" href="<?php echo _tpl_getFavicon() /* DW versions > 2010-11-12 can use the core function tpl_getFavicon() */ ?>" /> + <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> <?php _tpl_include('meta.html') ?> </head> @@ -56,24 +56,21 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <!-- USER TOOLS --> <?php if ($conf['useacl'] && $showTools): ?> <div id="dokuwiki__usertools"> - <div class="inner"> - <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3> - <ul> - <?php /* the optional second parameter of tpl_action() switches between a link and a button, - e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */ - if ($_SERVER['REMOTE_USER']) { - echo '<li class="user">'; - tpl_userinfo(); /* 'Logged in as ...' */ - echo '</li>'; - } - tpl_action('admin', 1, 'li'); - _tpl_action('userpage', 1, 'li'); - tpl_action('profile', 1, 'li'); - _tpl_action('register', 1, 'li'); /* DW versions > 2011-02-20 can use the core function tpl_action('register', 1, 'li') */ - tpl_action('login', 1, 'li'); - ?> - </ul> - </div> + <h3 class="a11y"><?php echo tpl_getLang('user_tools') ?></h3> + <ul> + <?php /* the optional second parameter of tpl_action() switches between a link and a button, + e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '<li class="user">'; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '</li>'; + } + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li'); + tpl_action('register', 1, 'li'); + tpl_action('login', 1, 'li'); + ?> + </ul> </div> <?php endif ?> @@ -90,7 +87,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER </div> </div> - <div class="clearer"></div> <div class="clearer"></div> <hr class="a11y" /> @@ -113,6 +109,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <?php if($conf['youarehere']){ ?> <div class="breadcrumbs"><?php tpl_youarehere() ?></div> <?php } ?> + <div id="page_id">[[page_id]]</div> <!-- wikipage start --> <?php tpl_content() /* the main content */ ?> @@ -140,7 +137,6 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <ul> <?php tpl_action('edit', 1, 'li'); - _tpl_action('discussion', 1, 'li'); tpl_action('history', 1, 'li'); tpl_action('backlink', 1, 'li'); tpl_action('subscribe', 1, 'li'); @@ -163,6 +159,5 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> <!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]--> - <div class="header_background"></div> </body> </html> @@ -62,4 +62,8 @@ __missing__ = "#f30" __highlight__ = "#ff9" ; sidebar width -__sidebar_width__ = "16em" +; @todo: width in em or px? +;__site_width__ = "64em" +__site_width__ = "1000px" +;__sidebar_width__ = "16em" +__sidebar_width__ = "220px" @@ -5,14 +5,14 @@ Look at next: icons (start with the usertools? Decide where icons are needed) footnotes -[[page name]] +* [[page name]] breadcrumb trace -Too much white/gray space -remove dashed line under downloadable +* Too much white/gray space +* remove dashed line under downloadable * alignment of usertools looks weird check out old default and consider edit-page menu -TOC looks unstyled, too much indentation +* TOC looks unstyled, too much indentation ------------ Anika todo: diff --git a/tpl_functions.php b/tpl_functions.php index 54b143fc9..1ea3d0f92 100755 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -12,117 +12,6 @@ if (!defined('DOKU_INC')) die(); /** - * Create link/button to discussion page and back - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_discussion($discussionPage,$title,$backTitle,$link=0,$wrapper=0) { - global $ID; - - $discussPage = str_replace('@ID@',$ID,$discussionPage); - $discussPageRaw = str_replace('@ID@','',$discussionPage); - $isDiscussPage = strpos($ID,$discussPageRaw)!==false; - $backID = str_replace($discussPageRaw,'',$ID); - - if ($wrapper) echo "<$wrapper>"; - - if ($isDiscussPage) { - if ($link) - tpl_pagelink($backID,$backTitle); - else - echo html_btn('back2article',$backID,'',array(),'get',0,$backTitle); - } else { - if ($link) - tpl_pagelink($discussPage,$title); - else - echo html_btn('discussion',$discussPage,'',array(),'get',0,$title); - } - - if ($wrapper) echo "</$wrapper>"; -} - -/** - * Create link/button to user page - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_userpage($userPage,$title,$link=0,$wrapper=0) { - if (!$_SERVER['REMOTE_USER']) return; - - global $conf; - $userPage = str_replace('@USER@',$_SERVER['REMOTE_USER'],$userPage); - - if ($wrapper) echo "<$wrapper>"; - - if ($link) - tpl_pagelink($userPage,$title); - else - echo html_btn('userpage',$userPage,'',array(),'get',0,$title); - - if ($wrapper) echo "</$wrapper>"; -} - -/** - * Create link/button to register page - * DW versions > 2011-02-20 can use the core function tpl_action('register') - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_register($link=0,$wrapper=0) { - global $conf; - global $lang; - global $ID; - $lang_register = !empty($lang['btn_register']) ? $lang['btn_register'] : $lang['register']; - - if ($_SERVER['REMOTE_USER'] || !$conf['useacl'] || !actionOK('register')) return; - - if ($wrapper) echo "<$wrapper>"; - - if ($link) - tpl_link(wl($ID,'do=register'),$lang_register,'class="action register" rel="nofollow"'); - else - echo html_btn('register',$ID,'',array('do'=>'register'),'get',0,$lang_register); - - if ($wrapper) echo "</$wrapper>"; -} - -/** - * Wrapper around custom template actions - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_action($type,$link=0,$wrapper=0) { - switch ($type) { - case 'discussion': - if (tpl_getConf('discussionPage')) { - _tpl_discussion(tpl_getConf('discussionPage'),tpl_getLang('discussion'),tpl_getLang('back_to_article'),$link,$wrapper); - } - break; - case 'userpage': - if (tpl_getConf('userPage')) { - _tpl_userpage(tpl_getConf('userPage'),tpl_getLang('userpage'),$link,$wrapper); - } - break; - case 'register': - _tpl_register($link,$wrapper); - break; - } -} - -/** - * Use favicon.ico from data/media root directory if it exists, otherwise use - * the one in the template's image directory. - * DW versions > 2010-11-12 can use the core function tpl_getFavicon() - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_getFavicon() { - if (file_exists(mediaFN('favicon.ico'))) - return ml('favicon.ico'); - return DOKU_TPL.'images/favicon.ico'; -} - -/** * Include additional html file from conf directory if it exists, otherwise use * file in the template's root directory. * |
