Updating branch refs/heads/master to a8dd2559074cff6dc7c7096a0f3bf3fe639657b0 (commit) from 79d9631d4494f0bf97114d7838d4f82c5a8d2ebf (commit)
commit a8dd2559074cff6dc7c7096a0f3bf3fe639657b0 Author: Nick Schermer <n...@xfce.org> Date: Tue Jan 3 20:03:01 2012 +0100 Add docs template. Reall work in progress, but it threw it away once, better to store it in git. lib/tpl/{xfce => docs}/_admin.css | 0 lib/tpl/{xfce => docs}/_linkwiz.css | 0 lib/tpl/{xfce => docs}/_mediaoptions.css | 2 +- lib/tpl/{xfce => docs}/_subscription.css | 0 lib/tpl/docs/_xfceheader.css | 64 ++++++ lib/tpl/docs/design.css | 208 ++++++++++++++++++++ lib/tpl/{xfce/design.css => docs/design2.css} | 193 ++++++------------ lib/tpl/{xfce => docs}/detail.php | 21 ++- lib/tpl/docs/footer.html | 41 ++++ lib/tpl/docs/geany_run_script.sh | 16 ++ lib/tpl/{xfce => docs}/images/UWEB.png | Bin 1138 -> 1065 bytes lib/tpl/docs/images/UWEBshadow.png | Bin 0 -> 900 bytes lib/tpl/{xfce => docs}/images/bullet.gif | Bin 50 -> 50 bytes lib/tpl/{xfce => docs}/images/button-cc.gif | Bin 1231 -> 1231 bytes lib/tpl/{xfce => docs}/images/button-css.png | Bin 299 -> 299 bytes lib/tpl/{xfce => docs}/images/button-donate.gif | Bin 187 -> 187 bytes lib/tpl/docs/images/button-dw.png | Bin 0 -> 404 bytes lib/tpl/{xfce => docs}/images/button-php.gif | Bin 207 -> 207 bytes lib/tpl/docs/images/button-rss.png | Bin 0 -> 196 bytes lib/tpl/{xfce => docs}/images/button-xhtml.png | Bin 321 -> 321 bytes lib/tpl/{xfce => docs}/images/buttonshadow.png | Bin 257 -> 218 bytes lib/tpl/{xfce => docs}/images/closed.gif | Bin 54 -> 54 bytes lib/tpl/docs/images/favicon.ico | Bin 0 -> 7406 bytes lib/tpl/docs/images/inputshadow.png | Bin 0 -> 93 bytes lib/tpl/{goodies => docs}/images/link_icon.gif | Bin 942 -> 942 bytes lib/tpl/{xfce => docs}/images/mail_icon.gif | Bin 918 -> 918 bytes lib/tpl/{xfce => docs}/images/open.gif | Bin 54 -> 54 bytes lib/tpl/{xfce => docs}/images/tocdot2.gif | Bin 810 -> 810 bytes lib/tpl/{xfce => docs}/images/windows.gif | Bin 223 -> 223 bytes lib/tpl/docs/layout.css | 42 ++++ lib/tpl/docs/main.php | 170 ++++++++++++++++ lib/tpl/{xfce => docs}/media.css | 4 +- lib/tpl/{xfce => docs}/mediamanager.php | 21 ++- lib/tpl/{xfce => docs}/print.css | 30 +--- lib/tpl/{xfce => docs}/rtl.css | 13 +- lib/tpl/{xfce => docs}/style.ini | 44 +++-- .../{xfce/xfce-header.html => docs/topheader.html} | 13 +- 37 files changed, 683 insertions(+), 199 deletions(-) diff --git a/lib/tpl/xfce/_admin.css b/lib/tpl/docs/_admin.css similarity index 100% copy from lib/tpl/xfce/_admin.css copy to lib/tpl/docs/_admin.css diff --git a/lib/tpl/xfce/_linkwiz.css b/lib/tpl/docs/_linkwiz.css similarity index 100% copy from lib/tpl/xfce/_linkwiz.css copy to lib/tpl/docs/_linkwiz.css diff --git a/lib/tpl/xfce/_mediaoptions.css b/lib/tpl/docs/_mediaoptions.css similarity index 98% copy from lib/tpl/xfce/_mediaoptions.css copy to lib/tpl/docs/_mediaoptions.css index 7ac4899..19e2c48 100644 --- a/lib/tpl/xfce/_mediaoptions.css +++ b/lib/tpl/docs/_mediaoptions.css @@ -5,7 +5,7 @@ display:none; border: 1px solid __border__; position: absolute; - width:270px; + width:280px; } #media__popup h1 { diff --git a/lib/tpl/xfce/_subscription.css b/lib/tpl/docs/_subscription.css similarity index 100% copy from lib/tpl/xfce/_subscription.css copy to lib/tpl/docs/_subscription.css diff --git a/lib/tpl/docs/_xfceheader.css b/lib/tpl/docs/_xfceheader.css new file mode 100644 index 0000000..076cf6b --- /dev/null +++ b/lib/tpl/docs/_xfceheader.css @@ -0,0 +1,64 @@ +body { + background-color: #eee; +} +#xfce-header { + position: absolute; + color: #fff; + left: 0; + top: 0; + width: 100%; + background-color: #333; + z-index: 1000; + box-shadow: 0 0 8px rgba(0, 0, 0, 0.5); + background: #333 url('http://users.xfce.org/~nick/proposal/header/logosmall.png') no-repeat 3px 50%; +} +#xfce-header h1, #xfce-header h4 { + display: none; +} +#xfce-header div { + margin-left: 100px; +} +#xfce-header.slide { + transition: top 0.2s linear; + transition-delay: 0.2s; + -moz-transition: top 0.2s linear; + -moz-transition-delay: 0.2s; + -webkit-transition: top 0.2s linear; + -webkit-transition-delay: 0.2s; + -o-transition: top 0.2s linear; + -o-transition-delay: 0.2s; +} +#xfce-header ul { + list-style: none; + float: right; + margin: 5px; + padding: 0; + line-height: 25px; +} +#xfce-header ul li { + float: left; +} +#xfce-header a { + color: #999; + text-decoration: none; + display: block; + padding: 0 8px 0 8px; + + transition: color 0.2s linear; + -moz-transition: color 0.2s linear; + -webkit-transition: color 0.2s linear; + -o-transition: color 0.2s linear; +} +#xfce-header ul li a:hover { + color: #fff; + text-decoration: underline; +} +#xfce-header .active { + color: #fff; +} +#xfce-header-clear { + clear: both; +} +#xfce-header-spacer { + height: 35px; /* initial size, javascript corrects this */ +} diff --git a/lib/tpl/docs/design.css b/lib/tpl/docs/design.css new file mode 100644 index 0000000..a1f0250 --- /dev/null +++ b/lib/tpl/docs/design.css @@ -0,0 +1,208 @@ +div.dokuwiki { + margin: 0 auto 1em auto; + width: 90%; + max-width: 1000px; + cursor: default; +} + +div.dokuwiki div { + margin: 0; + padding: 0; +} + +div.dokuwiki div.page { + background: #fff; + padding: 1.2em 1.2em 0 1.2em; + box-shadow: 0 0 3px rgba(0, 0, 0, 0.25); + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.25); +} + +div.dokuwiki div.page div.doc { + color: __border__; + text-align: right; + padding: 0.8em 0; +} + +div.dokuwiki div.header { + margin-bottom: 6px; +} + +div.dokuwiki div.breadcrumbs { + color: __text_neu__; + float: left; + margin-top: 0.5em; +} + +div.dokuwiki div.translation { + float: right; + padding-left: 1em; +} + +div.dokuwiki div.search { + float: right; +} + +div.dokuwiki h1 { + margin-top: 0; + font-size: 1.44em; + border-bottom: solid 1px __border__; + color: __text_neu__; +} + +div.dokuwiki h2, +div.dokuwiki h3, +div.dokuwiki h4 { + font-size: 1.2em; + border-bottom: solid 1px __border__; + margin-top: 2em; + color: __text_neu__; +} + +div.dokuwiki div.secedit input.button { + cursor: pointer; + border: 1px solid __border__; + background: __background_c__; + float: right; +} + +div.dokuwiki .section_highlight { + background: #dfd; +} + +div.dokuwiki div.toc { + margin: 1.2em 0 0 2em; + float: right; + width: 200px; + font-size: 80%; + clear: both; +} + +div.dokuwiki div.bar { + margin-top: 0.8em; +} + +div.dokuwiki .bar input.button { + background: __background_c__; + border: 1px solid __border__; +} + +div.dokuwiki .bar a { + text-decoration: none; +} + +div.dokuwiki .bar-left { + float: left; +} + +div.dokuwiki .bar-right { + float: right; + text-align: right; +} + +div.dokuwiki table.inline { + background-color: __background__; + border: 1px solid __border__; + padding: 6px; + +} + +div.dokuwiki table.inline img { + border: 1px solid __border__; + padding: 6px; + background-color: __background_c__; +} + +div.dokuwiki .gui { + color: __text_neu__; +} + +div.dokuwiki form { + border: none; + display: inline; +} + +div.dokuwiki pre, +div.dokuwiki code { + font-family: monospace, serif; + font-size: 100%; + background-color: __background__; +} +div.dokuwiki pre { + padding: 0.5em; + border: 1px dashed __border__; + color: __text__; + overflow: auto; +} + +/* code blocks by indention */ +div.dokuwiki pre.pre { + background-color: __background__; +} + +/* code blocks by code tag */ +div.dokuwiki pre.code { + background-color: __background__; +} + +/* code blocks by file tag */ +div.dokuwiki pre.file { + background-color: __background__; +} + +/* filenames for file and code blocks */ +div.dokuwiki dl.file, +div.dokuwiki dl.code { + margin-top: 2em; + margin-bottom: 2.5em; +} + +div.dokuwiki dt { + color: __text_neu__; + font-weight: normal; +} +div.dokuwiki dd { + margin-left: 20px; + margin-top: 0.5em; + margin-bottom: 1em; +} + +/* indent different sections */ +div.dokuwiki h1, div.dokuwiki div.level1 { margin-left: 0px; } +div.dokuwiki h2, div.dokuwiki div.level2 { margin-left: 0px; } +div.dokuwiki h3, div.dokuwiki div.level3 { margin-left: 20px; } +div.dokuwiki h4, div.dokuwiki div.level4 { margin-left: 40px; } +div.dokuwiki h5, div.dokuwiki div.level5 { margin-left: 60px; } + +div.dokuwiki a.urlextern:hover, +div.dokuwiki a.urlextern:active, +div.dokuwiki a.windows:hover, +div.dokuwiki a.windows:active, +div.dokuwiki a.wikilink1:hover, +div.dokuwiki a.wikilink1:active, +div.dokuwiki a.wikilink2:hover, +div.dokuwiki a.wikilink2:active, +div.dokuwiki a.interwiki:hover, +div.dokuwiki a.interwiki:active { + color: __hover__; +} + +div.dokuwiki a { + transition: color 0.2s linear; + -moz-transition: color 0.2s linear; + -webkit-transition: color 0.2s linear; + -o-transition: color 0.2s linear; +} + +/* existing wikipage */ +div.dokuwiki a.wikilink1 { + color: __existing__; + text-decoration: none !important; +} + +/* not existing wikipage */ +div.dokuwiki a.wikilink2 { + color: __existing__; + text-decoration: none !important; + border-bottom: dashed 1px __missing__ !important; +} diff --git a/lib/tpl/xfce/design.css b/lib/tpl/docs/design2.css similarity index 84% copy from lib/tpl/xfce/design.css copy to lib/tpl/docs/design2.css index b24b6bd..1fdf2bf 100644 --- a/lib/tpl/xfce/design.css +++ b/lib/tpl/docs/design2.css @@ -1,7 +1,6 @@ /** * Design elements for default Template * - * @author Mike Massonnet <mmasson...@xfce.org> * @author Andreas Gohr <a...@splitbrain.org> * @author Anika Henke <an...@selfthinker.org> */ @@ -11,25 +10,15 @@ * { padding: 0; margin: 0; } body { - font: 80% Verdana, Arial, Helvetica, sans-serif; + font: 80% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; background-color: __background__; color: __text__; } /* the document */ -div.bottom-right-corner { - position: fixed; - z-index: -1; - right: 0; - bottom: 0; - width: 205px; - height: 152px; - background: no-repeat url(images/bottom-right-corner.png); -} - div.dokuwiki div.page { + margin: 4px 2em 0 1em; text-align: justify; - line-height: 1.7em; } div.dokuwiki table { @@ -50,7 +39,6 @@ div.dokuwiki blockquote, div.dokuwiki table, div.dokuwiki pre { margin: 0 0 1.0em 0; - line-height: 1.7em; } div.dokuwiki hr { @@ -65,15 +53,6 @@ div.dokuwiki div.nothing { margin: 2em; } -div.dokuwiki div.header { -} - -div.dokuwiki div.stylefoot { - margin-top: 1.5em; - border-top: 1px __border__ solid; - color: __text_alt__; -} - /* ---------------- forms ------------------------ */ div.dokuwiki form { @@ -106,8 +85,10 @@ div.dokuwiki fieldset { } div.dokuwiki textarea.edit { - font-family: monospace; - font-size: 14px; + font-family: monospace, serif; + /* second generic font fixes problem with font-size, see + http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ + font-size: 100%; color: __text__; background-color: __background__; border: 1px solid __border__; @@ -197,13 +178,8 @@ div.dokuwiki div#draft__status { } div.dokuwiki div.license { - padding: 0.5em 0; + padding: 0.5em; font-size: 90%; - text-align: left; -} - -div.dokuwiki div.credit { - margin: 1.4em 0; text-align: center; } @@ -217,12 +193,11 @@ div.dokuwiki form#dw__editform div.license { div.dokuwiki input.button, div.dokuwiki button.button { border: 1px solid __border__; - color: __text_alt__; - background-color: __background_alt__; + color: __text__; + background-color: __background__; vertical-align: middle; text-decoration: none; font-size: 100%; - font-weight: bold; cursor: pointer; margin: 1px; padding: 0.125em 0.4em; @@ -231,25 +206,23 @@ div.dokuwiki button.button { /* nice alphatransparency background except for IE <7 */ html>body div.dokuwiki input.button, html>body div.dokuwiki button.button { - background: __background_alt__ url(images/buttonshadow.png) repeat-x bottom; + background: __background__ url(images/buttonshadow.png) repeat-x bottom; } * html div.dokuwiki input.button, * html div.dokuwiki button.button { height: 1.8em; - font-weight: bold; } div.dokuwiki div.secedit input.button { border: 1px solid __border__; - color: __text_alt__; - background-color: __background_alt__; + color: __text__; + background-color: __background__; vertical-align: middle; text-decoration: none; margin: 0; padding: 0; font-size: 10px; - font-weight: bold; cursor: pointer; float: right; display: inline; @@ -282,8 +255,8 @@ div.dokuwiki a:visited { } div.dokuwiki a:hover, div.dokuwiki a:active { - color: __hover__; - text-decoration: none; + color: __text__; + text-decoration: underline; } div.dokuwiki h1 a, @@ -292,7 +265,7 @@ div.dokuwiki h3 a, div.dokuwiki h4 a, div.dokuwiki h5 a, div.dokuwiki a.nolink { - color: __text_neu__ !important; + color: __text__ !important; text-decoration: none !important; } @@ -331,11 +304,9 @@ div.dokuwiki a.urlextern:hover, div.dokuwiki a.urlextern:active, div.dokuwiki a.windows:hover, div.dokuwiki a.windows:active, -div.dokuwiki a.wikilink1:hover, -div.dokuwiki a.wikilink1:active, div.dokuwiki a.interwiki:hover, div.dokuwiki a.interwiki:active { - color: __hover__; + color: __text__; } /* email link */ @@ -346,11 +317,12 @@ div.dokuwiki a.mail { /* existing wikipage */ div.dokuwiki a.wikilink1 { - color: __existing__; + color: __existing__ !important; } /* not existing wikipage */ div.dokuwiki a.wikilink2 { + color: __missing__ !important; text-decoration: none !important; border-bottom: dashed 1px __missing__ !important; } @@ -365,37 +337,10 @@ div.dokuwiki div.preview { } div.dokuwiki div.breadcrumbs { + background-color: __background_neu__; color: __text_neu__; - font-size: 84%; - padding: 0.22em 0 0 0; -} - -div.dokuwiki div.translation { - float: right; - font-size: 84%; -} - -div.dokuwiki div.translation div.notify, -div.dokuwiki div.plugin_translation { - padding-right: 0; - margin-right: 3px; - float: left; -} - -div.dokuwiki div.plugin_translation span { - display: none; -} - -div.dokuwiki div.translation a.action { - display: block; - float: right; - padding: 0 0.2em; - margin: 0 0.2em; - font-weight: bold; -} - -div.dokuwiki div.translation a.action:first-child { - display: none; + font-size: 80%; + padding: 0 0 0 4px; } div.dokuwiki span.user { @@ -447,30 +392,22 @@ div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 { + color: __text__; + background-color: inherit; font-size: 100%; font-weight: normal; - color: __text_neu__ !important; margin: 0 0 1em 0; - padding: 0.5em 0 0.34em 0; + padding: 0.5em 0 0 0; border-bottom: 1px solid __border__; clear: left; } -div.dokuwiki h1 a, -div.dokuwiki h2 a, -div.dokuwiki h3 a, -div.dokuwiki h4 a, -div.dokuwiki h5 a { - color: __text_neu__ !important; - background-color: inherit; -} - /* special headlines */ -div.dokuwiki h1 {font-size: 180%; margin-left: 0px; } -div.dokuwiki h2 {font-size: 170%; margin-left: 20px;} -div.dokuwiki h3 {font-size: 160%; margin-left: 40px; border-bottom: none; } -div.dokuwiki h4 {font-size: 150%; margin-left: 60px; border-bottom: none; } -div.dokuwiki h5 {font-size: 120%; margin-left: 80px; border-bottom: none; } +div.dokuwiki h1 {font-size: 160%; margin-left: 0px; font-weight: bold;} +div.dokuwiki h2 {font-size: 150%; margin-left: 20px;} +div.dokuwiki h3 {font-size: 140%; margin-left: 40px; border-bottom: none; font-weight: bold;} +div.dokuwiki h4 {font-size: 120%; margin-left: 60px; border-bottom: none; font-weight: bold;} +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; } @@ -481,7 +418,7 @@ div.dokuwiki div.level5 { margin-left: 83px; } /* unordered lists */ div.dokuwiki ul { - line-height: 1.7em; + line-height: 1.5em; list-style-type: square; list-style-image: none; margin: 0 0 1em 3.5em; @@ -490,7 +427,7 @@ div.dokuwiki ul { /* ordered lists */ div.dokuwiki ol { - line-height: 1.7em; + line-height: 1.5em; list-style-image: none; margin: 0 0 1em 3.5em; color: __text_alt__; @@ -529,9 +466,14 @@ div.dokuwiki blockquote { padding-left: 3px; } +div.dokuwiki pre, +div.dokuwiki code { + font-family: monospace, serif; + /* second generic font fixes problem with font-size, see + http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ + font-size: 100%; +} div.dokuwiki pre { - font-family: monospace; - font-size: 120%; padding: 0.5em; border: 1px dashed __border__; color: __text__; @@ -584,11 +526,6 @@ div.dokuwiki dl.file dt { } -/* inline code words */ -div.dokuwiki code { - font-size: 120%; -} - /* inline tables */ div.dokuwiki table.inline { background-color: __background__; @@ -610,17 +547,20 @@ div.dokuwiki table.inline td { /* ---------- table of contents ------------------- */ div.dokuwiki div.toc { + margin: 1.2em 0 0 2em; float: right; - font-size: 90%; + width: 200px; + font-size: 80%; clear: both; - opacity: 0.8; } div.dokuwiki div.tocheader { - visibility: hidden; - height: 0; - margin: 0; - padding: 0; + border: 1px solid __border__; + background-color: __background_alt__; + text-align: left; + font-weight: bold; + padding: 3px; + margin-bottom: 2px; } div.dokuwiki span.toc_open, @@ -648,31 +588,22 @@ div.dokuwiki span.toc_close { div.dokuwiki #toc__inside { border: 1px solid __border__; - background-color: __background_alt__; + background-color: __background__; text-align: left; - padding: 0.6em 0; + padding: 0.5em 0 0.7em 0; } div.dokuwiki ul.toc { list-style-type: none; list-style-image: none; - line-height: 1.6em; - padding: 0 0.8em; + line-height: 1.2em; + padding-left: 1em; margin: 0; } -div.dokuwiki ul.toc li.level1 > div.li span.li { - font-weight: bold; - color: __text_alt__; -} -div.dokuwiki ul.toc li.level1 > div.li span.li:before { - content: "\25B6\2002"; - font-size: 0.73em; - vertical-align: top; -} - -div.dokuwiki ul.toc li.level1 > div.li { - padding: 2px 0; +div.dokuwiki ul.toc li { + background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat; + padding-left: 0.4em; } div.dokuwiki ul.toc li.clear { @@ -682,12 +613,12 @@ div.dokuwiki ul.toc li.clear { div.dokuwiki a.toc:link, div.dokuwiki a.toc:visited { - color: __text_alt__; + color: __extern__; } div.dokuwiki a.toc:hover, div.dokuwiki a.toc:active { - color: __existing__; + color: __text__; } /* ---------------------------- Diff rendering --------------------------*/ @@ -723,10 +654,12 @@ div.dokuwiki table.diff td { font-family: monospace; font-size: 100%; } -div.dokuwiki td.diff-addedline { +div.dokuwiki td.diff-addedline, +div.dokuwiki span.diff-addedline { background-color: #ddffdd; } -div.dokuwiki td.diff-deletedline { +div.dokuwiki td.diff-deletedline, +div.dokuwiki span.diff-deletedline { background-color: #ffffbb; } div.dokuwiki td.diff-context { @@ -818,7 +751,7 @@ div.dokuwiki ul.search_quickhits li { } div.dokuwiki .section_highlight { - background-color: __background_neu__ !important; + background-color: __background_alt__ !important; } /* ------------------ Additional ---------------------- */ @@ -888,15 +821,15 @@ button.pickerbutton { div.dokuwiki div.img_big { float: left; - padding: 1.5em; margin-right: 0.5em; - background-color: __background__; } div.dokuwiki dl.img_tags dt { font-weight: bold; + background-color: __background_alt__; } div.dokuwiki dl.img_tags dd { + background-color: __background_neu__; } div.dokuwiki div.imagemeta { diff --git a/lib/tpl/xfce/detail.php b/lib/tpl/docs/detail.php similarity index 83% copy from lib/tpl/xfce/detail.php copy to lib/tpl/docs/detail.php index 18f83b4..4f42b11 100644 --- a/lib/tpl/xfce/detail.php +++ b/lib/tpl/docs/detail.php @@ -1,10 +1,14 @@ <?php /** - * Xfce Wiki Template + * DokuWiki Image Detail Template * - * This template is based on top of the default DokuWiki template. + * This is the template for displaying image details * - * @author Mike Massonnet <a...@splitbrain.org> + * 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 <a...@splitbrain.org> */ // must be run from within DokuWiki @@ -16,18 +20,19 @@ if (!defined('DOKU_INC')) die(); <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" /> - <title><?php echo strip_tags($conf['title'])?> - <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></title> + <title> + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> + [<?php echo strip_tags($conf['title'])?>] + </title> <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.png" /> + <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> </head> <body> - -<div class="msgarea"><?php html_msgarea()?></div> - <div class="dokuwiki"> + <?php html_msgarea()?> <div class="page"> <?php if($ERROR){ print $ERROR; }else{ ?> diff --git a/lib/tpl/docs/footer.html b/lib/tpl/docs/footer.html new file mode 100644 index 0000000..38aab72 --- /dev/null +++ b/lib/tpl/docs/footer.html @@ -0,0 +1,41 @@ +<?php +/** + * Example footer include + * + * This file shows you how to use the include hooks. However I recommend to + * create your own complete new template instead. + */ + +$tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : ''; +?> + +<div class="footerinc"> + + <a <?php echo $tgt?> href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" /></a> + + <?php + $lic = license_img('button'); + if($lic){ + ?> + <a <?php echo $tgt?> href="<?php echo $license[$conf['license']]['url']?>" rel="license" title="<?php echo $license[$conf['license']]['name']?>"><img src="<?php echo DOKU_BASE.$lic ?>" width="80" height="15" alt="" /></a> + <?php } ?> + + <a <?php echo $tgt?> href="http://www.dokuwiki.org/donate" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a> + + <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a> + + <a <?php echo $tgt?> href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a> + + <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a> + + <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a> + +<?php +if ($conf['allowdebug']) { + echo '<!-- page made in '.round(delta_time(DOKU_START_TIME), 3).' seconds -->'; +} +?> + + +</div> +<?php include(dirname(__FILE__).'/dwtb.html') ?> diff --git a/lib/tpl/docs/geany_run_script.sh b/lib/tpl/docs/geany_run_script.sh new file mode 100644 index 0000000..66baa57 --- /dev/null +++ b/lib/tpl/docs/geany_run_script.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +rm $0 + +./design2 + +echo " + +------------------ +(program exited with code: $?)" + + +echo "Press return to continue" +#to be more compatible with shells like dash +dummy_var="" +read dummy_var diff --git a/lib/tpl/xfce/images/UWEB.png b/lib/tpl/docs/images/UWEB.png similarity index 56% copy from lib/tpl/xfce/images/UWEB.png copy to lib/tpl/docs/images/UWEB.png index ea03aec..bded2c7 100644 Binary files a/lib/tpl/xfce/images/UWEB.png and b/lib/tpl/docs/images/UWEB.png differ diff --git a/lib/tpl/docs/images/UWEBshadow.png b/lib/tpl/docs/images/UWEBshadow.png new file mode 100644 index 0000000..8c4e5f8 Binary files /dev/null and b/lib/tpl/docs/images/UWEBshadow.png differ diff --git a/lib/tpl/xfce/images/bullet.gif b/lib/tpl/docs/images/bullet.gif similarity index 100% copy from lib/tpl/xfce/images/bullet.gif copy to lib/tpl/docs/images/bullet.gif diff --git a/lib/tpl/xfce/images/button-cc.gif b/lib/tpl/docs/images/button-cc.gif similarity index 100% copy from lib/tpl/xfce/images/button-cc.gif copy to lib/tpl/docs/images/button-cc.gif diff --git a/lib/tpl/xfce/images/button-css.png b/lib/tpl/docs/images/button-css.png similarity index 100% copy from lib/tpl/xfce/images/button-css.png copy to lib/tpl/docs/images/button-css.png diff --git a/lib/tpl/xfce/images/button-donate.gif b/lib/tpl/docs/images/button-donate.gif similarity index 100% copy from lib/tpl/xfce/images/button-donate.gif copy to lib/tpl/docs/images/button-donate.gif diff --git a/lib/tpl/docs/images/button-dw.png b/lib/tpl/docs/images/button-dw.png new file mode 100644 index 0000000..97272d9 Binary files /dev/null and b/lib/tpl/docs/images/button-dw.png differ diff --git a/lib/tpl/xfce/images/button-php.gif b/lib/tpl/docs/images/button-php.gif similarity index 100% copy from lib/tpl/xfce/images/button-php.gif copy to lib/tpl/docs/images/button-php.gif diff --git a/lib/tpl/docs/images/button-rss.png b/lib/tpl/docs/images/button-rss.png new file mode 100644 index 0000000..0a55642 Binary files /dev/null and b/lib/tpl/docs/images/button-rss.png differ diff --git a/lib/tpl/xfce/images/button-xhtml.png b/lib/tpl/docs/images/button-xhtml.png similarity index 100% copy from lib/tpl/xfce/images/button-xhtml.png copy to lib/tpl/docs/images/button-xhtml.png diff --git a/lib/tpl/xfce/images/buttonshadow.png b/lib/tpl/docs/images/buttonshadow.png similarity index 57% copy from lib/tpl/xfce/images/buttonshadow.png copy to lib/tpl/docs/images/buttonshadow.png index f60be30..b96ebf7 100644 Binary files a/lib/tpl/xfce/images/buttonshadow.png and b/lib/tpl/docs/images/buttonshadow.png differ diff --git a/lib/tpl/xfce/images/closed.gif b/lib/tpl/docs/images/closed.gif similarity index 100% copy from lib/tpl/xfce/images/closed.gif copy to lib/tpl/docs/images/closed.gif diff --git a/lib/tpl/docs/images/favicon.ico b/lib/tpl/docs/images/favicon.ico new file mode 100644 index 0000000..8b9616a Binary files /dev/null and b/lib/tpl/docs/images/favicon.ico differ diff --git a/lib/tpl/docs/images/inputshadow.png b/lib/tpl/docs/images/inputshadow.png new file mode 100644 index 0000000..4800449 Binary files /dev/null and b/lib/tpl/docs/images/inputshadow.png differ diff --git a/lib/tpl/goodies/images/link_icon.gif b/lib/tpl/docs/images/link_icon.gif similarity index 100% copy from lib/tpl/goodies/images/link_icon.gif copy to lib/tpl/docs/images/link_icon.gif diff --git a/lib/tpl/xfce/images/mail_icon.gif b/lib/tpl/docs/images/mail_icon.gif similarity index 100% copy from lib/tpl/xfce/images/mail_icon.gif copy to lib/tpl/docs/images/mail_icon.gif diff --git a/lib/tpl/xfce/images/open.gif b/lib/tpl/docs/images/open.gif similarity index 100% copy from lib/tpl/xfce/images/open.gif copy to lib/tpl/docs/images/open.gif diff --git a/lib/tpl/xfce/images/tocdot2.gif b/lib/tpl/docs/images/tocdot2.gif similarity index 100% copy from lib/tpl/xfce/images/tocdot2.gif copy to lib/tpl/docs/images/tocdot2.gif diff --git a/lib/tpl/xfce/images/windows.gif b/lib/tpl/docs/images/windows.gif similarity index 100% copy from lib/tpl/xfce/images/windows.gif copy to lib/tpl/docs/images/windows.gif diff --git a/lib/tpl/docs/layout.css b/lib/tpl/docs/layout.css new file mode 100644 index 0000000..4831138 --- /dev/null +++ b/lib/tpl/docs/layout.css @@ -0,0 +1,42 @@ +div.dokuwiki .bar { + padding: 0.1em 0.15em; + clear: both; +} +div.dokuwiki .bar a { + text-decoration: none; +} + +div.dokuwiki div.bar .button { + border: 0; + background: __background__; +} + +div.dokuwiki .bar-left { + float: left; +} + +div.dokuwiki .bar-right { + float: right; + text-align: right; +} + +div.dokuwiki #bar__bottom { + margin-bottom: 3px; +} + +/* ------------- File Metadata ----------------------- */ + +div.dokuwiki div.meta { + clear: both; + margin-top: 1em; + color: __text_alt__; + font-size: 70%; +} + +div.dokuwiki div.meta div.user { + float: left; +} + +div.dokuwiki div.meta div.doc { + text-align: right; +} diff --git a/lib/tpl/docs/main.php b/lib/tpl/docs/main.php new file mode 100644 index 0000000..ae07515 --- /dev/null +++ b/lib/tpl/docs/main.php @@ -0,0 +1,170 @@ +<?php +/** + * DokuWiki Default Template + * + * 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 <a...@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="<?php echo $lang['direction']?>"> +<head> + <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() ?>" /> + + <script type="text/javascript"> + function slide(h) { + if (typeof (window.pageYOffset) == 'number') + o = window.pageYOffset; + else if (document.body && document.body.scrollTop) + o = document.body.scrollTop; + else if (document.documentElement + && document.documentElement.scrollTop) + o = document.documentElement.scrollTop; + else + o = 0; + + var min_offset = h.clientHeight - 5; + if (o > min_offset) + o = min_offset; + + h.className = ''; + h.style.top = -o + "px"; + + return o; + } + window.onload = function (e) { + var h = document.getElementById('xfce-header'); + var o = slide (h); + + h.style.position = 'fixed'; + document.getElementById('xfce-header-spacer').style.height = h.clientHeight + 'px'; + + window.onscroll = function (e) { + o = slide (h); + } + h.onmouseover = function (e) { + h.style.top = '0px'; + h.className = 'slide'; + } + h.onmouseout = function (e) { + h.style.top = -o + 'px'; + } + } + </script> +</head> + +<body> +<div id="xfce-header"> +<div> + <h1>Xfce Desktop Enviroment</h1> + <h4>Xfce subdomain navigation</h4> + + <ul> + <li><a href="http://www.xfce.org" title="Go to the homepage">Home</a></li> + <li><a href="http://docs.xfce.org" title="Official documentation" class="active">Docs</a></li> + <li><a href="http://archive.xfce.org" title="Download location of tarballs">Archive</a></li> + <li><a href="http://wiki.xfce.org" title="Community documentation">Wiki</a></li> + <li><a href="http://forum.xfce.org" title="Community forums">Forum</a></li> + <li><a href="https://bugzilla.xfce.org" title="Report and track bugs">Bugs</a></li> + <li><a href="http://blog.xfce.org" title="Visit the blog">Blog</a></li> + <li><a href="https://translations.xfce.org" title="Help translating the Xfce project">Translate</a></li> + <li><a href="http://git.xfce.org" title="Project repositories">GIT</a></li> + </ul> + </div> + <div id="xfce-header-clear"></div> +</div> +<div id="xfce-header-spacer"></div> + +<div class="dokuwiki" id="dokuwiki"> + <?php html_msgarea()?> + <div class="header"> + <div class="breadcrumbs"> + <?php tpl_youarehere() ?> + </div> + <div class="translation"> + <?php $translation = &plugin_load('helper','translation'); ?> + <?php if ($translation != NULL) { ?> + <?php echo $translation->showTranslations(); ?> + <?php } ?> + </div> + <div class="search"> + <?php tpl_searchform()?> + </div> + <div class="clearer"></div> + </div> + + <?php tpl_flush()?> + + <div class="page"> + <!-- wikipage start --> + <?php tpl_content()?> + <!-- wikipage stop --> + <div class="clearer"></div> + <div class="doc"> + <?php tpl_pageinfo()?> + </div> + </div> + + <div class="clearer"></div> + + <div class="bar" id="bar__bottom"> + <div class="bar-left" id="bar__bottomleft"> + <?php tpl_button('edit')?> + <?php tpl_button('history')?> + <?php tpl_button('revert')?> + </div> + <div class="bar-right" id="bar__bottomright"> + <?php tpl_button('subscribe')?> + <?php tpl_button('admin')?> + <?php tpl_button('profile')?> + <?php tpl_button('login')?> + <?php tpl_button('index')?> + <?php tpl_button('top')?> + </div> + <div class="clearer"></div> + </div> + + + + <?php tpl_flush()?> + + + + + <div class="stylefoot"> + + <div class="meta"> + <div class="user"> + <?php tpl_userinfo()?> + </div> + + </div> + + + </div> + <?php tpl_license(false);?> +</div> + +<div class="no"><?php /* provide DokuWiki housekeeping, required in all templates */ tpl_indexerWebBug()?></div> +</body> +</html> diff --git a/lib/tpl/xfce/media.css b/lib/tpl/docs/media.css similarity index 97% copy from lib/tpl/xfce/media.css copy to lib/tpl/docs/media.css index 844b481..d412fd9 100644 --- a/lib/tpl/xfce/media.css +++ b/lib/tpl/docs/media.css @@ -1,12 +1,10 @@ /** - * The CSS in here cotrols the appearance of the media manager + * The CSS in here controls the appearance of the media manager */ #media__manager { height: 100%; overflow: hidden; - margin: 0; - padding: 0; } #media__left { diff --git a/lib/tpl/xfce/mediamanager.php b/lib/tpl/docs/mediamanager.php similarity index 66% copy from lib/tpl/xfce/mediamanager.php copy to lib/tpl/docs/mediamanager.php index 2dd8933..7b7fe86 100644 --- a/lib/tpl/xfce/mediamanager.php +++ b/lib/tpl/docs/mediamanager.php @@ -2,27 +2,32 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <?php /** - * Xfce Wiki Template + * DokuWiki Default Template * - * This template is based on top of the default DokuWiki template. + * This is the template for the media manager popup * - * @author Mike Massonnet <a...@splitbrain.org> + * 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 <a...@splitbrain.org> */ ?> <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" /> - <title><?php echo strip_tags($conf['title'])?> - <?php echo hsc($lang['mediaselect'])?></title> + <title> + <?php echo hsc($lang['mediaselect'])?> + [<?php echo strip_tags($conf['title'])?>] + </title> <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.png" /> + <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> </head> <body> - -<div class="msgarea"><?php html_msgarea()?></div> - <div id="media__manager" class="dokuwiki"> <div id="media__left"> + <?php html_msgarea()?> <h1><?php echo hsc($lang['mediaselect'])?></h1> <?php /* keep the id! additional elements are inserted via JS here */?> diff --git a/lib/tpl/xfce/print.css b/lib/tpl/docs/print.css similarity index 93% copy from lib/tpl/xfce/print.css copy to lib/tpl/docs/print.css index 60c1725..45b60aa 100644 --- a/lib/tpl/xfce/print.css +++ b/lib/tpl/docs/print.css @@ -33,16 +33,11 @@ div.meta { text-align: right; } - -div.notify, -div.info, -div.success, -div.error, -div.breadcrumbs, -div.secedit { +div.breadcrumbs { display: none; } + /* --------------------- Text formating -------------------------------- */ /* external link */ @@ -102,17 +97,16 @@ img.media { margin: 3px; } +/* the styles for media images are already in + lib/styles/all.css, these are additional styles */ img.medialeft { - border: 0; - float: left; margin: 0 1.5em 0 0; } - img.mediaright { - border: 0; - float: right; margin: 0 0 0 1.5em; } +img.mediacenter { +} /* unordered lists */ ul { @@ -230,17 +224,5 @@ table.inline td { border: 1px solid #000000; } -.leftalign { - text-align: left; -} - -.centeralign { - text-align: center; -} - -.rightalign { - text-align: right; -} - .toc, .footerinc, .header, .bar, .user { display: none; } diff --git a/lib/tpl/xfce/rtl.css b/lib/tpl/docs/rtl.css similarity index 92% copy from lib/tpl/xfce/rtl.css copy to lib/tpl/docs/rtl.css index 6c2d1fb..82c8583 100644 --- a/lib/tpl/xfce/rtl.css +++ b/lib/tpl/docs/rtl.css @@ -1,5 +1,5 @@ /** - * Layout and dedsign corrections for right-to-left languages + * Layout and design corrections for right-to-left languages * * @author Andreas Gohr <a...@splitbrain.org> * @author Dotan Kamber <kamb...@yahoo.com> @@ -55,8 +55,7 @@ div.dokuwiki li ol { div.dokuwiki a.urlextern, div.dokuwiki a.interwiki, div.dokuwiki a.windows, -div.dokuwiki a.mail, -div.dokuwiki a.mail.JSnocheck { +div.dokuwiki a.mail { /* should work but doesn't - so we just disable icons here*/ /* background-position: right 1px; @@ -145,3 +144,11 @@ div.dokuwiki blockquote { text-align: right; } +/* Search corrections */ +div.dokuwiki ul.search_quickhits li { + float: right; +} + +div#qsearch__out { + text-align: right; +} diff --git a/lib/tpl/xfce/style.ini b/lib/tpl/docs/style.ini similarity index 63% copy from lib/tpl/xfce/style.ini copy to lib/tpl/docs/style.ini index 00e6621..ea55d9f 100644 --- a/lib/tpl/xfce/style.ini +++ b/lib/tpl/docs/style.ini @@ -6,19 +6,19 @@ ; print, screen and rtl are supported. rtl styles are loaded additionally ; to screen styles if a right-to-left language is selected (eg. hebrew) [stylesheets] -layout.css = screen +;layout.css = screen design.css = screen -style.css = screen +;style.css = screen -media.css = screen +;media.css = screen _mediaoptions.css = screen _admin.css = screen -_linkwiz.css = screen -_subscription.css = screen +;_linkwiz.css = screen +;_subscription.css = screen _xfceheader.css = screen -rtl.css = rtl -print.css = print +;rtl.css = rtl +;print.css = print ; This section is used to configure some placeholder values used in ; the stylesheets. Changing this file is the simplest method to @@ -29,15 +29,15 @@ print.css = print ;------ guaranteed dokuwiki color placeholders that every plugin can use ; main text and background colors __text__ = "#000" -__background__ = "#fff" +__background__ = "#eee" +__background_c__ = "#fff" ; alternative text and background colors -__text_alt__ = "#666" -__background_alt__ = "#eee" +__text_alt__ = "#638c9c" +__background_alt__ = "#dee7ec" ; neutral text and background colors -__text_neu__ = "#666" +__text_neu__ = "#3f3f3f" __background_neu__ = "#f5f5f5" ; border color -;__border__ = "#e0e0e0" __border__ = "#ccc" ;-------------------------------------------------------------------------- @@ -46,7 +46,6 @@ __text_other__ = "#ccc" __background_other__ = "#f7f9fa" ; these are used for links -__meta__ = "#505050" __extern__ = "#0C6AD4" __existing__ = "#0C6AD4" __missing__ = "#f30" @@ -55,6 +54,19 @@ __hover__ = "#f00" ; highlighting search snippets __highlight__ = "#ff9" -; colors for bar -__text_bar__ = "#666" -__background_bar__ = "#e9e9e9" + +;-------------------------------------------------------------------------- +;------ for keeping old templates and plugins compatible to the old pattern +; (to be deleted at the next or after next release) +__white__ = "#fff" +__lightgray__ = "#f5f5f5" +__mediumgray__ = "#ccc" +__darkgray__ = "#666" +__black__ = "#000" + +; these are the shades of blue +__lighter__ = "#f7f9fa" +__light__ = "#eef3f8" +__medium__ = "#dee7ec" +__dark__ = "#8cacbb" +__darker__ = "#638c9c" diff --git a/lib/tpl/xfce/xfce-header.html b/lib/tpl/docs/topheader.html similarity index 83% copy from lib/tpl/xfce/xfce-header.html copy to lib/tpl/docs/topheader.html index 215fccb..6895782 100644 --- a/lib/tpl/xfce/xfce-header.html +++ b/lib/tpl/docs/topheader.html @@ -1,17 +1,18 @@ <div id="xfce-header"> <div> - <h1 id="xfce-header-title">Xfce Wiki</h1> - <h5 id="xfce-header-subtitle">Sub domains</h5> - - <ul> - <li><a href="http://www.xfce.org" title="Go to the homepage">Home</a></li> + <h1>Xfce Desktop Enviroment</h1> + <h4>Xfce subdomain navigation</h4> + <ul> + <li><a href="http://www.xfce.org" title="Go to the homepage" class="active">Home</a></li> <li><a href="http://docs.xfce.org" title="Official documentation">Docs</a></li> + <li><a href="http://archive.xfce.org" title="Download location of tarballs">Archive</a></li> - <li><a href="http://wiki.xfce.org" title="Community documentation" class="active">Wiki</a></li> + <li><a href="http://wiki.xfce.org" title="Community documentation">Wiki</a></li> <li><a href="http://forum.xfce.org" title="Community forums">Forum</a></li> <li><a href="https://bugzilla.xfce.org" title="Report and track bugs">Bugs</a></li> <li><a href="http://blog.xfce.org" title="Visit the blog">Blog</a></li> <li><a href="https://translations.xfce.org" title="Help translating the Xfce project">Translate</a></li> + <li><a href="http://git.xfce.org" title="Project repositories">GIT</a></li> </ul> </div> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits