From 557c665527de33680cac0b4f8d3af7952d51cec5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 6 Aug 2013 10:36:50 +0100 Subject: changed style of `` slightly to help tell it apart from `` For Ingo from the LinuxHotel --- lib/tpl/dokuwiki/css/content.less | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less index 56551fe3b..a5ffbf2be 100644 --- a/lib/tpl/dokuwiki/css/content.less +++ b/lib/tpl/dokuwiki/css/content.less @@ -113,10 +113,6 @@ text-decoration: underline; } -/* for code in */ -.dokuwiki pre.file { -} - /* filenames for downloadable file and code blocks */ .dokuwiki dl.code, .dokuwiki dl.file { @@ -163,6 +159,17 @@ } } +/* for code in */ +.dokuwiki dl.file { + pre, + dt { + border-style: dashed; + } + dt { + border-bottom-style: solid; + } +} + /*____________ JS popup ____________*/ .JSpopup { -- cgit v1.2.3 From b8e3002b530a50a44dab17129c5e750749a4de62 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Aug 2013 21:35:34 +0100 Subject: removed unintentionally added sidebar classes from detail.php --- lib/tpl/dokuwiki/detail.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 7e46231d3..9c04ba8e7 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -28,8 +28,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); -
+
-- cgit v1.2.3 From 90562fe4194ca0d5d1a5a7ca0fc0728ecd44c843 Mon Sep 17 00:00:00 2001 From: flammy Date: Wed, 14 Aug 2013 13:45:36 +0200 Subject: add pointer curser to mediafile Added the pointer icon to the media manager pop-up to show users it is clickable. --- lib/tpl/dokuwiki/css/_media_popup.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css index 1fefd68b6..20d669c14 100644 --- a/lib/tpl/dokuwiki/css/_media_popup.css +++ b/lib/tpl/dokuwiki/css/_media_popup.css @@ -154,6 +154,7 @@ html.popup { #media__content a.mediafile { margin-right: 1.5em; font-weight: bold; + cursor: pointer; } [dir=rtl] #media__content a.mediafile { margin-right: 0; -- cgit v1.2.3 From 089c81d581a43ab1cdf04ea3e7b22ce76e47ad48 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Fri, 23 Aug 2013 02:48:25 -0700 Subject: Fix CodeSniffer violations for PHP files Fix violations for Zend.Files.ClosingTag.NotAllowed --- lib/tpl/dokuwiki/tpl_footer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index b7dc9c631..00417de9c 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -29,4 +29,5 @@ if (!defined('DOKU_INC')) die();
- + Date: Sun, 1 Sep 2013 20:24:53 +0100 Subject: Removed old default template The old 'default' template was deprecated with the release of the new 'dokuwiki' template (2012-10-13). It is still available in a separate repository here: https://github.com/dokufreaks/template-default But no-one in the core development team intends to maintain this template anymore. So, anyone willing to adopt it is welcome to clone it and make it your own. --- lib/tpl/default/_admin.css | 48 -- lib/tpl/default/_fileuploader.css | 111 ---- lib/tpl/default/_linkwiz.css | 40 -- lib/tpl/default/_mediamanager.css | 475 --------------- lib/tpl/default/_mediaoptions.css | 18 - lib/tpl/default/_subscription.css | 21 - lib/tpl/default/_tabs.css | 50 -- lib/tpl/default/design.css | 863 ---------------------------- lib/tpl/default/detail.php | 86 --- lib/tpl/default/footer.html | 41 -- lib/tpl/default/images/UWEB.png | Bin 462 -> 0 bytes lib/tpl/default/images/UWEBshadow.png | Bin 900 -> 0 bytes lib/tpl/default/images/apple-touch-icon.png | Bin 17728 -> 0 bytes lib/tpl/default/images/bullet.gif | Bin 50 -> 0 bytes lib/tpl/default/images/button-cc.gif | Bin 359 -> 0 bytes lib/tpl/default/images/button-css.png | Bin 299 -> 0 bytes lib/tpl/default/images/button-donate.gif | Bin 187 -> 0 bytes lib/tpl/default/images/button-dw.png | Bin 404 -> 0 bytes lib/tpl/default/images/button-php.gif | Bin 207 -> 0 bytes lib/tpl/default/images/button-rss.png | Bin 191 -> 0 bytes lib/tpl/default/images/button-xhtml.png | Bin 321 -> 0 bytes lib/tpl/default/images/buttonshadow.png | Bin 218 -> 0 bytes lib/tpl/default/images/closed.gif | Bin 54 -> 0 bytes lib/tpl/default/images/favicon.ico | Bin 7406 -> 0 bytes lib/tpl/default/images/inputshadow.png | Bin 93 -> 0 bytes lib/tpl/default/images/link_icon.gif | Bin 168 -> 0 bytes lib/tpl/default/images/mail_icon.gif | Bin 151 -> 0 bytes lib/tpl/default/images/open.gif | Bin 54 -> 0 bytes lib/tpl/default/images/resizecol.png | Bin 225 -> 0 bytes lib/tpl/default/images/tocdot2.gif | Bin 50 -> 0 bytes lib/tpl/default/images/windows.gif | Bin 170 -> 0 bytes lib/tpl/default/layout.css | 79 --- lib/tpl/default/main.php | 135 ----- lib/tpl/default/media.css | 224 -------- lib/tpl/default/mediamanager.php | 45 -- lib/tpl/default/print.css | 228 -------- lib/tpl/default/rtl.css | 162 ------ lib/tpl/default/style.ini | 77 --- lib/tpl/default/template.info.txt | 7 - 39 files changed, 2710 deletions(-) delete mode 100644 lib/tpl/default/_admin.css delete mode 100644 lib/tpl/default/_fileuploader.css delete mode 100644 lib/tpl/default/_linkwiz.css delete mode 100644 lib/tpl/default/_mediamanager.css delete mode 100644 lib/tpl/default/_mediaoptions.css delete mode 100644 lib/tpl/default/_subscription.css delete mode 100644 lib/tpl/default/_tabs.css delete mode 100644 lib/tpl/default/design.css delete mode 100644 lib/tpl/default/detail.php delete mode 100644 lib/tpl/default/footer.html delete mode 100644 lib/tpl/default/images/UWEB.png delete mode 100644 lib/tpl/default/images/UWEBshadow.png delete mode 100644 lib/tpl/default/images/apple-touch-icon.png delete mode 100644 lib/tpl/default/images/bullet.gif delete mode 100644 lib/tpl/default/images/button-cc.gif delete mode 100644 lib/tpl/default/images/button-css.png delete mode 100644 lib/tpl/default/images/button-donate.gif delete mode 100644 lib/tpl/default/images/button-dw.png delete mode 100644 lib/tpl/default/images/button-php.gif delete mode 100644 lib/tpl/default/images/button-rss.png delete mode 100644 lib/tpl/default/images/button-xhtml.png delete mode 100644 lib/tpl/default/images/buttonshadow.png delete mode 100644 lib/tpl/default/images/closed.gif delete mode 100644 lib/tpl/default/images/favicon.ico delete mode 100644 lib/tpl/default/images/inputshadow.png delete mode 100644 lib/tpl/default/images/link_icon.gif delete mode 100644 lib/tpl/default/images/mail_icon.gif delete mode 100644 lib/tpl/default/images/open.gif delete mode 100644 lib/tpl/default/images/resizecol.png delete mode 100644 lib/tpl/default/images/tocdot2.gif delete mode 100644 lib/tpl/default/images/windows.gif delete mode 100644 lib/tpl/default/layout.css delete mode 100644 lib/tpl/default/main.php delete mode 100644 lib/tpl/default/media.css delete mode 100644 lib/tpl/default/mediamanager.php delete mode 100644 lib/tpl/default/print.css delete mode 100644 lib/tpl/default/rtl.css delete mode 100644 lib/tpl/default/style.ini delete mode 100644 lib/tpl/default/template.info.txt (limited to 'lib/tpl') diff --git a/lib/tpl/default/_admin.css b/lib/tpl/default/_admin.css deleted file mode 100644 index 6c8066ba6..000000000 --- a/lib/tpl/default/_admin.css +++ /dev/null @@ -1,48 +0,0 @@ -#admin__version { - clear:left; - float: right; - color: __text_neu__; -} - -.dokuwiki ul.admin_tasks { - font-size: 115%; - float: left; - width: 40%; - list-style-type: none; -} - -.dokuwiki ul.admin_tasks li { - line-height: 22px; - padding-left: 35px; - margin: 1em 0; - background: transparent none no-repeat scroll 0 0; - text-align: left; -} - -.dokuwiki ul.admin_tasks li div.li { - font-weight: bold; -} - -.dokuwiki ul.admin_tasks li.admin_acl { - background-image: url(../../images/admin/acl.png); -} - -.dokuwiki ul.admin_tasks li.admin_usermanager { - background-image: url(../../images/admin/usermanager.png); -} - -.dokuwiki ul.admin_tasks li.admin_plugin { - background-image: url(../../images/admin/plugin.png); -} - -.dokuwiki ul.admin_tasks li.admin_config { - background-image: url(../../images/admin/config.png); -} - -.dokuwiki ul.admin_tasks li.admin_revert { - background-image: url(../../images/admin/revert.png); -} - -.dokuwiki ul.admin_tasks li.admin_popularity { - background-image: url(../../images/admin/popularity.png); -} diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css deleted file mode 100644 index d06bfd519..000000000 --- a/lib/tpl/default/_fileuploader.css +++ /dev/null @@ -1,111 +0,0 @@ - -.qq-uploader { - position: relative; - width: 100%; -} - -.qq-uploader .error { - color: #f00; - background-color: #fff; -} - -/* select file button */ - -.qq-upload-button { - display: inline-block; - border: 1px solid __border__; - color: __text__; - background: __background__ url(images/buttonshadow.png) repeat-x bottom; - text-decoration: none; - font-size: 100%; - cursor: pointer; - margin: 1px 1px 5px; - padding: 0.125em 0.4em; -} - -* html .qq-upload-button, -*+html .qq-upload-button { - display: inline; -} - -.qq-upload-button-focus { - outline: 1px dotted; -} - -/* drop area */ - -.qq-upload-drop-area { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - min-height: 70px; - z-index: 2; - background: __background_neu__; - color: __text__; - text-align: center; -} - -.qq-upload-drop-area span { - display: block; - position: absolute; - top: 50%; - width: 100%; - margin-top: -8px; - font-size: 120%; -} - -.qq-upload-drop-area-active { - background: __background_alt__; -} - -/* list of files to upload */ - -div.qq-uploader ul { - margin: 0; - list-style: none; -} - -.qq-uploader li { - margin-bottom: 5px; - color: __text__; -} - -.qq-uploader li span, -.qq-uploader li input, -.qq-uploader li a { - margin-right: 5px; -} - -.qq-upload-file { - display: block; - font-weight: bold; -} - -.qq-upload-spinner { - display: inline-block; - background: url("../../images/throbber.gif"); - width: 15px; - height: 15px; - vertical-align: text-bottom; -} - -.qq-upload-size, -.qq-upload-cancel { - font-size: 85%; -} - -.qq-upload-failed-text { - display: none; -} -.qq-upload-fail .qq-upload-failed-text { - display: inline; -} - -.qq-action-container * { - vertical-align: middle; -} -.qq-overwrite-check input { - margin-left: 10px; -} diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css deleted file mode 100644 index ca8812867..000000000 --- a/lib/tpl/default/_linkwiz.css +++ /dev/null @@ -1,40 +0,0 @@ -#link__wiz { -} - -#link__wiz_result { - background-color: __background__; - width: 293px; - height: 193px; - overflow: auto; - border: 1px solid __border__; - margin: 3px auto; - text-align: left; -} - -#link__wiz_result div.type_u { - padding: 3px 3px 3px 22px; - background: transparent url(../../images/up.png) 3px 3px no-repeat; -} - -#link__wiz_result div.type_f { - padding: 3px 3px 3px 22px; - background: transparent url(../../images/page.png) 3px 3px no-repeat; -} - -#link__wiz_result div.type_d { - padding: 3px 3px 3px 22px; - background: transparent url(../../images/ns.png) 3px 3px no-repeat; -} - -#link__wiz_result div.even { - background-color: __background_neu__; -} - -#link__wiz_result div.selected { - background-color: __background_alt__; -} - -#link__wiz_result span { - display: block; - color: __text_neu__; -} diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css deleted file mode 100644 index 2ce345e40..000000000 --- a/lib/tpl/default/_mediamanager.css +++ /dev/null @@ -1,475 +0,0 @@ - -/*____________ Layout ____________*/ - -#mediamanager__page h1 { - margin: 0 0 .5em; -} - -#mediamanager__page { - min-width: 800px; - width: 100%; - text-align: left; -} - -#mediamanager__page .panel { - float: left; -} - -#mediamanager__page .namespaces { - width: 15%; - min-width: 120px; -} -#mediamanager__page .filelist { - width: 50%; - min-width: 400px; -} -#mediamanager__page .file { - width: 35%; - min-width: 280px; -} - -#mediamanager__page .panelHeader { - background-color: __background_alt__; - margin: 0 10px 10px 0; - padding: 10px 10px 8px; - text-align: left; - min-height: 20px; - overflow: hidden; -} -[dir=rtl] #mediamanager__page .panelContent { - text-align: right; -} - - -#mediamanager__page .panelContent { - overflow-y: auto; - overflow-x: hidden; - padding: 0; - margin: 0 10px 10px 0; - position: relative; -} - -#mediamanager__page .file .panelHeader, -#mediamanager__page .file .panelContent { - margin-right: 0; -} - -#mediamanager__page .ui-resizable-e { - width: 6px; - right: 2px; - background: transparent url(images/resizecol.png) center center no-repeat; -} -#mediamanager__page .ui-resizable-e:hover { - background-color: __background_alt__; -} - - -/*____________ Namespaces tree ____________*/ - -[dir=rtl] #mediamanager__page .namespaces { - text-align: right; -} - -#mediamanager__page .namespaces h2 { - font-size: 1em; - display: inline-block; - border-width: 0; - padding: .3em .8em; - margin: 0 .3em 0 0; - border-radius: .5em .5em 0 0; - font-weight: normal; - background-color: __background_alt__; - color: __text__; - line-height: 1.5em; -} -* html #mediamanager__page .namespaces h2, -*+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__; - font-weight: bold; -} - -/*____________ Panel header ____________*/ - -#mediamanager__page .panelHeader h3 { - float: left; - font-weight: normal; - font-size: 1em; - padding: 0; - margin: 0 0 3px; -} - -#mediamanager__page .panelHeader form.options { - float: right; - margin-top: -3px; -} - -#mediamanager__page .panelHeader ul { - list-style: none; - margin: 0; - padding: 0; -} -#mediamanager__page .panelHeader ul li { - color: __text__; - float: left; - line-height: 1; - padding-left: 3px; -} - -#mediamanager__page .panelHeader ul li.listType { - padding-left: 30px; - background: url('../../images/icon-list.png') 3px 1px no-repeat; -} -#mediamanager__page .panelHeader ul li.sortBy { - padding-left: 30px; - background: url('../../images/icon-sort.png') 3px 1px no-repeat; -} - -#mediamanager__page .panelHeader form.options .ui-buttonset label{ - font-size: 90%; - margin-right: -0.4em; -} -#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { - padding: .4em .7em; - line-height: 1; -} - -/*____________ File list ____________*/ - -#mediamanager__page .filelist ul { - 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__; -} - -#mediamanager__page .filelist li dt a { - vertical-align: middle; - display: table-cell; - overflow: hidden; -} -* html #mediamanager__page .filelist .thumbs li dt a, -*+html #mediamanager__page .filelist .thumbs li dt a { - display: block; -} -* html #mediamanager__page .filelist .rows li dt a, -*+html #mediamanager__page .filelist .rows li dt a { - display: inline; -} - -/* thumbs */ - -#mediamanager__page .filelist .thumbs li { - width: 100px; - min-height: 130px; - display: inline-block; - display: -moz-inline-stack; - /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */ - margin: 0 6px 10px 0; - background-color: __background_neu__; - color: __text__; - padding: 5px; - vertical-align: top; - text-align: center; - 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; - zoom: 1; -} - -#mediamanager__page .filelist .thumbs li dt a { - width: 100px; - height: 90px; -} - -#mediamanager__page .filelist .thumbs li dt a img { - max-width: 90px; - max-height: 90px; -} - -#mediamanager__page .filelist .thumbs li .name, -#mediamanager__page .filelist .thumbs li .size, -#mediamanager__page .filelist .thumbs li .filesize, -#mediamanager__page .filelist .thumbs li .date { - display: block; - overflow: hidden; - text-overflow: ellipsis; - width: 90px; - white-space: nowrap; -} -#mediamanager__page .filelist .thumbs li .name { - padding: 5px 0; - font-weight: bold; -} -#mediamanager__page .filelist .thumbs li .date { - font-style: italic; - white-space: normal; -} - -/* rows */ - -#mediamanager__page .filelist .rows li { - list-style: none; - display: block; - position: relative; - max-height: 50px; - margin: 0; - margin-bottom: 3px; - background-color: __background__; - color: __text__; - overflow: hidden; -} - -#mediamanager__page .filelist .rows li:nth-child(2n+1) { - background-color: __background_neu__; -} - -#mediamanager__page .filelist .rows li dt { - float: left; - width: 10%; - height: 40px; - text-align: center; -} - -#mediamanager__page .filelist .rows li dt a { - width: 100px; - height: 40px; -} - -#mediamanager__page .filelist .rows li dt a img { - max-width: 40px; - max-height: 40px; -} - -#mediamanager__page .filelist .rows li .name, -#mediamanager__page .filelist .rows li .size, -#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; -} - -#mediamanager__page .filelist .rows li .name { - width: 30%; - font-weight: bold; -} -#mediamanager__page .filelist .rows li .size, -#mediamanager__page .filelist .rows li .filesize { - width: 15%; -} -#mediamanager__page .filelist .rows li .date { - width: 20%; - font-style: italic; - white-space: normal; -} - -/*____________ Upload panel ____________*/ - -#mediamanager__page div.upload { - padding-bottom: 0.5em; -} - -#media__content #mediamanager__uploader { - border-bottom: 1px solid __border__; - padding-bottom: 0.5em; -} - -/*____________ File preview ____________*/ - -#mediamanager__page .file ul.actions { - text-align: center; - margin: 0 0 5px; - list-style: none; -} -#mediamanager__page .file ul.actions li { - display: inline; -} - -#mediamanager__page .file div.image { - margin-bottom: 5px; - text-align: center; -} - -#mediamanager__page .file div.image img { - width: 100%; -} - -#mediamanager__page .file dl { -} -#mediamanager__page .file dl dt { - font-weight: bold; - display: block; - background-color: __background_alt__; -} -#mediamanager__page .file dl dd { - display: block; - background-color: __background_neu__; -} - - -/*____________ Meta data edit form ____________*/ - -#mediamanager__page form.meta div.row { - margin-bottom: 5px; -} - -#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%; -} - -#mediamanager__page form.meta input.button { - width: auto; -} - -#mediamanager__page form.meta textarea.edit { - height: 6em; - width: 95%; - min-width: 95%; - max-width: 95%; -} - -/*____________ Revisions form ____________*/ - -#mediamanager__page form.changes ul { - margin-left: 10px; - list-style-type: none; -} - -#mediamanager__page form.changes ul li div.li div { - font-size: 90%; - color: __text_neu__; - padding-left: 18px; -} - -#mediamanager__page form.changes ul li div.li input { - position: relative; - top: 1px; -} - -/* File diff */ - -#mediamanager__diff table { - table-layout: fixed; -} - -#mediamanager__diff td, -#mediamanager__diff th { - width: 48%; - margin: 0 5px 10px 0; - padding: 0; - 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; -} -#mediamanager__diff th a { - font-weight: bold; -} -#mediamanager__diff th span { - font-size: 90%; -} - -#mediamanager__diff dl dd strong{ - background-color: __highlight__; - color: __text__; - font-weight: normal; -} - -/* Image diff */ - -#mediamanager__page .file form.diffView { - margin-bottom: 10px; - display: block; -} - -#mediamanager__diff div.slider { - margin: 10px; - width: 95%; -} - -#mediamanager__diff .imageDiff { - position: relative; -} -#mediamanager__diff .imageDiff .image2 { - position: absolute; - top: 0; - left: 0; -} - -#mediamanager__diff .imageDiff.opacity .image2 { - -moz-opacity: 0.5; - -khtml-opacity: 0.5; - opacity: 0.5; -} - -#mediamanager__diff .imageDiff.portions .image2 { - border-right: 1px solid red; - overflow: hidden; -} - -#mediamanager__diff .imageDiff.portions img { - float: left; -} - -#mediamanager__diff .imageDiff img { - width: 100%; - max-width: none; -} - diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css deleted file mode 100644 index 81e87aa8e..000000000 --- a/lib/tpl/default/_mediaoptions.css +++ /dev/null @@ -1,18 +0,0 @@ - -#media__popup_content p { - margin: 0 0 .5em; -} - -#media__popup_content label { - float: left; - width: 9em; -} - -#media__popup_content .button { - margin-right: 1px; - cursor: pointer; -} - -#media__popup_content input.button { - margin-left: 9em; -} diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css deleted file mode 100644 index 0792c8c21..000000000 --- a/lib/tpl/default/_subscription.css +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Styles for the subscription page - */ - -form#subscribe__form { - display: block; - width: 300px; - text-align: center; -} - -form#subscribe__form fieldset { - text-align: left; - margin: 0.5em 0; -} - -form#subscribe__form label { - display:block; - margin: 0 0.5em 0.5em; -} - - diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css deleted file mode 100644 index a39b43441..000000000 --- a/lib/tpl/default/_tabs.css +++ /dev/null @@ -1,50 +0,0 @@ - -.dokuwiki ul.tabs { - padding: 0; - margin: 0; - overflow: hidden; -} -.dokuwiki ul.tabs li { - float: left; - padding: 0; - margin: 0; - list-style: none; -} -[dir=rtl] .dokuwiki ul.tabs li { - float: right; -} - -.dokuwiki ul.tabs li strong, -.dokuwiki ul.tabs li a { - float: left; - padding: .3em .8em; - margin: 0 .3em 0 0; - background-color: __background_neu__; - 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; -} - -.dokuwiki ul.tabs li a:link, -.dokuwiki ul.tabs li a:visited { -} -.dokuwiki ul.tabs li a:hover, -.dokuwiki ul.tabs li a:active, -.dokuwiki ul.tabs li a:focus, -.dokuwiki ul.tabs li strong { - background-color: __background_alt__; - color: __text__; - text-decoration: none; -} diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css deleted file mode 100644 index 4772fd2a5..000000000 --- a/lib/tpl/default/design.css +++ /dev/null @@ -1,863 +0,0 @@ -/** - * Design elements for default Template - * - * @author Andreas Gohr - * @author Anika Henke - */ - -/* -------------- general elements --------------- */ - -* { padding: 0; margin: 0; } - -body { - font: 80% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; - background-color: __background__; - color: __text__; -} - -/* the document */ -div.dokuwiki div.page { - margin: 4px 2em 0 1em; - text-align: justify; -} - -div.dokuwiki table { - font-size: 100%; -} - -div.dokuwiki tr, -div.dokuwiki td, -div.dokuwiki th { -} - -div.dokuwiki img { - border: 0; -} - -div.dokuwiki p, -div.dokuwiki blockquote, -div.dokuwiki table, -div.dokuwiki pre { - margin: 0 0 1.0em 0; -} - -div.dokuwiki hr { - border: 0px; - border-top: 1px solid __border__; - text-align: center; - height: 0px; -} - -div.dokuwiki div.nothing { - text-align: center; - margin: 2em; -} - -/* ---------------- forms ------------------------ */ - -div.dokuwiki form { - border: none; - display: inline; -} - -div.dokuwiki label.block { - display: block; - text-align: right; - font-weight: bold; -} - -div.dokuwiki label.simple { - display: block; - text-align: left; - font-weight: normal; -} - -div.dokuwiki label.block input.edit { - width: 50%; -} - -div.dokuwiki fieldset { - width: 300px; - text-align: center; - border: 1px solid __border__; - padding: 0.5em; - margin: auto; -} - -div.dokuwiki textarea.edit { - 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__; - padding: 0.3em 0 0 0.3em; - /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ - width: 700px; - min-width: 100%; - max-width: 100%; -} - -/* nice alphatransparency background except for IE <7 */ -html>body div.dokuwiki textarea.edit { - background: __background__ url(images/inputshadow.png) repeat-x top; -} - -div.dokuwiki input.edit, -div.dokuwiki select.edit { - font-size: 100%; - border: 1px solid __border__; - color: __text__; - background-color: __background__; - vertical-align: middle; - margin: 1px; - padding: 0.20em 0.3em; - display: inline; -} - -/* nice alphatransparency background except for IE <7 */ -html>body div.dokuwiki input.edit, -html>body div.dokuwiki select.edit { - background: __background__ url(images/inputshadow.png) repeat-x top; -} - -div.dokuwiki select.edit { - padding: 0.1em 0; -} - -div.dokuwiki input.missing { - font-size: 100%; - border: 1px solid __border__; - color: __text__; - background-color: #ffcccc; - vertical-align: middle; - margin: 1px; - padding: 0.20em 0.3em; - display: inline; -} - -/* disabled style - not understood by IE */ -div.dokuwiki textarea.edit[disabled], -div.dokuwiki textarea.edit[readonly], -div.dokuwiki input.edit[disabled], -div.dokuwiki input.edit[readonly], -div.dokuwiki input.button[disabled], -div.dokuwiki select.edit[disabled] { - background-color: __background_neu__!important; - color: __text_neu__!important; -} - -/* edit form */ -div.dokuwiki div.toolbar, -div.dokuwiki div#wiki__editbar { - margin: 2px 0; - text-align: left; -} -div.dokuwiki div#size__ctl { - float: right; - width: 60px; - height: 2.7em; -} -div.dokuwiki #size__ctl img { - cursor: pointer; -} -div.dokuwiki div#wiki__editbar div.editButtons { - float: left; - padding: 0 1.0em 0.7em 0; -} -div.dokuwiki div#wiki__editbar div.summary { - float: left; -} -div.dokuwiki .nowrap { - white-space: nowrap; -} -div.dokuwiki div#draft__status { - float: right; - color: __text_alt__; -} - -div.dokuwiki div.license { - padding: 0.5em; - font-size: 90%; - text-align: center; -} - -div.dokuwiki form#dw__editform div.license { - clear: left; - font-size: 90%; -} - -/* --------- buttons ------------------- */ - -div.dokuwiki input.button, -div.dokuwiki button.button { - border: 1px solid __border__; - color: __text__; - background-color: __background__; - vertical-align: middle; - text-decoration: none; - font-size: 100%; - cursor: pointer; - margin: 1px; - padding: 0.125em 0.4em; -} - -/* nice alphatransparency background except for IE <7 */ -html>body div.dokuwiki input.button, -html>body div.dokuwiki button.button { - background: __background__ url(images/buttonshadow.png) repeat-x bottom; -} - -* html div.dokuwiki input.button, -* html div.dokuwiki button.button { - height: 1.8em; -} - -div.dokuwiki div.secedit input.button { - border: 1px solid __border__; - color: __text__; - background-color: __background__; - vertical-align: middle; - text-decoration: none; - margin: 0; - padding: 0; - font-size: 10px; - cursor: pointer; - float: right; - display: inline; -} - -/* ----------- page navigator ------------- */ - -div.dokuwiki div.pagenav { - margin: 1em 0 0 0; -} - -div.dokuwiki div.pagenav-prev { - text-align: right; - float: left; - width: 49% -} - -div.dokuwiki div.pagenav-next { - text-align: left; - float: right; - width: 49% -} - -/* ----------- type of recent changes select -------- */ - -div.dokuwiki form#dw__recent select { - margin-bottom: 10px; -} - -/* --------------- Links ------------------ */ - -div.dokuwiki a:link, -div.dokuwiki a:visited { - color: __extern__; - text-decoration: none; -} -div.dokuwiki a:hover, -div.dokuwiki a:active { - color: __text__; - text-decoration: underline; -} - -div.dokuwiki a.nolink { - color: __text__ !important; - text-decoration: none !important; -} - -/* external link */ -div.dokuwiki a.urlextern { - background: transparent url(images/link_icon.gif) 0px 1px no-repeat; - padding: 1px 0px 1px 16px; -} - -/* windows share */ -div.dokuwiki a.windows { - background: transparent url(images/windows.gif) 0px 1px no-repeat; - padding: 1px 0px 1px 16px; -} - -/* interwiki link (icon are set by dokuwiki) */ -div.dokuwiki a.interwiki { -} - -/* link to some embedded media */ -div.dokuwiki a.media { -} - -div.dokuwiki a.urlextern:link, -div.dokuwiki a.windows:link, -div.dokuwiki a.interwiki:link { - color: __extern__; -} - -div.dokuwiki a.urlextern:visited, -div.dokuwiki a.windows:visited, -div.dokuwiki a.interwiki:visited { - color: purple; -} -div.dokuwiki a.urlextern:hover, -div.dokuwiki a.urlextern:active, -div.dokuwiki a.windows:hover, -div.dokuwiki a.windows:active, -div.dokuwiki a.interwiki:hover, -div.dokuwiki a.interwiki:active { - color: __text__; -} - -/* email link */ -div.dokuwiki a.mail { - background: transparent url(images/mail_icon.gif) 0px 1px no-repeat; - padding: 1px 0px 1px 16px; -} - -/* existing wikipage */ -div.dokuwiki a.wikilink1 { - color: __existing__ !important; -} - -/* not existing wikipage */ -div.dokuwiki a.wikilink2 { - color: __missing__ !important; - text-decoration: none !important; - border-bottom: dashed 1px __missing__ !important; -} - -/* ------------- Page elements ----------------- */ - -div.dokuwiki div.preview { - background-color: __background_neu__; - margin: 0 0 0 2em; - padding: 4px; - border: 1px dashed __text__; -} - -div.dokuwiki div.breadcrumbs { - background-color: __background_neu__; - color: __text_neu__; - font-size: 80%; - padding: 0 0 0 4px; -} - -div.dokuwiki span.user { - color: __text_other__; - font-size: 90%; -} - -div.dokuwiki li.minor { - color: __text_neu__; - font-style: italic; -} - -/* embedded images */ -div.dokuwiki img.media { - margin: 3px; -} - -div.dokuwiki img.medialeft { - border: 0; - float: left; - margin: 0 1.5em 0 0; -} - -div.dokuwiki img.mediaright { - border: 0; - float: right; - margin: 0 0 0 1.5em; -} - -div.dokuwiki img.mediacenter { - border: 0; - display: block; - margin: 0 auto; -} - -/* smileys */ -div.dokuwiki img.icon { - vertical-align: middle; -} - -div.dokuwiki abbr { - cursor: help; - border-bottom: 1px dotted __text__; -} - -/* general headline setup */ -div.dokuwiki h1, -div.dokuwiki h2, -div.dokuwiki h3, -div.dokuwiki h4, -div.dokuwiki h5 { - color: __text__; - background-color: inherit; - font-size: 100%; - font-weight: normal; - margin: 0 0 1em 0; - padding: 0.5em 0 0 0; - border-bottom: 1px solid __border__; - clear: left; -} - -/* special headlines */ -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; } -div.dokuwiki div.level2 { margin-left: 23px; } -div.dokuwiki div.level3 { margin-left: 43px; } -div.dokuwiki div.level4 { margin-left: 63px; } -div.dokuwiki div.level5 { margin-left: 83px; } - -/* unordered lists */ -div.dokuwiki ul { - line-height: 1.5em; - list-style-type: square; - list-style-image: none; - margin: 0 0 1em 3.5em; - color: __text_alt__; -} - -/* ordered lists */ -div.dokuwiki ol { - line-height: 1.5em; - list-style-image: none; - margin: 0 0 1em 3.5em; - color: __text_alt__; - font-weight: bold; -} - -/* no bottom gap in between and smaller left margin for nested lists */ -div.dokuwiki li ul, -div.dokuwiki li ol { - margin: 0 0 0 1.5em; -} - -/* the list items overriding the ul/ol definition */ -div.dokuwiki .li { - color: __text__; - font-weight: normal; -} - -div.dokuwiki ol { list-style-type: decimal; } -div.dokuwiki ol ol { list-style-type: upper-roman; } -div.dokuwiki ol ol ol { list-style-type: lower-alpha; } -div.dokuwiki ol ol ol ol { list-style-type: lower-greek; } - -div.dokuwiki li.open { - list-style-image: url(images/open.gif); - /*list-style-type: circle;*/ -} - -div.dokuwiki li.closed { - list-style-image: url(images/closed.gif); - /*list-style-type: disc;*/ -} - -div.dokuwiki blockquote { - border-left: 2px solid __border__; - 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 { - padding: 0.5em; - border: 1px dashed __border__; - color: __text__; - overflow: auto; -} - -/* code blocks by indention */ -div.dokuwiki pre.pre { - background-color: __background_other__; -} - -/* code blocks by code tag */ -div.dokuwiki pre.code { - background-color: __background_other__; -} - -/* code blocks by file tag */ -div.dokuwiki pre.file { - background-color: __background_alt__; -} - -/* filenames for file and code blocks */ -div.dokuwiki dl.file, -div.dokuwiki dl.code { - margin-top: 2em; - margin-bottom: 2.5em; -} - -div.dokuwiki dl.file dt, -div.dokuwiki dl.code dt { - border: 1px dashed __border__; - display: inline; - padding: 0.1em 1em; - margin-left: 2em; -} - -div.dokuwiki dl.code dt a, -div.dokuwiki dl.file dt a { - color: __text__; -} - -div.dokuwiki dl.code dt { - background-color: __background_other__; - border-bottom: 1px solid __background_other__; -} - -div.dokuwiki dl.file dt { - background-color: __background_alt__; - border-bottom: 1px solid __background_alt__; -} - - -/* inline tables */ -div.dokuwiki table.inline { - background-color: __background__; - border-spacing: 0px; - border-collapse: collapse; -} - -div.dokuwiki table.inline th { - padding: 3px; - border: 1px solid __border__; - background-color: __background_alt__; -} - -div.dokuwiki table.inline td { - padding: 3px; - border: 1px solid __border__; -} - -/* ---------- table of contents ------------------- */ - -div.dokuwiki #dw__toc { - margin: 1.2em 0 0 2em; - float: right; - width: 200px; - font-size: 80%; - clear: both; -} - -div.dokuwiki #dw__toc h3 { - border: 1px solid __border__; - background-color: __background_alt__; - text-align: left; - font-weight: bold; - padding: 3px; - margin: 0 0 2px 0; - font-size: 1em; -} - -div.dokuwiki .toggle strong { - border: 0.4em solid __background_alt__; - float: right; - display: block; - margin: 0.4em 3px 0 0; -} - -div.dokuwiki .toggle span { - display: none; -} - -div.dokuwiki .toggle.closed strong { - margin-top: 0.4em; - border-top: 0.4em solid __text__; -} - -div.dokuwiki .toggle.open strong { - margin-top: 0; - border-bottom: 0.4em solid __text__; -} - -div.dokuwiki #dw__toc > div { - border: 1px solid __border__; - background-color: __background__; - text-align: left; - padding: 0.5em 0 0.7em 0; -} - -div.dokuwiki #dw__toc ul { - list-style-type: none; - list-style-image: none; - line-height: 1.2em; - padding-left: 1em; - margin: 0; -} - -div.dokuwiki #dw__toc ul li { - background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat; - padding-left: 0.4em; -} - -div.dokuwiki #dw__toc ul li.clear { - background-image: none; - padding-left: 0.4em; -} - -div.dokuwiki #dw__toc a:link, -div.dokuwiki #dw__toc a:visited { - color: __extern__; -} - -div.dokuwiki #dw__toc a:hover, -div.dokuwiki #dw__toc a:active { - color: __text__; -} - -/* ---------------------------- Diff rendering --------------------------*/ -div.dokuwiki table.diff { - background-color: __background__; - width: 100%; -} -div.dokuwiki td.diff-blockheader { - font-weight: bold; -} -div.dokuwiki table.diff th { - border-bottom: 1px solid __border__; - font-size: 110%; - font-weight: normal; - text-align: left; -} -div.dokuwiki table.diff th a { - font-weight: bold; -} -div.dokuwiki table.diff th span.user { - color: __text__; - font-size: 80%; -} -div.dokuwiki table.diff th span.sum { - font-size: 80%; - font-weight: bold; -} -div.dokuwiki table.diff th.minor { - font-style: italic; -} -.dokuwiki table.diff_sidebyside th { - width: 50%; -} -.dokuwiki table.diff .diff-lineheader { - width: .7em; - text-align: right; -} -[dir=rtl] .dokuwiki table.diff .diff-lineheader { - text-align: left; -} -.dokuwiki table.diff .diff-lineheader, -div.dokuwiki table.diff td { - font-family: monospace; - font-size: 100%; -} -div.dokuwiki td.diff-addedline, -div.dokuwiki span.diff-addedline { - background-color: #ddffdd; -} -div.dokuwiki td.diff-deletedline, -div.dokuwiki span.diff-deletedline { - background-color: #ffffbb; -} -div.dokuwiki td.diff-context { - background-color: __background_neu__; -} -div.dokuwiki table.diff td.diff-addedline strong, -div.dokuwiki table.diff td.diff-deletedline strong { - color: red; -} - -/* --------------------- footnotes -------------------------------- */ - -div.dokuwiki div.footnotes { - clear: both; - border-top: 1px solid __border__; - padding-left: 1em; - margin-top: 1em; -} - -div.dokuwiki div.fn { - font-size: 90%; -} - -div.dokuwiki a.fn_bot { - font-weight: bold; -} - -/* insitu-footnotes */ -div.insitu-footnote { - font-size: 80%; - line-height: 1.2em; - border: 1px solid __border__; - background-color: __background_other__; - text-align: left; - padding: 4px; - max-width: 40%; /* IE's width is handled in javascript */ - min-width: 5em; -} - -/* overcome IE issue with one line code or file boxes which require h. scrolling */ -* html .insitu-footnote pre.code, -* html .insitu-footnote pre.file { - padding-bottom: 18px; -} - -/* --------------- search result formating --------------- */ -#dw__loading { - text-align: center; - margin-bottom: 1em; -} - -div.dokuwiki .search_results { - padding: 0 10px 0 30px; -} - -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; -} - -div.dokuwiki .search_sep { - color: __text__; -} - -div.dokuwiki .search_hit { - color: __text__; - background-color: __highlight__; -} -div.dokuwiki strong.search_hit { - font-weight: normal; -} - -div.dokuwiki div.search_quickresult { - margin: 0 0 15px 30px; - padding: 0 10px 10px 0; - border-bottom: 1px dashed __border__; -} -div.dokuwiki div.search_quickresult h3 { - margin: 0 0 1.0em 0; - font-size: 1em; - font-weight: bold; -} - -div.dokuwiki ul.search_quickhits { - margin: 0 0 0.5em 1.0em; -} - -div.dokuwiki ul.search_quickhits li { - margin: 0 1.0em 0 1.0em; - float: left; - width: 30%; -} - -div.dokuwiki .section_highlight { - background-color: __background_alt__ !important; -} - -/* ------------------ Additional ---------------------- */ - -div.footerinc { - text-align: center; -} -.footerinc a img { - opacity: 0.5; - border: 0; -} - -.footerinc a:hover img { - opacity: 1; -} - -/* ---------- AJAX quicksearch ----------- */ - -div.dokuwiki div.ajax_qsearch { - position: absolute; - right: 237px;; - width: 200px; - opacity: 0.9; - display: none; - font-size: 80%; - line-height: 1.2em; - border: 1px solid __border__; - background-color: __background_other__; - text-align: left; - padding: 4px; -} - -/* --------- Toolbar -------------------- */ -button.toolbutton { - background-color: __background__; - padding: 0px; - margin: 0 1px 0 0; - border: 1px solid __border__; - cursor: pointer; -} - -/* nice alphatransparency background except for IE <7 */ -html>body button.toolbutton { - background: __background__ url(images/buttonshadow.png) repeat-x bottom; -} - -div.picker { - width: 250px; - border: 1px solid __border__; - background-color: __background_alt__; -} - -div.pk_hl { - width: 125px; -} - -button.pickerbutton { - padding: 0px; - margin: 0 1px 1px 0; - border: 0; - background-color: transparent; - font-size: 80%; - cursor: pointer; -} - -/* --------------- Image Details ----------------- */ - -div.dokuwiki div.img_big { - float: left; - margin-right: 0.5em; -} - -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 { - color: __text_neu__; - font-size: 70%; - line-height: 95%; -} - -div.dokuwiki div.imagemeta img.thumb { - float: left; - margin-right: 0.1em; -} - diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php deleted file mode 100644 index 1c8042e15..000000000 --- a/lib/tpl/default/detail.php +++ /dev/null @@ -1,86 +0,0 @@ - - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -?> - - - - - - <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> - [<?php echo strip_tags($conf['title'])?>] - - - - - - - - -
- - -
- - -

- -
- -
- -
-

- -

- -

- = AUTH_UPLOAD) { - echo '

'.$lang['img_manager'].'

'; - } - ?> - -
- $tag){ - $t = array(); - if (!empty($tag[0])) $t = array($tag[0]); - if(is_array($tag[3])) $t = array_merge($t,$tag[3]); - $value = tpl_img_getTag($t); - if ($value) { - echo '
'.$lang[$tag[1]].':
'; - if ($tag[2] == 'date') echo dformat($value); - else echo hsc($value); - echo '
'; - } - } - ?> -
- -
- - -
-
- - - diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html deleted file mode 100644 index 38aab7216..000000000 --- a/lib/tpl/default/footer.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - diff --git a/lib/tpl/default/images/UWEB.png b/lib/tpl/default/images/UWEB.png deleted file mode 100644 index 292ade4ed..000000000 Binary files a/lib/tpl/default/images/UWEB.png and /dev/null differ diff --git a/lib/tpl/default/images/UWEBshadow.png b/lib/tpl/default/images/UWEBshadow.png deleted file mode 100644 index 8c4e5f829..000000000 Binary files a/lib/tpl/default/images/UWEBshadow.png and /dev/null differ diff --git a/lib/tpl/default/images/apple-touch-icon.png b/lib/tpl/default/images/apple-touch-icon.png deleted file mode 100644 index 45fa4e7b0..000000000 Binary files a/lib/tpl/default/images/apple-touch-icon.png and /dev/null differ diff --git a/lib/tpl/default/images/bullet.gif b/lib/tpl/default/images/bullet.gif deleted file mode 100644 index b43de48a4..000000000 Binary files a/lib/tpl/default/images/bullet.gif and /dev/null differ diff --git a/lib/tpl/default/images/button-cc.gif b/lib/tpl/default/images/button-cc.gif deleted file mode 100644 index c7a403a9e..000000000 Binary files a/lib/tpl/default/images/button-cc.gif and /dev/null differ diff --git a/lib/tpl/default/images/button-css.png b/lib/tpl/default/images/button-css.png deleted file mode 100644 index 706325e1c..000000000 Binary files a/lib/tpl/default/images/button-css.png and /dev/null differ diff --git a/lib/tpl/default/images/button-donate.gif b/lib/tpl/default/images/button-donate.gif deleted file mode 100644 index bba284e21..000000000 Binary files a/lib/tpl/default/images/button-donate.gif and /dev/null differ diff --git a/lib/tpl/default/images/button-dw.png b/lib/tpl/default/images/button-dw.png deleted file mode 100644 index 97272d968..000000000 Binary files a/lib/tpl/default/images/button-dw.png and /dev/null differ diff --git a/lib/tpl/default/images/button-php.gif b/lib/tpl/default/images/button-php.gif deleted file mode 100644 index 19aefb08f..000000000 Binary files a/lib/tpl/default/images/button-php.gif and /dev/null differ diff --git a/lib/tpl/default/images/button-rss.png b/lib/tpl/default/images/button-rss.png deleted file mode 100644 index f2438043f..000000000 Binary files a/lib/tpl/default/images/button-rss.png and /dev/null differ diff --git a/lib/tpl/default/images/button-xhtml.png b/lib/tpl/default/images/button-xhtml.png deleted file mode 100644 index ec686442c..000000000 Binary files a/lib/tpl/default/images/button-xhtml.png and /dev/null differ diff --git a/lib/tpl/default/images/buttonshadow.png b/lib/tpl/default/images/buttonshadow.png deleted file mode 100644 index b96ebf759..000000000 Binary files a/lib/tpl/default/images/buttonshadow.png and /dev/null differ diff --git a/lib/tpl/default/images/closed.gif b/lib/tpl/default/images/closed.gif deleted file mode 100644 index 8414d4d69..000000000 Binary files a/lib/tpl/default/images/closed.gif and /dev/null differ diff --git a/lib/tpl/default/images/favicon.ico b/lib/tpl/default/images/favicon.ico deleted file mode 100644 index 8b9616abb..000000000 Binary files a/lib/tpl/default/images/favicon.ico and /dev/null differ diff --git a/lib/tpl/default/images/inputshadow.png b/lib/tpl/default/images/inputshadow.png deleted file mode 100644 index 480044986..000000000 Binary files a/lib/tpl/default/images/inputshadow.png and /dev/null differ diff --git a/lib/tpl/default/images/link_icon.gif b/lib/tpl/default/images/link_icon.gif deleted file mode 100644 index d0a92f2fa..000000000 Binary files a/lib/tpl/default/images/link_icon.gif and /dev/null differ diff --git a/lib/tpl/default/images/mail_icon.gif b/lib/tpl/default/images/mail_icon.gif deleted file mode 100644 index 437d28fe1..000000000 Binary files a/lib/tpl/default/images/mail_icon.gif and /dev/null differ diff --git a/lib/tpl/default/images/open.gif b/lib/tpl/default/images/open.gif deleted file mode 100644 index f5d5c7e56..000000000 Binary files a/lib/tpl/default/images/open.gif and /dev/null differ diff --git a/lib/tpl/default/images/resizecol.png b/lib/tpl/default/images/resizecol.png deleted file mode 100644 index f0111507c..000000000 Binary files a/lib/tpl/default/images/resizecol.png and /dev/null differ diff --git a/lib/tpl/default/images/tocdot2.gif b/lib/tpl/default/images/tocdot2.gif deleted file mode 100644 index e2b5f15cb..000000000 Binary files a/lib/tpl/default/images/tocdot2.gif and /dev/null differ diff --git a/lib/tpl/default/images/windows.gif b/lib/tpl/default/images/windows.gif deleted file mode 100644 index 64dfeb6fb..000000000 Binary files a/lib/tpl/default/images/windows.gif and /dev/null differ diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css deleted file mode 100644 index ded2d87a2..000000000 --- a/lib/tpl/default/layout.css +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Tableless Layout for default template - * - * @author Andreas Gohr - * @author moraes - */ - -/* -------------- top row --------------- */ -div.dokuwiki .header { - padding: 3px 0 0 2px; -} - -div.dokuwiki .pagename { - float: left; - font-size: 200%; - font-weight: bolder; - color: __background_alt__; - text-align: left; - vertical-align: middle; -} - -div.dokuwiki .pagename a { - color: __extern__ !important; - text-decoration: none !important; -} - -div.dokuwiki .logo { - float: right; - font-size: 220%; - font-weight: bolder; - text-align: right; - vertical-align: middle; -} - -div.dokuwiki .logo a { - color: __background_alt__ !important; - text-decoration: none !important; - font-variant: small-caps; - letter-spacing: 2pt; -} - -/* --------------- top and bottom bar ---------------- */ -div.dokuwiki .bar { - border-top: 1px solid __border__; - border-bottom: 1px solid __border__; - background: __background_alt__; - padding: 0.1em 0.15em; - clear: both; -} - -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/default/main.php b/lib/tpl/default/main.php deleted file mode 100644 index 851afde6c..000000000 --- a/lib/tpl/default/main.php +++ /dev/null @@ -1,135 +0,0 @@ - - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -?> - - - - - - <?php tpl_pagetitle()?> - [<?php echo strip_tags($conf['title'])?>] - - - - - - - - - - -
- - -
- -
-
- [[]] -
- - -
-
- - - -
-
- - -
- -
- -   -
- -
-
- - - - - - - - - -
- - - - -
- - - -
- -
- - - -
- -
-
- -
-
- -
-
- - - -
-
- - - -
-
- - - - - - -   -
-
-
- -
- - - -
- - -
- - diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css deleted file mode 100644 index 640ad3162..000000000 --- a/lib/tpl/default/media.css +++ /dev/null @@ -1,224 +0,0 @@ -/** - * The CSS in here controls the appearance of the media manager - */ - -#media__manager { - height: 100%; - overflow: hidden; -} - -#media__left { - width: 30%; - border-right: solid 1px __border__; - - height: 100%; - overflow: auto; - position: absolute; - left: 0; -} - -#media__right { - width: 69.7%; - - height: 100%; - overflow: auto; - position: absolute; - right: 0; -} - -#media__manager h1 { - margin: 0; - padding: 0; - margin-bottom: 0.5em; -} - -#media__manager a.select { - cursor: pointer; -} - -/* --- Tree formatting --- */ - -#media__tree img { - 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__; -}/* I don't understand this, but this fixes a style bug in IE; -it's dirty, so any "real" fixes are welcome */ - -/* --- options --- */ - -#media__opts { - padding-left: 1em; - margin-bottom: 0.5em; -} - -#media__opts input { - float: left; - display: block; - margin-top: 4px; - position: absolute; -} -*+html #media__opts input, -* html #media__opts input { - position: static; -} - -#media__opts label { - display: block; - float: left; - margin-left: 20px; - margin-bottom: 4px; -} -*+html #media__opts label, -* html #media__opts label { - margin-left: 10px; -} - -#media__opts br { - clear: left; -} - -/* --- file list --- */ - -#media__content img.load { - margin: 1em auto; -} - -#media__content #scroll__here { - border: 1px dashed __border__; -} - -#media__content .odd { - background-color: __background_other__; - padding: 0.4em; -} - -#media__content .even { - padding: 0.4em; -} - -#media__content a.mediafile { - margin-right: 1.5em; - font-weight: bold; -} - -#media__content div.detail { - padding: 0.3em 0 0.3em 2em; -} - -#media__content div.detail div.thumb { - float: left; - width: 130px; - text-align: center; - margin-right: 0.4em; -} - - -#media__content img.btn { - vertical-align: text-bottom; -} - -#media__content div.example { - color: __text_neu__; - margin-left: 1em; -} - -/* --- upload form --- */ - -#media__content div.upload { - font-size: 90%; - padding: 0 0.5em 0.5em 0.5em; -} - -#media__content #mediamanager__uploader { - display: block; - border-bottom: solid 1px __border__; - padding: 0 0.5em 1em 0.5em; -} - -#media__content form#dw__upload { - border-bottom: 0; -} - -#media__content form#dw__upload fieldset { - padding: 0; - margin: 0; - border: none; - width: auto; -} -#media__content form#dw__upload p { - text-align: left; - padding: 0.25em 0; - margin: 0; - line-height: 1.0em; -} -#media__content form#dw__upload label.check { - float: none; - width: auto; - margin-left: 11.5em; -} - -/* --- meta edit form --- */ - -#media__content form.meta { - display: block; - padding: 0 0 1em 0; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - margin-left: 1em; - clear: left; -} - -#media__content form.meta .edit { - font: 100% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; - float: left; - width: 70%; - padding-right: 0; - padding-left: 0.2em; - margin: 2px; -} - -#media__content form.meta textarea.edit { - height: 8em; -} - -#media__content form.meta div.metafield { - clear: left; -} - -#media__content form.meta div.buttons { - clear: left; - margin-left: 20%; - padding-left: 1em; -} diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php deleted file mode 100644 index 35b526a32..000000000 --- a/lib/tpl/default/mediamanager.php +++ /dev/null @@ -1,45 +0,0 @@ - - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -?> - - - - - - <?php echo hsc($lang['mediaselect'])?> - [<?php echo strip_tags($conf['title'])?>] - - - - - - -
-
- -

- - -
- - -
- -
- -
-
- - diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css deleted file mode 100644 index f83e8c97c..000000000 --- a/lib/tpl/default/print.css +++ /dev/null @@ -1,228 +0,0 @@ - -body { - font: 10pt "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; - background-color: White; - color: Black; -} - -table { - font-size: 100%; - padding: 0; - margin: 0; -} - -tr,td,th { padding: 0; margin: 0; } - -img { border: 0; } - -a { - color: #000000; - text-decoration: none; - background: none !important; -} - -a.interwiki { - padding-left: 0px !important; -} - - -div.meta { - clear: both; - margin-top: 1em; - font-size: 70%; - text-align: right; -} - -div.breadcrumbs { - display: none; -} - - -/* --------------------- Text formating -------------------------------- */ - -/* external link */ -a.urlextern:after { - content: " [" attr(href) "]"; - font-size: 90%; -} - -/* interwiki link */ -a.interwiki:after { - content: " [" attr(href) "]"; - font-size: 90%; -} - -/* email link */ -a.mail:after { - content: " [" attr(href) "]"; - font-size: 90%; -} - -/* existing wikilink */ -a.wikilink1 { text-decoration: underline; } - -/* the document */ -div.page { - text-align: justify; -} - -/* general headline setup */ -h1, h2, h3, h4, h5 { - color: Black; - background-color: transparent; - font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; - font-size: 100%; - font-weight: normal; - margin-left: 0; - margin-right: 0; - margin-top: 0; - margin-bottom: 1em; - padding-left: 0; - padding-right: 0; - padding-top: 0.5em; - padding-bottom: 0; - border-bottom: 1px solid #000000; - clear: left; -} - -/* special headlines */ -h1 { font-size: 160%; font-weight: bold; } -h2 { font-size: 150%; } -h3 { font-size: 140%; border-bottom: none; } -h4 { font-size: 120%; border-bottom: none; } -h5 { font-size: 100%; border-bottom: none; } - -/* embedded images */ -img.media { - margin: 3px; -} - -/* the styles for media images are already in - lib/styles/all.css, these are additional styles */ -img.medialeft { - margin: 0 1.5em 0 0; -} -img.mediaright { - margin: 0 0 0 1.5em; -} -img.mediacenter { -} - -/* unordered lists */ -ul { - line-height: 1.5em; - list-style-type: square; - margin: 0 0 1em 3.5em; - padding: 0; -} - -/* ordered lists */ -ol { - line-height: 1.5em; - margin: 0 0 1em 3.5em; - padding: 0; - font-weight: normal; -} - -div.dokuwiki li ul { - margin-bottom: 0; -} -div.dokuwiki li ol { - margin-bottom: 0; -} - -div.dokuwiki ol { list-style-type: decimal; } -div.dokuwiki ol ol { list-style-type: upper-roman; } -div.dokuwiki ol ol ol { list-style-type: lower-alpha; } -div.dokuwiki ol ol ol ol { list-style-type: lower-greek; } - -/* the list items overriding the ol definition */ -span.li { - font-weight: normal; -} - -pre { - font-family: monospace; -} - -/* code blocks by indention */ -pre.pre { - font-size: 8pt; - padding: 0.5em; - border: 1px dashed #000000; - color: Black; - overflow: visible; -} - -/* code blocks by code tag */ -pre.code { - font-size: 8pt; - padding: 0.5em; - border: 1px dashed #000000; - color: Black; - overflow: visible; -} - -/* inline code words */ -code { - font-size: 120%; -} - -/* code blocks by file tag */ -pre.file { - font-size: 8pt; - padding: 0.5em; - border: 1px dotted #000000; - color: Black; - overflow: visible; -} - -/* footnotes */ -div.footnotes { - clear: both; - border-top: 1px solid #000000; - padding-left: 1em; - margin-top: 1em; -} - -div.fn { - font-size: 90%; -} - -a.fn_top { - vertical-align: super; - font-size: 80%; -} - -a.fn_bot { - vertical-align: super; - font-size: 80%; - font-weight: bold; -} - -abbr { - border: 0; -} - -/* ---------- inline tables ------------------- */ - -table.inline { - font-size: 80%; - background-color: #ffffff; - border-spacing: 0px; - border-collapse: collapse; -} - -table.inline th { - padding: 3px; - border: 1px solid #000000; - border-bottom: 2px solid #000000; -} - -table.inline td { - padding: 3px; - border: 1px solid #000000; -} - -#dw__toc, .footerinc, .header, .bar, .user { display: none; } - diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css deleted file mode 100644 index f16ba101b..000000000 --- a/lib/tpl/default/rtl.css +++ /dev/null @@ -1,162 +0,0 @@ -/** - * Layout and design corrections for right-to-left languages - * - * @author Andreas Gohr - * @author Dotan Kamber - */ - -.bar-left { - float: right; - text-align: right; -} - -.bar-right { - float: left; - text-align: left; -} - -.pagename { - float: right; - text-align: right; -} - -.logo { - float: left; - text-align: left; -} - -label { - text-align: left; -} - -label.simple { - text-align: right; -} - -div.meta div.user { - float: right; -} - -div.meta div.doc { - text-align: left; -} - -/* ------------------ Design corrections --------------------------------- */ - -div.dokuwiki ul, -div.dokuwiki ol { - margin: 0.5em 3.5em 0.5em 0; -} -div.dokuwiki li ul, -div.dokuwiki li ol { - margin: 0.5em 1.5em 0.5em 0; -} - -div.dokuwiki a.urlextern, -div.dokuwiki a.interwiki, -div.dokuwiki a.mediafile, -div.dokuwiki a.windows, -div.dokuwiki a.mail { - background-position: right 1px; - padding-right: 16px; - padding-left: 0; - display: inline-block; /* needed for IE7 */ -} - -div.dokuwiki a.mediafile { - padding-right: 18px; -} - -div.dokuwiki div.secedit input.button { - float: left; -} - -/* headlines */ -div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 { - clear: right; -} - -/* special headlines */ -div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; } -div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; } -div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; } -div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; } -div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; } - -/* indent different sections */ -div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; } -div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; } -div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; } -div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; } -div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; } - -/* TOC control */ -div.dokuwiki #dw__toc { - float: left; - margin: 1.2em 2em 0 0; -} - -div.dokuwiki #dw__toc h3 { - text-align: right; -} - -div.dokuwiki .toggle strong { - float: left; - margin: 0.4em 0 0 3px; -} - -div.dokuwiki #dw__toc > div { - text-align: right; -} - -div.dokuwiki #dw__toc ul { - padding: 0; - padding-right: 1em; -} - -div.dokuwiki #dw__toc ul li { - background-position: right 0.6em; - padding-right: 0.4em; - direction: rtl; -} - -div.dokuwiki #dw__toc ul li.clear { - padding-right: 0.4em; -} - -div.dokuwiki .code { - direction: ltr; - text-align: left; -} -div.dokuwiki blockquote { - border-left: 0; - padding-left: 0; - border-right: 2px solid __border__; - padding-right: 3px; -} - -/* Admin corrections */ -#admin__version { - clear: right; - float: left; -} - -.dokuwiki ul.admin_tasks { - float: right; -} - -.dokuwiki ul.admin_tasks li { - padding-left: 0px; - padding-right: 35px; - background: transparent none no-repeat scroll right 0; - text-align: right; -} - -/* Search corrections */ -div.dokuwiki ul.search_quickhits li { - float: right; -} - -div#qsearch__out { - text-align: right; -} diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini deleted file mode 100644 index 0706303d0..000000000 --- a/lib/tpl/default/style.ini +++ /dev/null @@ -1,77 +0,0 @@ -; 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 -; to screen styles if a right-to-left language is selected (eg. hebrew) -[stylesheets] -layout.css = screen -design.css = screen -style.css = screen - -media.css = screen -_mediaoptions.css = screen -_admin.css = screen -_linkwiz.css = screen -_subscription.css = screen -_mediamanager.css = screen -_tabs.css = screen -_fileuploader.css = screen - -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 -; give your wiki a new look. -[replacements] - -;-------------------------------------------------------------------------- -;------ guaranteed dokuwiki color placeholders that every plugin can use -; main text and background colors -__text__ = "#000" -__background__ = "#fff" -; alternative text and background colors -__text_alt__ = "#638c9c" -__background_alt__ = "#dee7ec" -; neutral text and background colors -__text_neu__ = "#666" -__background_neu__ = "#f5f5f5" -; border color -__border__ = "#8cacbb" -;-------------------------------------------------------------------------- - -; other text and background colors -__text_other__ = "#ccc" -__background_other__ = "#f7f9fa" - -; these are used for links -__extern__ = "#436976" -__existing__ = "#090" -__missing__ = "#f30" - -; highlighting search snippets -__highlight__ = "#ff9" - - -;-------------------------------------------------------------------------- -;------ 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/default/template.info.txt b/lib/tpl/default/template.info.txt deleted file mode 100644 index e0dbf54ba..000000000 --- a/lib/tpl/default/template.info.txt +++ /dev/null @@ -1,7 +0,0 @@ -base default -author Andreas Gohr -email andi@splitbrain.org -date 2013-02-16 -name DokuWiki Default Template -desc DokuWiki's default template until 2012 -url http://www.dokuwiki.org/template:default -- cgit v1.2.3 From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Tue, 10 Sep 2013 22:17:43 -0700 Subject: Fix CodeSniffer whitespace violoations Removed extraneous whitespace to eliminate errors reported by the Squiz.WhiteSpace.SuperfluousWhitespace sniff. --- lib/tpl/dokuwiki/css/_forms.css | 1 - lib/tpl/dokuwiki/css/_media_fullscreen.css | 1 - 2 files changed, 2 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 4d3f2b97a..522f9ed4d 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -1,4 +1,3 @@ - /* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */ /** diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 28e347882..31b71897b 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -501,4 +501,3 @@ width: 100%; max-width: none; } - -- cgit v1.2.3 From 4432749ab2140ede94ac1c724ab39b7219fdb406 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 4 Oct 2013 17:59:13 +0100 Subject: RS#2860 fix configuration option key to 'template' --- lib/tpl/dokuwiki/detail.php | 6 +++--- lib/tpl/dokuwiki/main.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 9c04ba8e7..c602830f7 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -122,11 +122,11 @@ header('X-UA-Compatible: IE=edge,chrome=1'); // Back to [ID]; @todo: transfer logic to backend $data['img_backto'] = '
  • '.$lang['img_backto'].' '.$ID.'
  • '; - // the page tools can be ammended through a custom plugin hook + // the page tools can be amended through a custom plugin hook // if you're deriving from this template and your design is close enough to // the dokuwiki template you might want to trigger a DOKUWIKI event instead - // of using $conf['tpl'] here - $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY'; + // of using $conf['template'] here + $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY'; $evt = new Doku_Event($hook, $data); if($evt->advise_before()){ foreach($evt->data as $k => $html) echo $html; diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 9e507d86d..f6ca4ed86 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -83,11 +83,11 @@ $showSidebar = $hasSidebar && ($ACT=='show'); 'top' => tpl_action('top', 1, 'li', 1, '', '') ); - // the page tools can be ammended through a custom plugin hook + // the page tools can be amended through a custom plugin hook // if you're deriving from this template and your design is close enough to // the dokuwiki template you might want to trigger a DOKUWIKI event instead - // of using $conf['tpl'] here - $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY'; + // of using $conf['template'] here + $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY'; $evt = new Doku_Event($hook, $data); if($evt->advise_before()){ foreach($evt->data as $k => $html) echo $html; -- cgit v1.2.3 From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:04:01 +0100 Subject: replace boolean conditional checks on possibly uninitialized vars with \!empty/empty/isset as appropriate --- lib/tpl/dokuwiki/tpl_header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 19d165059..a2bfd4346 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();

      '; tpl_userinfo(); /* 'Logged in as ...' */ echo ''; -- cgit v1.2.3