diff --git a/conf/default.php b/conf/default.php index 64bf080..417a7e1 100644 --- a/conf/default.php +++ b/conf/default.php @@ -7,5 +7,3 @@ $conf['discussionPage'] = 'discussion:@ID@'; $conf['userPage'] = 'user:@USER@:'; $conf['hideTools'] = 0; -$conf['tagline'] = 'This is the tagline - explaining what this site is about.'; -$conf['sidebarID'] = 'sidebar'; diff --git a/conf/metadata.php b/conf/metadata.php index 7345616..9a62ec3 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -7,5 +7,3 @@ $meta['discussionPage'] = array('string'); $meta['userPage'] = array('string'); $meta['hideTools'] = array('onoff'); -$meta['tagline'] = array('string'); -$meta['sidebarID'] = array('string'); diff --git a/css/_admin.css b/css/_admin.css deleted file mode 100644 index c8f3694..0000000 --- a/css/_admin.css +++ /dev/null @@ -1,59 +0,0 @@ -/** - * This file provides styles for the Administration overview - * (?do=admin). - */ - -.dokuwiki ul.admin_tasks { - float: left; - width: 40%; - list-style-type: none; - font-size: 1.125em; -} -[dir=rtl] .dokuwiki ul.admin_tasks { - float: right; -} - -.dokuwiki ul.admin_tasks li { - padding-left: 35px; - margin: 0 0 1em 0; - font-weight: bold; - list-style-type: none; - background: transparent none no-repeat scroll 0 0; - color: inherit; -} -[dir=rtl] .dokuwiki ul.admin_tasks li { - padding-left: 0; - padding-right: 35px; - background-position: right 0; -} - -.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); -} - -/* DokuWiki version below */ -.dokuwiki #admin__version { - clear: left; - float: right; - color: __text_neu__; - background-color: inherit; -} -[dir=rtl] .dokuwiki #admin__version { - clear: right; - float: left; -} diff --git a/css/_diff.css b/css/_diff.css deleted file mode 100644 index 62f8312..0000000 --- a/css/_diff.css +++ /dev/null @@ -1,65 +0,0 @@ -/** - * This file provides styles for the diff view, which shows you - * differences between two versions of a page (?do=diff). - */ - -.dokuwiki table.diff { - width: 100%; - border-width: 0; -} -.dokuwiki table.diff th, -.dokuwiki table.diff td { - vertical-align: top; - padding: 0; - border-width: 0; - /* no style.ini colours because deleted and added lines have a fixed background colour */ - background-color: #fff; - color: #333; -} - -/* table header */ -.dokuwiki table.diff th { - border-bottom: 1px solid __border__; - font-size: 110%; - width: 50%; - font-weight: normal; -} -.dokuwiki table.diff th a { - font-weight: bold; -} -.dokuwiki table.diff th span.user { - font-size: .9em; -} -.dokuwiki table.diff th span.sum { - font-size: .9em; - font-weight: bold; -} -.dokuwiki table.diff th.minor { - color: #999; -} - -/* table body */ -.dokuwiki table.diff td { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; -} -.dokuwiki table.diff td.diff-blockheader { - font-weight: bold; -} -.dokuwiki table.diff .diff-addedline { - background-color: #cfc; - color: inherit; -} -.dokuwiki table.diff .diff-deletedline { - background-color: #fdd; - color: inherit; -} -.dokuwiki table.diff td.diff-context { - background-color: #eee; - color: inherit; -} -.dokuwiki table.diff td.diff-addedline strong, -.dokuwiki table.diff td.diff-deletedline strong { - color: #f00; - background-color: inherit; - font-weight: bold; -} diff --git a/css/_edit.css b/css/_edit.css deleted file mode 100644 index da9a356..0000000 --- a/css/_edit.css +++ /dev/null @@ -1,153 +0,0 @@ -/** - * This file provides styles for the edit view (?do=edit), preview - * and section edit buttons. - */ - -/* edit view -********************************************************************/ - -.dokuwiki div.editBox { -} - -/*____________ toolbar ____________*/ - -.dokuwiki div.toolbar { - margin-bottom: .5em; - overflow: hidden; -} -#draft__status { - float: right; - color: __text_alt__; - background-color: inherit; -} -[dir=rtl] #draft__status { - float: left; -} - -#tool__bar { - float: left; -} -[dir=rtl] #tool__bar { - float: right; -} - -/* buttons inside of toolbar */ -.dokuwiki div.toolbar button.toolbutton { -} -/* picker popups (outside of .dokuwiki) */ -div.picker { - width: 300px; - border: 1px solid __border__; - background-color: __background_alt__; - color: inherit; -} -/* picker for headlines */ -div.picker.pk_hl { - width: auto; -} -/* buttons inside of picker */ -div.picker button.pickerbutton, -div.picker button.toolbutton { - padding: .1em .35em; - border-width: 0; -} - -/*____________ edit textarea ____________*/ - -.dokuwiki textarea.edit { - /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ - width: 700px; - min-width: 100%; - max-width: 100%; - margin-bottom: .5em; -} - -/*____________ below the textarea ____________*/ - -.dokuwiki #wiki__editbar, /* old, until 2012-01-25 */ -.dokuwiki div.editBar /* new */ { - overflow: hidden; - margin-bottom: .5em; -} - -/* size and wrap controls */ -#size__ctl { - float: right; -} -[dir=rtl] #size__ctl { - float: left; -} -#size__ctl img { - cursor: pointer; -} - -/* edit buttons */ -.dokuwiki #wiki__editbar .editButtons, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .editButtons /* new */ { - display: inline; - margin-right: 1em; -} -[dir=rtl] .dokuwiki #wiki__editbar .editButtons, /* old, until 2012-01-25 */ -[dir=rtl] .dokuwiki .editBar .editButtons /* new */ { - margin-right: 0; - margin-left: 1em; -} -.dokuwiki #wiki__editbar .editButtons input, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .editButtons input /* new */ { -} - -/* summary input and minor changes checkbox */ -.dokuwiki #wiki__editbar .summary, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .summary /* new */ { - display: inline; -} -.dokuwiki #wiki__editbar .summary label, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .summary label /* new */ { - vertical-align: middle; - white-space: nowrap; -} -.dokuwiki #wiki__editbar .summary label span, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .summary label span /* new */ { - vertical-align: middle; -} -.dokuwiki #wiki__editbar .summary input, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .summary input /* new */ { -} -/* change background colour if summary is missing */ -.dokuwiki #wiki__editbar .summary input.missing, /* old, until 2012-01-25 */ -.dokuwiki div.editBar .summary input.missing /* new */ { - color: __text__; - background-color: #ffcccc; -} - -/* preview -********************************************************************/ - -.dokuwiki div.preview { - border: dotted __border__; - border-width: .2em 0; - padding: 1.4em 0; - margin-bottom: 1.4em; -} - -/* section edit buttons -********************************************************************/ - -.dokuwiki .secedit { - float: right; - margin-top: -1.4em; -} -[dir=rtl] .dokuwiki .secedit { - float: left; -} -.dokuwiki .secedit input.button { - font-size: 75%; -} - -/* style for section highlighting */ -.dokuwiki div.section_highlight { - margin: 0 -1em; /* negative side margin = side padding + side border */ - padding: 0 .5em; - border: solid __background_alt__; - border-width: 0 .5em; -} diff --git a/css/_fileuploader.css b/css/_fileuploader.css deleted file mode 100644 index 84b182c..0000000 --- a/css/_fileuploader.css +++ /dev/null @@ -1,116 +0,0 @@ -/** - * This file provides the styles for the file uploader - * used in the media manager (both fullscreen and popup). - */ - -.qq-uploader { - position: relative; - width: 100%; -} - -.qq-uploader .error { - color: #f00; - background-color: #fff; -} - -/* select file button */ - -/* as this is not a real button, but functions as a button, - it should be styled the same way as your other buttons, - preferably in the same place, so just add '.qq-upload-button' to those styles */ -.qq-upload-button { - display: inline-block; - text-decoration: none; - font-size: 100%; - cursor: pointer; - margin: 1px 1px 5px; -} - - -* 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; - padding: 0; - list-style: none; -} - -.qq-uploader li { - margin: 0 0 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/css/_footnotes.css b/css/_footnotes.css deleted file mode 100644 index a20f296..0000000 --- a/css/_footnotes.css +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This file provides styles for footnotes. - */ - -/*____________ footnotes inside the text ____________*/ - -/* link to footnote inside the text */ -.dokuwiki sup a.fn_top { -} -/* JSpopup */ -div.insitu-footnote { - max-width: 40%; - min-width: 5em; -} - -/*____________ footnotes at the bottom of the page ____________*/ - -.dokuwiki div.footnotes { - border-top: 1px solid __border__; - padding: .5em 0 0 0; - margin: 1em 0 0 0; - clear: both; -} -.dokuwiki div.footnotes div.fn { -} -.dokuwiki div.footnotes div.fn sup a.fn_bot { - font-weight: bold; -} diff --git a/css/_forms.css b/css/_forms.css deleted file mode 100644 index 4309f88..0000000 --- a/css/_forms.css +++ /dev/null @@ -1,92 +0,0 @@ - -/* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */ - -/** - * This file provides styles for forms in general and specifically - * for ?do= - * - login - * - resendpwd - * - register - * - profile - * - subscribe - */ - -/* ---------------- forms ------------------------ */ - -.dokuwiki form { - border: none; - display: inline; -} - -.dokuwiki label.block { - display: block; - text-align: right; - font-weight: bold; -} -[dir=rtl] .dokuwiki label.block { - text-align: left; -} - -.dokuwiki label.simple { - display: block; - text-align: left; - font-weight: normal; -} -[dir=rtl] .dokuwiki label.simple { - text-align: right; -} - -.dokuwiki label.block select, -.dokuwiki label.block input.edit { - width: 50%; -} - -.dokuwiki label span { - vertical-align: middle; -} - -.dokuwiki fieldset { - width: 400px; - text-align: center; - border: 1px solid __border__; - padding: 0.5em; - margin: auto; -} - - -.dokuwiki input.edit, -.dokuwiki select.edit { - vertical-align: middle; -} -.dokuwiki select.edit { - padding: 0.1em 0; -} - - -.dokuwiki input.button, -.dokuwiki button.button { - vertical-align: middle; -} - -/** - * Styles for the subscription page - */ - -#subscribe__form { - display: block; - width: 400px; - text-align: center; -} - -#subscribe__form fieldset { - text-align: left; - margin: 0.5em 0; -} -[dir=rtl] #subscribe__form fieldset { - text-align: right; -} - -#subscribe__form label { - display: block; - margin: 0 0.5em 0.5em; -} diff --git a/css/_imgdetail.css b/css/_imgdetail.css deleted file mode 100644 index fbeb136..0000000 --- a/css/_imgdetail.css +++ /dev/null @@ -1,38 +0,0 @@ -/** - * This file provides styles for the image detail page (detail.php). - */ - -#dokuwiki__detail { - padding: 1em; -} -#dokuwiki__detail h1 { -} - -#dokuwiki__detail img { - float: left; - margin: 0 1.5em .5em 0; -} -[dir=rtl] #dokuwiki__detail img { - float: right; - margin-right: 0; - margin-left: 1.5em; -} -#dokuwiki__detail div.img_detail { - float: left; -} -[dir=rtl] #dokuwiki__detail div.img_detail { - float: right -} - -#dokuwiki__detail div.img_detail h2 { -} -#dokuwiki__detail div.img_detail dl { -} -#dokuwiki__detail div.img_detail dl dt { -} -#dokuwiki__detail div.img_detail dl dd { -} - -#dokuwiki__detail p.back { - clear: both; -} diff --git a/css/_links.css b/css/_links.css deleted file mode 100644 index 5b783b2..0000000 --- a/css/_links.css +++ /dev/null @@ -1,82 +0,0 @@ -/** - * This file provides styles for all types of links. - */ - -/*____________ links to wiki pages ____________*/ - -/* existing wikipage */ -.dokuwiki a.wikilink1 { -} -/* not existing wikipage */ -.dokuwiki a.wikilink2 { - text-decoration: none; -} -.dokuwiki a.wikilink2:link, -.dokuwiki a.wikilink2:visited { - border-bottom: 1px dashed; -} -.dokuwiki a.wikilink2:hover, -.dokuwiki a.wikilink2:active, -.dokuwiki a.wikilink2:focus { - border-bottom-width: 0; -} - -/* any link to current page */ -.dokuwiki span.curid a { - font-weight: bold; -} - -/*____________ other link types ____________*/ - -.dokuwiki a.urlextern, -.dokuwiki a.windows, -.dokuwiki a.mail, -.dokuwiki a.mediafile, -.dokuwiki a.interwiki { - background-repeat: no-repeat; - background-position: 0 center; - padding: 0 0 0 18px; -} -/* external link */ -.dokuwiki a.urlextern { - background-image: url(images/external-link.png); - /* - @deprecated, change since Adora Belle: - background-image: url(../../images/external-link.png); - */ -} -/* windows share */ -.dokuwiki a.windows { - background-image: url(images/unc.png); - /* - @deprecated, change since Adora Belle: - background-image: url(../../images/unc.png); - */ -} -/* email link */ -.dokuwiki a.mail { - background-image: url(images/email.png); - /* - @deprecated, change since Adora Belle: - background-image: url(../../images/email.png); - */ -} - -/* icons of the following are set by dokuwiki in lib/exe/css.php */ -/* link to some embedded media */ -.dokuwiki a.mediafile { -} -/* interwiki link */ -.dokuwiki a.interwiki { -} - -/* RTL corrections */ -[dir=rtl] .dokuwiki a.urlextern, -[dir=rtl] .dokuwiki a.windows, -[dir=rtl] .dokuwiki a.mail, -[dir=rtl] .dokuwiki a.interwiki, -[dir=rtl] .dokuwiki a.mediafile { - background-position: right center; - padding: 0 18px 0 0; - display: inline-block; /* needed for IE7 */ -} diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css deleted file mode 100644 index ab2e980..0000000 --- a/css/_media_fullscreen.css +++ /dev/null @@ -1,513 +0,0 @@ -/** - * This file provides the styles for the fullscreen media manager - * (?do=media). - * - * What most templates would probably need to change (depending on - * their site width) are the 4 min-width's (search for @change). - */ - - -/*____________ structure ____________*/ - -#mediamanager__page h1 { - margin-bottom: .5em; -} - -#mediamanager__page { - /* min-width must be summary of all 3 panels' min-widths */ - min-width: 50em; /* @change */ - width: 100%; - text-align: left; -} - -#mediamanager__page .panel { - float: left; -} - -#mediamanager__page .namespaces { - width: 20%; - min-width: 10em; /* @change */ -} -#mediamanager__page .filelist { - width: 50%; - min-width: 25em; /* @change */ -} -#mediamanager__page .file { - width: 30%; - min-width: 15em; /* @change */ -} - -#mediamanager__page .panelHeader { - background-color: __background_alt__; - margin: 0 10px 10px 0; - padding: 10px 10px 8px; - text-align: left; - min-height: 20px; - overflow: hidden; -} - -#mediamanager__page .panelContent { - overflow-y: auto; - overflow-x: hidden; - padding: 0; - margin: 0 10px 10px 0; - position: relative; -} -[dir=rtl] #mediamanager__page .panelContent { - text-align: right; -} - -#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; - /* - @deprecated, change since Adora Belle: - background: transparent url(../../images/resizecol.png) center center no-repeat; - */ -} -#mediamanager__page .ui-resizable-e:hover { - background-color: __background_alt__; -} - - -#mediamanager__page dd { - margin: 0; -} - -#mediamanager__page .panelHeader h3 { - float: left; - font-weight: normal; - font-size: 1em; - padding: 0; - margin: 0 0 3px; -} - - -/*____________ namespaces panel ____________*/ - -[dir=rtl] #mediamanager__page .namespaces { - text-align: right; -} - -/* make it look like a tab (as in _tabs.css) */ -#mediamanager__page .namespaces h2 { - font-size: 1em; - display: inline-block; - padding: .3em .8em; - margin: 0 0 0 .3em; - border-radius: .5em .5em 0 0; - font-weight: normal; - background-color: __background_alt__; - color: __text__; - border: 1px solid __border__; - border-bottom-color: __background_alt__; - line-height: 1.4em; - position: relative; - bottom: -1px; - z-index: 2; -} -* html #mediamanager__page .namespaces h2, -*+html #mediamanager__page .namespaces h2 { - display: inline; -} -[dir=rtl] #mediamanager__page .namespaces h2 { - margin: 0 .3em 0 0; - position: relative; - right: 10px; -} -#mediamanager__page .namespaces .panelHeader { - border-top: 1px solid __border__; - z-index: 1; -} - -#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; -} - - -/*____________ file list panel ____________*/ - -/* file list header */ - -#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; -} -[dir=rtl] #mediamanager__page .panelHeader ul li { - margin-right: 0; - margin-left: .5em; -} - -#mediamanager__page .panelHeader ul li.listType { - padding-left: 30px; - margin: 0 0 0 5px; - background: url('../../images/icon-list.png') 3px 1px no-repeat; -} -#mediamanager__page .panelHeader ul li.sortBy { - padding-left: 30px; - margin: 0 0 0 5px; - 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: .3em .5em; - line-height: 1; -} - -/* file list content */ - -#mediamanager__page .filelist ul { - padding: 0; - margin: 0 10px 0 0; -} -[dir=rtl] #mediamanager__page .filelist ul { - margin: 0 10px 0 0; -} - -#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; -} - -/* file list as 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; -} - -/* file list as 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 form */ - -#mediamanager__page div.upload { - padding-bottom: 0.5em; -} - -/*____________ file panel ____________*/ - -#mediamanager__page .file ul.actions { - text-align: center; - margin: 0 0 5px; - padding: 0; - list-style: none; -} -#mediamanager__page .file ul.actions li { - display: inline; - margin: 0; -} - -#mediamanager__page .file div.image { - margin-bottom: 5px; - text-align: center; -} - -#mediamanager__page .file div.image img { - width: 100%; -} - -#mediamanager__page .file dl { - margin-bottom: 0; -} -#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__; -} - - -/* file meta data edit form */ - -#mediamanager__page form.meta div.row { - margin-bottom: 5px; -} - -#mediamanager__page form.meta label span { - display: block; -} - -#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%; -} - -/* file revisions form */ - -#mediamanager__page #page__revisions ul, /* old, until 2012-01-25 */ -#mediamanager__page form.changes ul /* new */ { - margin-left: 10px; - padding: 0; - list-style-type: none; -} - -#mediamanager__page #page__revisions ul li div.li div, /* old, until 2012-01-25 */ -#mediamanager__page form.changes ul li div.li div /* new */ { - font-size: 90%; - color: __text_neu__; - padding-left: 18px; -} - -#mediamanager__page #page__revisions ul li div.li input, /* old, until 2012-01-25 */ -#mediamanager__page form.changes ul li div.li input /* new */ { - position: relative; - top: 1px; -} - -/* file diff view */ - -#mediamanager__diff table { - table-layout: fixed; - border-width: 0; -} - -#mediamanager__diff td, -#mediamanager__diff th { - width: 48%; - margin: 0 5px 10px 0; - padding: 0; - vertical-align: top; - text-align: left; - border-color: __background__; -} -[dir=rtl] #mediamanager__diff td, -[dir=rtl] #mediamanager__diff th { - text-align: right; -} - -#mediamanager__diff th { - font-weight: normal; - background-color: __background__; - line-height: 1.2; -} -#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 views */ - -#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/css/_media_popup.css b/css/_media_popup.css deleted file mode 100644 index c776e6b..0000000 --- a/css/_media_popup.css +++ /dev/null @@ -1,257 +0,0 @@ -/** - * This file provides styles for the media manager popup - * (mediamanager.php). - */ - -/*____________ structure ____________*/ - -html.popup { - overflow: auto; -} - -#media__manager { - height: 100%; - overflow: hidden; -} - -#mediamgr__aside { - width: 30%; - height: 100%; - overflow: auto; - position: absolute; - left: 0; - border-right: 1px solid __border__; -} -[dir=rtl] #mediamgr__aside { - left: auto; - right: 0; - border-right-width: 0; - border-left: 1px solid __border__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 0; -} -[dir=rtl] #mediamgr__content { - right: auto; - left: 0; -} -#mediamgr__content .pad { - padding: .5em; -} - -#media__manager h1, -#media__manager h2 { - font-size: 1.5em; - margin-bottom: .5em; - padding-bottom: .2em; - border-bottom: 1px solid __border__; -} - -/* left side -********************************************************************/ - -/*____________ options ____________*/ - -#media__opts { - margin-bottom: .5em; -} - -#media__opts input { - margin-right: .3em; -} -[dir=rtl] #media__opts input { - margin-right: 0; - margin-left: .3em; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -[dir=rtl] #media__tree ul { - padding-left: 0; - padding-right: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -[dir=rtl] #media__tree ul li { - clear: right; - margin-right: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -[dir=rtl] #media__tree ul li img { - float: right; - padding: .5em 0 0 .3em; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 1.5em; -} -[dir=rtl] #media__tree ul li li { - margin-left: 0; - margin-right: 1.5em; -} - -/* right side -********************************************************************/ - -/*____________ upload form ____________*/ - -/* upload info */ -#media__content div.upload { - font-size: .9em; - margin-bottom: .5em; -} - -#mediamanager__uploader { - margin-bottom: 1em; -} -#mediamanager__uploader p { - margin-bottom: .5em; -} - -/*____________ file list ____________*/ - -#media__content img.load { - margin: 1em auto; -} - -#media__content .odd, -#media__content .even { - padding: .5em; -} -#media__content .odd { - background-color: __background_alt__; -} -#media__content .even { -} -/* highlight newly uploaded or edited file */ -#media__content #scroll__here { - border: 1px dashed __border__; -} - -/* link which inserts media file */ -#media__content a.mediafile { - margin-right: 1.5em; - font-weight: bold; -} -[dir=rtl] #media__content a.mediafile { - margin-right: 0; - margin-left: 1.5em; -} -#media__content span.info { -} -#media__content img.btn { - vertical-align: text-bottom; -} - -/* info how to insert media, if JS disabled */ -#media__content div.example { - color: __text_neu__; - margin-left: 1em; -} - -#media__content div.detail { - padding: .2em 0; -} -#media__content div.detail div.thumb { - float: left; - margin: 0 .5em 0 18px; -} -[dir=rtl] #media__content div.detail div.thumb { - float: right; - margin: 0 18px 0 .5em; -} -#media__content div.detail div.thumb a { - display: block; - cursor: pointer; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -#dw__mediasearch { -} -#dw__mediasearch p { -} -#dw__mediasearch label { -} -#dw__mediasearch label span { -} -#dw__mediasearch input.edit { -} -#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} -[dir=rtl] #media__content form.meta div.metafield { - clear: right; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -[dir=rtl] #media__content form.meta label { - float: right; - clear: right; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -[dir=rtl] #media__content form.meta .edit { - float: right; -} -#media__content form.meta textarea.edit { - /* needed because of IE8 hack in _edit.css for textarea.edit: */ - max-width: 70%; - min-width: 70%; -} - -#media__content form.meta div.buttons { - clear: left; - margin: .2em 0 0 25%; -} -[dir=rtl] #media__content form.meta div.buttons { - clear: right; - margin: .2em 25% 0 0; -} diff --git a/css/_modal.css b/css/_modal.css deleted file mode 100644 index 509238c..0000000 --- a/css/_modal.css +++ /dev/null @@ -1,101 +0,0 @@ -/** - * This file provides styles for modal dialogues. - */ - -.dokuwiki .ui-widget { - font-size: 100%; -} - - -/* link wizard (opens from the link button in the edit toolbar) -********************************************************************/ - -#link__wiz { -} - -#link__wiz_result { - background-color: __background__; - width: 293px; - height: 193px; - overflow: auto; - border: 1px solid __border__; - margin: 3px auto; - text-align: left; - line-height: 1; -} -[dir=rtl] #link__wiz_result { - text-align: right; -} - -#link__wiz_result div { - padding: 3px 3px 3px 0; -} -[dir=rtl] #link__wiz_result div { - padding: 3px 0 3px 3px; -} - -#link__wiz_result div a { - display: block; - padding-left: 22px; - min-height: 16px; - background: transparent 3px center no-repeat; -} -[dir=rtl] #link__wiz_result div a { - padding-right: 22px; - background-position: right 0; -} - -#link__wiz_result div.type_u a { - background-image: url(../../images/up.png); -} -#link__wiz_result div.type_f a { - background-image: url(../../images/page.png); -} -#link__wiz_result div.type_d a { - background-image: url(../../images/ns.png); -} - -#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__; - margin-left: 22px; -} -[dir=rtl] #link__wiz_result span { - margin-left: 0; - margin-right: 22px; -} - - -/* media option wizard (opens when inserting media in the media popup) -********************************************************************/ - -#media__popup { - /* for backwards compatibility (not needed since Rincewind) */ - display: none; -} - -#media__popup_content p { - margin: 0 0 .5em; -} - -#media__popup_content label { - margin-right: .5em; - cursor: default; -} -[dir=rtl] #media__popup_content label { - margin-right: 0; - margin-left: .5em; -} - -#media__popup_content .button { - margin-right: 1px; - cursor: pointer; -} diff --git a/css/_recent.css b/css/_recent.css deleted file mode 100644 index cb1e7f4..0000000 --- a/css/_recent.css +++ /dev/null @@ -1,88 +0,0 @@ -/** - * This file provides styles for the recent changes (?do=recent) and - * old revisions (?do=revisions). - */ - -/*____________ list of revisions / recent changes ____________*/ - -/* select type of revisions (media/pages), should have a class on it's own, but hasn't (until after version 2012-01-25) */ -.dokuwiki #dw__recent label, /* old, until 2012-01-25 */ -.dokuwiki .changeType /* new */ { - margin-bottom: .5em; - display: block; -} - -.dokuwiki #dw__recent ul li, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li /* new */ { - list-style: none; - margin-left: 0; -} -[dir=rtl] .dokuwiki #dw__recent ul li, /* old, until 2012-01-25 */ -[dir=rtl] .dokuwiki #page__revisions ul li, /* old, until 2012-01-25 */ -[dir=rtl] .dokuwiki form.changes ul li /* new */ { - margin-right: 0; -} - -.dokuwiki #dw__recent ul li span, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li span, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li span, /* new */ -.dokuwiki #dw__recent ul li a, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li a, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li a /* new */ { - vertical-align: middle; -} -.dokuwiki #dw__recent ul li span.user a, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li span.user a, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li span.user a /* new */ { - vertical-align: bottom; -} -.dokuwiki #dw__recent ul li.minor, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li.minor, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li.minor /* new */ { - opacity: .7; -} - -.dokuwiki #dw__recent ul li span.date, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li span.date, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li span.date /* new */ { -} -.dokuwiki #dw__recent ul li a.diff_link, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li a.diff_link, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li a.diff_link /* new */ { - vertical-align: baseline; -} -.dokuwiki #dw__recent ul li a.revisions_link, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li a.revisions_link, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li a.revisions_link /* new */ { - vertical-align: baseline; -} -.dokuwiki #dw__recent ul li a.wikilink1, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li a.wikilink1, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li a.wikilink1, /* new */ -.dokuwiki #dw__recent ul li a.wikilink2, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li a.wikilink2, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li a.wikilink2 /* new */ { -} -.dokuwiki #dw__recent ul li span.sum, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li span.sum, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li span.sum /* new */ { - font-weight: bold; -} -.dokuwiki #dw__recent ul li span.user, /* old, until 2012-01-25 */ -.dokuwiki #page__revisions ul li span.user, /* old, until 2012-01-25 */ -.dokuwiki form.changes ul li span.user /* new */ { -} - - -/*____________ page navigator ____________*/ - -.dokuwiki div.pagenav { - text-align: center; - margin: 1.4em 0; -} -.dokuwiki div.pagenav-prev, -.dokuwiki div.pagenav-next { - display: inline; - margin: 0 .5em; -} diff --git a/css/_search.css b/css/_search.css deleted file mode 100644 index 07eb7d9..0000000 --- a/css/_search.css +++ /dev/null @@ -1,114 +0,0 @@ -/** - * This file provides styles for the search results page (?do=search) - * and the AJAX search popup. - */ - -/* search results page -********************************************************************/ - -/* loading gif */ -#dw__loading { - text-align: center; - margin-bottom: 1.4em; -} - -/*____________ matching pagenames ____________*/ - -.dokuwiki div.search_quickresult { - margin-bottom: 1.4em; -} -.dokuwiki div.search_quickresult h3 { -} -.dokuwiki div.search_quickresult ul { - padding: 0; -} -.dokuwiki div.search_quickresult ul li { - float: left; - width: 12em; - margin: 0 1.5em; -} -[dir=rtl] .dokuwiki div.search_quickresult ul li { - float: right; -} - -/*____________ search results ____________*/ - -.dokuwiki div.search_result { - margin-bottom: 1.2em; -} -/* search heading */ -.dokuwiki dl.search_results dt { - font-weight: normal; - margin-bottom: .2em; -} - -/* search snippet */ -.dokuwiki div.search_result div.search_snippet, /* old, until 2012-01-25 */ -.dokuwiki dl.search_results dd /* new */ { - color: __text_alt__; - background-color: inherit; - margin: 0 0 1.2em 0; -} - -/* search hit in normal text */ -.dokuwiki .search_hit { - color: __text__; - background-color: __highlight__; -} -/* search hit in search results */ -.dokuwiki div.search_result strong.search_hit, /* old */ -.dokuwiki .search_results strong.search_hit /* new */ { - font-weight: normal; -} -/* ellipsis separating snippets */ -.dokuwiki div.search_result .search_sep, /* old */ -.dokuwiki .search_results .search_sep /* new */ { - color: __text__; - background-color: inherit; -} - -/* "nothing found" at search + media */ -.dokuwiki div.nothing { - margin-bottom: 1.4em; -} - - -/* AJAX quicksearch popup -********************************************************************/ - -.dokuwiki form.search div.no { - position: relative; - z-index: 1; -} - -/* .JSpopup */ -.dokuwiki form.search div.ajax_qsearch { - position: absolute; - top: 0; - left: -13.5em; /* -( width of #qsearch__in + padding of .ajax_qsearch + a bit more ) */ - width: 12em; - padding: 0.5em; - font-size: .9em; - z-index: 20; - text-align: left; - display: none; -} -[dir=rtl] .dokuwiki form.search div.ajax_qsearch { - left: auto; - right: -13.5em; - text-align: right; -} - -.dokuwiki form.search div.ajax_qsearch strong { - display: block; - margin-bottom: .3em; -} -.dokuwiki form.search div.ajax_qsearch ul { - margin: 0 !important; - padding: 0 !important; -} -.dokuwiki form.search div.ajax_qsearch ul li { - margin: 0; - padding: 0; - display: block !important; -} diff --git a/css/_tabs.css b/css/_tabs.css deleted file mode 100644 index 845ec9a..0000000 --- a/css/_tabs.css +++ /dev/null @@ -1,82 +0,0 @@ -/** - * This file provides the styles for general tabs. - */ - -.dokuwiki .tabs > ul, -.dokuwiki ul.tabs { - padding: 0; - margin: 0; - overflow: hidden; - position: relative; -} -/* border underneath */ -.dokuwiki .tabs > ul:after, -.dokuwiki ul.tabs:after { - position: absolute; - content: ""; - width: 100%; - bottom: 0; - left: 0; - border-bottom: 1px solid __border__; - z-index: 1; -} - -.dokuwiki .tabs > ul li, -.dokuwiki ul.tabs li { - float: left; - padding: 0; - margin: 0; - list-style: none; -} -[dir=rtl] .dokuwiki .tabs > ul li, -[dir=rtl] .dokuwiki ul.tabs li { - float: right; -} - -.dokuwiki .tabs > ul li a, -.dokuwiki ul.tabs li strong, -.dokuwiki ul.tabs li a { - display: inline-block; - padding: .3em .8em; - margin: 0 0 0 .3em; - background-color: __background_neu__; - color: __text__; - border: 1px solid __border__; - border-radius: .5em .5em 0 0; - position: relative; - z-index: 0; -} -[dir=rtl] .dokuwiki .tabs > ul li a, -[dir=rtl] .dokuwiki ul.tabs li strong, -[dir=rtl] .dokuwiki ul.tabs li a { - margin: 0 .3em 0 0; -} - -.dokuwiki ul.tabs li strong { - font-weight: normal; -} - -.dokuwiki ul.tabs li a:link, -.dokuwiki ul.tabs li a:visited { -} -.dokuwiki .tabs > ul li a:hover, -.dokuwiki .tabs > ul li a:active, -.dokuwiki .tabs > ul li a:focus, -.dokuwiki .tabs > ul li .curid a, -.dokuwiki .tabs > ul .active a, -.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; - font-weight: normal; -} - -.dokuwiki .tabs > ul li .curid a, -.dokuwiki .tabs > ul li .active a, -.dokuwiki ul.tabs li strong { - z-index: 2; - border-bottom-color: __background_alt__; -} diff --git a/css/_toc.css b/css/_toc.css deleted file mode 100644 index 68eafba..0000000 --- a/css/_toc.css +++ /dev/null @@ -1,128 +0,0 @@ -/** - * This file provides styles for the TOC (table of contents), the - * sitemap (?do=index) and backlinks (?do=backlink). - */ - -/* toc -********************************************************************/ - -/* toc container */ -.dokuwiki div.toc, /* old, until 2012-01-25 */ -#dw__toc /* new */ { - float: right; - margin: 0 0 1.4em 1.4em; - width: 12em; - background-color: __background_alt__; - color: inherit; -} -[dir=rtl] .dokuwiki div.toc, /* old, until 2012-01-25 */ -[dir=rtl] #dw__toc /* new */ { - float: left; - margin: 0 1.4em 1.4em 0; -} - -/*____________ toc header ____________*/ - -.dokuwiki div.tocheader, /* old */ -#dw__toc h3 /* new */ { - padding: .2em .5em; - font-weight: bold; - margin-bottom: 0; - font-size: 1em; -} - -.dokuwiki .toc span.toc_open, /* old */ -.dokuwiki .toc span.toc_close, /* old */ -#dw__toc h3 strong /* new */ { - float: right; - margin: 0 .2em; - line-height: 1; -} -[dir=rtl] .dokuwiki .toc span.toc_open, /* old */ -[dir=rtl] .dokuwiki .toc span.toc_close, /* old */ -[dir=rtl] #dw__toc h3 strong /* new */ { - float: left; -} - -/*____________ toc list ____________*/ - -.dokuwiki #toc__inside, -#dw__toc > div { - padding: .2em .5em; -} -.dokuwiki #toc__inside ul, /* old */ -#dw__toc ul /* new */ { - padding: 0; - margin: 0; -} -.dokuwiki #toc__inside ul li, /* old */ -#dw__toc ul li /* new */ { - list-style: none; - padding: 0; - margin: 0; - line-height: 1.1; -} -.dokuwiki #toc__inside ul li div.li, /* old */ -#dw__toc ul li div.li /* new */ { - padding: .15em 0; -} -.dokuwiki #toc__inside ul ul, /* old */ -#dw__toc ul ul /* new */ { - padding-left: 1em; -} -[dir=rtl] .dokuwiki #toc__inside ul ul, /* old */ -[dir=rtl] #dw__toc ul ul /* new */ { - padding-left: 0; - padding-right: 1em; -} -.dokuwiki #toc__inside ul ul li, /* old */ -#dw__toc ul ul li /* new */ { -} -.dokuwiki #toc__inside ul li a, /* old */ -#dw__toc ul li a /* new */ { -} - -/* in case of toc list jumping one level - (e.g. if heading level 3 follows directly after heading level 1) */ -.dokuwiki #toc__inside ul li.clear, /* old */ -#dw__toc ul li.clear /* new */ { -} - - -/* sitemap (and backlinks) -********************************************************************/ - -.dokuwiki ul.idx { - padding-left: 0; -} -[dir=rtl] .dokuwiki ul.idx { - padding-right: 0; -} -.dokuwiki ul.idx li { - list-style-image: url(images/bullet.png); - /* - @deprecated, change since Adora Belle: - list-style-image: url(../../images/bullet.png); - */ -} -.dokuwiki ul.idx li.open { - list-style-image: url(images/open.png); - /* - @deprecated, change since Adora Belle: - list-style-image: url(../../images/open.png); - */ -} -.dokuwiki ul.idx li.closed { - list-style-image: url(images/closed.png); - /* - @deprecated, change since Adora Belle: - list-style-image: url(../../images/closed.png); - */ -} -[dir=rtl] .dokuwiki ul.idx li.closed { - list-style-image: url(images/closed-rtl.png); - /* - @deprecated, change since Adora Belle: - list-style-image: url(../../images/closed-rtl.png); - */ -} diff --git a/css/basic.css b/css/basic.css index cd952cc..87ad496 100644 --- a/css/basic.css +++ b/css/basic.css @@ -391,18 +391,3 @@ div.clearer { font-size: 1px; visibility: hidden; } - -/* @deprecated: has been in lib/styles/screen.css since Angua */ -.a11y { - position: absolute; - left: -99999em; - top: 0; - width: 0; - height: 0; - overflow: hidden; - display: inline; -} -[dir=rtl] .a11y { - left: auto; - right: -99999em; -} diff --git a/css/content.css b/css/content.css index cd23b62..92d48b3 100644 --- a/css/content.css +++ b/css/content.css @@ -122,7 +122,7 @@ } -/*____________ media manager ____________*/ +/*____________ changes to _media_fullscreen ____________*/ /* some headings in the media manager should not look like headings */ #mediamanager__page h2, @@ -140,6 +140,14 @@ } +/*____________ changes to _toc ____________*/ + +#dw__toc h3 { + margin-bottom: 0; + font-size: 1em; +} + + /*____________ JS popup ____________*/ .JSpopup { diff --git a/images/bullet.png b/images/bullet.png deleted file mode 100644 index da87696..0000000 Binary files a/images/bullet.png and /dev/null differ diff --git a/images/closed-rtl.png b/images/closed-rtl.png deleted file mode 100644 index 85ebd59..0000000 Binary files a/images/closed-rtl.png and /dev/null differ diff --git a/images/closed.png b/images/closed.png deleted file mode 100644 index 3691ebc..0000000 Binary files a/images/closed.png and /dev/null differ diff --git a/images/email.png b/images/email.png deleted file mode 100644 index d1d4a5f..0000000 Binary files a/images/email.png and /dev/null differ diff --git a/images/external-link.png b/images/external-link.png deleted file mode 100644 index a4d5de1..0000000 Binary files a/images/external-link.png and /dev/null differ diff --git a/images/icons-license.txt b/images/icons-license.txt deleted file mode 100644 index 747d6f5..0000000 --- a/images/icons-license.txt +++ /dev/null @@ -1,5 +0,0 @@ -Icons for: email.png, external-link.png and unc.png -Icon set: Dusseldorf -Designer: pc.de -License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] -URL: http://pc.de/icons/#Dusseldorf diff --git a/images/open.png b/images/open.png deleted file mode 100644 index eafb64e..0000000 Binary files a/images/open.png and /dev/null differ diff --git a/images/resizecol.png b/images/resizecol.png deleted file mode 100644 index f011150..0000000 Binary files a/images/resizecol.png and /dev/null differ diff --git a/images/unc.png b/images/unc.png deleted file mode 100644 index a552d6e..0000000 Binary files a/images/unc.png and /dev/null differ diff --git a/lang/de/lang.php b/lang/de/lang.php index 808d9e2..1a41f34 100644 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -9,10 +9,4 @@ $lang['discussion'] = 'Diskussion'; $lang['back_to_article'] = 'Zurück zum Artikel'; $lang['userpage'] = 'Benutzer-Seite'; -/* accessibility headlines */ -$lang['user_tools'] = 'Benutzer-Werkzeuge'; -$lang['site_tools'] = 'Webseiten-Werkzeuge'; -$lang['page_tools'] = 'Seiten-Werkzeuge'; -$lang['skip_to_content'] = 'springe zum Inhalt'; - //Setup VIM: ex: et ts=2 : diff --git a/lang/de/settings.php b/lang/de/settings.php index 64238dd..9e2eea5 100644 --- a/lang/de/settings.php +++ b/lang/de/settings.php @@ -7,5 +7,3 @@ $lang['discussionPage'] = 'Diskussion-Seite (leer lassen, um Funktion zu deaktivieren)'; $lang['userPage'] = 'Benutzer seite (leer lassen, um Funktion zu deaktivieren)'; $lang['hideTools'] = 'Tools abschalten, wenn der Benutzer nicht angemeldet ist?'; -$lang['tagline'] = 'Tagline (veraltet, nuten Sie die Basiseinstellung "tagline" - verfügbar seit Adora Belle)'; -$lang['sidebarID'] = 'Seitenname der Sidebar (veraltet, nutzen Sie die Basiseinstellung "sidebar" - verfügbar seit Adora Belle)'; diff --git a/lang/en/lang.php b/lang/en/lang.php index cefac6c..b6b9237 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -7,9 +7,3 @@ $lang['discussion'] = 'Discussion'; $lang['back_to_article'] = 'Back to article'; $lang['userpage'] = 'User page'; - -/* accessibility headlines (deprecated and superseded by core since Adora Belle) */ -$lang['user_tools'] = 'User Tools'; -$lang['site_tools'] = 'Site Tools'; -$lang['page_tools'] = 'Page Tools'; -$lang['skip_to_content'] = 'skip to content'; diff --git a/lang/en/settings.php b/lang/en/settings.php index 52ccf88..5ffea25 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -7,5 +7,3 @@ $lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)'; $lang['userPage'] = 'User page (leave empty to disable user pages)'; $lang['hideTools'] = 'Hide tools when not logged in?'; -$lang['tagline'] = 'Tagline (deprecated, use core "tagline" setting since Adora Belle)'; -$lang['sidebarID'] = 'page name of page included in sidebar (deprecated, use core "sidebar" setting since Adora Belle)'; diff --git a/lang/ru/lang.php b/lang/ru/lang.php index 73485ce..6cb17d3 100644 --- a/lang/ru/lang.php +++ b/lang/ru/lang.php @@ -9,9 +9,3 @@ $lang['discussion'] = 'Обсуждение'; $lang['back_to_article'] = 'Назад к статье'; $lang['userpage'] = 'Участник'; - -//accessibility headlines -$lang['user_tools'] = 'Инструменты пользователя'; -$lang['site_tools'] = 'Инструменты сайта'; -$lang['page_tools'] = 'Инструменты страницы'; -$lang['skip_to_content'] = 'перейти к содержанию'; diff --git a/lang/ru/settings.php b/lang/ru/settings.php index fe26242..76b54f1 100644 --- a/lang/ru/settings.php +++ b/lang/ru/settings.php @@ -6,8 +6,6 @@ * @author Aleksandr Selivanov */ -$lang['tagline'] = 'Подзаголовок (слоган)'; $lang['discussionPage'] = 'Страница обсуждения (оставьте поле пустым для отключения обсуждений)'; //default -- discussion:@ID@ $lang['userPage'] = 'Страница пользователя (оставьте поле пустым для отключения страниц пользователей)'; //default -- user:@USER@: -$lang['sidebarID'] = 'Имя страницы, отображаемой в боковой панели'; //default -- sidebar $lang['hideTools'] = 'Скрывать инструменты гостям?'; diff --git a/main.php b/main.php index 0b04d81..f7fadde 100644 --- a/main.php +++ b/main.php @@ -73,7 +73,7 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER tpl_action('admin', 1, 'li'); _tpl_action('userpage', 1, 'li'); tpl_action('profile', 1, 'li'); - tpl_action('register', 1, 'li'); /* DW versions < 2011-02-20 need to use _tpl_action('register', 1, 'li') */ + tpl_action('register', 1, 'li'); tpl_action('login', 1, 'li'); ?> diff --git a/style.ini b/style.ini index 5fa6ce7..70f7f24 100644 --- a/style.ini +++ b/style.ini @@ -12,29 +12,29 @@ [stylesheets] -css/basic.css = screen -css/_imgdetail.css = screen -css/_media_popup.css = screen -css/_media_fullscreen.css = screen -css/_fileuploader.css = screen -css/_tabs.css = screen -css/_links.css = screen -css/_toc.css = screen -css/_footnotes.css = screen -css/_search.css = screen -css/_recent.css = screen -css/_diff.css = screen -css/_edit.css = screen -css/_modal.css = screen -css/_forms.css = screen -css/_admin.css = screen -css/structure.css = screen -css/design.css = screen -css/content.css = screen -css/includes.css = screen +css/basic.css = screen +../dokuwiki/css/_imgdetail.css = screen +../dokuwiki/css/_media_popup.css = screen +../dokuwiki/css/_media_fullscreen.css = screen +../dokuwiki/css/_fileuploader.css = screen +../dokuwiki/css/_tabs.css = screen +../dokuwiki/css/_links.css = screen +../dokuwiki/css/_toc.css = screen +../dokuwiki/css/_footnotes.css = screen +../dokuwiki/css/_search.css = screen +../dokuwiki/css/_recent.css = screen +../dokuwiki/css/_diff.css = screen +../dokuwiki/css/_edit.css = screen +../dokuwiki/css/_modal.css = screen +../dokuwiki/css/_forms.css = screen +../dokuwiki/css/_admin.css = screen +css/structure.css = screen +css/design.css = screen +css/content.css = screen +css/includes.css = screen -css/mobile.css = all -css/print.css = print +css/mobile.css = all +css/print.css = print ; This section is used to configure some placeholder values used in @@ -68,5 +68,5 @@ __existing__ = "#090" __missing__ = "#f30" ; widths -__site_width__ = "64em" -__sidebar_width__ = "16em" +__site_width__ = "64em" +__sidebar_width__ = "16em" diff --git a/tpl_functions.php b/tpl_functions.php index 74df26a..a8ecee0 100644 --- a/tpl_functions.php +++ b/tpl_functions.php @@ -62,30 +62,6 @@ function _tpl_userpage($userPage, $title, $link=0, $wrapper=0) { if ($wrapper) echo ""; } -/** - * Create link/button to register page - * @deprecated DW versions > 2011-02-20 can use the core function tpl_action('register') - * - * @author Anika Henke - */ -function _tpl_register($link=0, $wrapper=0) { - global $conf; - global $lang; - global $ID; - $lang_register = !empty($lang['btn_register']) ? $lang['btn_register'] : $lang['register']; - - if ($_SERVER['REMOTE_USER'] || !$conf['useacl'] || !actionOK('register')) return; - - if ($wrapper) echo "<$wrapper>"; - - if ($link) - tpl_link(wl($ID, 'do=register'), $lang_register, 'class="action register" rel="nofollow"'); - else - echo html_btn('register', $ID, '', array('do'=>'register'), 'get', 0, $lang_register); - - if ($wrapper) echo ""; -} - /** * Wrapper around custom template actions * @@ -103,133 +79,5 @@ function _tpl_action($type, $link=0, $wrapper=0) { _tpl_userpage(tpl_getConf('userPage'), tpl_getLang('userpage'), $link, $wrapper); } break; - case 'register': // deprecated - _tpl_register($link, $wrapper); - break; - } -} - - - -/* fallbacks for things missing in older DokuWiki versions -********************************************************************/ - - -/* if newer settings exist in the core, use them, otherwise fall back to template settings */ - -if (!isset($conf['tagline'])) { - $conf['tagline'] = tpl_getConf('tagline'); -} - -if (!isset($conf['sidebar'])) { - $conf['sidebar'] = tpl_getConf('sidebarID'); -} - -/* these $lang strings are now in the core */ - -if (!isset($lang['user_tools'])) { - $lang['user_tools'] = tpl_getLang('user_tools'); -} -if (!isset($lang['site_tools'])) { - $lang['site_tools'] = tpl_getLang('site_tools'); -} -if (!isset($lang['page_tools'])) { - $lang['page_tools'] = tpl_getLang('page_tools'); -} -if (!isset($lang['skip_to_content'])) { - $lang['skip_to_content'] = tpl_getLang('skip_to_content'); -} - - -/** - * copied from core (available since Adora Belle) - */ -if (!function_exists('tpl_getMediaFile')) { - function tpl_getMediaFile($search, $abs = false, &$imginfo = null) { - $img = ''; - $file = ''; - $ismedia = false; - // loop through candidates until a match was found: - foreach($search as $img) { - if(substr($img, 0, 1) == ':') { - $file = mediaFN($img); - $ismedia = true; - } else { - $file = tpl_incdir().$img; - $ismedia = false; - } - - if(file_exists($file)) break; - } - - // fetch image data if requested - if(!is_null($imginfo)) { - $imginfo = getimagesize($file); - } - - // build URL - if($ismedia) { - $url = ml($img, '', true, '', $abs); - } else { - $url = tpl_basedir().$img; - if($abs) $url = DOKU_URL.substr($url, strlen(DOKU_REL)); - } - - return $url; - } -} - -/** - * copied from core (available since Angua) - */ -if (!function_exists('tpl_favicon')) { - function tpl_favicon($types = array('favicon')) { - - $return = ''; - - foreach($types as $type) { - switch($type) { - case 'favicon': - $look = array(':wiki:favicon.ico', ':favicon.ico', 'images/favicon.ico'); - $return .= ''.NL; - break; - case 'mobile': - $look = array(':wiki:apple-touch-icon.png', ':apple-touch-icon.png', 'images/apple-touch-icon.png'); - $return .= ''.NL; - break; - case 'generic': - // ideal world solution, which doesn't work in any browser yet - $look = array(':wiki:favicon.svg', ':favicon.svg', 'images/favicon.svg'); - $return .= ''.NL; - break; - } - } - - return $return; - } -} - -/** - * copied from core (available since Adora Belle) - */ -if (!function_exists('tpl_includeFile')) { - function tpl_includeFile($file) { - global $config_cascade; - foreach(array('protected', 'local', 'default') as $config_group) { - if(empty($config_cascade['main'][$config_group])) continue; - foreach($config_cascade['main'][$config_group] as $conf_file) { - $dir = dirname($conf_file); - if(file_exists("$dir/$file")) { - include("$dir/$file"); - return; - } - } - } - - // still here? try the template dir - $file = tpl_incdir().$file; - if(file_exists($file)) { - include($file); - } } }